debian: Multiarchify the library packages.

Manual sync with debian packaging (bzr r4068)

6 files changed, 22 insertions, 10 deletions

diff --git a/debian/changelog b/debian/changelog
index 49656e032..1f55b7208 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+unity (7.4.0+16.04.20151218-0ubuntu2) xenial; urgency=medium
+
+ * Multiarchify the library packages.
+
+ -- Matthias Klose <doko@ubuntu.com> Thu, 28 Jan 2016 17:38:52 +0100
+
 unity (7.4.0+16.04.20151218-0ubuntu1) xenial; urgency=medium
 
 [ Aneesh Madhavan ]
diff --git a/debian/control b/debian/control
index 623d22254..de7de19b0 100644
--- a/debian/control
+++ b/debian/control
@@ -139,6 +139,8 @@ Description: Interface designed for efficiency of space and interaction.
 Package: libunity-core-6.0-9
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
 ${misc:Depends},
 unity-services (= ${binary:Version}),
@@ -159,6 +161,7 @@ Description: core library for the Unity interface
 Package: libunity-core-6.0-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: ${misc:Depends},
 libunity-core-6.0-9 (= ${binary:Version}),
 libglib2.0-dev,
diff --git a/debian/libunity-core-6.0-9.install b/debian/libunity-core-6.0-9.install
index 3e2b01376..99c27b8a7 100644
--- a/debian/libunity-core-6.0-9.install
+++ b/debian/libunity-core-6.0-9.install
@@ -1,4 +1,4 @@
-usr/lib/libunity-core*.so.*
+usr/lib/*/libunity-core*.so.*
 usr/lib/unity/*.py
 usr/share/ccsm
 usr/share/gnome-control-center/
diff --git a/debian/libunity-core-6.0-dev.install b/debian/libunity-core-6.0-dev.install
index 96044d726..62b07c3f2 100644
--- a/debian/libunity-core-6.0-dev.install
+++ b/debian/libunity-core-6.0-dev.install
@@ -1,3 +1,3 @@
 usr/include/
-usr/lib/pkgconfig/
-usr/lib/libunity-core*.so
+usr/lib/*/pkgconfig/
+usr/lib/*/libunity-core*.so
diff --git a/debian/rules b/debian/rules
index 5430079e5..559781196 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,9 @@ override_dh_install:
	rm -f debian/tmp/usr/share/compiz/networkarearegion.xml
	rm -f debian/tmp//usr/lib/compiz/libnetworkarearegion.so
	rm -rf debian/tmp/usr/share/gconf/schemas/
+	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+	mv debian/tmp/usr/lib/lib*so* debian/tmp/usr/lib/pkgconfig \
+	debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
	dh_install --fail-missing
 
 override_dh_gencontrol:
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 66c7663f6..3e3dffb84 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -29,13 +29,13 @@ lockscreen/UserPromptView.cpp
 panel/PanelMenuView.cpp
 plugins/networkarearegion/networkarearegion.xml.in
 plugins/unity-mt-grab-handles/unitymtgrabhandles.xml.in
-plugins/unityshell/src/unity-dash-view-accessible.cpp
-plugins/unityshell/src/unity-launcher-accessible.cpp
-plugins/unityshell/src/unity-launcher-icon-accessible.cpp
-plugins/unityshell/src/unity-quicklist-menu-accessible.cpp
-plugins/unityshell/src/unity-scope-bar-icon-accessible.cpp
-plugins/unityshell/src/unity-search-bar-accessible.cpp
-plugins/unityshell/src/unity-switcher-accessible.cpp
+a11y/unity-dash-view-accessible.cpp
+a11y/unity-launcher-accessible.cpp
+a11y/unity-launcher-icon-accessible.cpp
+a11y/unity-quicklist-menu-accessible.cpp
+a11y/unity-scope-bar-icon-accessible.cpp
+a11y/unity-search-bar-accessible.cpp
+a11y/unity-switcher-accessible.cpp
 plugins/unityshell/src/unityshell.cpp
 plugins/unityshell/unityshell.xml.in
 shortcuts/ShortcutHintPrivate.cpp