r784 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Tue Mar 16 21:25:54 2010
New Revision: 784

Log:
debian/rules: Centralize changelogs installation.

Modified:
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Tue Mar 16 21:18:09 2010	(r783)
+++ lvm2/trunk/debian/rules	Tue Mar 16 21:25:54 2010	(r784)
@@ -141,6 +141,7 @@
 	touch $@
 
 install-base:
+	dh_installchangelogs $(if $(CHANGELOG),$(CHANGELOG),WHATS_NEW)
 	dh_installdebconf
 	dh_installdocs
 	dh_installexamples
@@ -160,7 +161,6 @@
 	dh_testroot
 	dh_prep
 	dh_install --sourcedir=$(DIR)
-	dh_installchangelogs WHATS_NEW
 	dh_installinit --no-start -- start 63 S . start 51 0 6 .
 	$(MAKE) -f debian/rules install-base
 
@@ -171,8 +171,7 @@
 	dh_testroot
 	dh_prep
 	dh_install -X .svn --sourcedir=$(DIR)
-	dh_installchangelogs WHATS_NEW_DM
-	$(MAKE) -f debian/rules install-base GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
+	$(MAKE) -f debian/rules install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
 install_dmsetup-udeb: PACKAGE_NAME = dmsetup-udeb
 install_dmsetup-udeb: export DH_OPTIONS = -p$(PACKAGE_NAME)
@@ -182,7 +181,7 @@
 	dh_testdir
 	dh_testroot
 	dh_prep
-	dh_installchangelogs WHATS_NEW_DM
+	dh_installchangelogs
 	dh_install --sourcedir=$(DIR)
 
 	dh_installdocs
@@ -206,13 +205,12 @@
 	dh_testroot
 	dh_prep
 	dh_install --sourcedir=$(DIR)
-	dh_installchangelogs WHATS_NEW_DM
 	dh_link -p libdevmapper-dev lib/libdevmapper.so.$(DEVMAPPER_ABINAME) usr/lib/libdevmapper.so
 	dh_makeshlibs -p 'libdevmapper$(DEVMAPPER_ABINAME)' \
 		--add-udeb 'libdevmapper$(DEVMAPPER_ABINAME)-udeb' \
 	       	"-Vlibdevmapper$(DEVMAPPER_ABINAME) (>= $(DEVMAPPER_VERSION))" \
 		-- "-v$(DEVMAPPER_VERSION_DEBIAN)" -c2
-	$(MAKE) -f debian/rules install-base GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
+	$(MAKE) -f debian/rules install-base CHANGELOG=WHATS_NEW_DM GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
 install_libdevmapper-udeb: PACKAGE_NAME = libdevmapper$(DEVMAPPER_ABINAME)-udeb
 install_libdevmapper-udeb: export DH_OPTIONS = -p$(PACKAGE_NAME)
@@ -246,7 +244,6 @@
 	dh_testroot
 	dh_prep
 	dh_install -X .svn --sourcedir=$(DIR)
-	dh_installchangelogs WHATS_NEW
 	dh_installinit --no-start -- start 26 S . start 50 0 6 .
 	$(MAKE) -f debian/rules install-base
 
@@ -257,7 +254,6 @@
 	dh_testroot
 	dh_prep
 	dh_install --sourcedir=$(DIR)
-	dh_installchangelogs
 	$(MAKE) -f debian/rules install-base
 
 binary-indep: