[Debian-ha-commits] [corosync] 05/05: Install libraries to multiarch paths.

myon at debian.org myon at debian.org
Tue Aug 11 11:22:04 UTC 2015 

This is an automated email from the git hooks/post-receive script.

myon pushed a commit to branch master
in repository corosync.

commit a5ce2508e60a715163bf9a0cf9228b7d51bb74c8
Author: Christoph Berg <christoph.berg at credativ.de>
Date:   Tue Aug 11 13:20:47 2015 +0200

    Install libraries to multiarch paths.
---
 debian/changelog                      | 1 +
 debian/libcfg-dev.install             | 6 +++---
 debian/libcfg6.install                | 3 +--
 debian/libcmap-dev.install            | 6 +++---
 debian/libcmap4.install               | 3 +--
 debian/libcorosync-common-dev.install | 8 ++++----
 debian/libcorosync-common4.install    | 3 +--
 debian/libcpg-dev.install             | 6 +++---
 debian/libcpg4.install                | 3 +--
 debian/libquorum-dev.install          | 6 +++---
 debian/libquorum5.install             | 3 +--
 debian/libsam-dev.install             | 6 +++---
 debian/libsam4.install                | 3 +--
 debian/libtotem-pg-dev.install        | 6 +++---
 debian/libtotem-pg5.install           | 3 +--
 debian/libvotequorum-dev.install      | 6 +++---
 debian/libvotequorum7.install         | 3 +--
 debian/rules                          | 5 +++--
 18 files changed, 37 insertions(+), 43 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4e4e00..037eef6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -92,6 +92,7 @@ corosync (2.3.5-1) UNRELEASED; urgency=medium
 
   [ Christoph Berg ]
   * Remove old libcorosync4 and libcorosync-dev transitional packages.
+  * Install libraries to multiarch paths.
 
  -- Christoph Berg <christoph.berg at credativ.de>  Tue, 11 Aug 2015 13:01:14 +0200
 
diff --git a/debian/libcfg-dev.install b/debian/libcfg-dev.install
index a57d787..e81b117 100644
--- a/debian/libcfg-dev.install
+++ b/debian/libcfg-dev.install
@@ -1,4 +1,4 @@
 usr/include/corosync/cfg.h
-usr/lib/libcfg.a
-usr/lib/libcfg.so
-usr/lib/pkgconfig/libcfg.pc
+usr/lib/*/libcfg.a
+usr/lib/*/libcfg.so
+usr/lib/*/pkgconfig/libcfg.pc
diff --git a/debian/libcfg6.install b/debian/libcfg6.install
index 22a196c..ec74ef6 100644
--- a/debian/libcfg6.install
+++ b/debian/libcfg6.install
@@ -1,2 +1 @@
-usr/lib/libcfg.so.6
-usr/lib/libcfg.so.6.0.0
+usr/lib/*/libcfg.so.6*
diff --git a/debian/libcmap-dev.install b/debian/libcmap-dev.install
index ba82bba..18526aa 100644
--- a/debian/libcmap-dev.install
+++ b/debian/libcmap-dev.install
@@ -1,7 +1,7 @@
 usr/include/corosync/cmap.h
