r8266: Update debian packages

(This used to be commit 35bfb5de6feaeed9854b701b8d38f08a350d91cb)

7 files changed, 28 insertions, 17 deletions

diff --git a/packaging/debian/control b/packaging/debian/control
index e48f7aa7f1..986b85d3e3 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -38,14 +38,12 @@ Description: SMB Server
 Package: samba4-gtk-frontends
 Architecture: any
 Depends: ${shlibs:Depends}
-Description: Graphical tool for viewing and editing registry files
- Supports:
+Description: Graphical Samba client utilities
+ Contains GTK+ programs for maintaining:
  .
- * NT4 Registry files
- * Win9x Registry files 
- * Remote Registries (thru RPC)
- * GConf
- * Using filesystem as a registry file
+ * Remote SAM databases
+ * Local and remote registries
+ * DCE/RPC endpoints
 
 Package: winregistry-tools
 Architecture: any
@@ -61,7 +59,7 @@ Description: IDL compiler written in Perl
  
 Package: samba4-dev
 Architecture: any
-Depends: pidl, libc6-dev, pkg-config (>= 0.14.0)
+Depends: libparse-pidl-perl, libc6-dev, pkg-config (>= 0.14.0)
 Description: Tools for extending Samba
  Contains Samba includes and tools
 
diff --git a/packaging/debian/ldb-tools.install b/packaging/debian/ldb-tools.install
index e41da00797..79b3fcd74e 100644
--- a/packaging/debian/ldb-tools.install
+++ b/packaging/debian/ldb-tools.install
@@ -3,4 +3,8 @@ usr/bin/ldbdel
 usr/bin/ldbedit
 usr/bin/ldbmodify
 usr/bin/ldbsearch
-usr/share/man/man3/ldb.3
+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
diff --git a/packaging/debian/libparse-pidl-perl.install b/packaging/debian/libparse-pidl-perl.install
index d2e53619ec..83aad38df9 100644
--- a/packaging/debian/libparse-pidl-perl.install
+++ b/packaging/debian/libparse-pidl-perl.install
@@ -1,2 +1,3 @@
 usr/bin/pidl
-usr/share/perl5/Parse/Pidl
+usr/share/perl
+usr/lib/perl
diff --git a/packaging/debian/rules b/packaging/debian/rules
index 232a95f2b1..4d29c6abea 100755
--- a/packaging/debian/rules
+++ b/packaging/debian/rules
@@ -24,6 +24,7 @@ configure:
 		--with-syslog \
 		--with-readline \
 		--with-ldap 
+	cd $(SOURCEPATH)/build/pidl && perl Makefile.PL PREFIX=/usr
 	touch $@
 
 build: configure
@@ -31,12 +32,13 @@ build: configure
 	$(MAKE) -C $(SOURCEPATH) proto 
 	-$(MAKE) -C $(SOURCEPATH) pch
 	$(MAKE) -C $(SOURCEPATH) all
+	$(MAKE) -C $(SOURCEPATH)/build/pidl all
 	touch $@
 
 clean:
 	dh_testdir
 	dh_clean
-	rm -f build
+	rm -f build configure
 	-$(MAKE) -C $(SOURCEPATH) clean
 
 binary-indep: build install
@@ -44,7 +46,6 @@ 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
@@ -64,9 +65,7 @@ install: build
 	$(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
+	$(MAKE) -C $(SOURCEPATH)/build/pidl install DESTDIR=$(CURDIR)/debian/tmp
 
 binary-arch: build install
 	dh_testdir -a
@@ -74,7 +73,6 @@ binary-arch: build install
 	dh_install -a --sourcedir=debian/tmp
 	dh_installchangelogs -a
 	dh_installdocs -a
-	dh_installman -a
 	dh_strip -a
 	dh_python -a
 	dh_compress -a
@@ -86,6 +84,6 @@ binary-arch: build install
 	dh_md5sums -a
 	dh_builddeb -a
 
-binary: binary-indep binary-arch
+binary: binary-arch binary-indep 
 
 .PHONY: binary binary-arch binary-indep clean
diff --git a/packaging/debian/samba4-gtk-frontends.install b/packaging/debian/samba4-gtk-frontends.install
index ea0de102bd..0bb395b143 100644
--- a/packaging/debian/samba4-gtk-frontends.install
+++ b/packaging/debian/samba4-gtk-frontends.install
@@ -1,3 +1,4 @@
 usr/bin/gregedit
 usr/bin/gwsam
 usr/bin/gepdump
+usr/share/man/man1/gregedit.1
diff --git a/packaging/debian/samba4-testsuite.install b/packaging/debian/samba4-testsuite.install
index d5dba98ac8..ff068e02d5 100644
--- a/packaging/debian/samba4-testsuite.install
+++ b/packaging/debian/samba4-testsuite.install
@@ -3,3 +3,8 @@ usr/bin/ndrdump
 usr/bin/gentest
 usr/bin/locktest
 usr/bin/masktest
+usr/share/man/man1/smbtorture.1
+usr/share/man/man1/ndrdump.1
+usr/share/man/man1/gentest.1
+usr/share/man/man1/locktest.1
+usr/share/man/man1/masktest.1
diff --git a/packaging/debian/winregistry-tools.install b/packaging/debian/winregistry-tools.install
index 6aae11482d..9ec9591050 100644
--- a/packaging/debian/winregistry-tools.install
+++ b/packaging/debian/winregistry-tools.install
@@ -2,3 +2,7 @@ usr/bin/regshell
 usr/bin/regpatch
 usr/bin/regdiff
 usr/bin/regtree
+usr/share/man/man1/regshell.1
+usr/share/man/man1/regpatch.1
+usr/share/man/man1/regdiff.1
+usr/share/man/man1/regtree.1