r7958: More debian packaging updates; packages build now with

a few minor issues.

Move ldb manpages one level higher - there is no longer a need to have
subdirectories.
(This used to be commit e8e3524b2394f4107230715ea38fb619332e0251)

15 files changed, 40 insertions, 34 deletions

diff --git a/packaging/debian/control b/packaging/debian/control
index 6b872d424d..e48f7aa7f1 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -3,13 +3,12 @@ Section: net
 Priority: optional
 Maintainer: Jelmer Vernooij <jelmer@samba.org>
 Standards-Version: 3.6.1.0
-Build-Depends: debmake, libgtk2.0-dev, libgconf2-dev, libldap-dev, debhelper (>> 4.0.0)
+Build-Depends: build-essential, libgtk2.0-dev, libgconf2-dev, libldap-dev, debhelper (>> 4.0.0), libparse-yapp-perl
 
 Package: samba4
-Architecture: any
-Depends: samba4-client, samba4-server
-Description: Samba4
- Foobar
+Architecture: all
+Description: Samba4 misc
+ Files common for all programs in Samba
 
 Package: samba4-common
 Architecture: all
@@ -19,6 +18,8 @@ Description: Common samba files
 Package: samba4-client
 Architecture: any
 Depends: ${shlibs:Depends}, 
+Description: Client utilities from Samba4
+ Client utilities for NetBIOS, SMB and RPC.
 
 Package: samba4-testsuite
 Architecture: any
@@ -29,6 +30,7 @@ Description: Testsuite from Samba4
  
 Package: samba4-server
 Architecture: any
+Recommends: samba4-swat
 Depends: ${shlibs:Depends}, samba4-common
 Description: SMB Server
  Contains smbd, the Samba server. 
@@ -51,7 +53,7 @@ Depends: ${shlibs:Depends}
 Description: Tools for viewing and manipulating 
  FIXME
 
-Package: pidl
+Package: libparse-pidl-perl
 Architecture: any
 Depends: perl
 Description: IDL compiler written in Perl
@@ -68,3 +70,9 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Description: Tools for maintaining LDB database files
  FIXME
+
+Package: samba4-swat
+Architecture: all
+Description: Swat data files
+ Data files for SWAT.
+
diff --git a/packaging/debian/ldb-tools.files b/packaging/debian/ldb-tools.files
deleted file mode 100644
index f8b3a5adcb..0000000000
--- a/packaging/debian/ldb-tools.files
+++ /dev/null
@@ -1,11 +0,0 @@
-usr/bin/ldbadd
-usr/bin/ldbdel
-usr/bin/ldbedit
-usr/bin/ldbmodify
-usr/bin/ldbsearch
-usr/share/man/man1/ldbadd.1
-usr/share/man/man1/ldbdel.1
-usr/share/man/man1/ldbedit.1
-usr/share/man/man1/ldbmodify.1
-usr/share/man/man1/ldbsearch.1
-usr/share/man/man7/ldb.7
diff --git a/packaging/debian/ldb-tools.install b/packaging/debian/ldb-tools.install
new file mode 100644
index 0000000000..e41da00797
--- /dev/null
+++ b/packaging/debian/ldb-tools.install
@@ -0,0 +1,6 @@
+usr/bin/ldbadd
+usr/bin/ldbdel
+usr/bin/ldbedit
+usr/bin/ldbmodify
+usr/bin/ldbsearch
+usr/share/man/man3/ldb.3
diff --git a/packaging/debian/libparse-pidl-perl.install b/packaging/debian/libparse-pidl-perl.install
new file mode 100644
index 0000000000..d2e53619ec
--- /dev/null
+++ b/packaging/debian/libparse-pidl-perl.install
@@ -0,0 +1,2 @@
+usr/bin/pidl
+usr/share/perl5/Parse/Pidl
diff --git a/packaging/debian/pidl.files b/packaging/debian/pidl.files
deleted file mode 100644
index 4d8a81a073..0000000000
--- a/packaging/debian/pidl.files
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin/pidl
-usr/share/man/man1/pidl.1
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 2d0505d225..232a95f2b1 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -12,6 +12,7 @@ configure:
 	cd $(SOURCEPATH) && ./autogen.sh
 	cd $(SOURCEPATH) && ./configure --with-fhs \
 		--prefix=/usr \
+		--mandir=/usr/share/man \
 		--enable-shared \
 		--enable-static \
 		--sysconfdir=/etc \
@@ -43,6 +44,7 @@ binary-indep: build install
 	dh_testroot -i
 	dh_install -i --sourcedir=debian/tmp
 	dh_installdocs -i
+	dh_installman -i
 	dh_installchangelogs -i
 	dh_compress -i
 	dh_fixperms -i
