[SCM] liblo/master: Enable multiarch for the shared library

fsateler at users.alioth.debian.org fsateler at users.alioth.debian.org
Wed Jan 7 00:34:18 UTC 2015


The following commit has been merged in the master branch:
commit e22931ea3f9ea63c5fa307110d18ee03123a6047
Author: Felipe Sateler <fsateler at debian.org>
Date:   Tue Jan 6 21:28:07 2015 -0300

    Enable multiarch for the shared library

diff --git a/debian/control.in b/debian/control.in
index b021f19..d1049ee 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -44,6 +44,8 @@ Architecture: any
 Suggests: liblo-dev
 Depends: ${misc:Depends},
  ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Lightweight OSC library
  LibLO is a lightweight, easy to use implementation of the OSC (Open
  Sound Control) protocol (see 
diff --git a/debian/liblo-dev.install b/debian/liblo-dev.install
index 2c03447..7005a82 100644
--- a/debian/liblo-dev.install
+++ b/debian/liblo-dev.install
@@ -1,5 +1,5 @@
 debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.a
-debian/tmp/usr/lib/lib*.so
-debian/tmp/usr/lib/pkgconfig/*
+debian/tmp/usr/lib/*/lib*.a
+debian/tmp/usr/lib/*/lib*.so
+debian/tmp/usr/lib/*/pkgconfig/*
 doc/html usr/share/doc/liblo-dev
diff --git a/debian/liblo7.install b/debian/liblo7.install
index c45ebcf..cdae829 100644
--- a/debian/liblo7.install
+++ b/debian/liblo7.install
@@ -1 +1 @@
-debian/tmp/usr/lib/lib*.so.*
+debian/tmp/usr/lib/*/lib*.so.*
diff --git a/debian/rules b/debian/rules
index 2999a9e..b9bd5e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -27,6 +27,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 # suppress optional build-dependencies
 CDBS_BUILD_DEPENDS_rules_upstream-tarball =
 CDBS_BUILD_DEPENDS_rules_utils_copyright-check =
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 pre-build::
 	test "$(DEB_HOST_ARCH_CPU)" != "sparc"

-- 
liblo packaging



More information about the pkg-multimedia-commits mailing list