Bug#636067: install library in multiarch paths
Package: libpolkit-qt-1-1
Version: 0.99.0-3
Followup-For: Bug #636067
Found some mistakes in the previous patches. Here is
a updated version that doesn't change the debhelper
compat level, B-D on cmake >= 2.8.5 and uses
$(overridden_command) instead of dh_auto_configure.
>From 304a538ec56014e18a76817fcffc11fcc8b03b39 Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farbing@web.de>
Date: Sat, 30 Jul 2011 16:01:19 +0200
Subject: [PATCH 1/2] switch to multiarch
- B-D on cmake >= 2.8.5
- change /usr/lib/ -> /usr/lib/*/ in .install files
- set LIB_INSTALL_DIR in dh_auto_configure
- set libpolkit-qt-1-1 Multi-Arch: same
---
debian/control | 4 +++-
debian/libpolkit-qt-1-1.install | 6 +++---
debian/libpolkit-qt-1-dev.install | 18 +++++++++---------
debian/rules | 7 ++++++-
4 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/debian/control b/debian/control
index 40af00c..25def19 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: polkit-qt-1
Priority: extra
Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Fathi Boudra <fabo@debian.org>, Modestas Vainius <modax@debian.org>
-Build-Depends: debhelper (>= 7.4.15), cmake, pkg-kde-tools (>= 0.11), automoc, libqt4-dev,
+Build-Depends: debhelper (>= 7.4.15), cmake (>= 2.8.5), pkg-kde-tools (>= 0.11), automoc, libqt4-dev,
libpolkit-agent-1-dev (>= 0.98), libpolkit-gobject-1-dev (>= 0.98)
Standards-Version: 3.9.2
Section: libs
@@ -28,7 +28,9 @@ Description: PolicyKit-qt-1 development files
Package: libpolkit-qt-1-1
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Description: PolicyKit-qt-1 library
PolicyKit is an application-level toolkit for defining and handling the policy
that allows unprivileged processes to speak to privileged processes.
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 a6682a5..66ce9ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,13 @@
export CFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
export CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
+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
-.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
--
1.7.5.4
>From 9c9bc97859d1da380fc0f2c2c6e43ea0555b20f8 Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farbing@web.de>
Date: Sat, 30 Jul 2011 19:07:47 +0200
Subject: [PATCH 2/2] set C(XX)FLAGS in dh_auto_configure
otherwise they will be overwritten by dhmk with
the values from dpkg-buildflags.
---
debian/rules | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/debian/rules b/debian/rules
index 66ce9ad..ae4d0c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,6 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
-export CFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
-export CXXFLAGS += -fvisibility=hidden -fvisibility-inlines-hidden
-
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
dh = --list-missing
@@ -13,6 +10,8 @@ dh = --list-missing
include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
override_dh_auto_configure:
- $(overridden_command) -- -DLIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+ $(overridden_command) -- -DLIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
+ -DCMAKE_C_FLAGS="$(CFLAGS) -fvisibility=hidden -fvisibility-inlines-hidden" \
+ -DCMAKE_CXX_FLAGS="$(CXXFLAGS) -fvisibility=hidden -fvisibility-inlines-hidden"
.PHONY: override_dh_auto_test override_dh_auto_configure
--
1.7.5.4
Reply to: