Bug#636067: libpolkit-qt-1-1: install library in multiarch paths
Package: libpolkit-qt-1-1
Version: 0.99.0-3
Severity: wishlist
Tags: patch
Attached is a patch to install the libraries in multiarch paths.
-- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (990, 'unstable'), (102, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0fglrx2 (SMP w/2 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages libpolkit-qt-1-1 depends on:
ii libc6 2.13-11 Embedded GNU C Library: Shared lib
ii libgcc1 1:4.6.1-5 GCC support library
ii libglib2.0-0 2.28.6-1 The GLib library of C routines
ii libpolkit-agent-1-0 0.101-4 PolicyKit Authentication Agent API
ii libpolkit-gobject-1-0 0.101-4 PolicyKit Authorization API
ii libqt4-dbus 4:4.7.3-5 Qt 4 D-Bus module
ii libqtcore4 4:4.7.3-5 Qt 4 core module
ii libqtgui4 4:4.7.3-5 Qt 4 GUI module
ii libstdc++6 4.6.1-5 GNU Standard C++ Library v3
libpolkit-qt-1-1 recommends no packages.
libpolkit-qt-1-1 suggests no packages.
-- no debconf information
>From 32517728214a22a43f56029005532c6f110c7923 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
---
debian/compat | 2 +-
debian/control | 3 ++-
debian/libpolkit-qt-1-1.install | 6 +++---
debian/libpolkit-qt-1-dev.install | 18 +++++++++---------
debian/rules | 7 ++++++-
5 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/control b/debian/control
index 40af00c..aab20e7 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 (>= 8.1.3), cmake (>= 2.6.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,6 +28,7 @@ Description: PolicyKit-qt-1 development files
Package: libpolkit-qt-1-1
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
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 a6682a5..ea9e004 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:
+ dh_auto_configure -- -DLIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+
+.PHONY: override_dh_auto_test override_dh_auto_configure
--
1.7.5.4
>From 473a70958853a542fc92ecfa41b391a196fb8b45 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 ea9e004..246736d 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:
- dh_auto_configure -- -DLIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+ dh_auto_configure -- -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: