r789 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Tue Mar 16 21:56:35 2010
New Revision: 789

Log:
debian/rules: Remove unneeded dh_gencontrol override.

Modified:
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Tue Mar 16 21:52:05 2010	(r788)
+++ lvm2/trunk/debian/rules	Tue Mar 16 21:56:35 2010	(r789)
@@ -158,11 +158,7 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-ifdef OVERRIDE_GENCONTROL
-	$(OVERRIDE_GENCONTROL)
-else
 	dh_gencontrol -- $(GENCONTROL_ARGS)
-endif
 	dh_md5sums
 	dh_builddeb $(BUILDDEB_ARGS)
 
@@ -186,11 +182,8 @@
 install_dmsetup-udeb: $(STAMPS_DIR)/install_udeb_device-mapper
 	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
 	+$(MAKE_SELF) install-base \
-		OVERRIDE_GENCONTROL="dpkg-gencontrol \
-			-p$(PACKAGE_NAME) -ldebian/changelog -n$(PACKAGE_FILE) \
-			-Tdebian/$(PACKAGE_NAME).substvars -Pdebian/$(PACKAGE_NAME) \
-			-v$(DEVMAPPER_VERSION_DEBIAN)" \
-		BUILDDEB_ARGS="--filename=$(PACKAGE_FILE)"
+		BUILDDEB_ARGS="--filename=$(PACKAGE_FILE)" \
+		GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
 install_libdevmapper: export DH_OPTIONS = -plibdevmapper-dev -plibdevmapper$(DEVMAPPER_ABINAME)
 install_libdevmapper: DIR = $(BUILD_DIR)/install_deb_device-mapper
@@ -210,11 +203,8 @@
 install_libdevmapper-udeb: $(STAMPS_DIR)/install_udeb_device-mapper
 	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
 	+$(MAKE_SELF) install-base \
-		OVERRIDE_GENCONTROL="dpkg-gencontrol \
-			-p$(PACKAGE_NAME) -ldebian/changelog -n$(PACKAGE_FILE) \
-			-Tdebian/$(PACKAGE_NAME).substvars -Pdebian/$(PACKAGE_NAME) \
-			-v$(DEVMAPPER_VERSION_DEBIAN)" \
-		BUILDDEB_ARGS="--filename=$(PACKAGE_FILE)"
+		BUILDDEB_ARGS="--filename=$(PACKAGE_FILE)" \
+		GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
 install_lvm2: export DH_OPTIONS = -plvm2
 install_lvm2: DIR = $(BUILD_DIR)/install_deb_lvm2