svn commit: samba r8266 - in branches/SAMBA_4_0/packaging/debian: .

jelmer at samba.org jelmer at samba.org
Sat Jul 9 21:40:19 GMT 2005


Author: jelmer
Date: 2005-07-09 21:40:15 +0000 (Sat, 09 Jul 2005)
New Revision: 8266

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8266

Log:
Update debian packages

Modified:
   branches/SAMBA_4_0/packaging/debian/control
   branches/SAMBA_4_0/packaging/debian/ldb-tools.install
   branches/SAMBA_4_0/packaging/debian/libparse-pidl-perl.install
   branches/SAMBA_4_0/packaging/debian/rules
   branches/SAMBA_4_0/packaging/debian/samba4-gtk-frontends.install
   branches/SAMBA_4_0/packaging/debian/samba4-testsuite.install
   branches/SAMBA_4_0/packaging/debian/winregistry-tools.install


Changeset:
Modified: branches/SAMBA_4_0/packaging/debian/control
===================================================================
--- branches/SAMBA_4_0/packaging/debian/control	2005-07-09 15:56:17 UTC (rev 8265)
+++ branches/SAMBA_4_0/packaging/debian/control	2005-07-09 21:40:15 UTC (rev 8266)
@@ -38,14 +38,12 @@
 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 @@
  
 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
 

Modified: branches/SAMBA_4_0/packaging/debian/ldb-tools.install
===================================================================
--- branches/SAMBA_4_0/packaging/debian/ldb-tools.install	2005-07-09 15:56:17 UTC (rev 8265)
+++ branches/SAMBA_4_0/packaging/debian/ldb-tools.install	2005-07-09 21:40:15 UTC (rev 8266)
@@ -3,4 +3,8 @@
 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

Modified: branches/SAMBA_4_0/packaging/debian/libparse-pidl-perl.install
===================================================================
--- branches/SAMBA_4_0/packaging/debian/libparse-pidl-perl.install	2005-07-09 15:56:17 UTC (rev 8265)
+++ branches/SAMBA_4_0/packaging/debian/libparse-pidl-perl.install	2005-07-09 21:40:15 UTC (rev 8266)
@@ -1,2 +1,3 @@
 usr/bin/pidl
-usr/share/perl5/Parse/Pidl
+usr/share/perl
+usr/lib/perl

Modified: branches/SAMBA_4_0/packaging/debian/rules
===================================================================
--- branches/SAMBA_4_0/packaging/debian/rules	2005-07-09 15:56:17 UTC (rev 8265)
+++ branches/SAMBA_4_0/packaging/debian/rules	2005-07-09 21:40:15 UTC (rev 8266)
@@ -24,6 +24,7 @@
 		--with-syslog \
 		--with-readline \
 		--with-ldap 
+	cd $(SOURCEPATH)/build/pidl && perl Makefile.PL PREFIX=/usr
 	touch $@
 
 build: configure
@@ -31,12 +32,13 @@
 	$(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 @@
 	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 @@
 	$(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 @@
 	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 @@
 	dh_md5sums -a
 	dh_builddeb -a
 
-binary: binary-indep binary-arch
+binary: binary-arch binary-indep 
 
 .PHONY: binary binary-arch binary-indep clean

Modified: branches/SAMBA_4_0/packaging/debian/samba4-gtk-frontends.install
===================================================================
--- branches/SAMBA_4_0/packaging/debian/samba4-gtk-frontends.install	2005-07-09 15:56:17 UTC (rev 8265)
+++ branches/SAMBA_4_0/packaging/debian/samba4-gtk-frontends.install	2005-07-09 21:40:15 UTC (rev 8266)
@@ -1,3 +1,4 @@
 usr/bin/gregedit
 usr/bin/gwsam
 usr/bin/gepdump
+usr/share/man/man1/gregedit.1

Modified: branches/SAMBA_4_0/packaging/debian/samba4-testsuite.install
===================================================================
--- branches/SAMBA_4_0/packaging/debian/samba4-testsuite.install	2005-07-09 15:56:17 UTC (rev 8265)
+++ branches/SAMBA_4_0/packaging/debian/samba4-testsuite.install	2005-07-09 21:40:15 UTC (rev 8266)
@@ -3,3 +3,8 @@
 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

Modified: branches/SAMBA_4_0/packaging/debian/winregistry-tools.install
===================================================================
--- branches/SAMBA_4_0/packaging/debian/winregistry-tools.install	2005-07-09 15:56:17 UTC (rev 8265)
+++ branches/SAMBA_4_0/packaging/debian/winregistry-tools.install	2005-07-09 21:40:15 UTC (rev 8266)
@@ -2,3 +2,7 @@
 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



More information about the samba-cvs mailing list