[Pkg-shadow-devel] Bug#314407: FTBFS: incompatible with dpkg-dev 1.13

[Matt Kraai]

This is a multi-part MIME message sent by reportbug.

--===============1344853464==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: shadow
Severity: serious
Tags: patch
Justification: no longer builds from source

shadow does not build with dpkg-dev 1.13 because the output of
dpkg-architecture has changed.

 http://lists.debian.org/debian-devel-announce/2005/06/msg00010.html

has more information about this.  The attached patch fixes it.

-- System Information:
Debian Release: 3.1
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (1, 'experimental')
Architecture: powerpc (ppc)
Kernel: Linux 2.6.8-powerpc
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1)

--===============1344853464==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="patch"

diff -ru shadow-4.0.3/debian/control shadow-4.0.3.new/debian/control
--- shadow-4.0.3/debian/control	2005-06-15 13:01:05.000000000 -0700
+++ shadow-4.0.3.new/debian/control	2005-06-15 10:52:18.000000000 -0700
@@ -4,7 +4,7 @@
 Maintainer: Shadow package maintainers <pkg-shadow-devel@lists.alioth.debian.org>
 Standards-Version: 3.6.1.1
 Uploaders: Christian Perrier <bubulle@debian.org>, Martin Quinson <mquinson@debian.org>
-Build-Depends: autoconf, automake1.7, libtool, bzip2, gettext, libpam0g-dev, texinfo, file, debhelper (>= 4.1.16), po-debconf, libpam-runtime (>= 0.76-14),quilt
+Build-Depends: autoconf, automake1.7, libtool, bzip2, gettext, libpam0g-dev, texinfo, file, debhelper (>= 4.1.16), po-debconf, libpam-runtime (>= 0.76-14),quilt, dpkg-dev (>= 1.13.5)
 
 Package: passwd
 Architecture: any
diff -ru shadow-4.0.3/debian/rules shadow-4.0.3.new/debian/rules
--- shadow-4.0.3/debian/rules	2005-06-15 13:01:05.000000000 -0700
+++ shadow-4.0.3.new/debian/rules	2005-06-15 10:50:38.000000000 -0700
@@ -2,7 +2,7 @@
 
 config_options := --disable-shared --without-libcrack --mandir=/usr/share/man --with-libpam
 
-DEB_HOST_GNU_SYSTEM := $(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)
+DEB_HOST_ARCH_OS := $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
 DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
@@ -104,7 +104,7 @@
 	install -c -m 444 debian/pam.d/chsh debian/passwd/etc/pam.d/chsh
 	install -c -m 444 debian/pam.d/passwd debian/passwd/etc/pam.d/passwd
 	install -c -m 444 debian/login.defs debian/login/etc/login.defs
-	install -c -m 444 debian/securetty.$(DEB_HOST_GNU_SYSTEM) debian/login/etc/securetty
+	install -c -m 444 debian/securetty.$(DEB_HOST_ARCH_OS) debian/login/etc/securetty
 	install -d debian/passwd/usr/share/passwd
 	install -c -m 444 debian/shells debian/passwd/usr/share/passwd/shells
 	install -d debian/passwd/sbin

--===============1344853464==--