Source: keyutils
Version: 1.4-4
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch

Hi Daniel,

Please find attached a patch to keyutils to transition it to use of the
multiarch library paths as described at
<http://wiki.debian.org/Multiarch/Implementation>.  This patch has been
applied and is being used successfully in Ubuntu 11.04, and should be safe
to apply in Debian now that multiarch has been bootstrapped there.

Thanks,
-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slanga...@ubuntu.com                                     vor...@debian.org
=== modified file 'debian/compat'
--- debian/compat	2010-12-19 21:16:19 +0000
+++ debian/compat	2011-03-24 17:19:53 +0000
@@ -1,1 +1,1 @@
-8
+9

=== modified file 'debian/control'
--- debian/control	2011-01-16 18:44:03 +0000
+++ debian/control	2011-03-24 17:19:53 +0000
@@ -2,7 +2,7 @@
 Section: admin
 Priority: optional
 Maintainer: Daniel Baumann <daniel.baum...@progress-technologies.net>
-Build-Depends: debhelper (>= 8)
+Build-Depends: debhelper (>= 8.1.3)
 Standards-Version: 3.9.1
 Homepage: http://people.redhat.com/~dhowells/keyutils/
 
@@ -36,6 +37,8 @@
 Priority: standard
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: Linux Key Management Utilities (library)
  Keyutils is a set of utilities for managing the key retention facility in the
  kernel, which can be used by filesystems, block devices and more to gain and

=== modified file 'debian/libkeyutils1.install'
--- debian/libkeyutils1.install	2008-09-01 13:01:00 +0000
+++ debian/libkeyutils1.install	2011-03-24 17:19:53 +0000
@@ -1,1 +1,1 @@
-/lib/*.so*
+/lib/*/*.so*

=== modified file 'debian/rules'
--- debian/rules	2010-12-19 21:16:19 +0000
+++ debian/rules	2011-03-24 17:19:53 +0000
@@ -3,6 +3,10 @@
 %:
 	dh ${@}
 
+override_dh_auto_install:
+	dh_auto_install -- LIBDIR=/lib/$(DEB_HOST_MULTIARCH) \
+		USRLIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH)
+
 override_dh_install:
 	dh_install --fail-missing
 


Attachment: signature.asc
Description: Digital signature

Reply via email to