* 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

ChangeLog

@@ -18,6 +18,11 @@
 	signature of a .dsc file, use the Debian
 	keyring if available.
 
+2006-05-10  Nicolas François  <nicolas.francois@centraliens.net>
+
+	* lib/showpkg.c (show1package): Honour the requested tabbing
+	of fields even if they are empty.
+
 2006-05-04  Guillem Jover  <guillem@debian.org>
 
 	* configure.ac: Bump version to 1.13.20~.

debian/changelog

@@ -12,6 +12,15 @@ dpkg (1.13.20~) UNRELEASED; urgency=low
   * 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).
@@ -29,10 +38,6 @@ dpkg (1.13.20~) UNRELEASED; urgency=low
   [ 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 <bubulle@debian.org>  Sat,  6 May 2006 07:36:34 +0200
 
 dpkg (1.13.19) unstable; urgency=low

lib/showpkg.c

@@ -230,8 +230,6 @@ void show1package(const struct lstitem* head, struct pkginfo *pkg) {
 			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);

man/C/dpkg-deb.1

@@ -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 @@ about each one and exit with status 2.
 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 @@ copyright licensing and lack of warranty. (The American spelling
 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

man/ChangeLog

@@ -1,5 +1,10 @@
 2006-05-10  Frank Lichtenheld  <djpig@debian.org>
 
+	* 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