r12198: Some more Debian updates. Thanks to Steinar H. Gunderson

(This used to be commit 049100bb9b2e39e20b79247f5111f86a9ca4118b)

diff --git a/packaging/debian/compat b/packaging/debian/compat
index b8626c4cff2849624fb67f87cd0ad72b163671ad..2e435a26e08d0cb483ca192b3003d030f6e501ee 100644 (file)
--- a/packaging/debian/compat
+++ b/packaging/debian/compat
@@ -1 +1,3 @@
 4
+4
+4

diff --git a/packaging/debian/copyright b/packaging/debian/copyright
index de4140c48886688cdbe484e9f60c368c15c206fe..a3bdd95d7c52d337f3b20334bb7a1086eb02c746 100644 (file)
--- a/packaging/debian/copyright
+++ b/packaging/debian/copyright
@@ -15,9 +15,8 @@ Copyright:
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program;  if not, write to the Free Software
-   Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.

diff --git a/packaging/debian/libparse-pidl-perl.install b/packaging/debian/libparse-pidl-perl.install
index 8dca43da7705fc7e13855307da1227b9c6f34f58..809cd97e2352e13364844603f349de168c9c9f12 100644 (file)
--- a/packaging/debian/libparse-pidl-perl.install
+++ b/packaging/debian/libparse-pidl-perl.install
@@ -2,4 +2,3 @@ usr/bin/pidl
 usr/share/perl5
 usr/share/man/man3/*.3pm
 usr/share/man/man1/pidl.1p
-

diff --git a/packaging/debian/rules b/packaging/debian/rules
index 35c6c7a45bbf047785417982f92229ca4d021d76..a3303ddac2fe0664c7084a8652f3778384c5d6dd 100755 (executable)
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -70,12 +70,14 @@ install: build
        $(MAKE) -C $(SOURCEPATH) install DESTDIR=$(CURDIR)/debian/tmp
        $(MAKE) -C $(SOURCEPATH) manpages installman DESTDIR=$(CURDIR)/debian/tmp
        cp $(CURDIR)/debian/smb.conf $(CURDIR)/debian/tmp/etc/samba4
+       cp $(SOURCEPATH)/setup/provision $(CURDIR)/debian/tmp/usr/lib/samba/setup
        $(MAKE) -C $(SOURCEPATH)/pidl install DESTDIR=$(CURDIR)/debian/tmp
 
 binary-arch: build install
        dh_testdir
        dh_testroot
        dh_install -a --sourcedir=debian/tmp
+       dh_installdocs -a
        dh_installchangelogs -a
        dh_strip -a
        dh_perl -a

diff --git a/packaging/debian/samba4-client.install b/packaging/debian/samba4-client.install
index 4412eac528bbbc1ba91db79a6622e0a8187e61eb..7740164cd1725f90a03388aa1f8fbba610da4a83 100644 (file)
--- a/packaging/debian/samba4-client.install
+++ b/packaging/debian/samba4-client.install
@@ -1,3 +1,5 @@
-usr/bin/smbclient
 usr/bin/net
 usr/bin/nmblookup
+usr/bin/setntacl
+usr/bin/setnttoken
+usr/bin/smbclient

diff --git a/packaging/debian/samba4-common.dirs b/packaging/debian/samba4-common.dirs
index 48b36e7fe92c49c8319701831d84aeea8744c469..61432f3de0a5940825bae885dac40afeec281f70 100644 (file)
--- a/packaging/debian/samba4-common.dirs
+++ b/packaging/debian/samba4-common.dirs
@@ -1,3 +1,4 @@
 etc/samba4/tls
 usr/lib/samba
 var/cache/samba
+var/run/samba4

diff --git a/packaging/debian/samba4-common.install b/packaging/debian/samba4-common.install
index 1589590a0860777a8479a344d7a6a4ec50690fd4..077489d74bf9d5988d8e94f841fe29c4667788c9 100644 (file)
--- a/packaging/debian/samba4-common.install
+++ b/packaging/debian/samba4-common.install
@@ -1,3 +1,4 @@
 etc/samba4/smb.conf
 usr/lib/samba/*.dat
 usr/lib/samba/setup
+usr/lib/samba/js

diff --git a/packaging/debian/samba4-dev.install b/packaging/debian/samba4-dev.install
index ba6f8f3baf606baa5184bb862afc8bd90f1db676..8e044882a823d0090bc3a6b7d3028b86b127283c 100644 (file)
--- a/packaging/debian/samba4-dev.install
+++ b/packaging/debian/samba4-dev.install
@@ -1,3 +1,9 @@
 usr/include
 usr/share/man/man3/talloc.3
 usr/share/man/man3/ldb.3
+usr/include
+usr/share/man/man3/talloc.3
+usr/share/man/man3/ldb.3
+usr/include
+usr/share/man/man3/talloc.3
+usr/share/man/man3/ldb.3

diff --git a/packaging/debian/samba4-server.install b/packaging/debian/samba4-server.install
index cdb5c3a72ad817315ca69c6e134fa0f1c364ff5b..a61f283dd8836aef7db9f2296b6ec1b07732a809 100644 (file)
--- a/packaging/debian/samba4-server.install
+++ b/packaging/debian/samba4-server.install
@@ -1 +1,3 @@
 usr/sbin/smbd
+usr/bin/smbstatus
+usr/bin/smbscript

diff --git a/packaging/debian/samba4-swat.install b/packaging/debian/samba4-swat.install
index 3877db742214a7e5c85034b71860a1e6600ec135..223f61243b39a4d1d83d76bdb416df38190772ec 100644 (file)
--- a/packaging/debian/samba4-swat.install
+++ b/packaging/debian/samba4-swat.install
@@ -1,2 +1,4 @@
 usr/share/samba/swat
+usr/share/samba/swat
+usr/share/samba/swat
 usr/lib/samba/js