Fix unterminated line in usage text

ChangeLog

@@ -1,3 +1,7 @@
+Wed Sep 12 17:28:57 CEST 2001 Wichert Akkerman <wakkerma@debian.org>
+
+  * dpkg-deb/main.c: Fix unterminated line in usage text
+
 Mon Sep 10 12:57:21 PDT 2001 Wichert Akkerman <wakkerma@debian.org>
 
   * dpkg-deb/dpkg-deb.h: add parseformat prototype

dpkg-deb/main.c

@@ -74,7 +74,7 @@ Command:\n\
 \n\
 Options:\n\
   --showformat=<format>      Use alternative format for --show\n\
-  -D                         Enable debugging output
+  -D                         Enable debugging output\n\
   --old, --new               select archive format\n\
   --nocheck                  suppress control file check (build bad package).\n\
   -z# to set the compression when building\n\

po/dpkg.pot

@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2001-08-01 15:40+0200\n"
+"POT-Creation-Date: 2001-09-12 17:28+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -160,41 +160,41 @@ msgstr ""
 msgid "unable to install updated status of `%.250s'"
 msgstr ""
 
-#: lib/dump.c:250
+#: lib/dump.c:289
 #, c-format
 msgid "failed to open `%s' for writing %s information"
 msgstr ""
 
-#: lib/dump.c:253
+#: lib/dump.c:292
 msgid "unable to set buffering on status file"
 msgstr ""
 
-#: lib/dump.c:264
+#: lib/dump.c:303
 #, c-format
 msgid "failed to write %s record about `%.50s' to `%.250s'"
 msgstr ""
 
-#: lib/dump.c:271
+#: lib/dump.c:310
 #, c-format
 msgid "failed to flush %s information to `%.250s'"
 msgstr ""
 
-#: lib/dump.c:273
+#: lib/dump.c:312
 #, c-format
 msgid "failed to fsync %s information to `%.250s'"
 msgstr ""
 
-#: lib/dump.c:275
+#: lib/dump.c:314
 #, c-format
 msgid "failed to close `%.250s' after writing %s information"
 msgstr ""
 
-#: lib/dump.c:279
+#: lib/dump.c:318
 #, c-format
 msgid "failed to link `%.250s' to `%.250s' for backup of %s info"
 msgstr ""
 
-#: lib/dump.c:282
+#: lib/dump.c:321
 #, c-format
 msgid "failed to install `%.250s' as `%.250s' containing %s info"
 msgstr ""
@@ -232,159 +232,159 @@ msgstr ""
 msgid "%s:%d: internal error `%s'\n"
 msgstr ""
 
-#: lib/fields.c:43
+#: lib/fields.c:44
 #, c-format
 msgid "%s is missing"
 msgstr ""
 
-#: lib/fields.c:56
+#: lib/fields.c:57
 #, c-format
 msgid "`%.*s' is not allowed for %s"
 msgstr ""
 
-#: lib/fields.c:63
+#: lib/fields.c:64
 #, c-format
 msgid "junk after %s"
 msgstr ""
 
-#: lib/fields.c:73
+#: lib/fields.c:74
 #, c-format
 msgid "invalid package name (%.250s)"
 msgstr ""
 
-#: lib/fields.c:90
+#: lib/fields.c:91
 #, c-format
 msgid "empty file details field `%s'"
 msgstr ""
 
-#: lib/fields.c:93
+#: lib/fields.c:94
 #, c-format
 msgid "file details field `%s' not allowed in status file"
 msgstr ""
 
-#: lib/fields.c:103
+#: lib/fields.c:104
 #, c-format
 msgid "too many values in file details field `%s' (compared to others)"
 msgstr ""
 
-#: lib/fields.c:116
+#: lib/fields.c:117
 #, c-format
 msgid "too few values in file details field `%s' (compared to others)"
 msgstr ""
 
-#: lib/fields.c:132
-msgid "yes/no in `essential' field"
+#: lib/fields.c:133
+msgid "yes/no in boolean field"
 msgstr ""
 
-#: lib/fields.c:165
+#: lib/fields.c:166
 msgid "value for `status' field not allowed in this context"
 msgstr ""
 
-#: lib/fields.c:176
+#: lib/fields.c:177
 msgid "third (status) word in `status' field"
 msgstr ""
 
-#: lib/fields.c:187
+#: lib/fields.c:188
 #, c-format
 msgid "error in Version string `%.250s': %.250s"
 msgstr ""
 
-#: lib/fields.c:198
+#: lib/fields.c:199
 msgid "obsolete `Revision' or `Package-Revision' field used"
 msgstr ""
 
-#: lib/fields.c:216
+#: lib/fields.c:217
 msgid "value for `config-version' field not allowed in this context"
 msgstr ""
 
-#: lib/fields.c:220
+#: lib/fields.c:221
 #, c-format
 msgid "error in Config-Version string `%.250s': %.250s"
 msgstr ""
 
-#: lib/fields.c:237
+#: lib/fields.c:238
 #, c-format
 msgid "value for `conffiles' has line starting with non-space `%c'"
 msgstr ""
 
-#: lib/fields.c:243
+#: lib/fields.c:244
 #, c-format
 msgid "value for `conffiles' has malformatted line `%.*s'"
 msgstr ""
 
-#: lib/fields.c:249
+#: lib/fields.c:250
 msgid "root or null directory is listed as a conffile"
 msgstr ""
 
-#: lib/fields.c:304
+#: lib/fields.c:305
 #, c-format
 msgid ""
 "`%s' field, missing package name, or garbage where package name expected"
 msgstr ""
 
-#: lib/fields.c:307
+#: lib/fields.c:308
 #, c-format
 msgid "`%s' field, invalid package name `%.255s': %s"
 msgstr ""
 
-#: lib/fields.c:338
+#: lib/fields.c:339
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " bad version relationship %c%c"
 msgstr ""
 
-#: lib/fields.c:344
+#: lib/fields.c:345
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " `%c' is obsolete, use `%c=' or `%c%c' instead"
 msgstr ""
 
-#: lib/fields.c:354
+#: lib/fields.c:355
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " implicit exact match on version number, suggest using `=' instead"
 msgstr ""
 
-#: lib/fields.c:361
+#: lib/fields.c:362
 msgid "Only exact versions may be used for Provides"
 msgstr ""
 
-#: lib/fields.c:365
+#: lib/fields.c:366
 #, c-format
 msgid ""
 "`%s' field, reference to `%.255s':\n"
 " version value starts with non-alphanumeric, suggest adding a space"
 msgstr ""
 
-#: lib/fields.c:379
+#: lib/fields.c:380
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains `('"
 msgstr ""
 
-#: lib/fields.c:382
+#: lib/fields.c:383
 #, c-format
 msgid "`%s' field, reference to `%.255s': version contains ` '"
 msgstr ""
 
-#: lib/fields.c:385
+#: lib/fields.c:386
 #, c-format
 msgid "`%s' field, reference to `%.255s': version unterminated"
 msgstr ""
 
-#: lib/fields.c:396
+#: lib/fields.c:397
 #, c-format
 msgid "`%s' field, reference to `%.255s': error in version: %.255s"
 msgstr ""
 
-#: lib/fields.c:405
+#: lib/fields.c:406
 #, c-format
 msgid "`%s' field, syntax error after reference to package `%.255s'"
 msgstr ""
 
-#: lib/fields.c:412
+#: lib/fields.c:413
 #, c-format
 msgid "alternatives (`|') not allowed in %s field"
 msgstr ""
@@ -483,7 +483,7 @@ msgid "unable to set close-on-exec flag for %.250s"
 msgstr ""
 
 #: lib/mlib.c:199
-msgid "failed in buffer_write(fd) (%i, ret=%zi %s)"
+msgid "failed in buffer_write(fd) (%i, ret=%zi %s): %s"
 msgstr ""
 
 #: lib/mlib.c:206
@@ -761,6 +761,15 @@ msgstr ""
 msgid "cannot open GPL file "
 msgstr ""
 
+#: lib/showpkg.c:70
+#, c-format
+msgid "invalid character `%c' in field width\n"
+msgstr ""
+
+#: lib/showpkg.c:157
+msgid "Closing brace missing in format\n"
+msgstr ""
+
 #: lib/varbuf.c:105
 msgid "failed to realloc for variable buffer"
 msgstr ""
@@ -1924,11 +1933,11 @@ msgstr ""
 msgid "failed to rmdir/unlink `%.255s'"
 msgstr ""
 
-#: dpkg-deb/info.c:52 main/help.c:477
+#: dpkg-deb/info.c:54 main/help.c:477
 msgid "failed to exec rm for cleanup"
 msgstr ""
 
-#: dpkg-deb/main.c:44 main/main.c:44
+#: main/main.c:44
 msgid "Debian GNU/Linux `"
 msgstr ""
 
@@ -2032,7 +2041,7 @@ msgid ""
 "`more' !"
 msgstr ""
 
-#: dpkg-deb/main.c:137 main/main.c:185 main/query.c:502 split/main.c:144
+#: dpkg-deb/main.c:157 main/main.c:185 main/query.c:502 split/main.c:144
 #, c-format
 msgid "conflicting actions --%s and --%s"
 msgstr ""
