r664 - lvm2/trunk/debian

Bastian Blank waldi at alioth.debian.org
Mon Feb 23 13:42:13 UTC 2009 

Author: waldi
Date: Mon Feb 23 13:42:12 2009
New Revision: 664

Log:
debian/rules: Explicitely set version of devmapper packages.


Modified:
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	(original)
+++ lvm2/trunk/debian/rules	Mon Feb 23 13:42:12 2009
@@ -8,10 +8,13 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 SOURCE := $(shell dpkg-parsechangelog | sed -ne 's,^Source: *\(.*\)$$,\1,p')
-VERSION_DEBIAN := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
-VERSION := $(shell echo "$(VERSION_DEBIAN)" | sed -e 's,^[0-9]*:,,' -e 's,-[^-]*$$,,')
-
-LIBDEVMAPPER_ABINAME = 1.02.1
+VERSION_COMPLETE := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
+VERSION_UPSTREAM := $(shell echo "$(VERSION_COMPLETE)" | sed -e 's,^[0-9]*:,,' -e 's,-[^-]*$$,,')
+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)
 
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
@@ -88,7 +91,7 @@
 $(STAMPS_DIR)/build-deb: DIR = $(BUILD_DIR)/build-deb
 $(STAMPS_DIR)/build-deb: $(STAMPS_DIR)/setup-deb
 	dh_testdir
-	$(MAKE) -C $(DIR) LIB_VERSION_DM=$(LIBDEVMAPPER_ABINAME)
+	$(MAKE) -C $(DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
 	touch $@
 
 build-udeb: $(STAMPS_DIR)/build-udeb
@@ -96,7 +99,7 @@
 $(STAMPS_DIR)/build-udeb: DIR = $(BUILD_DIR)/build-udeb
 $(STAMPS_DIR)/build-udeb: $(STAMPS_DIR)/setup-udeb
 	dh_testdir
-	$(MAKE) -C $(DIR) LIB_VERSION_DM=$(LIBDEVMAPPER_ABINAME)
+	$(MAKE) -C $(DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
 	touch $@
 
 $(BUILD_DIR) $(STAMPS_DIR):
@@ -150,9 +153,11 @@
 	dh_installdebconf
 	dh_installexamples
 	dh_installudev --priority=65
-	$(MAKE) -f debian/rules install-base GENCONTROL_ARGS="-v2:$(VERSION_DEBIAN)"
+	$(MAKE) -f debian/rules install-base GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION)"
 
-install-dmsetup-udeb: export DH_OPTIONS = -pdmsetup-udeb
+install-dmsetup-udeb: PACKAGE_NAME = dmsetup-udeb
+install-dmsetup-udeb: export DH_OPTIONS = -p$(PACKAGE_NAME)
+install-dmsetup-udeb: PACKAGE_FILE = $(PACKAGE_NAME)_$(DEVMAPPER_VERSION_FILE)_$(DEB_HOST_ARCH).udeb
 install-dmsetup-udeb: DIR = $(BUILD_DIR)/build-udeb
 install-dmsetup-udeb: INSTALL_DIR = $(BUILD_DIR)/install-dmsetup-udeb
 install-dmsetup-udeb: $(STAMPS_DIR)/build-udeb
@@ -162,37 +167,64 @@
 	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR)
 	dh_installchangelogs WHATS_NEW_DM
 	dh_install --sourcedir=$(INSTALL_DIR)
-	$(MAKE) -f debian/rules install-base GENCONTROL_ARGS="-v2:$(VERSION_DEBIAN)"
 
-install-libdevmapper: export DH_OPTIONS = -plibdevmapper-dev -plibdevmapper$(LIBDEVMAPPER_ABINAME)
+	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)
+	dh_md5sums
+	dpkg-deb --build debian/$(PACKAGE_NAME) ../$(PACKAGE_FILE)
+
+
+install-libdevmapper: export DH_OPTIONS = -plibdevmapper-dev -plibdevmapper$(DEVMAPPER_ABINAME)
 install-libdevmapper: DIR = $(BUILD_DIR)/build-deb
 install-libdevmapper: INSTALL_DIR = $(BUILD_DIR)/install-libdevmapper
 install-libdevmapper: $(STAMPS_DIR)/build-deb
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR) LIB_VERSION_DM=$(LIBDEVMAPPER_ABINAME)
+	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
 	dh_install --sourcedir=$(INSTALL_DIR)
 	dh_installchangelogs WHATS_NEW_DM
 	dh_installexamples
-	dh_link -p libdevmapper-dev lib/libdevmapper.so.$(LIBDEVMAPPER_ABINAME) usr/lib/libdevmapper.so
-	dh_makeshlibs -p 'libdevmapper$(LIBDEVMAPPER_ABINAME)' \
-		--add-udeb 'libdevmapper$(LIBDEVMAPPER_ABINAME)-udeb' -V \
-		-- "-v2:$(VERSION_DEBIAN)"
-	$(MAKE) -f debian/rules install-base GENCONTROL_ARGS="-v2:$(VERSION_DEBIAN)"
-
-install-libdevmapper-udeb: export DH_OPTIONS = -plibdevmapper$(LIBDEVMAPPER_ABINAME)-udeb
+	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)"
+
+install-libdevmapper-udeb: PACKAGE_NAME = libdevmapper$(DEVMAPPER_ABINAME)-udeb
+install-libdevmapper-udeb: export DH_OPTIONS = -p$(PACKAGE_NAME)
+install-libdevmapper-udeb: PACKAGE_FILE = $(PACKAGE_NAME)_$(DEVMAPPER_VERSION_FILE)_$(DEB_HOST_ARCH).udeb
 install-libdevmapper-udeb: DIR = $(BUILD_DIR)/build-udeb
 install-libdevmapper-udeb: INSTALL_DIR = $(BUILD_DIR)/install-libdevmapper-udeb
 install-libdevmapper-udeb: $(STAMPS_DIR)/build-udeb
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR) LIB_VERSION_DM=$(LIBDEVMAPPER_ABINAME)
+	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR) LIB_VERSION_DM=$(DEVMAPPER_ABINAME)
 	dh_install --sourcedir=$(INSTALL_DIR)
 	dh_installchangelogs WHATS_NEW_DM
 	dh_installexamples
-	$(MAKE) -f debian/rules install-base GENCONTROL_ARGS="-v2:$(VERSION_DEBIAN)"
+
+	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)
+	dh_md5sums
+	dpkg-deb --build debian/$(PACKAGE_NAME) ../$(PACKAGE_FILE)
 
 install-lvm2: export DH_OPTIONS = -plvm2
 install-lvm2: DIR = $(BUILD_DIR)/build-deb
@@ -228,8 +260,8 @@
 
 binary: binary-indep binary-arch
 
-DIR_ORIG = ../orig/$(SOURCE)-$(VERSION)
-TAR_ORIG_NAME = $(SOURCE)_$(VERSION).orig.tar.gz
+DIR_ORIG = ../orig/$(SOURCE)-$(VERSION_UPSTREAM)
+TAR_ORIG_NAME = $(SOURCE)_$(VERSION_UPSTREAM).orig.tar.gz
 TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard ../orig/$(TAR_ORIG_NAME)))
 
 orig: $(DIR_ORIG)

More information about the pkg-lvm-commits mailing list