[Pkg-utopia-maintainers] Bug#636196: policykit-1: switch to multiarch
Daniel Schaal
farbing at web.de
Mon Aug 1 09:48:36 UTC 2011
Source: policykit-1
Version: 0.101-4
Severity: wishlist
Tags: patch
Attached is a patch to install the libraries in multiarch paths.
The patch bumps dh compat to 9, adds Pre-Depends: ${misc:Pre-Depends}
to all library packages and marks them Multi-Arch: same.
It replaces all occurrences of usr/lib with usr/lib/* in .install files,
except for the helper binaries in policykit-1.
One thing I'm not quite sure about is whether the extensions in
'usr/lib/polkit-1/extensions/*.so' should stay at usr/lib or
whether they should also be moved to usr/lib/*
Thanks,
Daniel Schaal
-- 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 policykit-1 depends on:
ii consolekit 0.4.5-1 framework for defining and trackin
ii dbus 1.5.6-1 simple interprocess messaging syst
ii libc6 2.13-13 Embedded GNU C Library: Shared lib
ii libexpat1 2.0.1-7 XML parsing C library - runtime li
ii libglib2.0-0 2.28.6-1 The GLib library of C routines
ii libpam0g 1.1.3-2 Pluggable Authentication Modules l
ii libpolkit-agent-1-0 0.101-4 PolicyKit Authentication Agent API
ii libpolkit-backend-1-0 0.101-4 PolicyKit backend API
ii libpolkit-gobject-1-0 0.101-4 PolicyKit Authorization API
policykit-1 recommends no packages.
policykit-1 suggests no packages.
-- no debconf information
-------------- next part --------------
>From 0c39d3f0e148f20f68241f2b4f5e8f6f45e78931 Mon Sep 17 00:00:00 2001
From: Daniel Schaal <farbing at web.de>
Date: Mon, 1 Aug 2011 00:39:53 +0200
Subject: [PATCH] switch to multiarch
---
debian/compat | 2 +-
debian/control | 8 +++++++-
debian/libpolkit-agent-1-0.install | 2 +-
debian/libpolkit-agent-1-dev.install | 4 ++--
debian/libpolkit-backend-1-0.install | 2 +-
debian/libpolkit-backend-1-dev.install | 4 ++--
debian/libpolkit-gobject-1-0.install | 2 +-
debian/libpolkit-gobject-1-dev.install | 4 ++--
debian/policykit-1.install | 2 +-
debian/rules | 7 +++++--
10 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 14e3946..7f3a509 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: admin
Priority: optional
Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers at lists.alioth.debian.org>
Uploaders: Michael Biebl <biebl at debian.org>, Martin Pitt <mpitt at debian.org>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 8.1.3),
autotools-dev,
pkg-config,
libglib2.0-dev (>= 2.28.0),
@@ -45,7 +45,9 @@ Description: documentation for PolicyKit-1
Package: libpolkit-gobject-1-0
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Breaks: policykit-1 (<< 0.99), libpolkit-gtk-1-0 (<< 0.99), libpolkit-agent-1-0 (<< 0.99), libpolkit-backend-1-0 (<< 0.99)
Description: PolicyKit Authorization API
PolicyKit is a toolkit for defining and handling the policy that
@@ -67,7 +69,9 @@ Description: PolicyKit Authorization API - development files
Package: libpolkit-agent-1-0
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Description: PolicyKit Authentication Agent API
PolicyKit is a toolkit for defining and handling the policy that
allows unprivileged processes to speak to privileged processes.
@@ -88,7 +92,9 @@ Description: PolicyKit Authentication Agent API - development files
Package: libpolkit-backend-1-0
Architecture: any
Section: libs
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${shlibs:Depends}, ${misc:Depends}
+Multi-Arch: same
Breaks: policykit-1 (<< 0.99)
Description: PolicyKit backend API
PolicyKit is a toolkit for defining and handling the policy that
diff --git a/debian/libpolkit-agent-1-0.install b/debian/libpolkit-agent-1-0.install
index 2598326..155da4a 100644
--- a/debian/libpolkit-agent-1-0.install
+++ b/debian/libpolkit-agent-1-0.install
@@ -1 +1 @@
-usr/lib/libpolkit-agent-1.so.*
+usr/lib/*/libpolkit-agent-1.so.*
diff --git a/debian/libpolkit-agent-1-dev.install b/debian/libpolkit-agent-1-dev.install
index 92e996f..fc0a9a7 100644
--- a/debian/libpolkit-agent-1-dev.install
+++ b/debian/libpolkit-agent-1-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libpolkit-agent*.{so,a}
-usr/lib/pkgconfig/polkit-agent*.pc
+usr/lib/*/libpolkit-agent*.{so,a}
+usr/lib/*/pkgconfig/polkit-agent*.pc
usr/include/polkit-1/polkitagent/
usr/share/gir-1.0/PolkitAgent-1.0.gir
diff --git a/debian/libpolkit-backend-1-0.install b/debian/libpolkit-backend-1-0.install
index e94ce90..be99517 100644
--- a/debian/libpolkit-backend-1-0.install
+++ b/debian/libpolkit-backend-1-0.install
@@ -1 +1 @@
-usr/lib/libpolkit-backend-1.so.*
+usr/lib/*/libpolkit-backend-1.so.*
diff --git a/debian/libpolkit-backend-1-dev.install b/debian/libpolkit-backend-1-dev.install
index ae3b48c..3ad314f 100644
--- a/debian/libpolkit-backend-1-dev.install
+++ b/debian/libpolkit-backend-1-dev.install
@@ -1,3 +1,3 @@
-usr/lib/libpolkit-backend*.{so,a}
-usr/lib/pkgconfig/polkit-backend*.pc
+usr/lib/*/libpolkit-backend*.{so,a}
+usr/lib/*/pkgconfig/polkit-backend*.pc
usr/include/polkit-1/polkitbackend/
diff --git a/debian/libpolkit-gobject-1-0.install b/debian/libpolkit-gobject-1-0.install
index 4959a53..4afe8c3 100644
--- a/debian/libpolkit-gobject-1-0.install
+++ b/debian/libpolkit-gobject-1-0.install
@@ -1 +1 @@
-usr/lib/libpolkit-gobject-1.so.*
+usr/lib/*/libpolkit-gobject-1.so.*
diff --git a/debian/libpolkit-gobject-1-dev.install b/debian/libpolkit-gobject-1-dev.install
index 0e3d57e..49520f5 100644
--- a/debian/libpolkit-gobject-1-dev.install
+++ b/debian/libpolkit-gobject-1-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libpolkit-gobject*.{so,a}
-usr/lib/pkgconfig/polkit-gobject*.pc
+usr/lib/*/libpolkit-gobject*.{so,a}
+usr/lib/*/pkgconfig/polkit-gobject*.pc
usr/include/polkit-1/polkit/
usr/share/gir-1.0/Polkit-1.0.gir
diff --git a/debian/policykit-1.install b/debian/policykit-1.install
index a227823..9a927b3 100644
--- a/debian/policykit-1.install
+++ b/debian/policykit-1.install
@@ -2,7 +2,7 @@ etc/pam.d/
etc/dbus-1/
etc/polkit-1/
usr/bin/
-usr/lib/polkit-1/extensions/*.so
+usr/lib/*/polkit-1/extensions/*.so
usr/lib/policykit-1/
usr/share/man/
usr/share/polkit-1/
diff --git a/debian/rules b/debian/rules
index 827b5ce..b9e5fe2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
#!/usr/bin/make -f
# -*- makefile -*-
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
%:
dh $@
@@ -12,10 +14,11 @@ override_dh_auto_configure:
--enable-gtk-doc \
--enable-man-pages \
--enable-introspection \
- --disable-examples
+ --disable-examples \
+ --libexecdir=\$${prefix}/lib/policykit-1
override_dh_makeshlibs:
- dh_makeshlibs -Xusr/lib/polkit-1/
+ dh_makeshlibs -Xusr/lib/$(DEB_HOST_MULTIARCH)/polkit-1/
override_dh_shlibdeps:
dh_shlibdeps
--
1.7.5.4
More information about the Pkg-utopia-maintainers
mailing list