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

[Martin Quinson]

Author: mquinson
Date: 2005-06-11 15:21:06 +0000 (Sat, 11 Jun 2005)
New Revision: 236

Modified:
   trunk/debian/patches/002_more-i18n.dpatch
   trunk/debian/patches/401_cppw_src.dpatch
Log:
src/cppw.c is created in patch 401_cppw_src, so it should be added to po/POTFILES.in in there, not in 002_more-i18n (which can be submitted upstream, now that it's cleaner)

Modified: trunk/debian/patches/002_more-i18n.dpatch
===================================================================
--- trunk/debian/patches/002_more-i18n.dpatch	2005-06-11 15:15:39 UTC (rev 235)
+++ trunk/debian/patches/002_more-i18n.dpatch	2005-06-11 15:21:06 UTC (rev 236)
@@ -4,16 +4,13 @@
 Detail: remove a bunch of unexisting files (lib/md5.c for example) and add
 some files which were forgotten (libmisc/getdate.c for example)
 
-Note that it adds src/cppw.c, which is added by patch 401_cppw_src.dpatch in
-Debian.
-
 Status wrt upstream: was submitted once, but not applied was cleanup in the
 meanwhile.
 
 Index: shadow-4.0.3/po/POTFILES.in
 ===================================================================
---- shadow-4.0.3.orig/po/POTFILES.in	2002-03-10 08:29:33.000000000 +0100
-+++ shadow-4.0.3/po/POTFILES.in	2005-06-10 12:12:11.879821376 +0200
+--- shadow-4.0.3.orig/po/POTFILES.in	2005-06-11 17:16:40.036938526 +0200
++++ shadow-4.0.3/po/POTFILES.in	2005-06-11 17:17:13.947871794 +0200
 @@ -13,6 +13,7 @@ libmisc/entry.c
  libmisc/env.c
  libmisc/failure.c
@@ -34,7 +31,7 @@
  libmisc/pwd_init.c
  libmisc/rlogin.c
  libmisc/salt.c
-@@ -58,46 +61,32 @@ lib/gsdbm.c
+@@ -58,33 +61,19 @@ lib/gsdbm.c
  lib/gshadow.c
  lib/gspack.c
  lib/lockpw.c
@@ -68,13 +65,7 @@
  lib/tcfsio.c
  lib/utent.c
  src/chage.c
- src/chfn.c
- src/chpasswd.c
- src/chsh.c
-+src/cppw.c
- src/dpasswd.c
- src/expiry.c
- src/faillog.c
+@@ -97,7 +86,6 @@ src/faillog.c
  src/gpasswd.c
  src/groupadd.c
  src/groupdel.c

Modified: trunk/debian/patches/401_cppw_src.dpatch
===================================================================
--- trunk/debian/patches/401_cppw_src.dpatch	2005-06-11 15:15:39 UTC (rev 235)
+++ trunk/debian/patches/401_cppw_src.dpatch	2005-06-11 15:21:06 UTC (rev 236)
@@ -5,9 +5,10 @@
 ## DP: Add cppw / cpgr
 
 @DPATCH@
-diff -urNad shadow-4.0.3/src/cppw.c /tmp/dpep.VHAQ7k/shadow-4.0.3/src/cppw.c
---- shadow-4.0.3/src/cppw.c	1970-01-01 01:00:00.000000000 +0100
-+++ /tmp/dpep.VHAQ7k/shadow-4.0.3/src/cppw.c	2005-04-14 18:23:52.229246000 +0200
+Index: shadow-4.0.3/src/cppw.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ shadow-4.0.3/src/cppw.c	2005-06-11 17:17:36.838451645 +0200
 @@ -0,0 +1,200 @@
 +/*
 +  cppw, cpgr  copy with locking given file over the password or group file
@@ -209,10 +210,11 @@
 +
 +  return 0;
 +}
-diff -urNad shadow-4.0.3/src/Makefile.am /tmp/dpep.VHAQ7k/shadow-4.0.3/src/Makefile.am
---- shadow-4.0.3/src/Makefile.am	2005-04-14 16:55:11.919246000 +0200
-+++ /tmp/dpep.VHAQ7k/shadow-4.0.3/src/Makefile.am	2005-04-14 18:24:26.199246000 +0200
-@@ -25,7 +25,7 @@
+Index: shadow-4.0.3/src/Makefile.am
+===================================================================
+--- shadow-4.0.3.orig/src/Makefile.am	2005-06-11 17:16:25.832060919 +0200
++++ shadow-4.0.3/src/Makefile.am	2005-06-11 17:17:36.847450300 +0200
+@@ -25,7 +25,7 @@ bin_PROGRAMS = groups login su
  ubin_PROGRAMS = faillog lastlog chage chfn chsh expiry gpasswd newgrp passwd
  usbin_PROGRAMS = chpasswd dpasswd groupadd groupdel groupmod \
  	logoutd mkpasswd newusers useradd userdel usermod grpck \
@@ -221,3 +223,15 @@
  
  noinst_PROGRAMS = id sulogin
  
+Index: shadow-4.0.3/po/POTFILES.in
+===================================================================
+--- shadow-4.0.3.orig/po/POTFILES.in	2005-06-11 17:17:13.947871794 +0200
++++ shadow-4.0.3/po/POTFILES.in	2005-06-11 17:18:12.704092854 +0200
+@@ -80,6 +80,7 @@ src/chage.c
+ src/chfn.c
+ src/chpasswd.c
+ src/chsh.c
++src/cppw.c
+ src/dpasswd.c
+ src/expiry.c
+ src/faillog.c