[Pkg-shadow-commits] r1101 - in trunk/debian: . patches

[Christian Perrier]

Author: bubulle
Date: 2006-08-25 17:47:51 +0000 (Fri, 25 Aug 2006)
New Revision: 1101

Added:
   trunk/debian/patches/499_gettext-0.15
Modified:
   trunk/debian/changelog
   trunk/debian/control
   trunk/debian/patches/series
   trunk/debian/rules
Log:
Merge the 'build with gettext-0.15' fix from etch branch

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-08-25 16:56:42 UTC (rev 1100)
+++ trunk/debian/changelog	2006-08-25 17:47:51 UTC (rev 1101)
@@ -8,6 +8,8 @@
   * Upstream bugs not yet fixed in upstream releases or CVS but fixed
     in the etch branch (we don't want regressions)
     - debian/patches/101_ja: Japanese. Closes: #381873
+    - build with new gettext 0.15. This requires building with automake 1.9
+      and a change in po/Makefile.in.in: 499_gettext-0.15. Closes: #384631
 
  -- Christian Perrier <bubulle at debian.org>  Fri, 25 Aug 2006 12:00:51 +0200
 

Modified: trunk/debian/control
===================================================================
--- trunk/debian/control	2006-08-25 16:56:42 UTC (rev 1100)
+++ trunk/debian/control	2006-08-25 17:47:51 UTC (rev 1101)
@@ -4,7 +4,7 @@
 Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
 Standards-Version: 3.7.2.0
 Uploaders: Christian Perrier <bubulle at debian.org>, Martin Quinson <mquinson at debian.org>, Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>
-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), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], gnome-doc-utils
+Build-Depends: autoconf, automake1.9, libtool, bzip2, gettext, libpam0g-dev, texinfo, file, debhelper (>= 4.1.16), po-debconf, libpam-runtime (>= 0.76-14), quilt, dpkg-dev (>= 1.13.5), xsltproc, docbook-xsl, docbook-xml, libxml2-utils, cdbs, libselinux1-dev [!hurd-i386 !kfreebsd-i386 !kfreebsd-amd64], gnome-doc-utils
 
 Package: passwd
 Architecture: any

Added: trunk/debian/patches/499_gettext-0.15
===================================================================
--- trunk/debian/patches/499_gettext-0.15	2006-08-25 16:56:42 UTC (rev 1100)
+++ trunk/debian/patches/499_gettext-0.15	2006-08-25 17:47:51 UTC (rev 1101)
@@ -0,0 +1,20 @@
+Goal: MKINSTALLDIRS is not defined otherwise.
+
+Fixes: #384631
+
+Note: this is a minimal patch. Maybe it would be better to update the file
+to the new one distributed with gettext.
+
+Index: shadow-4.0.18.1/po/Makefile.in.in
+===================================================================
+--- shadow-4.0.18.1.orig/po/Makefile.in.in	2006-08-25 17:43:49.000000000 +0200
++++ shadow-4.0.18.1/po/Makefile.in.in	2006-08-25 17:44:12.000000000 +0200
+@@ -26,7 +26,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+-MKINSTALLDIRS = @MKINSTALLDIRS@
++MKINSTALLDIRS = @install_sh@ -d
+ mkinstalldirs = $(SHELL) $(MKINSTALLDIRS)
+ 
+ GMSGFMT = @GMSGFMT@

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2006-08-25 16:56:42 UTC (rev 1100)
+++ trunk/debian/patches/series	2006-08-25 17:47:51 UTC (rev 1101)
@@ -40,3 +40,4 @@
 497_non_numerical_identifier
 498_man_nonpam_undefined
 101_ja
+499_gettext-0.15

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2006-08-25 16:56:42 UTC (rev 1100)
+++ trunk/debian/rules	2006-08-25 17:47:51 UTC (rev 1101)
@@ -20,9 +20,9 @@
 
 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