[Pkg-shadow-devel] Ubuntu shadow 1:4.0.16-2ubuntu3

[Ubuntu Merge-o-Matic]

This e-mail has been sent due to an upload to Ubuntu that contains Ubuntu
changes.  It contains the difference between the new version and the
previous version of the same source package in Ubuntu.
-------------- next part --------------
Format: 1.7
Date: Tue, 17 Oct 2006 09:09:52 +0200
Source: shadow
Binary: login passwd
Architecture: source
Version: 1:4.0.16-2ubuntu3
Distribution: edgy
Urgency: low
Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
Changed-By: Martin Pitt <martin.pitt at ubuntu.com>
Description: 
 login      - system login tools
 passwd     - change and administer password and group data
Changes: 
 shadow (1:4.0.16-2ubuntu3) edgy; urgency=low
 .
   * Fix FTBFS due to new gettext 0.15:
     - debian/rules: Use automake 1.9 instead of 1.7, 1.7 breaks with newer
       gettext.
     - Add debian/patches/593_po_mkinstalldirs: Hardcode the value of
       'mkinstalldirs' in po/Makefile.in.in instead of using @MKINSTALLDIRS at .
       The latter has been removed from gettext 0.15. This is a Gross Hackâ„¢,
       but has to do for Edgy.
     - Closes: LP#66506
Files: 
 1ac7a898708d5eea969fd4a0684c79b4 995 admin required shadow_4.0.16-2ubuntu3.dsc
 7ebbbf2dc8e3f5958b5337d84d0ecf25 529196 admin required shadow_4.0.16-2ubuntu3.diff.gz
-------------- next part --------------
diff -pruN 1:4.0.16-2ubuntu2/debian/changelog 1:4.0.16-2ubuntu3/debian/changelog
--- 1:4.0.16-2ubuntu2/debian/changelog	2006-10-17 16:08:00.000000000 +0100
+++ 1:4.0.16-2ubuntu3/debian/changelog	2006-10-17 16:07:59.000000000 +0100
@@ -1,3 +1,16 @@
+shadow (1:4.0.16-2ubuntu3) edgy; urgency=low
+
+  * Fix FTBFS due to new gettext 0.15:
+    - debian/rules: Use automake 1.9 instead of 1.7, 1.7 breaks with newer
+      gettext.
+    - Add debian/patches/593_po_mkinstalldirs: Hardcode the value of
+      'mkinstalldirs' in po/Makefile.in.in instead of using @MKINSTALLDIRS at .
+      The latter has been removed from gettext 0.15. This is a Gross Hackâ„¢,
+      but has to do for Edgy.
+    - Closes: LP#66506
+
+ -- Martin Pitt <martin.pitt at ubuntu.com>  Tue, 17 Oct 2006 09:09:52 +0200
+
 shadow (1:4.0.16-2ubuntu2) edgy; urgency=low
 
   * Consolidate some duplicated code in passwd.postinst.
diff -pruN 1:4.0.16-2ubuntu2/debian/patches/593_po_mkinstalldirs 1:4.0.16-2ubuntu3/debian/patches/593_po_mkinstalldirs
--- 1:4.0.16-2ubuntu2/debian/patches/593_po_mkinstalldirs	1970-01-01 01:00:00.000000000 +0100
+++ 1:4.0.16-2ubuntu3/debian/patches/593_po_mkinstalldirs	2006-10-17 16:07:59.000000000 +0100
@@ -0,0 +1,14 @@
+Index: shadow-4.0.16/po/Makefile.in.in
+===================================================================
+--- shadow-4.0.16.orig/po/Makefile.in.in	2006-10-17 09:08:58.000000000 +0200
++++ shadow-4.0.16/po/Makefile.in.in	2006-10-17 09:09:27.000000000 +0200
+@@ -26,8 +26,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
++mkinstalldirs = install -d
+ 
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@
diff -pruN 1:4.0.16-2ubuntu2/debian/patches/series 1:4.0.16-2ubuntu3/debian/patches/series
--- 1:4.0.16-2ubuntu2/debian/patches/series	2006-10-17 16:08:00.000000000 +0100
+++ 1:4.0.16-2ubuntu3/debian/patches/series	2006-10-17 16:07:59.000000000 +0100
@@ -35,3 +35,4 @@
 487_passwd_chauthtok_failed_message
 403_fix_PATH-MAX_hurd
 495_salt_stack_smash
+593_po_mkinstalldirs
diff -pruN 1:4.0.16-2ubuntu2/debian/rules 1:4.0.16-2ubuntu3/debian/rules
--- 1:4.0.16-2ubuntu2/debian/rules	2006-10-17 16:08:00.000000000 +0100
+++ 1:4.0.16-2ubuntu3/debian/rules	2006-10-17 16:07:59.000000000 +0100
@@ -20,9 +20,9 @@ DEB_DESTDIR=$(CURDIR)/debian/tmp
 
 include /usr/share/cdbs/1/class/autotools.mk
 # Automatically update autoconf, etc.
-DEB_AUTO_UPDATE_ACLOCAL  = 1.7
-DEB_AUTO_UPDATE_AUTOCONF = 1.7
-DEB_AUTO_UPDATE_AUTOMAKE = 1.7
+DEB_AUTO_UPDATE_ACLOCAL  = 1.9
+DEB_AUTO_UPDATE_AUTOCONF = 1.9
+DEB_AUTO_UPDATE_AUTOMAKE = 1.9
 
 # Adds extra options when calling the configure script:
 DEB_CONFIGURE_EXTRA_FLAGS := --disable-shared --without-libcrack --mandir=/usr/share/man --with-libpam --enable-shadowgrp --enable-man