r787 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Tue Mar 16 21:45:30 2010
New Revision: 787

Log:
debian/rules: Move udeb generation into base target.

Modified:
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Tue Mar 16 21:33:42 2010	(r786)
+++ lvm2/trunk/debian/rules	Tue Mar 16 21:45:30 2010	(r787)
@@ -158,9 +158,17 @@
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
+ifdef OVERRIDE_GENCONTROL
+	$(OVERRIDE_GENCONTROL)
+else
 	dh_gencontrol -- $(GENCONTROL_ARGS)
+endif
 	dh_md5sums
+ifdef OVERRIDE_BUILDDEB
+	$(OVERRIDE_BUILDDEB)
+else
 	dh_builddeb
+endif
 
 install_clvm: export DH_OPTIONS = -pclvm
 install_clvm: DIR = $(BUILD_DIR)/install_deb_cluster
@@ -181,21 +189,12 @@
 install_dmsetup-udeb: DIR = $(BUILD_DIR)/install_udeb_device-mapper
 install_dmsetup-udeb: $(STAMPS_DIR)/install_udeb_device-mapper
 	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
-	dh_installchangelogs
-
-	dh_installdocs
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dpkg-gencontrol \
-		-p$(PACKAGE_NAME) -ldebian/changelog -n$(PACKAGE_FILE) \
-		-Tdebian/$(PACKAGE_NAME).substvars -Pdebian/$(PACKAGE_NAME) \
-		-v$(DEVMAPPER_VERSION_DEBIAN)
-	dh_md5sums
-	dpkg-deb --build debian/$(PACKAGE_NAME) ../$(PACKAGE_FILE)
-
+	+$(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)" \
+		OVERRIDE_BUILDDEB="dpkg-deb --build debian/$(PACKAGE_NAME) ../$(PACKAGE_FILE)"
 
 install_libdevmapper: export DH_OPTIONS = -plibdevmapper-dev -plibdevmapper$(DEVMAPPER_ABINAME)
 install_libdevmapper: DIR = $(BUILD_DIR)/install_deb_device-mapper
@@ -214,21 +213,12 @@
 install_libdevmapper-udeb: DIR = $(BUILD_DIR)/install_udeb_device-mapper
 install_libdevmapper-udeb: $(STAMPS_DIR)/install_udeb_device-mapper
 	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
-	dh_installchangelogs
-	dh_installexamples
-
-	dh_installdocs
-	dh_strip
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_shlibdeps
-	dpkg-gencontrol \
-		-p$(PACKAGE_NAME) -ldebian/changelog -n$(PACKAGE_FILE) \
-		-Tdebian/$(PACKAGE_NAME).substvars -Pdebian/$(PACKAGE_NAME) \
-		-v$(DEVMAPPER_VERSION_DEBIAN)
-	dh_md5sums
-	dpkg-deb --build debian/$(PACKAGE_NAME) ../$(PACKAGE_FILE)
+	+$(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)" \
+		OVERRIDE_BUILDDEB="dpkg-deb --build debian/$(PACKAGE_NAME) ../$(PACKAGE_FILE)"
 
 install_lvm2: export DH_OPTIONS = -plvm2
 install_lvm2: DIR = $(BUILD_DIR)/install_deb_lvm2