[Pkg-xen-changes] [xen] 03/09: Make library packages multi-arch: same

[Bastian Blank]

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

waldi pushed a commit to branch develop
in repository xen.

commit 31b256a0b3d06e9806517d301b14e93e4ff1d463
Author: Bastian Blank <waldi at debian.org>
Date:   Fri Aug 29 15:49:54 2014 +0200

    Make library packages multi-arch: same
---
 debian/changelog                 |  1 +
 debian/libxen-dev.install        | 20 ++++++++++----------
 debian/libxenstore3.0.install    |  2 +-
 debian/rules.real                |  2 +-
 debian/templates/control.main.in |  2 ++
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4392966..86e96f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xen (4.4.0-3) UNRELEASED; urgency=medium
 
   [ Bastian Blank ]
   * Really update config.{sub,guess}.
+  * Make library packages multi-arch: same. (closes: #730417)
 
  -- Ian Campbell <ijc at hellion.org.uk>  Mon, 18 Aug 2014 15:59:57 +0100
 
diff --git a/debian/libxen-dev.install b/debian/libxen-dev.install
index 7c5687c..96ffc25 100644
--- a/debian/libxen-dev.install
+++ b/debian/libxen-dev.install
@@ -1,13 +1,13 @@
-usr/lib/libxenctrl.a
-usr/lib/libxenctrl.so
-usr/lib/libxenguest.a
-usr/lib/libxenguest.so
-usr/lib/libxenlight.a
-usr/lib/libxenlight.so
-usr/lib/libxenstore.a
-usr/lib/libxenstore.so
-usr/lib/libxlutil.a
-usr/lib/libxlutil.so
+usr/lib/*/libxenctrl.a
+usr/lib/*/libxenctrl.so
+usr/lib/*/libxenguest.a
+usr/lib/*/libxenguest.so
+usr/lib/*/libxenlight.a
+usr/lib/*/libxenlight.so
+usr/lib/*/libxenstore.a
+usr/lib/*/libxenstore.so
+usr/lib/*/libxlutil.a
+usr/lib/*/libxlutil.so
 usr/include/_libxl*.h
 usr/include/libxl*.h
 usr/include/xenctrl.h
diff --git a/debian/libxenstore3.0.install b/debian/libxenstore3.0.install
index 87b5a98..b0eecf5 100644
--- a/debian/libxenstore3.0.install
+++ b/debian/libxenstore3.0.install
@@ -1 +1 @@
-usr/lib/libxenstore.so.*
+usr/lib/*/libxenstore.so.*
diff --git a/debian/rules.real b/debian/rules.real
index ad32b57..32affeb 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -160,7 +160,7 @@ install-libxen_$(ARCH): $(STAMPS_DIR)/install-utils_$(ARCH) install-libxenstore_
 	dh_testdir
 	dh_testroot
 	dh_prep
-	dh_install --sourcedir=$(DIR) usr/lib/lib*-$(VERSION).so
+	dh_install --sourcedir=$(DIR) usr/lib/*/lib*-$(VERSION).so
 	dh_strip
 	dh_makeshlibs -V
 	dh_shlibdeps
diff --git a/debian/templates/control.main.in b/debian/templates/control.main.in
index 67dd825..831255c 100644
--- a/debian/templates/control.main.in
+++ b/debian/templates/control.main.in
@@ -1,12 +1,14 @@
 Package: libxen- at version@
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Public libs for Xen
  This package contains the shared libraries for Xen.
 
 Package: libxenstore3.0
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
 Description: Xenstore communications library for Xen
  This package contains the public libxenstore.
 

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