DEB packaging: Install libraries according to multi-arch rules.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

5 files changed, 31 insertions, 23 deletions

diff --git a/debian/control b/debian/control
index 7cfeca4df..7da8dc684 100644
--- a/debian/control
+++ b/debian/control
@@ -7,12 +7,12 @@ Build-Depends: cdbs, debhelper (>= 9~), quilt, cmake-trinity, ninja-build, libtq
                libpolkit-gobject-1-dev, libpolkit-agent-1-dev, libdbus-1-tqt-dev
 Standards-Version: 3.9.2
 
-Package: libpolkit-tqt-dev
-Section: libdevel
+Package: libpolkit-tqt
+Section: libs
 Architecture: any
-Depends: libpolkit-tqt (= ${binary:Version}), libtqtinterface-dev
-Suggests: libpolkit-tqt-examples
-Description: PolicyKit-tqt development files
+Multi-Arch: same
+Depends: ${shlibs:Depends}, policykit-1
+Description: PolicyKit-tqt library
  PolicyKit is an application-level toolkit for defining and handling the policy
  that allows unprivileged processes to speak to privileged processes.
  .
@@ -22,13 +22,16 @@ Description: PolicyKit-tqt development files
  libpolkit-tqt provides convenience classes and methods for TQt/TDE
  applications that want to use PolicyKit.
  .
- This package contains the development libraries and headers.
+ This package contains the files necessary for running applications that use
+ the libpolkit-tqt library.
 
-Package: libpolkit-tqt
-Section: libs
+Package: libpolkit-tqt-dev
+Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, policykit-1
-Description: PolicyKit-tqt library
+Multi-Arch: foreign
+Depends: libpolkit-tqt (= ${binary:Version}), libtqtinterface-dev
+Suggests: libpolkit-tqt-examples
+Description: PolicyKit-tqt development files
  PolicyKit is an application-level toolkit for defining and handling the policy
  that allows unprivileged processes to speak to privileged processes.
  .
@@ -38,12 +41,12 @@ Description: PolicyKit-tqt library
  libpolkit-tqt provides convenience classes and methods for TQt/TDE
  applications that want to use PolicyKit.
  .
- This package contains the files necessary for running applications that use
- the libpolkit-tqt library.
+ This package contains the development libraries and headers.
 
 Package: libpolkit-tqt-examples
 Section: libs
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends}, policykit-1
 Description: PolicyKit-tqt library example files
  PolicyKit is an application-level toolkit for defining and handling the policy
@@ -56,4 +59,3 @@ Description: PolicyKit-tqt library example files
  applications that want to use PolicyKit.
  .
  This package contains example files and applications.
-
diff --git a/debian/libpolkit-tqt-dev.install b/debian/libpolkit-tqt-dev.install
index 4ee6a26fa..846767587 100644
--- a/debian/libpolkit-tqt-dev.install
+++ b/debian/libpolkit-tqt-dev.install
@@ -21,10 +21,11 @@ debian/tmp/usr/include/polkit-tqt/polkit-tqt-gui-actionbuttons.h
 debian/tmp/usr/include/polkit-tqt/polkit-tqt-identity.h
 debian/tmp/usr/include/polkit-tqt/polkit-tqt-subject.h
 debian/tmp/usr/include/polkit-tqt/polkit-tqt-temporaryauthorization.h
-debian/tmp/usr/lib/libpolkit-tqt-agent.so
-debian/tmp/usr/lib/libpolkit-tqt-core.so
-debian/tmp/usr/lib/libpolkit-tqt-gui.so
-debian/tmp/usr/lib/pkgconfig/polkit-tqt.pc
-debian/tmp/usr/lib/pkgconfig/polkit-tqt-agent.pc
-debian/tmp/usr/lib/pkgconfig/polkit-tqt-core.pc
-debian/tmp/usr/lib/pkgconfig/polkit-tqt-gui.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-agent.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-core.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-gui.so
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-agent.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-core.pc
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/polkit-tqt-gui.pc
+debian/tmp/usr/share/cmake/polkit-tqt.cmake
diff --git a/debian/libpolkit-tqt-examples.install b/debian/libpolkit-tqt-examples.install
index 2a6649d81..5bb70628a 100644
--- a/debian/libpolkit-tqt-examples.install
+++ b/debian/libpolkit-tqt-examples.install
@@ -6,4 +6,3 @@ debian/tmp/usr/share/apps/polkit-tqt/examples/*
 debian/tmp/usr/share/apps/polkit-tqt/icons/*
 debian/tmp/usr/share/dbus-1/system-services/org.tqt.policykit.examples.service
 debian/tmp/usr/share/polkit-1/actions/org.tqt.policykit.examples.policy
-
diff --git a/debian/libpolkit-tqt.install b/debian/libpolkit-tqt.install
index 00107d9e5..1bbe0900a 100644
--- a/debian/libpolkit-tqt.install
+++ b/debian/libpolkit-tqt.install
@@ -1 +1 @@
-debian/tmp/usr/lib/libpolkit-tqt-*.so.*
+debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libpolkit-tqt-*.so.*
diff --git a/debian/rules b/debian/rules
index f1ab72756..71edffe1c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,14 +4,20 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/cmake.mk
 include debian/cdbs/debian-tde.mk
 
+ifdef DEB_HOST_MULTIARCH
+  CMAKE_INSTALL_LIBDIR = lib/$(DEB_HOST_MULTIARCH)
+else
+  CMAKE_INSTALL_LIBDIR = lib
+endif
+
 # Build options
 DEB_CMAKE_EXTRA_FLAGS := \
  -DCMAKE_EXPORT_COMPILE_COMMANDS="ON" \
  -DCMAKE_SKIP_RPATH="OFF" \
  -DCMAKE_VERBOSE_MAKEFILE="ON" \
  -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DCMAKE_INSTALL_LIBDIR=$(CMAKE_INSTALL_LIBDIR) \
  -DWITH_ALL_OPTIONS="ON" \
  -DBUILD_ALL="ON"
 
 DEB_MAKE_CHECK_TARGET = check
-