[Pkg-samba-maint] r1069 - trunk

[Peter Eisentraut]

Author: petere
Date: 2006-05-28 16:50:34 +0000 (Sun, 28 May 2006)
New Revision: 1069

Modified:
   trunk/changelog
   trunk/compat
   trunk/control
   trunk/control.in
   trunk/rules
Log:
* Updated to debhelper level 5
* Rearranged dh_strip calls so that build succeeds with
  DEB_BUILD_OPTIONS=nostrip. Closes: #288995


Modified: trunk/changelog
===================================================================
--- trunk/changelog	2006-05-27 23:10:13 UTC (rev 1068)
+++ trunk/changelog	2006-05-28 16:50:34 UTC (rev 1069)
@@ -25,6 +25,9 @@
   * Replaced libsmbclient shlibs file by dh_makeshlibs call, so the
     required ldconfig calls appear in the maintainer scripts
   * Adjusted debian/rules to get 3.0.23rc1 to build
+  * Updated to debhelper level 5
+  * Rearranged dh_strip calls so that build succeeds with
+    DEB_BUILD_OPTIONS=nostrip. Closes: #288995
 
  -- Christian Perrier <bubulle at debian.org>  Tue, 25 Apr 2006 11:27:23 +0200
 

Modified: trunk/compat
===================================================================
--- trunk/compat	2006-05-27 23:10:13 UTC (rev 1068)
+++ trunk/compat	2006-05-28 16:50:34 UTC (rev 1069)
@@ -1 +1 @@
-4
+5

Modified: trunk/control
===================================================================
--- trunk/control	2006-05-27 23:10:13 UTC (rev 1068)
+++ trunk/control	2006-05-28 16:50:34 UTC (rev 1069)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Eloy A. Paris <peloy at debian.org>
 Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Adam Conrad <adconrad at 0c3.net>
-Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40)
+Build-Depends: debhelper (>= 5), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [i386 ia64 alpha amd64 armeb arm hppa m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc], libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40)
 Standards-Version: 3.7.2
 
 Package: samba

Modified: trunk/control.in
===================================================================
--- trunk/control.in	2006-05-27 23:10:13 UTC (rev 1068)
+++ trunk/control.in	2006-05-28 16:50:34 UTC (rev 1069)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Eloy A. Paris <peloy at debian.org>
 Uploaders: Steve Langasek <vorlon at debian.org>, Christian Perrier <bubulle at debian.org>, Noèl Köthe <noel at debian.org>, Adam Conrad <adconrad at 0c3.net>
-Build-Depends: debhelper (>= 4.1.13), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [@libacl@], libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40)
+Build-Depends: debhelper (>= 5), libpam0g-dev, libreadline5-dev, libcupsys2-dev (>=1.1.20final+cvs20040330-4), libacl1-dev (>= 2.2.11-1) [@libacl@], libkrb5-dev, libldap2-dev, po-debconf, python2.3-dev, binutils (>= 2.14.90.0.7), type-handling (>= 0.2.1), libpopt-dev, dpkg-dev (>= 1.13.9), quilt (>= 0.40)
 Standards-Version: 3.7.2
 
 Package: samba

Modified: trunk/rules
===================================================================
--- trunk/rules	2006-05-27 23:10:13 UTC (rev 1068)
+++ trunk/rules	2006-05-28 16:50:34 UTC (rev 1069)
@@ -218,9 +218,8 @@
 	done
 	dh_installchangelogs -Nlibpam-smbpass
 	DH_OPTIONS= dh_installchangelogs -plibpam-smbpass source/pam_smbpass/CHANGELOG
-	dh_strip --dbg-package=samba --dbg-package=smbclient
-	cp -a debian/smbclient-dbg/* debian/samba-dbg
-	rm -rf debian/smbclient-dbg
+	DH_OPTIONS= dh_strip -psamba -psmbclient --dbg-package=samba-dbg
+	DH_OPTIONS= dh_strip -Nsamba -Nsmbclient
 	dh_link
 	dh_compress
 	dh_fixperms