[Pkg-shadow-commits] r233 - trunk/debian/patches
Martin Quinson
pkg-shadow-devel@lists.alioth.debian.org
Fri, 10 Jun 2005 10:36:42 +0000
Author: mquinson
Date: 2005-06-10 10:36:41 +0000 (Fri, 10 Jun 2005)
New Revision: 233
Modified:
trunk/debian/patches/002_more-i18n.dpatch
Log:
Document the patch; cleanup by sorting *manually* the files in the po/POTFILES.in, which results in more sane result and reduced patch size. Note that the pot file was not updated
Modified: trunk/debian/patches/002_more-i18n.dpatch
===================================================================
--- trunk/debian/patches/002_more-i18n.dpatch 2005-06-09 23:43:23 UTC (rev 232)
+++ trunk/debian/patches/002_more-i18n.dpatch 2005-06-10 10:36:41 UTC (rev 233)
@@ -1,52 +1,20 @@
-#! /bin/sh -e
-## 002_more-i18n.dpatch by <bubulle@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Add new files with translatable strings
+Purpose: Clean up the list of the files containing stuff to translate, and
+ update the pot file accordingly.
+
+Detail: remove a bunch of unexisting files (lib/md5.c for example) and add
+some files which were forgotten (libmisc/getdate.c for example)
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
+Note that it adds src/cppw.c, which is added by patch 401_cppw_src.dpatch in
+Debian.
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
+Status wrt upstream: was submitted once, but not applied was cleanup in the
+meanwhile.
-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/po/POTFILES.in
-+++ shadow-4.0.3/po/POTFILES.in
-@@ -1,5 +1,19 @@
- # List of files which contain translatable strings.
-
-+lib/commonio.c
-+lib/dialchk.c
-+lib/dialup.c
-+lib/encrypt.c
-+lib/fputsx.c
-+lib/getdef.c
-+lib/getpass.c
-+lib/grdbm.c
-+lib/groupio.c
-+lib/grpack.c
-+lib/gsdbm.c
-+lib/gshadow.c
-+lib/gspack.c
-+lib/lockpw.c
- libmisc/addgrps.c
- libmisc/age.c
- libmisc/basename.c
-@@ -13,6 +27,7 @@
+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
+@@ -13,6 +13,7 @@ libmisc/entry.c
libmisc/env.c
libmisc/failure.c
libmisc/fields.c
@@ -54,7 +22,7 @@
libmisc/hushed.c
libmisc/isexpired.c
libmisc/limits.c
-@@ -25,9 +40,11 @@
+@@ -25,9 +26,11 @@ libmisc/loginprompt.c
libmisc/mail.c
libmisc/motd.c
libmisc/myname.c
@@ -66,24 +34,10 @@
libmisc/pwd_init.c
libmisc/rlogin.c
libmisc/salt.c
-@@ -44,60 +61,32 @@
- libmisc/utmp.c
- libmisc/valid.c
- libmisc/xmalloc.c
--lib/commonio.c
--lib/dialchk.c
--lib/dialup.c
--lib/encrypt.c
--lib/fputsx.c
--lib/getdef.c
--lib/getpass.c
--lib/grdbm.c
--lib/groupio.c
--lib/grpack.c
--lib/gsdbm.c
--lib/gshadow.c
--lib/gspack.c
--lib/lockpw.c
+@@ -58,46 +61,32 @@ lib/gsdbm.c
+ lib/gshadow.c
+ lib/gspack.c
+ lib/lockpw.c
-lib/md5.c
-lib/md5crypt.c
-lib/mkdir.c
@@ -128,21 +82,10 @@
src/groupmod.c
src/groups.c
src/grpck.c
-@@ -114,11 +103,10 @@
- src/pwck.c
- src/pwconv.c
- src/pwunconv.c
--src/su.c
- src/suauth.c
-+src/su.c
- src/sulogin.c
- src/useradd.c
- src/userdel.c
- src/usermod.c
- src/vipw.c
--
---- shadow-4.0.3.orig/po/shadow.pot
-+++ shadow-4.0.3/po/shadow.pot
+Index: shadow-4.0.3/po/shadow.pot
+===================================================================
+--- shadow-4.0.3.orig/po/shadow.pot 2002-03-12 12:16:48.000000000 +0100
++++ shadow-4.0.3/po/shadow.pot 2005-06-10 12:09:49.450102220 +0200
@@ -1,18 +1,48 @@
# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
@@ -194,7 +137,7 @@
#: libmisc/addgrps.c:60
#, c-format
-@@ -20,18 +50,22 @@
+@@ -20,18 +50,22 @@ msgid "Warning: unknown group %s\n"
msgstr ""
#: libmisc/addgrps.c:71
@@ -217,7 +160,7 @@
msgid "Your login has expired."
msgstr ""
-@@ -49,10 +83,12 @@
+@@ -49,10 +83,12 @@ msgid "Your password will expire in %ld
msgstr ""
#: libmisc/age.c:178
@@ -230,7 +173,7 @@
msgid "Your password will expire today.\n"
msgstr ""
-@@ -62,6 +98,7 @@
+@@ -62,6 +98,7 @@ msgid "Unable to change tty %s"
msgstr ""
#: libmisc/env.c:160
@@ -238,7 +181,7 @@
msgid "Environment overflow\n"
msgstr ""
-@@ -70,20 +107,15 @@
+@@ -70,20 +107,15 @@ msgstr ""
msgid "You may not change $%s\n"
msgstr ""
@@ -265,7 +208,7 @@
msgid "Too many logins.\n"
msgstr ""
-@@ -124,6 +156,11 @@
+@@ -124,6 +156,11 @@ msgstr ""
msgid "passwd: %s\n"
msgstr ""
@@ -277,7 +220,7 @@
#: libmisc/setupenv.c:211
#, c-format
msgid "Unable to cd to \"%s\"\n"
-@@ -158,37 +195,11 @@
+@@ -158,37 +195,11 @@ msgstr ""
msgid "Can't change root directory to \"%s\"\n"
msgstr ""
@@ -316,7 +259,7 @@
#.
#. * get the password from her, and set the salt for
#. * the decryption from the group file.
-@@ -206,50 +217,46 @@
+@@ -206,50 +217,46 @@ msgstr ""
msgid "(Echo on) "
msgstr ""
@@ -377,7 +320,7 @@
msgid "Account Expiration Date (YYYY-MM-DD)"
msgstr ""
-@@ -260,22 +267,22 @@
+@@ -260,22 +267,22 @@ msgstr ""
#. * expires that the user is told, and the number of days after the
#. * password expires that the account becomes unusable.
#.
@@ -404,7 +347,7 @@
#, c-format
msgid "Inactive:\t%ld\n"
msgstr ""
-@@ -284,11 +291,13 @@
+@@ -284,11 +291,13 @@ msgstr ""
#. * The "last change" date is either "Never" or the date the password
#. * was last modified. The date is the number of days since 1/1/1970.
#.
@@ -420,7 +363,7 @@
msgid "Never\n"
msgstr ""
-@@ -296,7 +305,8 @@
+@@ -296,7 +305,8 @@ msgstr ""
#. * The password expiration date is determined from the last change
#. * date plus the number of days the password is valid for.
#.
@@ -430,7 +373,7 @@
msgid "Password Expires:\t"
msgstr ""
-@@ -306,7 +316,8 @@
+@@ -306,7 +316,8 @@ msgstr ""
#. * number of inactive days is added. The resulting date is when the
#. * active will be disabled.
#.
@@ -440,7 +383,7 @@
msgid "Password Inactive:\t"
msgstr ""
-@@ -314,90 +325,92 @@
+@@ -314,90 +325,92 @@ msgstr ""
#. * The account will expire on the given date regardless of the
#. * password expiring or not.
#.
@@ -554,7 +497,7 @@
#, c-format
msgid "%s: PAM chauthtok failed\n"
msgstr ""
-@@ -415,6 +428,7 @@
+@@ -415,6 +428,7 @@ msgid "Usage: %s [-f full_name] [-r room
msgstr ""
#: src/chfn.c:139
@@ -562,7 +505,7 @@
msgid "Enter the new value, or press ENTER for the default\n"
msgstr ""
-@@ -520,81 +534,87 @@
+@@ -520,81 +534,87 @@ msgid "%s: fields too long\n"
msgstr ""
#: src/chfn.c:504 src/chsh.c:316 src/gpasswd.c:570 src/passwd.c:1277
@@ -661,7 +604,7 @@
#, c-format
msgid "%s: error updating password file\n"
msgstr ""
-@@ -605,6 +625,7 @@
+@@ -605,6 +625,7 @@ msgid "Usage: %s [-s shell] [name]\n"
msgstr ""
#: src/chsh.c:89
@@ -669,7 +612,7 @@
msgid "Enter the new value, or press return for the default\n"
msgstr ""
-@@ -666,6 +687,7 @@
+@@ -666,6 +687,7 @@ msgid "%s: Shell %s not found.\n"
msgstr ""
#: src/expiry.c:59
@@ -677,7 +620,7 @@
msgid "Usage: expiry {-f|-c}\n"
msgstr ""
-@@ -690,6 +712,7 @@
+@@ -690,6 +712,7 @@ msgid "Unknown User: %s\n"
msgstr ""
#: src/faillog.c:212
@@ -685,7 +628,7 @@
msgid "Username Failures Maximum Latest\n"
msgstr ""
-@@ -739,6 +762,7 @@
+@@ -739,6 +762,7 @@ msgid "%s: unknown user %s\n"
msgstr ""
#: src/gpasswd.c:157
@@ -693,7 +636,7 @@
msgid "Permission denied.\n"
msgstr ""
-@@ -748,6 +772,7 @@
+@@ -748,6 +772,7 @@ msgid "%s: shadow group passwords requir
msgstr ""
#: src/gpasswd.c:294
@@ -701,7 +644,7 @@
msgid "Who are you?\n"
msgstr ""
-@@ -854,33 +879,34 @@
+@@ -854,33 +879,34 @@ msgstr ""
msgid "%s: can't update DBM shadow files\n"
msgstr ""
@@ -744,7 +687,7 @@
#, c-format
msgid "%s: can't get unique gid\n"
msgstr ""
-@@ -888,78 +914,79 @@
+@@ -888,78 +914,79 @@ msgstr ""
#.
#. * All invalid group names land here.
#.
@@ -841,7 +784,7 @@
#, c-format
msgid "%s: error removing shadow group dbm entry\n"
msgstr ""
-@@ -967,82 +994,47 @@
+@@ -967,82 +994,47 @@ msgstr ""
#.
#. * Can't remove the group.
#.
@@ -934,7 +877,7 @@
#, c-format
msgid "%s: %s is not a unique name\n"
msgstr ""
-@@ -1066,17 +1058,17 @@
+@@ -1066,17 +1058,17 @@ msgstr ""
msgid "No"
msgstr ""
@@ -955,7 +898,7 @@
#: src/pwck.c:251
#, c-format
msgid "%s: cannot open file %s\n"
-@@ -1086,12 +1078,13 @@
+@@ -1086,12 +1078,13 @@ msgstr ""
#. * Tell the user this entire line is bogus and ask
#. * them to delete it.
#.
@@ -972,7 +915,7 @@
#: src/pwck.c:543
#, c-format
msgid "delete line `%s'? "
-@@ -1101,21 +1094,21 @@
+@@ -1101,21 +1094,21 @@ msgstr ""
#. * Tell the user this entry is a duplicate of
#. * another and ask them to delete it.
#.
@@ -998,7 +941,7 @@
#, c-format
msgid "delete member `%s'? "
msgstr ""
-@@ -1124,7 +1117,8 @@
+@@ -1124,7 +1117,8 @@ msgstr ""
#. * Tell the user this entire line is bogus and ask
#. * them to delete it.
#.
@@ -1008,7 +951,7 @@
msgid "invalid shadow group file entry\n"
msgstr ""
-@@ -1132,45 +1126,45 @@
+@@ -1132,45 +1126,45 @@ msgstr ""
#. * Tell the user this entry is a duplicate of
#. * another and ask them to delete it.
#.
@@ -1063,7 +1006,7 @@
#, c-format
msgid "%s: the files have been updated\n"
msgstr ""
-@@ -1231,10 +1225,12 @@
+@@ -1231,10 +1225,12 @@ msgid "%s: can't delete shadow group fil
msgstr ""
#: src/id.c:53
@@ -1076,7 +1019,7 @@
msgid "usage: id\n"
msgstr ""
-@@ -1247,6 +1243,7 @@
+@@ -1247,6 +1243,7 @@ msgstr ""
#. * corresponding name for each respective numerical value.
#.
#: src/id.c:169
@@ -1084,7 +1027,7 @@
msgid " groups="
msgstr ""
-@@ -1256,100 +1253,131 @@
+@@ -1256,100 +1253,131 @@ msgid "Usage: %s [<-u|--login> login-nam
msgstr ""
#: src/lastlog.c:181
@@ -1234,7 +1177,7 @@
msgid "Starting rad_login\n"
msgstr ""
-@@ -1374,6 +1402,7 @@
+@@ -1374,6 +1402,7 @@ msgid "%s: the beginning with "
msgstr ""
#: src/mkpasswd.c:288
@@ -1242,7 +1185,7 @@
msgid " is too long\n"
msgstr ""
-@@ -1383,11 +1412,13 @@
+@@ -1383,11 +1412,13 @@ msgid "%s: error parsing line \"%s\"\n"
msgstr ""
#: src/mkpasswd.c:323 src/mkpasswd.c:328 src/mkpasswd.c:333 src/mkpasswd.c:338
@@ -1256,7 +1199,7 @@
msgid "\n"
msgstr ""
-@@ -1417,10 +1448,12 @@
+@@ -1417,10 +1448,12 @@ msgid "Usage: %s [-vf] [-p|g] file\n"
msgstr ""
#: src/newgrp.c:61
@@ -1269,7 +1212,7 @@
msgid "usage: sg group [[-c] command]\n"
msgstr ""
-@@ -1438,71 +1471,72 @@
+@@ -1438,71 +1471,72 @@ msgstr ""
msgid "Sorry.\n"
msgstr ""
@@ -1356,7 +1299,7 @@
#, c-format
msgid "%s: error updating files\n"
msgstr ""
-@@ -1528,6 +1562,7 @@
+@@ -1528,6 +1562,7 @@ msgid "User %s has a TCFS key, his old p
msgstr ""
#: src/passwd.c:286
@@ -1364,7 +1307,7 @@
msgid "You can use -t option to force the change.\n"
msgstr ""
-@@ -1557,16 +1592,19 @@
+@@ -1557,16 +1592,19 @@ msgid "New password: "
msgstr ""
#: src/passwd.c:350
@@ -1384,7 +1327,7 @@
msgid "They don't match; try again.\n"
msgstr ""
-@@ -1586,18 +1624,22 @@
+@@ -1586,18 +1624,22 @@ msgid "%s: out of memory\n"
msgstr ""
#: src/passwd.c:769
@@ -1407,7 +1350,7 @@
msgid "Cannot commit TCFS changes.\n"
msgstr ""
-@@ -1618,7 +1660,7 @@
+@@ -1618,7 +1660,7 @@ msgstr ""
#: src/passwd.c:1176
#, c-format
@@ -1416,7 +1359,7 @@
msgstr ""
#: src/passwd.c:1242
-@@ -1632,6 +1674,7 @@
+@@ -1632,6 +1674,7 @@ msgid "The password for %s is unchanged.
msgstr ""
#: src/passwd.c:1297
@@ -1424,7 +1367,7 @@
msgid "Password changed.\n"
msgstr ""
-@@ -1650,6 +1693,7 @@
+@@ -1650,6 +1693,7 @@ msgstr ""
#. * them to delete it.
#.
#: src/pwck.c:295
@@ -1432,7 +1375,7 @@
msgid "invalid password file entry\n"
msgstr ""
-@@ -1692,6 +1736,7 @@
+@@ -1692,6 +1736,7 @@ msgstr ""
#. * them to delete it.
#.
#: src/pwck.c:456
@@ -1440,7 +1383,7 @@
msgid "invalid shadow password file entry\n"
msgstr ""
-@@ -1761,60 +1806,85 @@
+@@ -1761,60 +1806,85 @@ msgstr ""
msgid "%s: can't delete shadow password file\n"
msgstr ""
@@ -1549,7 +1492,7 @@
msgid "No password file\n"
msgstr ""
-@@ -1822,6 +1892,7 @@
+@@ -1822,6 +1892,7 @@ msgstr ""
#. * Fail secure
#.
#: src/sulogin.c:174
@@ -1557,7 +1500,7 @@
msgid "No password entry for 'root'\n"
msgstr ""
-@@ -1837,507 +1908,520 @@
+@@ -1837,507 +1908,520 @@ msgstr ""
msgid "Entering System Maintenance Mode\n"
msgstr ""
@@ -2182,7 +2125,7 @@
msgid "failed to rename mailbox"
msgstr ""
-@@ -2362,6 +2446,7 @@
+@@ -2362,6 +2446,7 @@ msgid "%s: can't restore %s: %s (your ch
msgstr ""
#: src/vipw.c:244