Teach dpkg-parsechangelog about the new debian parser options

diff --git a/scripts/changelog/debian.pl b/scripts/changelog/debian.pl
index 08225c641c1f1560918e6fea783a5731467acd5e..342319635a7cd7e42d8abe3e4639a696478f49ed 100755 (executable)
--- a/scripts/changelog/debian.pl
+++ b/scripts/changelog/debian.pl
@@ -36,8 +36,6 @@ Options:
     --version, -V               print version information
     --file, -l <file>           changelog file to parse, defaults
                                 to 'debian/changelog'
-    -F<changelogformat>         ignored if changelogformat = 'debian'
-                                for compatibility with dpkg-dev
     --format <outputformat>     see man page for list of available
                                 output formats, defaults to 'dpkg'
                                 for compatibility with dpkg-dev

diff --git a/scripts/dpkg-parsechangelog.pl b/scripts/dpkg-parsechangelog.pl
index 40be5389ab5fbbe8e51c467a782417c960dc33b6..95401a21fb25ec050ee379a65c3c78b6c917efe0 100755 (executable)
--- a/scripts/dpkg-parsechangelog.pl
+++ b/scripts/dpkg-parsechangelog.pl
@@ -40,11 +40,27 @@ sub usage {
 
 Options:
   -l<changelogfile>        get per-version info from this file.
-  -v<sinceversion>         include all changes later than version.
   -F<changelogformat>      force change log format.
   -L<libdir>               look for change log parsers in <libdir>.
   -h, --help               show this help message.
       --version            show the version.
+
+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
+                                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
+                                <number> is lower than 0)
+    --all                       include all changes
 "), $progname;
 }
 
@@ -57,7 +73,11 @@ while (@ARGV) {
     push(@ap,$_);
     if (m/^-l/ && length($_)>2) { $changelogfile=$POSTMATCH; next; }
     m/^--$/ && last;
-    m/^-v/ && next;
+    m/^-[cfnostuv]/ && next;
+    m/^--(all|count|file|from|offset|since|to|until)(.*)$/ && do {
+       push(@ap, shift(@ARGV)) unless $1;
+       next;
+    };
     if (m/^-(h|-help)$/) { &usage; exit(0); }
     if (m/^--version$/) { &version; exit(0); }
     &usageerr(_g("unknown option \`%s'"), $_);