[Pkg-telepathy-commits] [telepathy-mission-control-5] 01/02: Multiarchify the library packages, removing the comment why the should not be M-A same packages.

[Laurent Bigonville]

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

bigon pushed a commit to branch debian
in repository telepathy-mission-control-5.

commit 276b336a1e0a39a7778f8fa358fc6d0c8a84d949
Author: Laurent Bigonville <bigon at debian.org>
Date:   Tue Sep 12 18:21:41 2017 +0200

    Multiarchify the library packages, removing the comment why the should not be M-A same packages.
    
    Allows installation of the library packages for cross builds.
    
    Closes: #835084
---
 debian/control                                |  3 +++
 debian/libmission-control-plugins-dev.install |  6 +++---
 debian/libmission-control-plugins0.install    |  2 +-
 debian/rules                                  | 11 +++++++----
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 33afb87..c6f2fc0 100644
--- a/debian/control
+++ b/debian/control
@@ -50,7 +50,9 @@ Description: management daemon for Telepathy real-time communication framework
 
 Package: libmission-control-plugins0
 Architecture: any
+Multi-Arch: same
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: telepathy-mission-control-5 (= ${binary:Version})
 Description: management daemon for Telepathy (library for plugins)
@@ -60,6 +62,7 @@ Description: management daemon for Telepathy (library for plugins)
 
 Package: libmission-control-plugins-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Priority: extra
 Depends: libmission-control-plugins0 (= ${binary:Version}),
diff --git a/debian/libmission-control-plugins-dev.install b/debian/libmission-control-plugins-dev.install
index d86e4c4..bbaa11b 100644
--- a/debian/libmission-control-plugins-dev.install
+++ b/debian/libmission-control-plugins-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/include/mission-control-5.*/mission-control-plugins
-debian/tmp/usr/lib/libmission-control-plugins.so
-debian/tmp/usr/lib/pkgconfig/mission-control-plugins.pc
+usr/include/mission-control-5.*/mission-control-plugins
+usr/lib/*/libmission-control-plugins.so
+usr/lib/*/pkgconfig/mission-control-plugins.pc
diff --git a/debian/libmission-control-plugins0.install b/debian/libmission-control-plugins0.install
index be66249..0440f58 100644
--- a/debian/libmission-control-plugins0.install
+++ b/debian/libmission-control-plugins0.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libmission-control-plugins.so.0*
+usr/lib/*/libmission-control-plugins.so.0*
diff --git a/debian/rules b/debian/rules
index 013fe81..209089b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,9 +9,9 @@ CONFIGURE_FLAGS = --libexecdir=\$${prefix}/lib/telepathy \
                   --with-html-dir=\$${prefix}/share/doc/libmission-control-plugins-doc \
                   --disable-upower
 
-# We specifically do not want multiarch: only one version of MC can be
-# installed anyway, the plugin directory is based on the ${libdir}, and
-# empathy/experimental ships a plugin in the non-multiarch location
+# The package has to be configured with --libdir=\$${prefix}/lib, because
+# the plugindir is derived from the libdir.  Move the library to the final
+# multiarch libdir location manually.
 CONFIGURE_FLAGS += --libdir=\$${prefix}/lib
 
 # Having a static library for a plugin loader is pretty useless, so get rid
@@ -30,7 +30,7 @@ override_dh_makeshlibs:
 
 override_dh_auto_install:
 	dh_auto_install
-	rm -f debian/tmp/usr/lib/libmission-control-plugins*.la
+	rm -f debian/tmp/usr/lib/*/libmission-control-plugins*.la
 
 override_dh_strip:
 	dh_strip --dbgsym-migration='telepathy-mission-control-5-dbg (<< 1:5.16.4)'
@@ -43,6 +43,9 @@ override_dh_auto_configure:
 	dh_auto_configure -- ${CONFIGURE_FLAGS}
 
 override_dh_install:
+	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+	mv debian/tmp/usr/lib/libmission-control-plugins.so* debian/tmp/usr/lib/pkgconfig \
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 	dh_install --list-missing
 
 # we symlink some of the doc directories together

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-telepathy/telepathy-mission-control-5.git