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

[Christian Perrier]

Author: bubulle
Date: 2005-06-09 21:55:50 +0000 (Thu, 09 Jun 2005)
New Revision: 228

Added:
   trunk/debian/patches/354_Makefile.am
Removed:
   trunk/debian/patches/003_Makefile.am.dpatch
Modified:
   trunk/debian/patches/series
Log:
Move 003 to the 3xx series (applied upstream)


Deleted: trunk/debian/patches/003_Makefile.am.dpatch
===================================================================
--- trunk/debian/patches/003_Makefile.am.dpatch	2005-06-09 21:51:31 UTC (rev 227)
+++ trunk/debian/patches/003_Makefile.am.dpatch	2005-06-09 21:55:50 UTC (rev 228)
@@ -1,33 +0,0 @@
-#! /bin/sh -e
-## 003_Makefile.am.dpatch by <unknown>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-
-if [ $# -lt 1 ]; then
-    echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
-    exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-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
-
-exit 0
-
-@DPATCH@
-
---- shadow-4.0.3.orig/Makefile.am
-+++ shadow-4.0.3/Makefile.am
-@@ -5,4 +5,4 @@
- AUTOMAKE_OPTIONS = 1.5 dist-bzip2 foreign
- 
- SUBDIRS = intl po man libmisc lib src \
--	contrib debian doc etc
-+	contrib doc etc

Copied: trunk/debian/patches/354_Makefile.am (from rev 226, trunk/debian/patches/003_Makefile.am.dpatch)
===================================================================
--- trunk/debian/patches/003_Makefile.am.dpatch	2005-06-09 21:49:05 UTC (rev 226)
+++ trunk/debian/patches/354_Makefile.am	2005-06-09 21:55:50 UTC (rev 228)
@@ -0,0 +1,14 @@
+Goal: Remove the "debian" directoryfrom the Makefile.am
+
+Status wrt upstream: Applied 
+
+Index: shadow-4.0.3/Makefile.am
+===================================================================
+--- shadow-4.0.3.orig/Makefile.am
++++ shadow-4.0.3/Makefile.am
+@@ -5,4 +5,4 @@
+ AUTOMAKE_OPTIONS = 1.5 dist-bzip2 foreign
+ 
+ SUBDIRS = intl po man libmisc lib src \
+-	contrib debian doc etc
++	contrib doc etc

Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series	2005-06-09 21:51:31 UTC (rev 227)
+++ trunk/debian/patches/series	2005-06-09 21:55:50 UTC (rev 228)
@@ -1,6 +1,6 @@
 001_Makefile.in.in.dpatch
 002_more-i18n.dpatch
-003_Makefile.am.dpatch
+354_Makefile.am
 004_configure.in.dpatch
 005_manpages.dpatch
 336_chfn.1