-usr/lib/libcmap.a
-usr/lib/libcmap.so
-usr/lib/pkgconfig/libcmap.pc
+usr/lib/*/libcmap.a
+usr/lib/*/libcmap.so
+usr/lib/*/pkgconfig/libcmap.pc
 usr/share/man/man3/cmap_*.3
 usr/share/man/man8/cmap_*.8
 usr/share/doc/corosync/html/cmap_context_get.3.html
diff --git a/debian/libcmap4.install b/debian/libcmap4.install
index e88d5c3..93e3570 100644
--- a/debian/libcmap4.install
+++ b/debian/libcmap4.install
@@ -1,2 +1 @@
-usr/lib/libcmap.so.4
-usr/lib/libcmap.so.4.1.0
+usr/lib/*/libcmap.so.4*
diff --git a/debian/libcorosync-common-dev.install b/debian/libcorosync-common-dev.install
index 505fa68..d0e5f65 100644
--- a/debian/libcorosync-common-dev.install
+++ b/debian/libcorosync-common-dev.install
@@ -1,7 +1,7 @@
-usr/lib/libcorosync_common.a
-usr/lib/libcorosync_common.so
-usr/lib/pkgconfig/libcorosync_common.pc
+usr/lib/*/libcorosync_common.a
+usr/lib/*/libcorosync_common.so
+usr/lib/*/pkgconfig/libcorosync_common.pc
+usr/lib/*/pkgconfig/corosync.pc
 usr/include/corosync/corodefs.h
 usr/include/corosync/corotypes.h
 usr/include/corosync/hdb.h
-usr/lib/pkgconfig/corosync.pc
diff --git a/debian/libcorosync-common4.install b/debian/libcorosync-common4.install
index 57dbc44..d9f0e5c 100644
--- a/debian/libcorosync-common4.install
+++ b/debian/libcorosync-common4.install
@@ -1,2 +1 @@
-usr/lib/libcorosync_common.so.4
-usr/lib/libcorosync_common.so.4.0.0
+usr/lib/*/libcorosync_common.so.4*
diff --git a/debian/libcpg-dev.install b/debian/libcpg-dev.install
index 103d7e1..2a3d713 100644
--- a/debian/libcpg-dev.install
+++ b/debian/libcpg-dev.install
@@ -1,7 +1,7 @@
 usr/include/corosync/cpg.h
-usr/lib/libcpg.a
-usr/lib/libcpg.so
-usr/lib/pkgconfig/libcpg.pc
+usr/lib/*/libcpg.a
+usr/lib/*/libcpg.so
+usr/lib/*/pkgconfig/libcpg.pc
 usr/share/man/man3/cpg_*.3
 usr/share/man/man8/cpg_overview.8
 usr/share/doc/corosync/html/cpg_context_get.3.html
diff --git a/debian/libcpg4.install b/debian/libcpg4.install
index 8683daf..d12565c 100644
--- a/debian/libcpg4.install
+++ b/debian/libcpg4.install
@@ -1,2 +1 @@
-usr/lib/libcpg.so.4
-usr/lib/libcpg.so.4.1.0
+usr/lib/*/libcpg.so.4*
diff --git a/debian/libquorum-dev.install b/debian/libquorum-dev.install
index a36ed56..c7ccaee 100644
--- a/debian/libquorum-dev.install
+++ b/debian/libquorum-dev.install
@@ -1,6 +1,6 @@
-usr/lib/libquorum.a
-usr/lib/libquorum.so
-usr/lib/pkgconfig/libquorum.pc
+usr/lib/*/libquorum.a
+usr/lib/*/libquorum.so
+usr/lib/*/pkgconfig/libquorum.pc
 usr/include/corosync/quorum.h
 usr/share/man/man3/quorum_*.3
 usr/share/man/man8/quorum_overview.8
diff --git a/debian/libquorum5.install b/debian/libquorum5.install
index ae80125..9aeed97 100644
--- a/debian/libquorum5.install
+++ b/debian/libquorum5.install
@@ -1,2 +1 @@
-usr/lib/libquorum.so.5
-usr/lib/libquorum.so.5.0.0
+usr/lib/*/libquorum.so.5*
diff --git a/debian/libsam-dev.install b/debian/libsam-dev.install
index c90146d..00c25ff 100644
--- a/debian/libsam-dev.install
+++ b/debian/libsam-dev.install
@@ -1,7 +1,7 @@
 usr/include/corosync/sam.h
-usr/lib/libsam.a
-usr/lib/libsam.so
-usr/lib/pkgconfig/libsam.pc
+usr/lib/*/libsam.a
+usr/lib/*/libsam.so
+usr/lib/*/pkgconfig/libsam.pc
 usr/share/man/man3/sam_*.3
 usr/share/man/man8/sam_overview.8
 usr/share/doc/corosync/html/sam_data_getsize.3.html
diff --git a/debian/libsam4.install b/debian/libsam4.install
index c52b50c..1bb08da 100644
--- a/debian/libsam4.install
+++ b/debian/libsam4.install
@@ -1,2 +1 @@
-usr/lib/libsam.so.4
-usr/lib/libsam.so.4.4.0
+usr/lib/*/libsam.so.4*
diff --git a/debian/libtotem-pg-dev.install b/debian/libtotem-pg-dev.install
index e791b49..5cb44e2 100644
--- a/debian/libtotem-pg-dev.install
+++ b/debian/libtotem-pg-dev.install
@@ -1,6 +1,6 @@
 usr/include/corosync/totem/totem.h
 usr/include/corosync/totem/totemip.h
 usr/include/corosync/totem/totempg.h
-usr/lib/libtotem_pg.a
-usr/lib/libtotem_pg.so
-usr/lib/pkgconfig/libtotem_pg.pc
+usr/lib/*/libtotem_pg.a
+usr/lib/*/libtotem_pg.so
+usr/lib/*/pkgconfig/libtotem_pg.pc
diff --git a/debian/libtotem-pg5.install b/debian/libtotem-pg5.install
index 0e55b06..776a651 100644
--- a/debian/libtotem-pg5.install
+++ b/debian/libtotem-pg5.install
@@ -1,2 +1 @@
-usr/lib/libtotem_pg.so.5
-usr/lib/libtotem_pg.so.5.0.0
+usr/lib/*/libtotem_pg.so.5*
diff --git a/debian/libvotequorum-dev.install b/debian/libvotequorum-dev.install
index f44326c..6b1e01b 100644
--- a/debian/libvotequorum-dev.install
+++ b/debian/libvotequorum-dev.install
@@ -1,7 +1,7 @@
 usr/include/corosync/votequorum.h
-usr/lib/libvotequorum.a
-usr/lib/libvotequorum.so
-usr/lib/pkgconfig/libvotequorum.pc
+usr/lib/*/libvotequorum.a
+usr/lib/*/libvotequorum.so
+usr/lib/*/pkgconfig/libvotequorum.pc
 usr/share/man/man3/votequorum_*.3
 usr/share/man/man5/votequorum.5
 usr/share/man/man8/votequorum_overview.8
diff --git a/debian/libvotequorum7.install b/debian/libvotequorum7.install
index a2bde80..a0e5753 100644
--- a/debian/libvotequorum7.install
+++ b/debian/libvotequorum7.install
@@ -1,2 +1 @@
-usr/lib/libvotequorum.so.7
-usr/lib/libvotequorum.so.7.0.0
+usr/lib/*/libvotequorum.so.7*
diff --git a/debian/rules b/debian/rules
index 7ae7956..7e71194 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,8 @@ override_dh_autoreconf:
 	dh_autoreconf ./autogen.sh
 
 override_dh_auto_configure:
-	./configure --prefix=/usr \
+	dh_auto_configure -- \
+	    --prefix=/usr \
 	    --libexecdir=/usr/lib/ \
 	    --localstatedir=/var \
 	    --sysconfdir=/etc \
@@ -50,7 +51,7 @@ override_dh_auto_build:
 override_dh_auto_install:
 	dh_auto_install
 # remove .la files
-	rm -v debian/tmp/usr/lib/lib*.la
+	rm -v debian/tmp/usr/lib/*/lib*.la
 # install example configuration file
 	mkdir -p $(CURDIR)/debian/corosync/etc/corosync/
 	cp -ax $(CURDIR)/debian/corosync.example-config $(CURDIR)/debian/corosync/etc/corosync/corosync.conf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/corosync.git

More information about the Debian-HA-Commits mailing list