[Pkg-samba-maint] r3965 - trunk/ctdb/debian

[vorlon at alioth.debian.org]

Author: vorlon
Date: 2011-11-06 16:22:42 +0000 (Sun, 06 Nov 2011)
New Revision: 3965

Modified:
   trunk/ctdb/debian/changelog
   trunk/ctdb/debian/rules
Log:
don't export various variables that are no longer used.

Modified: trunk/ctdb/debian/changelog
===================================================================
--- trunk/ctdb/debian/changelog	2011-11-06 16:21:02 UTC (rev 3964)
+++ trunk/ctdb/debian/changelog	2011-11-06 16:22:42 UTC (rev 3965)
@@ -2,6 +2,7 @@
 
   * Further reduce debian/rules with dh:
     - move dh_auto_clean overrides to debian/clean
+    - don't export various variables that are no longer used.
 
  -- Steve Langasek <vorlon at debian.org>  Sun, 06 Nov 2011 08:19:59 -0800
 

Modified: trunk/ctdb/debian/rules
===================================================================
--- trunk/ctdb/debian/rules	2011-11-06 16:21:02 UTC (rev 3964)
+++ trunk/ctdb/debian/rules	2011-11-06 16:22:42 UTC (rev 3965)
@@ -3,20 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
-
-# Set the host and build architectures for use with config.cache loading,
-# cross-building, etc.
-DEB_HOST_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE	:= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_ARCH_OS	:= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-export DEB_HOST_GNU_TYPE
-export DEB_BUILD_GNU_TYPE
-export DEB_HOST_ARCH_OS
-
 export DEB_CFLAGS_MAINT_APPEND  := -Wall
 export DEB_BUILD_MAINT_OPTIONS	:= hardening=+bindnow
 
@@ -52,7 +38,7 @@
 
 override_dh_installinit:
 	#install init script
-	DH_OPTIONS= dh_installinit -pctdb --no-start --no-restart-on-upgrade
+	dh_installinit -pctdb --no-start --no-restart-on-upgrade
 
 override_dh_strip:
 	dh_strip --dbg-package=ctdb-dbg