[Pkg-shadow-commits] r196 - trunk/debian/patches

[Martin Quinson]

Author: mquinson
Date: 2005-06-08 09:54:42 +0000 (Wed, 08 Jun 2005)
New Revision: 196

Modified:
   trunk/debian/patches/001_Makefile.in.in.dpatch
Log:
Sorted out why this patch

Modified: trunk/debian/patches/001_Makefile.in.in.dpatch
===================================================================
--- trunk/debian/patches/001_Makefile.in.in.dpatch	2005-06-07 15:24:21 UTC (rev 195)
+++ trunk/debian/patches/001_Makefile.in.in.dpatch	2005-06-08 09:54:42 UTC (rev 196)
@@ -1,28 +1,30 @@
-#! /bin/sh -e
-## 001_Makefile.in.in.dpatch by <unknown>
-##
-## All lines beginning with `## DP:' are a description of the patch.
+PURPOSE: Close #200052, which was a FTBFS
 
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
+Quoting the bug submitter (Goswin Brederlow):
+<<<<<<<
+Making install in po
+make[2]: Entering directory /home/mrvn/shadow/shadow-4.0.3/po
+/bin/sh `case ".././mkinstalldirs" in /*) echo ".././mkinstalldirs" ;; *) echo "../.././mkinstalldirs" ;; esac` /home/mrvn/shadow/shadow-4.0.3/debian/tmp/usr/share
+../.././mkinstalldirs: ../.././mkinstalldirs: No such file or directory
+make[2]: *** [install-data-yes] Error 127
+make[2]: Leaving directory /home/mrvn/shadow/shadow-4.0.3/po'
+make[1]: *** [install-recursive] Error 1
+make[1]: Leaving directory /home/mrvn/shadow/shadow-4.0.3'
+make: *** [install] Error 2
+Build command 'cd shadow-4.0.3 && dpkg-buildpackage -b -uc' failed.
 
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+Using the following in po/Makefile.ini.in builds but you should
+probably change your configure.in for and run autopoint:
 
-case "$1" in
-    -patch) patch -p1 ${patch_opts} < $0;;
-    -unpatch) patch -R -p1 ${patch_opts} < $0;;
-    *)
-        echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-        exit 1;;
-esac
+mkinstalldirs = $(SHELL) if [ -x "$(MKINSTALLDIRS)" ]; then echo "$(MKINSTALLDIRS)"; else echo "$(top_builddir)/$(MKINSTALLDIRS)"; fi
+>>>>>>>
 
-exit 0
+STATUS WRT UPSTREAM: Tomacz said that patching files of gettext that was was pure evil.
 
-@DPATCH@
+I (Mt) agree and vote in favour of dropping it. If the bug comes back, we
+will reassign it to gettext and help Santiago fixing it. (IMHO)
 
+
 --- shadow-4.0.3.orig/po/Makefile.in.in
 +++ shadow-4.0.3/po/Makefile.in.in
 @@ -94,7 +94,7 @@