r659 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Mon Feb 23 01:57:40 2009
New Revision: 659

Log:
debian/patches/install.patch: Fix installation of dmsetup.


Added:
   lvm2/trunk/debian/dmsetup-udeb.install   (contents, props changed)
      - copied, changed from r653, /devmapper/trunk/debian/dmsetup-udeb.install
   lvm2/trunk/debian/dmsetup.install   (contents, props changed)
      - copied, changed from r653, /devmapper/trunk/debian/dmsetup.install
   lvm2/trunk/debian/dmsetup.udev   (props changed)
      - copied unchanged from r653, /devmapper/trunk/debian/dmsetup.udev
Modified:
   lvm2/trunk/debian/rules

Copied: lvm2/trunk/debian/dmsetup-udeb.install (from r653, /devmapper/trunk/debian/dmsetup-udeb.install)
==============================================================================
--- /devmapper/trunk/debian/dmsetup-udeb.install	(original)
+++ lvm2/trunk/debian/dmsetup-udeb.install	Mon Feb 23 01:57:40 2009
@@ -1 +1 @@
-usr/sbin/dmsetup sbin
+sbin/dmsetup

Copied: lvm2/trunk/debian/dmsetup.install (from r653, /devmapper/trunk/debian/dmsetup.install)
==============================================================================
--- /devmapper/trunk/debian/dmsetup.install	(original)
+++ lvm2/trunk/debian/dmsetup.install	Mon Feb 23 01:57:40 2009
@@ -1,2 +1,2 @@
-usr/sbin/dmsetup sbin
+sbin/dmsetup
 usr/share/man/man8/dmsetup.8

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	(original)
+++ lvm2/trunk/debian/rules	Mon Feb 23 01:57:40 2009
@@ -110,7 +110,7 @@
 	rm -rf $(BUILD_DIR) $(STAMPS_DIR)
 	dh_clean
 
-install: $(addprefix install-,libdevmapper lvm2 lvm2-udeb clvm)
+install: $(addprefix install-,libdevmapper libdevmapper-udeb dmsetup dmsetup-udeb lvm2 lvm2-udeb clvm)
 
 install-base:
 	dh_installdocs
@@ -137,6 +137,33 @@
 	dh_installinit --no-start -- start 63 S . start 51 0 6 .
 	$(MAKE) -f debian/rules install-base
 
+install-dmsetup: export DH_OPTIONS = -pdmsetup
+install-dmsetup: DIR = $(BUILD_DIR)/build-deb
+install-dmsetup: INSTALL_DIR = $(BUILD_DIR)/install-dmsetup
+install-dmsetup: $(STAMPS_DIR)/build-deb
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR)
+	dh_install --sourcedir=$(INSTALL_DIR)
+	dh_installchangelogs WHATS_NEW_DM
+	dh_installdebconf
+	dh_installexamples
+	dh_installudev --priority=65
+	$(MAKE) -f debian/rules install-base GENCONTROL_ARGS="-v2:$(VERSION_DEBIAN)"
+
+install-dmsetup-udeb: export DH_OPTIONS = -pdmsetup-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
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	$(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)
 install-libdevmapper: DIR = $(BUILD_DIR)/build-deb
 install-libdevmapper: INSTALL_DIR = $(BUILD_DIR)/install-libdevmapper
@@ -148,7 +175,6 @@
 	dh_install --sourcedir=$(INSTALL_DIR)
 	dh_installchangelogs WHATS_NEW_DM
 	dh_installexamples
-	dh_installudev --priority=65
 	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 \