diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/control | 3 | ||||
| -rw-r--r-- | debian/libck-connector-dev.install | 4 | ||||
| -rw-r--r-- | debian/libck-connector0.install | 2 | ||||
| -rw-r--r-- | debian/libpam-ck-connector.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 3 |
6 files changed, 11 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog index a3f70bf..529b52c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ consolekit (0.4.5-3) UNRELEASED; urgency=low there is already one in libck-connector-dev. * Bump debhelper compatibility level to 9 for hardening build flags via dpkg-buildflags and multiarch support. + * Install libck-connector and libpam-ck-connector into multiarch paths and + mark them as Multi-Arch: same. -- Michael Biebl <biebl@debian.org> Mon, 27 Feb 2012 18:29:01 +0100 diff --git a/debian/control b/debian/control index b95c183..f3a6ce1 100644 --- a/debian/control +++ b/debian/control @@ -38,6 +38,8 @@ Description: framework for defining and tracking users, sessions and seats Package: libck-connector0 Section: libs Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} Description: ConsoleKit libraries ConsoleKit is a system daemon for tracking what users are logged @@ -61,6 +63,7 @@ Description: ConsoleKit development files Package: libpam-ck-connector Section: admin Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends}, libpam-runtime (>= 1.0.1-6) Description: ConsoleKit PAM module ConsoleKit is a system daemon for tracking what users are logged diff --git a/debian/libck-connector-dev.install b/debian/libck-connector-dev.install index 480f5cf..cfb930b 100644 --- a/debian/libck-connector-dev.install +++ b/debian/libck-connector-dev.install @@ -1,5 +1,5 @@ -usr/lib/libck-connector.so -usr/lib/pkgconfig/ +usr/lib/*/libck-connector.so +usr/lib/*/pkgconfig/ usr/include/ConsoleKit/ck-connector/ usr/share/dbus-1/interfaces/org.freedesktop.ConsoleKit.*.xml usr/share/doc/ConsoleKit/spec/ usr/share/doc/libck-connector-dev/ diff --git a/debian/libck-connector0.install b/debian/libck-connector0.install index f7954b5..9ef82fc 100644 --- a/debian/libck-connector0.install +++ b/debian/libck-connector0.install @@ -1 +1 @@ -usr/lib/libck-connector.so.* +usr/lib/*/libck-connector.so.* diff --git a/debian/libpam-ck-connector.install b/debian/libpam-ck-connector.install index f79680f..5df8e6f 100644 --- a/debian/libpam-ck-connector.install +++ b/debian/libpam-ck-connector.install @@ -1,3 +1,3 @@ -lib/security/pam_ck_connector.so +lib/*/security/pam_ck_connector.so usr/share/man/man8/pam_ck_connector.8 usr/share/pam-configs/consolekit diff --git a/debian/rules b/debian/rules index 3a4c677..2e8d504 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,8 @@ override_dh_auto_configure: --enable-pam-module \ --enable-docbook-docs \ --with-pid-file=/var/run/console-kit-daemon.pid \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-systemdsystemunitdir=/lib/systemd/system \ + --with-pam-module-dir=/lib/$(DEB_HOST_MULTIARCH)/security override_dh_auto_install: dh_auto_install |