r780 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Tue Mar 16 21:07:40 2010
New Revision: 780

Log:
debian/rules: Cleanup.

Modified:
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Tue Mar 16 20:54:42 2010	(r779)
+++ lvm2/trunk/debian/rules	Tue Mar 16 21:07:40 2010	(r780)
@@ -143,7 +143,9 @@
 install: $(addprefix install-,libdevmapper libdevmapper-udeb dmsetup dmsetup-udeb lvm2 lvm2-udeb clvm)
 
 install-base:
+	dh_installdebconf
 	dh_installdocs
+	dh_installexamples
 	dh_strip
 	dh_compress
 	dh_fixperms
@@ -161,7 +163,6 @@
 	dh_clean -k
 	dh_install --sourcedir=$(DIR)
 	dh_installchangelogs WHATS_NEW
-	dh_installexamples
 	dh_installinit --no-start -- start 63 S . start 51 0 6 .
 	$(MAKE) -f debian/rules install-base
 
@@ -173,8 +174,6 @@
 	dh_clean -k
 	dh_install -X .svn --sourcedir=$(DIR)
 	dh_installchangelogs WHATS_NEW_DM
-	dh_installdebconf
-	dh_installexamples
 	$(MAKE) -f debian/rules install-base GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
 install-dmsetup-udeb: PACKAGE_NAME = dmsetup-udeb
@@ -210,7 +209,6 @@
 	dh_clean -k
 	dh_install --sourcedir=$(DIR)
 	dh_installchangelogs WHATS_NEW_DM
-	dh_installexamples
 	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' \
@@ -227,7 +225,7 @@
 	dh_testroot
 	dh_clean -k
 	dh_install --sourcedir=$(DIR)
-	dh_installchangelogs WHATS_NEW_DM
+	dh_installchangelogs
 	dh_installexamples
 
 	dh_installdocs
@@ -251,8 +249,6 @@
 	dh_clean -k
 	dh_install -X .svn --sourcedir=$(DIR)
 	dh_installchangelogs WHATS_NEW
-	dh_installdebconf
-	dh_installexamples
 	dh_installinit --no-start -- start 26 S . start 50 0 6 .
 	$(MAKE) -f debian/rules install-base
 
@@ -262,8 +258,8 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installchangelogs WHATS_NEW
 	dh_install --sourcedir=$(DIR)
+	dh_installchangelogs
 	$(MAKE) -f debian/rules install-base
 
 binary-indep: