- updated for 2.7

Changed files:
    cpio-info.patch -> 1.5
    cpio-locale.patch -> 1.2

diff --git a/cpio-info.patch b/cpio-info.patch
index 6efa48365f1aad4643c40aabfd13358bbb898db8..e4134a4154723792bc26b6712e9cd9697093cac3 100644 (file)
--- a/cpio-info.patch
+++ b/cpio-info.patch
@@ -1,25 +1,14 @@
---- cpio-2.6.orig/doc/cpio.texi        Wed Dec 20 17:29:34 1995
-+++ cpio-2.6/doc/cpio.texi     Wed Dec 30 02:59:32 1998
-@@ -9,9 +9,10 @@
+--- cpio-2.7/doc/cpio.texi.orig        2006-07-06 15:52:03.000000000 +0200
++++ cpio-2.7/doc/cpio.texi     2006-10-28 13:19:35.667501250 +0200
+@@ -5,9 +5,9 @@
+ @setchapternewpage off
+ @c %**end of header
  
- @ifinfo
- @format
--START-INFO-DIR-ENTRY
--* cpio: (cpio).                 Making tape (or disk) archives.
--END-INFO-DIR-ENTRY
+-@dircategory Archiving
 +@dircategory File utilities:
-+@direntry
-+* cpio: (cpio).                               Making tape (or disk) archives
-+@end direntry
- @end format
- @end ifinfo
+ @direntry
+-* Cpio: (cpio).                 Copy-in-copy-out archiver to tape or disk.
++* Cpio: (cpio).                               Copy-in-copy-out archiver to tape or disk
+ @end direntry
  
-@@ -77,7 +78,7 @@
- @ifinfo
- @node Top, Introduction, (dir), (dir)
- @comment  node-name,  next,  previous,  up
--@top
-+@top cpio
- 
- GNU cpio is a tool for creating and extracting archives, or copying
- files from one place to another.  It handles a number of cpio formats as
+ @include version.texi

diff --git a/cpio-locale.patch b/cpio-locale.patch
index a8361dd4450ed4023495a99d82a609fc597e9c92..37a81f2ff0e34bf40e0c45f9074fcb72a56047d3 100644 (file)
--- a/cpio-locale.patch
+++ b/cpio-locale.patch
@@ -1,25 +1,3 @@
---- cpio-2.6/configure.ac.orig 2005-01-09 15:15:19.582866000 +0100
-+++ cpio-2.6/configure.ac      2005-01-09 15:28:39.316288816 +0100
-@@ -92,7 +92,7 @@
-   AC_CONFIG_LINKS(src/fnmatch.h:headers/fnmatch.h)
- fi
- 
--AC_CHECK_FUNCS(lchown endpwent endgrent)
-+AC_CHECK_FUNCS(lchown endpwent endgrent setlocale)
- AC_FUNC_VPRINTF
- AC_FUNC_ALLOCA
- AC_CHECK_FUNC(gethostname,,[AC_CHECK_LIB(nsl, gethostname, [LIBS="$LIBS -lnsl"])])
---- cpio-2.6/src/main.c.orig   2005-01-09 11:32:19.024020000 +0100
-+++ cpio-2.6/src/main.c        2005-01-09 14:36:59.866476808 +0100
-@@ -629,7 +629,7 @@
-       
-       if (append_flag && !(archive_name || output_archive_name))
-       USAGE_ERROR ((0, 0,
--                    _("--append is used but no archive file name is given (use -F or -O options")));
-+                    _("--append is used but no archive file name is given (use -F or -O options)")));
- 
-       CHECK_USAGE(rename_batch_file, "--rename-batch-file", "--create");
-       CHECK_USAGE(no_abs_paths_flag, "--no-absolute-pathnames", "--create");
 --- cpio-2.6/po/POTFILES.in.orig       2004-09-06 13:22:27.000000000 +0200
 +++ cpio-2.6/po/POTFILES.in    2005-01-09 15:50:33.665477368 +0100
 @@ -9,6 +9,9 @@
@@ -32,68 +10,41 @@
  lib/getopt.c
  lib/rtapelib.c
  lib/strerror.c
---- cpio-2.6/po/fr.po.orig     2004-12-20 16:41:52.000000000 +0100
-+++ cpio-2.6/po/fr.po  2005-01-09 14:37:32.778473424 +0100
-@@ -541,7 +541,7 @@
- 
- #: src/main.c:631
- msgid ""
--"--append is used but no archive file name is given (use -F or -O options"
-+"--append is used but no archive file name is given (use -F or -O options)"
- msgstr ""
- "--append est utiliser mais aucun nom de fichier d'archive n'a été donné "
- "(utilisez les options -F ou -O)"
---- cpio-2.6/po/tr.po.orig     2004-12-20 16:42:17.000000000 +0100
-+++ cpio-2.6/po/tr.po  2005-01-09 14:38:20.020291576 +0100
-@@ -529,7 +529,7 @@
- 
- #: src/main.c:631
- msgid ""
--"--append is used but no archive file name is given (use -F or -O options"
-+"--append is used but no archive file name is given (use -F or -O options)"
- msgstr ""
- "--append kullanılmış ama bir arşiv dosyası ismi belirtilmemiş (-F ya da -O "
- "seçeneğini kullanın"
---- cpio-2.6/po/pl.po.orig     2005-01-09 15:28:54.606964000 +0100
-+++ cpio-2.6/po/pl.po  2005-01-09 16:07:46.257499520 +0100
-@@ -517,7 +517,7 @@
- 
- #: src/main.c:631
- msgid ""
--"--append is used but no archive file name is given (use -F or -O options"
-+"--append is used but no archive file name is given (use -F or -O options)"
- msgstr ""
- "U¿yto --append, ale nie podano nazwy pliku archiwum (nale¿y u¿yæ opcji -F lub -O)"
- 
-@@ -636,6 +636,129 @@
+--- cpio-2.7/po/pl.po.orig     2006-10-21 18:55:18.000000000 +0200
++++ cpio-2.7/po/pl.po  2006-10-28 14:24:47.491975000 +0200
+@@ -801,6 +801,134 @@
  msgid "internal error: tape descriptor changed from %d to %d"
  msgstr "b³±d wewnêtrzny: deskryptor ta¶my zmieni³ siê z %d na %d"
  
-+#: rmt/rmt.c:92
-+msgid "Unknown system error"
-+msgstr "Nieznany b³±d systemowy"
++#: rmt/rmt.c:142
++msgid "Input string too long"
++msgstr "£añcuch wej¶ciowy zbyt d³ugi"
 +
-+#: rmt/rmt.c:144
++#: rmt/rmt.c:161
++msgid "Number syntax error"
++msgstr "B³±d sk³adni liczby"
++
++#: rmt/rmt.c:180
 +msgid "rmtd: Cannot allocate buffer space\n"
 +msgstr "rmtd: Nie mo¿na przydzieliæ miejsca na bufor\n"
 +
-+#: rmt/rmt.c:146
++#: rmt/rmt.c:182
 +msgid "Cannot allocate buffer space"
 +msgstr "Nie mo¿na przydzieliæ miejsca na bufor"
 +
-+#: rmt/rmt.c:256
++#: rmt/rmt.c:304
 +#, c-format
 +msgid "Try `%s --help' for more information.\n"
 +msgstr "Wywo³anie `%s --help' poda wiêcej informacji.\n"
 +
-+#: rmt/rmt.c:260
++#: rmt/rmt.c:308
 +#, c-format
 +msgid ""
 +"Usage: %s [OPTION]\n"
 +"Manipulate a tape drive, accepting commands from a remote process.\n"
 +"\n"
 +"  --version  Output version info.\n"
-+"  --help  Output this help.\n"
++"  --help     Output this help.\n"
 +msgstr ""
 +"Sk³adnia: %s [OPCJA]\n"
 +"Obs³uga napêdu ta¶mowego, przyjmowanie poleceñ od zdalnego procesu.\n"
@@ -101,7 +52,7 @@
 +"  --version  Wypisanie informacji o wersji.\n"
 +"  --help     Wypisanie tego tekstu pomocy.\n"
 +
-+#: rmt/rmt.c:267
++#: rmt/rmt.c:315
 +#, c-format
 +msgid ""
 +"\n"
@@ -110,59 +61,56 @@
 +"\n"
 +"B³êdy nale¿y zg³aszaæ na adres <%s>.\n"
 +
-+#: rmt/rmt.c:300
-+msgid ""
-+"This program comes with NO WARRANTY, to the extent permitted by law.\n"
-+"You may redistribute it under the terms of the GNU General Public License;\n"
-+"see the file named COPYING for details."
-+msgstr ""
-+"Ten program jest dostarczany BEZ ¯ADNEJ GWARANCJI w zakresie\n"
-+"dopuszczalnym przez prawo. Mo¿na go rozprowadzaæ na warunkach\n"
-+"Powszechnej Licencji Publicznej GNU (General Public License);\n"
-+"szczegó³y znajduj± siê w pliku COPYING."
++#: rmt/rmt.c:397
++msgid "Seek offset error"
++msgstr "B³±d offsetu przesuniêcia"
 +
-+#: rmt/rmt.c:399 rmt/rmt.c:519 rmt/rmt.c:529
++#: rmt/rmt.c:406 rmt/rmt.c:547 rmt/rmt.c:557
 +msgid "Seek offset out of range"
 +msgstr "Offset przesuniêcia spoza zakresu"
 +
-+#: rmt/rmt.c:412
++#: rmt/rmt.c:428
 +msgid "Seek direction out of range"
 +msgstr "Kierunek przesuniêcia spoza zakresu"
 +
-+#: rmt/rmt.c:451
++#: rmt/rmt.c:472
 +msgid "rmtd: Premature eof\n"
 +msgstr "rmtd: Przedwczesny koniec pliku\n"
 +
-+#: rmt/rmt.c:453
-+#, fuzzy
++#: rmt/rmt.c:474
 +msgid "Premature end of file"
 +msgstr "Przedwczesny koniec pliku"
 +
-+#: rmt/rmt.c:561
-+#, c-format
-+msgid "rmtd: Garbage command %c\n"
-+msgstr "rmtd: Nieistniej±ce polecenie %c\n"
-+
-+#: rmt/rmt.c:563
++#: rmt/rmt.c:672
 +msgid "Garbage command"
 +msgstr "Nieistniej±ce polecenie"
 +
-+#: lib/argp-help.c:194
++#: lib/argp-help.c:148
++#, c-format
++msgid "ARGP_HELP_FMT: %s value is less than or equal to %s"
++msgstr "ARGP_HELP_FMT: warto¶æ %s jest mniejsza lub równa %s"
++
++#: lib/argp-help.c:221
 +#, c-format
 +msgid "%.*s: ARGP_HELP_FMT parameter requires a value"
 +msgstr "%.*s: parametr ARGP_HELP_FMT wymaga warto¶ci"
 +
-+#: lib/argp-help.c:203
++#: lib/argp-help.c:227
++#, c-format
++msgid "%.*s: ARGP_HELP_FMT parameter must be positive"
++msgstr "%.*s: parametr ARGP_HELP_FMT musi byæ dodatni"
++
++#: lib/argp-help.c:236
 +#, c-format
 +msgid "%.*s: Unknown ARGP_HELP_FMT parameter"
 +msgstr "%.*s: Nieznany parametr ARGP_HELP_FMT"
 +
-+#: lib/argp-help.c:215
++#: lib/argp-help.c:248
 +#, c-format
 +msgid "Garbage in ARGP_HELP_FMT: %s"
 +msgstr "¦mieci w ARGP_HELP_FMT: %s"
 +
-+#: lib/argp-help.c:1188
++#: lib/argp-help.c:1229
 +msgid ""
 +"Mandatory or optional arguments to long options are also mandatory or "
 +"optional for any corresponding short options."
@@ -170,28 +118,32 @@
 +"Obowi±zkowe lub opcjonalne argumenty dla opcji d³ugich s± obowi±zkowe "
 +"lub opcjonalne tak¿e dla odpowiadaj±cych im opcji krótkich."
 +
-+#: lib/argp-help.c:1575
++#: lib/argp-help.c:1622
 +msgid "Usage:"
 +msgstr "Sk³adnia:"
 +
-+#: lib/argp-help.c:1579
++#: lib/argp-help.c:1626
 +msgid "  or: "
 +msgstr "  lub: "
 +
-+#: lib/argp-help.c:1591
++#: lib/argp-help.c:1638
 +msgid " [OPTION...]"
 +msgstr " [OPCJA...]"
 +
-+#: lib/argp-help.c:1618
++#: lib/argp-help.c:1665
 +#, c-format
 +msgid "Try `%s --help' or `%s --usage' for more information.\n"
 +msgstr "Wywo³anie `%s --help' lub `%s --usage' poda wiêcej informacji.\n"
 +
-+#: lib/argp-help.c:1646
++#: lib/argp-help.c:1693
 +#, c-format
 +msgid "Report bugs to %s.\n"
 +msgstr "B³êdy nale¿y zg³aszaæ na adres %s.\n"
 +
- #: lib/getopt.c:551 lib/getopt.c:570
++#: lib/argp-help.c:1912
++msgid "Unknown system error"
++msgstr "Nieznany b³±d systemowy"
++
+ #: lib/getopt.c:531 lib/getopt.c:547
  #, c-format
  msgid "%s: option `%s' is ambiguous\n"