[pkg-apparmor] Bug#771667: libapparmor1: Please move to /lib

[Martin Pitt]

Martin Pitt [2014-12-02  7:26 +0100]:
> Debdiff attached.

*blush*

-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
-------------- next part --------------
diff -Nru apparmor-2.9.0/debian/changelog apparmor-2.9.0/debian/changelog
--- apparmor-2.9.0/debian/changelog	2014-11-07 11:37:49.000000000 +0100
+++ apparmor-2.9.0/debian/changelog	2014-12-02 07:14:09.000000000 +0100
@@ -1,3 +1,10 @@
+apparmor (2.9.0-3) UNRELEASED; urgency=medium
+
+  * Ship libapparmor in /lib instead of /usr as we want to use it in systemd
+    now. (Closes: #771667, LP: #1397960)
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 02 Dec 2014 07:13:36 +0100
+
 apparmor (2.9.0-2) unstable; urgency=medium
 
   * Add versioned Breaks/Replaces from python-apparmor to apparmor-utils.
diff -Nru apparmor-2.9.0/debian/libapparmor1.install apparmor-2.9.0/debian/libapparmor1.install
--- apparmor-2.9.0/debian/libapparmor1.install	2014-10-18 20:04:11.000000000 +0200
+++ apparmor-2.9.0/debian/libapparmor1.install	2014-12-02 07:13:21.000000000 +0100
@@ -1 +1 @@
-usr/lib/*/libapparmor.so.1*
+/lib/*/libapparmor.so.1*
diff -Nru apparmor-2.9.0/debian/libapparmor-dev.install apparmor-2.9.0/debian/libapparmor-dev.install
--- apparmor-2.9.0/debian/libapparmor-dev.install	2014-10-18 20:04:11.000000000 +0200
+++ apparmor-2.9.0/debian/libapparmor-dev.install	2014-12-02 07:13:21.000000000 +0100
@@ -1,5 +1,5 @@
-usr/lib/*/libapparmor.a
-usr/lib/*/libapparmor.la
-usr/lib/*/libapparmor.so
+/lib/*/libapparmor.a
+/lib/*/libapparmor.la
+/lib/*/libapparmor.so
 usr/lib/*/pkgconfig/libapparmor*
 usr/include/*
diff -Nru apparmor-2.9.0/debian/rules apparmor-2.9.0/debian/rules
--- apparmor-2.9.0/debian/rules	2014-10-18 20:04:11.000000000 +0200
+++ apparmor-2.9.0/debian/rules	2014-12-02 07:13:21.000000000 +0100
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export DEB_HOST_ARCH_OS   ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+export DEB_HOST_MULTIARCH   ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 export PERL_VENDORARCH := $(shell perl -MConfig -e 'print substr($$Config{vendorarch},1)' )
 export PYTHON=/usr/bin/python3
@@ -13,7 +14,7 @@
 
 override_dh_auto_configure:
 	cd libraries/libapparmor && sh ./autogen.sh
-	dh_auto_configure -D libraries/libapparmor -- --with-perl
+	dh_auto_configure -D libraries/libapparmor -- --with-perl --libdir /lib/$(DEB_HOST_MULTIARCH)
 
 
 override_dh_auto_build:
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-apparmor-team/attachments/20141202/d5f7ca86/attachment.sig>