@@ -2163,7 +2172,7 @@ msgstr ""
 msgid "unexpected eof before end of line %d"
 msgstr ""
 
-#: dpkg-deb/main.c:158 main/main.c:536 main/main.c:571 main/query.c:549
+#: dpkg-deb/main.c:178 main/main.c:536 main/main.c:571 main/query.c:549
 #: split/main.c:166
 msgid "need an action option"
 msgstr ""
@@ -2725,7 +2734,7 @@ msgid ""
 "and dpkg --contents (= dpkg-deb --contents) to list their contents.\n"
 msgstr ""
 
-#: main/query.c:430
+#: dpkg-deb/main.c:46 main/query.c:430
 msgid "Debian `"
 msgstr ""
 
@@ -2773,15 +2782,6 @@ msgid ""
 "\n"
 msgstr ""
 
-#: main/showpkg.c:71
-#, c-format
-msgid "invalid character `%c' in field width\n"
-msgstr ""
-
-#: main/showpkg.c:158
-msgid "Closing brace missing in format\n"
-msgstr ""
-
 #: dpkg-deb/build.c:66
 #, c-format
 msgid "dpkg-deb - error: %s (`%s') doesn't contain any digits\n"
@@ -3183,7 +3183,7 @@ msgstr ""
 msgid "failed to exec tar"
 msgstr ""
 
-#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:66
+#: dpkg-deb/extract.c:326 dpkg-deb/extract.c:341 dpkg-deb/info.c:68
 #, c-format
 msgid "--%s needs a .deb filename argument"
 msgstr ""
@@ -3205,137 +3205,163 @@ msgstr ""
 msgid "--%s takes only one argument (.deb filename)"
 msgstr ""
 
-#: dpkg-deb/info.c:47
+#: dpkg-deb/info.c:49
 msgid "failed to chdir to `/' for cleanup"
 msgstr ""
 
-#: dpkg-deb/info.c:49
+#: dpkg-deb/info.c:51
 msgid "failed to fork for cleanup"
 msgstr ""
 
-#: dpkg-deb/info.c:54
+#: dpkg-deb/info.c:56
 msgid "failed to wait for rm cleanup"
 msgstr ""
 
-#: dpkg-deb/info.c:55
+#: dpkg-deb/info.c:57
 #, c-format
 msgid "rm cleanup failed, code %d\n"
 msgstr ""
 
-#: dpkg-deb/info.c:69
-msgid "failed to make temporary filename"
+#: dpkg-deb/info.c:71
+msgid "failed to make temporary directoryname"
 msgstr ""
 
-#: dpkg-deb/info.c:73
+#: dpkg-deb/info.c:75
 msgid "failed to exec rm -rf"
 msgstr ""
 
-#: dpkg-deb/info.c:93
+#: dpkg-deb/info.c:95
 msgid "info_spew"
 msgstr ""
 
-#: dpkg-deb/info.c:95
+#: dpkg-deb/info.c:97
 #, c-format
 msgid "dpkg-deb: `%.255s' contains no control component `%.255s'\n"
 msgstr ""
 
-#: dpkg-deb/info.c:99
+#: dpkg-deb/info.c:101
 #, c-format
 msgid "open component `%.255s' (in %.255s) failed in an unexpected way"
 msgstr ""
 
-#: dpkg-deb/info.c:103
-msgid "at least one requested control component missing"
+#: dpkg-deb/info.c:106
+msgid "One requested control component is missing"
 msgstr ""
 
-#: dpkg-deb/info.c:116
+#: dpkg-deb/info.c:108
 #, c-format
-msgid "cannot scan directory `%.255s'"
+msgid "%d requested control components are missing"
 msgstr ""
 
 #: dpkg-deb/info.c:121
 #, c-format
+msgid "cannot scan directory `%.255s'"
+msgstr ""
+
+#: dpkg-deb/info.c:126
+#, c-format
 msgid "cannot stat `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:124
+#: dpkg-deb/info.c:129
 #, c-format
 msgid "cannot open `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:138
+#: dpkg-deb/info.c:143
 #, c-format
 msgid "failed to read `%.255s' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:141
+#: dpkg-deb/info.c:146
 #, c-format
 msgid " %7ld bytes, %5d lines   %c  %-20.127s %.127s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:147
+#: dpkg-deb/info.c:152
 #, c-format
 msgid "     not a plain file          %.255s\n"
 msgstr ""
 
-#: dpkg-deb/info.c:152
+#: dpkg-deb/info.c:157
 #, c-format
 msgid "failed to read `control' (in `%.255s')"
 msgstr ""
 
