[Pkg-samba-maint] r3919 - trunk/samba/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2011-09-27 01:32:19 +0000 (Tue, 27 Sep 2011)
New Revision: 3919

Modified:
   trunk/samba/debian/changelog
   trunk/samba/debian/rules
Log:
* Pass --sourcedirectory=source3 to dh instead of having to pass it to each
  dh_auto_* command.
* Ironically, this means that we have to manually disable dh_auto_test,
  which now finds the makefile targets but doesn't work unless we build an
  extra wrapper library into our binaries that we don't want.

Modified: trunk/samba/debian/changelog
===================================================================
--- trunk/samba/debian/changelog	2011-09-26 21:31:34 UTC (rev 3918)
+++ trunk/samba/debian/changelog	2011-09-27 01:32:19 UTC (rev 3919)
@@ -24,6 +24,11 @@
     the box - critical for a server like samba.
   * Use DH_ALWAYS_EXCLUDE instead of passing override options to
     dh_installexamples.
+  * Pass --sourcedirectory=source3 to dh instead of having to pass it to each
+    dh_auto_* command.
+  * Ironically, this means that we have to manually disable dh_auto_test,
+    which now finds the makefile targets but doesn't work unless we build an
+    extra wrapper library into our binaries that we don't want.
 
  -- Steve Langasek <vorlon at debian.org>  Sat, 24 Sep 2011 13:36:50 -0700
 

Modified: trunk/samba/debian/rules
===================================================================
--- trunk/samba/debian/rules	2011-09-26 21:31:34 UTC (rev 3918)
+++ trunk/samba/debian/rules	2011-09-27 01:32:19 UTC (rev 3919)
@@ -13,7 +13,7 @@
 DESTDIR=`pwd`/debian/tmp
 
 %:
-	dh $@
+	dh $@ --sourcedirectory=source3
 
 conf_args = \
 		--cache-file=./config.cache \
@@ -67,16 +67,16 @@
 	if [ -f debian/config.cache ]; then \
 		cp -f debian/config.cache source3/config.cache; \
 	fi
-	dh_auto_configure -Dsource3 -- $(conf_args)
+	dh_auto_configure -- $(conf_args)
 
 override_dh_auto_build:
-	dh_auto_build -Dsource3 -- everything nsswitch
+	dh_auto_build -- everything nsswitch
 
-override_dh_auto_clean:
-	dh_auto_clean -Dsource3
+# our test suite requires including a wrapper lib we don't want to ship.
+override_dh_auto_test:
 
 override_dh_auto_install:
-	dh_auto_install -Dsource3
+	dh_auto_install
 
 	# Rename to *.samba3 for alternatives
 	mv $(DESTDIR)/usr/bin/smbstatus $(DESTDIR)/usr/bin/smbstatus.samba3