Author: djpig
Date: 2006-05-12 03:33:41 +0000 (Fri, 12 May 2006)
New Revision: 306
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/lib/showpkg.c
trunk/man/C/dpkg-deb.1
trunk/man/ChangeLog
Log:
* Improve the description of --show-format in dpkg-deb
man page and add a pointer to the complete description
of the option in dpkg-query.
* Honour tabbing requested via --show-format even if the field to
be printed is empty. Closes: #361671
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-05-12 03:22:36 UTC (rev 305)
+++ trunk/ChangeLog 2006-05-12 03:33:41 UTC (rev 306)
@@ -18,6 +18,11 @@
signature of a .dsc file, use the Debian
keyring if available.
+2006-05-10 Nicolas François <[EMAIL PROTECTED]>
+
+ * lib/showpkg.c (show1package): Honour the requested tabbing
+ of fields even if they are empty.
+
2006-05-04 Guillem Jover <[EMAIL PROTECTED]>
* configure.ac: Bump version to 1.13.20~.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-05-12 03:22:36 UTC (rev 305)
+++ trunk/debian/changelog 2006-05-12 03:33:41 UTC (rev 306)
@@ -12,7 +12,16 @@
* Let dpkg-buildpackage pass through all remotely sensible
-sX options to dpkg-source (-s[nsAkurKUR] currently).
Closes: #36586
+ * Improve the description of --show-format in dpkg-deb
+ man page and add a pointer to the complete description
+ of the option in dpkg-query.
+ [ Nicolas François ]
+ * fix typos in the Russian man pages. Thanks to Stepan Golosunov.
+ Closes: #366587
+ * Honour tabbing requested via --show-format even if the field to
+ be printed is empty. Closes: #361671
+
[ Updated dpkg Translations ]
* Portuguese (Miguel Figueiredo).
* Polish (Robert Luberda).
@@ -29,10 +38,6 @@
[ Updated man pages translations ]
* Polish (Robert Luberda).
- [ Nicolas François ]
- * fix typos in the Russian man pages. Thanks to Stepan Golosunov.
- Closes: #366587
-
-- Christian Perrier <[EMAIL PROTECTED]> Sat, 6 May 2006 07:36:34 +0200
dpkg (1.13.19) unstable; urgency=low
Modified: trunk/lib/showpkg.c
===================================================================
--- trunk/lib/showpkg.c 2006-05-12 03:22:36 UTC (rev 305)
+++ trunk/lib/showpkg.c 2006-05-12 03:33:41 UTC (rev 306)
@@ -230,8 +230,6 @@
for (fip=fieldinfos; fip->name; fip++)
if (strcasecmp(head->data, fip->name)==0) {
fip->wcall(&wb,pkg,&pkg->installed,0,fip);
- if (!wb.used)
- break;
varbufaddc(&wb, '\0');
varbufprintf(&fb, fmt, wb.buf);
Modified: trunk/man/C/dpkg-deb.1
===================================================================
--- trunk/man/C/dpkg-deb.1 2006-05-12 03:22:36 UTC (rev 305)
+++ trunk/man/C/dpkg-deb.1 2006-05-12 03:33:41 UTC (rev 306)
@@ -1,4 +1,4 @@
-.TH dpkg\-deb 1 "2006-02-28" "Debian Project" "dpkg suite"
+.TH dpkg\-deb 1 "2006-05-10" "Debian Project" "dpkg suite"
.SH NAME
dpkg\-deb - Debian package archive (.deb) manipulation tool
.SH SYNOPSIS
@@ -127,15 +127,8 @@
Provides information about a binary package archive in the format
specified by the
.B \-\-showformat
-argument.
-
-This argument is a string that may reference any status field using the
-"${\fIfield-name\fR}" form, a list of the valid fields can be easily
-produced using
-.B -I
-on the same package.
-
-The default for this field is "${Package}\\t${Version}\\n".
+argument. The default format displays the package's name and version
+on one line, seperated by a tabulator.
.TP
.BR \-\-field ", " \-f
Extracts control file information from a binary package archive.
@@ -216,6 +209,22 @@
is also supported).
.SH OTHER OPTIONS
.TP
+\fB\-\-show\-format=\fP\fIformat\fR
+This option is used to specify the format of the output \fB\-\-show\fP
+will produce. The format is a string that will be output for each package
+listed.
+
+The string may reference any status field using the
+"${\fIfield-name\fR}" form, a list of the valid fields can be easily
+produced using
+.B \-I
+on the same package. A complete explanation of the formatting options
+(including escape sequences and field tabbing) can be found in the
+explanation of the \fB\-\-showformat\fP option in
+.BR dpkg-query (1).
+
+The default for this field is "${Package}\\t${Version}\\n".
+.TP
.BR \-\-new
Ensures that
.B dpkg\-deb
Modified: trunk/man/ChangeLog
===================================================================
--- trunk/man/ChangeLog 2006-05-12 03:22:36 UTC (rev 305)
+++ trunk/man/ChangeLog 2006-05-12 03:33:41 UTC (rev 306)
@@ -1,5 +1,10 @@
2006-05-10 Frank Lichtenheld <[EMAIL PROTECTED]>
+ * C/dpkg-deb.1: Mention the --show-format option also
+ seperatly, not just in the description of --show.
+ Point the reader to the explanation of --show-format
+ in dpkg-query.1 to avoid having to duplicate it.
+
* C/dpkg-scanpackages.1: Add remark that apt ignores
uncompressed Packages files on non-local access.
* C/dpkg-scansources.1: Likewise (with Sources instead of
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