-#: dpkg-deb/info.c:153
+#: dpkg-deb/info.c:158
 msgid "(no `control' file in control archive!)\n"
 msgstr ""
 
-#: dpkg-deb/info.c:173
+#: dpkg-deb/info.c:178
 msgid "could not open the `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:203
+#: dpkg-deb/info.c:208
 msgid "failed during read of `control' component"
 msgstr ""
 
-#: dpkg-deb/info.c:235
+#: dpkg-deb/info.c:219
+msgid "Error in format"
+msgstr ""
+
+#: dpkg-deb/info.c:255
 msgid "--contents takes exactly one argument"
 msgstr ""
 
-#: dpkg-deb/main.c:46
+#: dpkg-deb/main.c:48
 msgid "' package archive backend version "
 msgstr ""
 
-#: dpkg-deb/main.c:48
+#: dpkg-deb/main.c:50
 msgid ""
-"Copyright (C) 1994-1996 Ian Jackson.  This is free software; see the\n"
-"GNU General Public Licence version 2 or later for copying conditions.\n"
-"There is NO warranty.  See dpkg-deb --licence for details.\n"
+"This is free software; see the GNU General Public Licence version 2 or\n"
+"later for copying conditions. There is NO warranty.\n"
+"See dpkg-deb --licence for details.\n"
 msgstr ""
 
-#: dpkg-deb/main.c:55
+#: dpkg-deb/main.c:57
 msgid ""
-"Usage: dpkg-deb -b|--build <directory> [<deb>]    Build an archive.\n"
-"       dpkg-deb -c|--contents <deb>               List contents.\n"
-"       dpkg-deb -I|--info <deb> [<cfile>...]      Show info to stdout.\n"
-"       dpkg-deb -f|--field <deb> [<cfield>...]    Show field(s) to stdout.\n"
-"       dpkg-deb -e|--control <deb> [<directory>]  Extract control info.\n"
-"       dpkg-deb -x|--extract <deb> <directory>    Extract files.\n"
-"       dpkg-deb -X|--vextract <deb> <directory>   Extract & list files.\n"
-"       dpkg-deb --fsys-tarfile <deb>              Output filesystem "
-"tarfile.\n"
-"       dpkg-deb -h|--help                         Display this message.\n"
-"       dpkg-deb --version | --licence             Show version/licence.\n"
+"Command:\n"
+"  -b|--build <directory> [<deb>]    build an archive.\n"
+"  -c|--contents <deb>               list contents.\n"
+"  -I|--info <deb> [<cfile>...]      show info to stdout.\n"
+"  -W|--show <deb>                   Show information on package(s)\n"
+"  -f|--field <deb> [<cfield>...]    show field(s) to stdout.\n"
+"  -e|--control <deb> [<directory>]  extract control info.\n"
+"  -x|--extract <deb> <directory>    extract files.\n"
+"  -X|--vextract <deb> <directory>   extract & list files.\n"
+"  --fsys-tarfile <deb>              output filesystem tarfile.\n"
+"  -h|--help                         display this message.\n"
+"  --version | --licence             show version/licence.\n"
+"\n"
 "<deb> is the filename of a Debian format archive.\n"
 "<cfile> is the name of an administrative file component.\n"
 "<cfield> is the name of a field in the main `control' file.\n"
-"Options:  -D for debugging output; --old or --new controls archive format;\n"
-"          --nocheck to suppress control file check (build bad package).\n"
-"          -z# to set the compression when building\n"
+"\n"
+"Options:\n"
+"  --showformat=<format>      Use alternative format for --show\n"
+"  -D                         Enable debugging output\n"
+"  --old, --new               select archive format\n"
+"  --nocheck                  suppress control file check (build bad "
+"package).\n"
+"  -z# to set the compression when building\n"
+"\n"
+"Format syntax:\n"
+"  A format is a string that will be output for each package. The format\n"
+"  can include the standard escape sequences \\n (newline), \\r (carriage\n"
+"  return) or \\\\ (plain backslash). Package information can be included\n"
+"  by inserting variable references to package fields using the ${var[;"
+"width]}\n"
+"  syntax. Fields will be right-aligned unless the width is negative in "
+"which\n"
+"   case left aligenment will be used. \n"
 "\n"
 "Use `dpkg' to install and remove packages from your system, or\n"
 "`dselect' for user-friendly package management.  Packages unpacked\n"
 "using `dpkg-deb --extract' will be incorrectly installed !\n"
 msgstr ""
 
-#: dpkg-deb/main.c:81
+#: dpkg-deb/main.c:98
 msgid ""
 "Type dpkg-deb --help for help about manipulating *.deb files;\n"
 "Type dpkg --help for help about installing and deinstalling packages."