summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSteve Langasek <vorlon@debian.org>2011-06-21 01:18:30 -0700
committerSteve Langasek <vorlon@debian.org>2019-01-08 21:52:00 -0800
commit1872ca626d0c76cdc947e5802a62603a04eb076d (patch)
tree4fc62425b38e65351909fe67246fe9fce851a998 /debian
parent736a8c9f5b470e07a8bfe161de2593b2fe42cbaf (diff)
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
Diffstat (limited to 'debian')
-rw-r--r--debian/control7
-rwxr-xr-xdebian/rules6
2 files changed, 7 insertions, 6 deletions
diff --git a/debian/control b/debian/control
index 9f4a994a..6941c851 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Uploaders: Sam Hartman <hartmans@debian.org>, Roger Leigh <rleigh@debian.org>
Maintainer: Steve Langasek <vorlon@debian.org>
Standards-Version: 3.9.1
-Build-Depends: libcrack2-dev (>= 2.8), bzip2, debhelper (>= 7.0.50), quilt (>= 0.48-1), flex, libdb-dev, libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !netbsd-i386], po-debconf
+Build-Depends: libcrack2-dev (>= 2.8), bzip2, debhelper (>= 8.1.3), quilt (>= 0.48-1), flex, libdb-dev, libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64 !netbsd-i386], po-debconf
Build-Depends-Indep: xsltproc, libxml2-utils, docbook-xml, docbook-xsl, w3m
Build-Conflicts-Indep: fop
Build-Conflicts: libdb4.2-dev, libxcrypt-dev
@@ -17,6 +17,7 @@ Architecture: any
Multi-Arch: same
Replaces: libpam0g-util
Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
Suggests: libpam-doc
Description: Pluggable Authentication Modules library
Contains the C shared library for Linux-PAM, a suite of shared
@@ -32,7 +33,7 @@ Section: admin
Priority: required
Architecture: any
Multi-Arch: same
-Pre-Depends: ${shlibs:Depends}, ${misc:Depends},
+Pre-Depends: ${shlibs:Depends}, ${misc:Depends}, libpam0g (>= 1.1.3-2),
libpam-modules-bin (= ${binary:Version})
Conflicts: libpam-motd, libpam-mkhomedir, libpam-umask
Replaces: libpam0g-util, libpam-umask
@@ -47,7 +48,7 @@ Priority: required
Architecture: any
Multi-Arch: foreign
Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libpam-modules (<< 1.1.1-4)
+Replaces: libpam-modules (<< 1.1.3-2)
Description: Pluggable Authentication Modules for PAM - helper binaries
This package contains helper binaries used by the standard set of PAM
modules in the libpam-modules package.
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