[Pkg-shadow-commits] r259 - trunk/debian

[Christian Perrier]

Author: bubulle
Date: 2005-06-16 06:51:38 +0000 (Thu, 16 Jun 2005)
New Revision: 259

Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/rules
Log:
Fix FTBFS with new dpkg 1.13


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-06-16 06:36:04 UTC (rev 258)
+++ trunk/debian/changelog	2005-06-16 06:51:38 UTC (rev 259)
@@ -1,6 +1,8 @@
 shadow (1:4.0.3-36) UNRELEASED; urgency=low
 
   * Debian packaging fixes:
+    - Fix FTBFS with new dpkg 1.13 and use a correct dpkg-architecture
+      invocation. Closes: #314407
     - Add a comment about potential sensitive information exposure
       when LOG_UNKFAIL_ENAB is set in login.defs
       Closes: #298773

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2005-06-16 06:36:04 UTC (rev 258)
+++ trunk/debian/control	2005-06-16 06:51:38 UTC (rev 259)
@@ -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

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2005-06-16 06:36:04 UTC (rev 258)
+++ trunk/debian/rules	2005-06-16 06:51:38 UTC (rev 259)
@@ -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))
@@ -105,7 +105,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