@@ -59,12 +61,18 @@ install: build
 	dh_clean -k
 	dh_installdirs
 	$(MAKE) -C $(SOURCEPATH) install DESTDIR=$(CURDIR)/debian/tmp
-	cp debian/smb.conf $(CURDIR)/debian/tmp/etc/samba4
+	$(MAKE) -C $(SOURCEPATH) manpages installman DESTDIR=$(CURDIR)/debian/tmp
+	mkdir -p $(CURDIR)/debian/tmp/etc/samba4
+	cp $(CURDIR)/debian/smb.conf $(CURDIR)/debian/tmp/etc/samba4
+	cp $(CURDIR)/../source/build/pidl/pidl.pl $(CURDIR)/debian/tmp/usr/bin/pidl
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/perl5/Parse/Pidl
+	cp $(CURDIR)/../source/build/pidl/*.pm $(CURDIR)/debian/tmp/usr/share/perl5/Parse/Pidl
 
 binary-arch: build install
 	dh_testdir -a
 	dh_testroot -a
 	dh_install -a --sourcedir=debian/tmp
+	dh_installchangelogs -a
 	dh_installdocs -a
 	dh_installman -a
 	dh_strip -a
diff --git a/packaging/debian/samba4-client.files b/packaging/debian/samba4-client.files
deleted file mode 100644
index 322315e26e..0000000000
--- a/packaging/debian/samba4-client.files
+++ /dev/null
@@ -1 +0,0 @@
-usr/bin/smbclient
diff --git a/packaging/debian/samba4-client.install b/packaging/debian/samba4-client.install
new file mode 100644
index 0000000000..4412eac528
--- /dev/null
+++ b/packaging/debian/samba4-client.install
@@ -0,0 +1,3 @@
+usr/bin/smbclient
+usr/bin/net
+usr/bin/nmblookup
diff --git a/packaging/debian/samba4-common.install b/packaging/debian/samba4-common.install
index 9406328a45..69f3994af2 100644
--- a/packaging/debian/samba4-common.install
+++ b/packaging/debian/samba4-common.install
@@ -1,2 +1 @@
-etc/samba4
 etc/samba4/smb.conf
diff --git a/packaging/debian/samba4-gtk-frontends.files b/packaging/debian/samba4-gtk-frontends.install
index 747b87dc5b..ea0de102bd 100644
--- a/packaging/debian/samba4-gtk-frontends.files
+++ b/packaging/debian/samba4-gtk-frontends.install
@@ -1,3 +1,3 @@
 usr/bin/gregedit
 usr/bin/gwsam
-usr/share/man/man1/gregedit.1
+usr/bin/gepdump
diff --git a/packaging/debian/samba4-server.files b/packaging/debian/samba4-server.install
index cdb5c3a72a..cdb5c3a72a 100644
--- a/packaging/debian/samba4-server.files
+++ b/packaging/debian/samba4-server.install
diff --git a/packaging/debian/samba4-testsuite.files b/packaging/debian/samba4-testsuite.install
index 38cb96f5e5..d5dba98ac8 100644
--- a/packaging/debian/samba4-testsuite.files
+++ b/packaging/debian/samba4-testsuite.install
@@ -3,5 +3,3 @@ usr/bin/ndrdump
 usr/bin/gentest
 usr/bin/locktest
 usr/bin/masktest
-usr/share/man/man1/smbtorture.1
-usr/share/man/man1/ndrdump.1
diff --git a/packaging/debian/smb.conf b/packaging/debian/smb.conf
index f7e3060e30..718217f607 100644
--- a/packaging/debian/smb.conf
+++ b/packaging/debian/smb.conf
@@ -1,2 +1,2 @@
-[global]
 # Example configuration file
+[global]
diff --git a/packaging/debian/winregistry-tools.files b/packaging/debian/winregistry-tools.files
deleted file mode 100644
index 081f8bdf6e..0000000000
--- a/packaging/debian/winregistry-tools.files
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/bin/regshell
-usr/bin/regpatch
-usr/bin/regdiff
-usr/bin/regtree
-usr/share/man/man1/regtree.1
-usr/share/man/man1/regdiff.1
-usr/share/man/man1/regpatch.1
-usr/share/man/man1/regshell.1
diff --git a/packaging/debian/winregistry-tools.install b/packaging/debian/winregistry-tools.install
new file mode 100644
index 0000000000..6aae11482d
--- /dev/null
+++ b/packaging/debian/winregistry-tools.install
@@ -0,0 +1,4 @@
+usr/bin/regshell
+usr/bin/regpatch
+usr/bin/regdiff
+usr/bin/regtree