Package: acl Version: 2.2.49-5 Severity: normal Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu oneiric ubuntu-patch
Hi guys, Please find attached an updated patch to add multiarch support to the acl package, using the final interfaces as agreed with the dpkg/apt maintainers and following the guidelines described at <http://wiki.debian.org/Multiarch/Implementation>. This patch is already successfully in use in Ubuntu natty, and should not present any problems for Debian. -- 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/control' --- debian/control 2011-05-28 09:10:42 +0000 +++ debian/control 2011-06-02 22:00:15 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Nathan Scott <nath...@debian.org> Uploaders: Anibal Monsalve Salazar <ani...@debian.org>, Luk Claes <l...@debian.org> -Build-Depends: autoconf, automake, debhelper (>= 7), gettext, libtool, libattr1-dev (>= 2.4.4) +Build-Depends: autoconf, automake, debhelper (>= 8.1.3), gettext, libtool, libattr1-dev (>= 2.4.4) Standards-Version: 3.8.4 Homepage: http://savannah.nongnu.org/projects/acl/ Vcs-Git: git://git.savannah.nongnu.org/acl.git @@ -12,6 +13,7 @@ Package: acl Depends: ${shlibs:Depends}, ${misc:Depends} Architecture: any +Multi-Arch: foreign Description: Access control list utilities This package contains the getfacl and setfacl utilities needed for manipulating access control lists. @@ -35,6 +37,8 @@ Priority: required Conflicts: acl (<< 2.0.0), libacl1-kerberos4kth Architecture: any +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: Access control list shared library This package contains the libacl.so dynamic library containing the POSIX 1003.1e draft standard 17 functions for manipulating === modified file 'debian/rules' --- debian/rules 2011-05-28 09:10:42 +0000 +++ debian/rules 2011-06-02 22:00:47 +0000 @@ -18,6 +18,9 @@ INSTALL_USER=root INSTALL_GROUP=root CONFIG_SHELL=/bin/bash; checkdir = test -f debian/rules +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) +LOCAL_CONFIGURE_OPTIONS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) + # Ensure cross builds succeed DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
