r895 - lvm2/trunk/debian

Bastian Blank waldi at alioth.debian.org
Thu May 3 09:33:49 UTC 2012


Author: waldi
Date: Thu May  3 09:33:48 2012
New Revision: 895

Log:
* debian/changelog: Update.
* debian/control: Add new pre-depends and build-depends for multi-arch support.
* debian/libdevmapper1.02.1.install, debian/liblvm2app2.2.install,
  debian/liblvm2cmd2.02.install: Use correct path.
* debian/rules: Install libs into multi-arch directories.

Modified:
   lvm2/trunk/debian/changelog
   lvm2/trunk/debian/control
   lvm2/trunk/debian/libdevmapper1.02.1.install
   lvm2/trunk/debian/liblvm2app2.2.install
   lvm2/trunk/debian/liblvm2cmd2.02.install
   lvm2/trunk/debian/rules

Modified: lvm2/trunk/debian/changelog
==============================================================================
--- lvm2/trunk/debian/changelog	Tue May  1 18:28:20 2012	(r894)
+++ lvm2/trunk/debian/changelog	Thu May  3 09:33:48 2012	(r895)
@@ -1,3 +1,9 @@
+lvm2 (2.02.95-2) UNRELEASED; urgency=low
+
+  * Convert library packages to multi-arch.
+
+ -- Bastian Blank <waldi at debian.org>  Thu, 03 May 2012 11:31:26 +0200
+
 lvm2 (2.02.95-1) unstable; urgency=low
 
   * New upstream version. (closes: #670072)

Modified: lvm2/trunk/debian/control
==============================================================================
--- lvm2/trunk/debian/control	Tue May  1 18:28:20 2012	(r894)
+++ lvm2/trunk/debian/control	Thu May  3 09:33:48 2012	(r895)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian LVM Team <pkg-lvm-maintainers at lists.alioth.debian.org>
 Uploaders: Bastian Blank <waldi at debian.org>
-Build-Depends: debhelper (>> 7), automake, libcman-dev (>> 2), libcorosync-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, openais-dev, pkg-config
+Build-Depends: debhelper (>= 8.1.3~), automake, libcman-dev (>> 2), libcorosync-dev, libdlm-dev (>> 2), libreadline-gplv2-dev, libselinux1-dev, libudev-dev, openais-dev, pkg-config
 Standards-Version: 3.9.1
 Homepage: http://sources.redhat.com/lvm2/
 Vcs-Svn: svn://svn.debian.org/pkg-lvm/lvm2/trunk/
@@ -64,6 +64,7 @@
 Section: libs
 Priority: required
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, dmsetup (>= ${binary:Version})
 Breaks: lvm2 (<< 2.02.66)
 Conflicts: libdevmapper1.02
@@ -123,6 +124,7 @@
 Package: liblvm2app2.2
 Section: libs
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: LVM2 application library
  This package contains the lvm2app shared library. It allows easier access
@@ -132,6 +134,7 @@
 Package: liblvm2cmd2.02
 Section: libs
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: LVM2 command library
  This package contains the lvm2cmd shared library.

Modified: lvm2/trunk/debian/libdevmapper1.02.1.install
==============================================================================
--- lvm2/trunk/debian/libdevmapper1.02.1.install	Tue May  1 18:28:20 2012	(r894)
+++ lvm2/trunk/debian/libdevmapper1.02.1.install	Thu May  3 09:33:48 2012	(r895)
@@ -1 +1 @@
-lib/libdevmapper.so.*
+lib/*/libdevmapper.so.*

Modified: lvm2/trunk/debian/liblvm2app2.2.install
==============================================================================
--- lvm2/trunk/debian/liblvm2app2.2.install	Tue May  1 18:28:20 2012	(r894)
+++ lvm2/trunk/debian/liblvm2app2.2.install	Thu May  3 09:33:48 2012	(r895)
@@ -1 +1 @@
-lib/liblvm2app.so.2.2
+lib/*/liblvm2app.so.2.2

Modified: lvm2/trunk/debian/liblvm2cmd2.02.install
==============================================================================
--- lvm2/trunk/debian/liblvm2cmd2.02.install	Tue May  1 18:28:20 2012	(r894)
+++ lvm2/trunk/debian/liblvm2cmd2.02.install	Thu May  3 09:33:48 2012	(r895)
@@ -1 +1 @@
-lib/liblvm2cmd.so.2.02
+lib/*/liblvm2cmd.so.2.02

Modified: lvm2/trunk/debian/rules
==============================================================================
--- lvm2/trunk/debian/rules	Tue May  1 18:28:20 2012	(r894)
+++ lvm2/trunk/debian/rules	Thu May  3 09:33:48 2012	(r895)
@@ -5,6 +5,7 @@
 
 DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 SOURCE := $(shell dpkg-parsechangelog | sed -ne 's,^Source: *\(.*\)$$,\1,p')
@@ -69,6 +70,7 @@
 	cd $(DIR); \
 	./configure CFLAGS="$(CFLAGS)" \
 		$(CONFIGURE_FLAGS) \
+		--libdir=\$${exec_prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		--with-optimisation="" \
 		--with-clvmd=cman,corosync,openais \
 		--with-cluster=internal \



More information about the pkg-lvm-commits mailing list