[SCM] Polkit Qt 1 packaging branch, master, updated. debian/0.103.0-1-4-g281a661

[Felix Geyer]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/polkit-qt-1.git;a=commitdiff;h=abedbfb

The following commit has been merged in the master branch:
commit abedbfb21d6bde7b454c58cbc2c487a9717c8033
Author: Felix Geyer <fgeyer at debian.org>
Date:   Sun May 12 12:16:18 2013 +0200

    Convert package to multiarch, based on a patch from Daniel Schaal.
    
    Closes: #636067
---
 debian/changelog                  |    4 ++++
 debian/control                    |    3 +++
 debian/libpolkit-qt-1-1.install   |    6 +++---
 debian/libpolkit-qt-1-dev.install |   18 +++++++++---------
 debian/rules                      |    7 ++++++-
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index df3f54d..b18650c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ polkit-qt-1 (0.103.0-2) UNRELEASED; urgency=low
   [ Iain Lane ]
   * Add Depends on consolekit, since we're using its D-Bus API.
 
+  [ Felix Geyer ]
+  * Convert package to multiarch, based on a patch from Daniel Schaal.
+    (Closes: #636067)
+
  -- Felix Geyer <fgeyer at debian.org>  Sun, 12 May 2013 11:48:56 +0200
 
 polkit-qt-1 (0.103.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 24c4cef..5cdd625 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-req/polkit-qt-1.git
 Package: libpolkit-qt-1-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libpolkit-qt-1-1 (= ${binary:Version}), libqt4-dev, ${misc:Depends}
 Description: PolicyKit-qt-1 development files
  PolicyKit is an application-level toolkit for defining and handling the policy
@@ -33,6 +34,8 @@ Description: PolicyKit-qt-1 development files
 
 Package: libpolkit-qt-1-1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}, consolekit
 Description: PolicyKit-qt-1 library
  PolicyKit is an application-level toolkit for defining and handling the policy
diff --git a/debian/libpolkit-qt-1-1.install b/debian/libpolkit-qt-1-1.install
index 73b68a2..656daa0 100644
--- a/debian/libpolkit-qt-1-1.install
+++ b/debian/libpolkit-qt-1-1.install
@@ -1,3 +1,3 @@
-usr/lib/libpolkit-qt-agent-1.so.1*
-usr/lib/libpolkit-qt-core-1.so.1*
-usr/lib/libpolkit-qt-gui-1.so.1*
+usr/lib/*/libpolkit-qt-agent-1.so.1*
+usr/lib/*/libpolkit-qt-core-1.so.1*
+usr/lib/*/libpolkit-qt-gui-1.so.1*
diff --git a/debian/libpolkit-qt-1-dev.install b/debian/libpolkit-qt-1-dev.install
index 337a7a0..f1f18cf 100644
--- a/debian/libpolkit-qt-1-dev.install
+++ b/debian/libpolkit-qt-1-dev.install
@@ -22,12 +22,12 @@ usr/include/polkit-qt-1/polkitqt1-identity.h
 usr/include/polkit-qt-1/polkitqt1-subject.h
 usr/include/polkit-qt-1/polkitqt1-temporaryauthorization.h
 usr/include/polkit-qt-1/polkitqt1-version.h
-usr/lib/cmake/PolkitQt-1/PolkitQt-1Config.cmake
-usr/lib/cmake/PolkitQt-1/PolkitQt-1ConfigVersion.cmake
-usr/lib/libpolkit-qt-agent-1.so
-usr/lib/libpolkit-qt-core-1.so
-usr/lib/libpolkit-qt-gui-1.so
-usr/lib/pkgconfig/polkit-qt-1.pc
-usr/lib/pkgconfig/polkit-qt-agent-1.pc
-usr/lib/pkgconfig/polkit-qt-core-1.pc
-usr/lib/pkgconfig/polkit-qt-gui-1.pc
+usr/lib/*/cmake/PolkitQt-1/PolkitQt-1Config.cmake
+usr/lib/*/cmake/PolkitQt-1/PolkitQt-1ConfigVersion.cmake
+usr/lib/*/libpolkit-qt-agent-1.so
+usr/lib/*/libpolkit-qt-core-1.so
+usr/lib/*/libpolkit-qt-gui-1.so
+usr/lib/*/pkgconfig/polkit-qt-1.pc
+usr/lib/*/pkgconfig/polkit-qt-agent-1.pc
+usr/lib/*/pkgconfig/polkit-qt-core-1.pc
+usr/lib/*/pkgconfig/polkit-qt-gui-1.pc
diff --git a/debian/rules b/debian/rules
index d61c9b6..e58164d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
 dh = --list-missing
 
 include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
@@ -10,4 +12,7 @@ include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 export CFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
 export CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
 
-.PHONY: override_dh_auto_test
+override_dh_auto_configure:
+	$(overridden_command) -- -DLIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+
+.PHONY: override_dh_auto_test override_dh_auto_configure

-- 
Polkit Qt 1 packaging