The following commit has been merged in the master branch:
commit 398fd2848c4ea056ae4a0a9c404de436aa2f71e4
Author: Raphael Hertzog <[email protected]>
Date:   Tue May 19 00:10:46 2009 +0200

    dpkg-parsechangelog: documentation update
    
    Update dpkg-parsechangelog's documentation to make it clearer that spaces
    are not allowed between single characters options and their values.
    
    For example, "-v1.14" works but "-v 1.14" doesn't. However "--since 1.14"
    works. Long options can have values as the next command line argument but
    not short ones.

diff --git a/debian/changelog b/debian/changelog
index ebc736c..7ef67c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -90,6 +90,9 @@ dpkg (1.15.1) UNRELEASED; urgency=low
   * Improves how dpkg-parsechangelog handles non-existing versions
     in its --since, --until, --to, --from options. Approximate the intent
     by selectioning the nearest version instead. Closes: #477638
+  * Update dpkg-parsechangelog's documentation to make it clearer that spaces
+    are not allowed between single characters options and their values.
+    Closes: #494883
 
   [ Guillem Jover ]
   * Fix typo in dpkg output (‘unexecpted’ → ‘unexpected’). Closes: #519082
diff --git a/man/dpkg-parsechangelog.1 b/man/dpkg-parsechangelog.1
index 18a7035..b721c57 100644
--- a/man/dpkg-parsechangelog.1
+++ b/man/dpkg-parsechangelog.1
@@ -82,23 +82,23 @@ The \fBrfc822\fP format uses the same fields but outputs
 a separate paragraph for each changelog entry so that all
 metadata for each entry is preserved.
 .TP
-.BR \-\-since ", " \-s ", " \-v " \fIversion\fP"
+.BR \-\-since " \fIversion\fP, " \-s \fIversion\fP, " \-v" \fIversion\fP
 include all changes later than \fIversion\fP.
 .TP
-.BR \-\-until ", " \-u " \fIversion\fP"
+.BR \-\-until " \fIversion\fP, " \-u \fIversion\fP
 include all changes earlier than \fIversion\fP.
 .TP
-.BR \-\-from ", " \-f " \fIversion\fP"
+.BR \-\-from " \fIversion\fP, " \-f \fIversion\fP
 include all changes equal or later than \fIversion\fP.
 .TP
-.BR \-\-to ", " \-t " \fIversion\fP"
+.BR \-\-to " \fIversion\fP, " \-t \fIversion\fP
 include all changes up to or equal than \fIversion\fP.
 .TP
-.BR \-\-count ", " \-c ", " \-n " \fInumber\fI"
+.BR \-\-count " \fInumber\fP, " \-c "\fInumber\fP, " \-n \fInumber\fP
 include \fInumber\fP entries from the top (or the tail
 if \fInumber\fP is lower than 0).
 .TP
-.BR \-\-offset ", " \-o " \fInumber\fP"
+.BR \-\-offset " \fInumber\fP, " \-o \fInumber\fP
 change the starting point for \-\-count, counted from the top
 (or the tail if \fInumber\fP is lower than 0).
 .TP
diff --git a/scripts/dpkg-parsechangelog.pl b/scripts/dpkg-parsechangelog.pl
index 96c5886..f214e69 100755
--- a/scripts/dpkg-parsechangelog.pl
+++ b/scripts/dpkg-parsechangelog.pl
@@ -43,16 +43,18 @@ parser options:
     --format <outputformat>     see man page for list of available
                                 output formats, defaults to 'dpkg'
                                 for compatibility with dpkg-dev
-    --since, -s, -v <version>   include all changes later than version
-    --until, -u <version>       include all changes earlier than version
-    --from, -f <version>        include all changes equal or later
+    --since <version>,          include all changes later than version
+      -s<version>, -v<version>
+    --until <version>,          include all changes earlier than version
+      -u<version>
+    --from <version>,           include all changes equal or later
+      -f<version>               than version
+    --to <version>, -t<version> include all changes up to or equal
                                 than version
-    --to, -t <version>          include all changes up to or equal
-                                than version
-    --count, -c, -n <number>    include <number> entries from the top
-                                (or the tail if <number> is lower than 0)
-    --offset, -o <number>       change the starting point for --count,
-                                counted from the top (or the tail if
+    --count <number>,           include <number> entries from the top
+      -c<number>, -n<number>    (or the tail if <number> is lower than 0)
+    --offset <number>,          change the starting point for --count,
+      -o<number>                counted from the top (or the tail if
                                 <number> is lower than 0)
     --all                       include all changes
 "), $progname;

-- 
dpkg's main repository


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to