From 1872ca626d0c76cdc947e5802a62603a04eb076d Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 21 Jun 2011 01:18:30 -0700 Subject: Pull in final multiarch support from Ubuntu: - bump the debhelper build-dep - add Pre-Depends: ${misc:Pre-Depends} for multiarch-support - add Pre-Depends: libpam0g (>= 1.1.3-2) to libpam-modules - bump the version in libpam-modules-bin's replaces: of libpam-modules - use DEB_HOST_MULTIARCH, not DEB_HOST_GNU_TYPE --- debian/rules | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian/rules') diff --git a/debian/rules b/debian/rules index 98539256..774e4b72 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ else CFLAGS += -O0 endif -DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) LC_COLLATE=C export LC_COLLATE @@ -24,7 +24,7 @@ dl = $(d)/local override_dh_auto_configure: dh_auto_configure -- --enable-static --enable-shared \ - --libdir=/lib/$(DEB_HOST_GNU_TYPE) --sbindir=/sbin \ + --libdir=/lib/$(DEB_HOST_MULTIARCH) --sbindir=/sbin \ --enable-isadir=/lib/security --disable-audit \ CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" @@ -51,7 +51,7 @@ override_dh_installman: # dh_link doesn't do wildcards, so we can't auto-link to the right per-arch # directory override_dh_link: - sed -e"s,^/lib,/lib/$(DEB_HOST_GNU_TYPE)," $(d)/libpam0g-dev.links.in > $(d)/libpam0g-dev.links + sed -e"s,^/lib,/lib/$(DEB_HOST_MULTIARCH)," $(d)/libpam0g-dev.links.in > $(d)/libpam0g-dev.links dh_link # using perms that differ from upstream (sgid instead of suid) /and/ that -- cgit v1.2.3