debian: Multiarchify the library packages.

Manual sync with debian packaging

(bzr r4068)

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 ]

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,

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/

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

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:

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