r668 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Mon Feb 23 14:21:21 2009
New Revision: 668

Log:
debian/rules: Also override version for dh_makeshlibs.


Modified:
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	(original)
+++ lvm2/trunk/debian/rules	Mon Feb 23 14:21:21 2009
@@ -13,8 +13,10 @@
 VERSION_DEBIAN := $(shell echo "$(VERSION_COMPLETE)" | sed -e 's,^[^-]*-,,')
 
 DEVMAPPER_ABINAME = 1.02.1
-DEVMAPPER_VERSION = 2:1.02.30-$(VERSION_DEBIAN)
-DEVMAPPER_VERSION_FILE = 1.02.30-$(VERSION_DEBIAN)
+DEVMAPPER_VERSION_PLAIN = 1.02.30
+DEVMAPPER_VERSION = 2:$(DEVMAPPER_VERSION_PLAIN)
+DEVMAPPER_VERSION_DEBIAN = $(DEVMAPPER_VERSION)-$(VERSION_DEBIAN)
+DEVMAPPER_VERSION_FILE = $(DEVMAPPER_VERSION_PLAIN)-$(VERSION_DEBIAN)
 
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
@@ -153,7 +155,7 @@
 	dh_installdebconf
 	dh_installexamples
 	dh_installudev --priority=65
-	$(MAKE) -f debian/rules install-base GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION)"
+	$(MAKE) -f debian/rules install-base GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
 install-dmsetup-udeb: PACKAGE_NAME = dmsetup-udeb
 install-dmsetup-udeb: export DH_OPTIONS = -p$(PACKAGE_NAME)
@@ -177,7 +179,7 @@
 	dpkg-gencontrol \
 		-p$(PACKAGE_NAME) -ldebian/changelog -n$(PACKAGE_FILE) \
 		-Tdebian/$(PACKAGE_NAME).substvars -Pdebian/$(PACKAGE_NAME) \
-		-v$(DEVMAPPER_VERSION)
+		-v$(DEVMAPPER_VERSION_DEBIAN)
 	dh_md5sums
 	dpkg-deb --build debian/$(PACKAGE_NAME) ../$(PACKAGE_FILE)
 
@@ -195,9 +197,10 @@
 	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' -V \
-		-- "-v$(DEVMAPPER_VERSION)"
-	$(MAKE) -f debian/rules install-base GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION)"
+		--add-udeb 'libdevmapper$(DEVMAPPER_ABINAME)-udeb' \
+	       	"-Vlibdevmapper$(DEVMAPPER_ABINAME) (>= $(DEVMAPPER_VERSION))" \
+		-- "-v$(DEVMAPPER_VERSION_DEBIAN)"
+	$(MAKE) -f debian/rules install-base GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
 install-libdevmapper-udeb: PACKAGE_NAME = libdevmapper$(DEVMAPPER_ABINAME)-udeb
 install-libdevmapper-udeb: export DH_OPTIONS = -p$(PACKAGE_NAME)
@@ -222,7 +225,7 @@
 	dpkg-gencontrol \
 		-p$(PACKAGE_NAME) -ldebian/changelog -n$(PACKAGE_FILE) \
 		-Tdebian/$(PACKAGE_NAME).substvars -Pdebian/$(PACKAGE_NAME) \
-		-v$(DEVMAPPER_VERSION)
+		-v$(DEVMAPPER_VERSION_DEBIAN)
 	dh_md5sums
 	dpkg-deb --build debian/$(PACKAGE_NAME) ../$(PACKAGE_FILE)