r656 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Mon Feb 23 01:49:58 2009
New Revision: 656

Log:
debian/rules: Install libdevmapper.


Added:
   lvm2/trunk/debian/libdevmapper-dev.install   (props changed)
      - copied unchanged from r653, /devmapper/trunk/debian/libdevmapper-dev.install
   lvm2/trunk/debian/libdevmapper1.02.1.install   (contents, props changed)
      - copied, changed from r653, /devmapper/trunk/debian/libdevmapper1.02.1.install
   lvm2/trunk/debian/libdevmapper1.02.1.preinst   (props changed)
      - copied unchanged from r653, /devmapper/trunk/debian/libdevmapper1.02.1.preinst
   lvm2/trunk/debian/libdevmapper1.02.1.symbols   (props changed)
      - copied unchanged from r653, /devmapper/trunk/debian/libdevmapper1.02.1.symbols
Modified:
   lvm2/trunk/debian/rules

Copied: lvm2/trunk/debian/libdevmapper1.02.1.install (from r653, /devmapper/trunk/debian/libdevmapper1.02.1.install)
==============================================================================
--- /devmapper/trunk/debian/libdevmapper1.02.1.install	(original)
+++ lvm2/trunk/debian/libdevmapper1.02.1.install	Mon Feb 23 01:49:58 2009
@@ -1 +1 @@
-usr/lib/libdevmapper.so.* lib
+lib/libdevmapper.so.*

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	(original)
+++ lvm2/trunk/debian/rules	Mon Feb 23 01:49:58 2009
@@ -16,9 +16,6 @@
 BUILD_DIR = debian/build
 STAMPS_DIR = debian/stamps
 
-PACKAGES_DEB = lvm2 clvm
-PACKAGES_UDEB = lvm2-udeb
-
 CFLAGS_UDEB := $(CFLAGS)
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 CFLAGS_UDEB = -g -Os
@@ -65,6 +62,7 @@
 		$(CONFIGURE_FLAGS) \
 		--with-optimisation="" \
 		--with-clvmd=cman \
+		--enable-pkgconfig \
 		--enable-readline
 	touch $@
 
@@ -112,17 +110,16 @@
 	rm -rf $(BUILD_DIR) $(STAMPS_DIR)
 	dh_clean
 
-install: $(addprefix install-, $(PACKAGES_DEB) $(PACKAGES_UDEB))
+install: $(addprefix install-,libdevmapper lvm2 lvm2-udeb clvm)
 
 install-base:
-	dh_installchangelogs WHATS_NEW
 	dh_installdocs
 	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol
+	dh_gencontrol -- $(GENCONTROL_ARGS)
 	dh_md5sums
 	dh_builddeb
 
@@ -135,10 +132,29 @@
 	dh_clean -k
 	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR)
 	dh_install --sourcedir=$(INSTALL_DIR)
+	dh_installchangelogs WHATS_NEW
 	dh_installexamples
 	dh_installinit --no-start -- start 63 S . start 51 0 6 .
 	$(MAKE) -f debian/rules install-base
 
+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
+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)
+	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 \
+		-- "-v2:$(VERSION_DEBIAN)"
+	$(MAKE) -f debian/rules install-base GENCONTROL_ARGS="-v2:$(VERSION_DEBIAN)"
+
 install-lvm2: export DH_OPTIONS = -plvm2
 install-lvm2: DIR = $(BUILD_DIR)/build-deb
 install-lvm2: INSTALL_DIR = $(BUILD_DIR)/install-lvm2
@@ -150,6 +166,7 @@
 	dh_install --sourcedir=$(INSTALL_DIR)
 	cp -a debian/initramfs-tools debian/lvm2/usr/share
 	chmod +x -R debian/lvm2/usr/share/initramfs-tools
+	dh_installchangelogs WHATS_NEW
 	dh_installdebconf
 	dh_installexamples
 	dh_installinit --no-start -- start 26 S . start 50 0 6 .
@@ -163,6 +180,7 @@
 	dh_testroot
 	dh_clean -k
 	$(MAKE) -C $(DIR) install DESTDIR=$(CURDIR)/$(INSTALL_DIR)
+	dh_installchangelogs WHATS_NEW
 	dh_install --sourcedir=$(INSTALL_DIR)
 	$(MAKE) -f debian/rules install-base