r806 - lvm2/trunk/debian

[Bastian Blank]

Author: waldi
Date: Wed May 19 10:41:35 2010
New Revision: 806

Log:
* debian: Update ignores.
* debian/changelog: Update.
* debian/control: Add liblvm2app2.2 and liblvm-dev package.
* debian/liblvm2app2.2.install, debian/liblvm-dev.install: Add-
* debian/rules: Install new packages.

Added:
   lvm2/trunk/debian/liblvm-dev.install
   lvm2/trunk/debian/liblvm2app2.2.install
Modified:
   lvm2/trunk/debian/   (props changed)
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/control
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Wed May 19 10:27:21 2010	(r805)
+++ lvm2/trunk/debian/changelog	Wed May 19 10:41:35 2010	(r806)
@@ -4,6 +4,7 @@
   * Don't longer build static libraries.
   * Fix readline support. (closes: #575640)
   * Built-in cluster locking.
+  * Build liblvm2app. (closes: #564810)
 
  -- Bastian Blank <waldi at debian.org>  Sat, 15 May 2010 14:38:31 +0000
 

Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control	Wed May 19 10:27:21 2010	(r805)
+++ lvm2/trunk/debian/control	Wed May 19 10:41:35 2010	(r806)
@@ -116,3 +116,20 @@
  raid, and other drivers that create "virtual" block devices.
  .
  This package contains a utility for modifying device mappings.
+
+Package: liblvm2app2.2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: LVM2 application library
+ This package contains the lvm2app shared library. It allows easier access
+ to the basic LVM objects and provides functions to enumerate, create or
+ modify them.
+
+Package: liblvm-dev
+Section: libdevel
+Architecture: any
+Depends: ${misc:Depends}, liblvm2app2.1 (= ${binary:Version}), libdevmapper-dev
+Description: LVM2 libraries - development files
+ This package contains files needed to develop applications that use the
+ lvm2app library.

Added: lvm2/trunk/debian/liblvm-dev.install
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ lvm2/trunk/debian/liblvm-dev.install	Wed May 19 10:41:35 2010	(r806)
@@ -0,0 +1,3 @@
+usr/include/lvm2app.h
+usr/lib/liblvm2app.so
+usr/lib/pkgconfig/lvm2app.pc

Added: lvm2/trunk/debian/liblvm2app2.2.install
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ lvm2/trunk/debian/liblvm2app2.2.install	Wed May 19 10:41:35 2010	(r806)
@@ -0,0 +1 @@
+lib/liblvm2app.so.2.2

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Wed May 19 10:27:21 2010	(r805)
+++ lvm2/trunk/debian/rules	Wed May 19 10:41:35 2010	(r806)
@@ -18,6 +18,8 @@
 DEVMAPPER_VERSION_DEBIAN = $(DEVMAPPER_VERSION)-$(VERSION_DEBIAN)
 DEVMAPPER_VERSION_FILE = $(DEVMAPPER_VERSION_PLAIN)-$(VERSION_DEBIAN)
 
+LVM2APP_ABINAME = 2.2
+
 MAKE_SELF = $(MAKE) -f debian/rules
 
 BUILD_DIR = debian/build
@@ -78,6 +80,7 @@
 		--with-device-uid=0 \
 		--with-device-gid=6 \
 		--with-device-mode=0660 \
+		--enable-applib \
 		--enable-pkgconfig \
 		--enable-readline
 	touch $@
@@ -199,6 +202,19 @@
 		BUILDDEB_ARGS="--filename=$(PACKAGE_FILE)" \
 		GENCONTROL_ARGS="-v$(DEVMAPPER_VERSION_DEBIAN)"
 
+install_liblvm2app: export DH_OPTIONS = -pliblvm2app$(LVM2APP_ABINAME)
+install_liblvm2app: DIR = $(BUILD_DIR)/install_deb
+install_liblvm2app: $(STAMPS_DIR)/install_deb
+	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
+	dh_makeshlibs -V -- -c2
+	+$(MAKE_SELF) install-base
+
+install_liblvm-dev: export DH_OPTIONS = -pliblvm-dev
+install_liblvm-dev: DIR = $(BUILD_DIR)/install_deb
+install_liblvm-dev: $(STAMPS_DIR)/install_deb
+	+$(MAKE_SELF) install-base-prep INSTALL_DIR='$(DIR)'
+	+$(MAKE_SELF) install-base
+
 install_lvm2: export DH_OPTIONS = -plvm2
 install_lvm2: DIR = $(BUILD_DIR)/install_deb
 install_lvm2: $(STAMPS_DIR)/install_deb
@@ -213,7 +229,7 @@
 	+$(MAKE_SELF) install-base
 
 binary-indep:
-binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-dev dmsetup dmsetup-udeb lvm2 lvm2-udeb clvm)
+binary-arch: $(addprefix install_,libdevmapper libdevmapper-udeb libdevmapper-dev dmsetup dmsetup-udeb liblvm2app liblvm-dev lvm2 lvm2-udeb clvm)
 
 binary: binary-indep binary-arch