Print the correct file being parsed by dpkg-parsechangelog's debian

parser. Closes: #368961

diff --git a/ChangeLog b/ChangeLog
index 7b93defb7d640624b11bcb24b443d1c15e0883da..50e9b9ff79c4097904f6628edecb48bd845dbe50 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-06-04  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-parsechangelog.pl: Pass forward the '-l' option to
+       the format parser.
+       * scripts/changelog/debian.pl: Add '-l' option and set $changelogfile.
+       (usage): Document the new '-l' option.
+       (clerror): Print $changelogfile instead of 'changelog'.
+       (clwarn): Likewise.
+
 2006-06-02  Guillem Jover  <guillem@debian.org>
 
        * scripts/install-info.pl: Do not use English non-essential module.

diff --git a/debian/changelog b/debian/changelog
index 36b174f3f770b98ce366256e6444423a715a3843..5ffdceb65eb687c6e67a5db199c8b9690eea1567 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ dpkg (1.13.21~) UNRELEASED; urgency=low
     list. Closes: #367892
   * Revert usage of English perl non-essential module from install-info.
     Closes: #369928, #369958, #370157, #370174, #370210
+  * Print the correct file being parsed by dpkg-parsechangelog's debian
+    parser. Closes: #368961
 
   [ Updated dpkg Translations ]
   * Czech (Miroslav Kure).

diff --git a/scripts/changelog/debian.pl b/scripts/changelog/debian.pl
index 02eb8d6b436f35445a8f543a8eb8fd2e69acc6e4..f083f0b6e481dbb0d5580614f47a4ea6b8117150 100755 (executable)
--- a/scripts/changelog/debian.pl
+++ b/scripts/changelog/debian.pl
@@ -38,6 +38,7 @@ sub usage {
 "Usage: %s [<option>]
 
 Options:
+  -l<changelog>       use <changelog> as the file name when reporting.
   -v<versionsince>    print changes since <versionsince>.
   -h, --help          print this help message.
       --version       print program version.
@@ -48,6 +49,8 @@ while (@ARGV) {
     $_=shift(@ARGV);
     if (m/^-v(.+)$/) {
         $since= $1;
+    } elsif (m/^-l(.+)$/) {
+        $changelogfile = $1;
     } elsif (m/^-(h|-help)$/) {
         &usage; exit(0);
     } elsif (m/^--version$/) {
@@ -162,5 +165,13 @@ $f{'Closes'} = join(' ',sort { $a <=> $b} @closes);
 
 &outputclose(0);
 
-sub clerror { &error(sprintf(_g("%s, at changelog line %d"), $_[0], $.)); }
-sub clwarn { &warn(sprintf(_g("%s, at changelog line %d"), $_[0], $.)); }
+sub clerror
+{
+    &error(sprintf(_g("%s, at file %s line %d"), $_[0], $changelogfile, $.));
+}
+
+sub clwarn
+{
+    &warn(sprintf(_g("%s, at file %s line %d"), $_[0], $changelogfile, $.));
+}
+

diff --git a/scripts/dpkg-parsechangelog.pl b/scripts/dpkg-parsechangelog.pl
index af3f4c8ba963ac71d1c0d84e780c4ee2690660fb..266e7499a0af9c2ba47b6631fa189d2641680264 100755 (executable)
--- a/scripts/dpkg-parsechangelog.pl
+++ b/scripts/dpkg-parsechangelog.pl
@@ -50,8 +50,8 @@ while (@ARGV) {
     $_= shift(@ARGV);
     if (m/^-L/ && length($_)>2) { $libdir=$'; next; }
     if (m/^-F([0-9a-z]+)$/) { $force=1; $format=$1; next; }
-    if (m/^-l/ && length($_)>2) { $changelogfile=$'; next; }
     push(@ap,$_);
+    if (m/^-l/ && length($_)>2) { $changelogfile=$'; next; }
     m/^--$/ && last;
     m/^-v/ && next;
     if (m/^-(h|-help)$/) { &usage; exit(0); }

diff --git a/scripts/po/ChangeLog b/scripts/po/ChangeLog
index a9dc5e09f5e0eac844cbde4371d4574c12c00624..a4ad5b495df58b6cbc61435d9358367bc7656b6d 100644 (file)
--- a/scripts/po/ChangeLog
+++ b/scripts/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-04  Guillem Jover  <guillem@debian.org>
+
+       * dpkg-dev.pot: Regenerated.
+
 2006-05-31  Guillem Jover  <guillem@debian.org>
 
        * dpkg-dev.pot: Regenerated.

diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot
index 6551d1b49a1f7090e74f2d19874d4b21e4d352e1..f7db77962ca056f14c79112767e81db953925ec7 100644 (file)
--- a/scripts/po/dpkg-dev.pot
+++ b/scripts/po/dpkg-dev.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
-"POT-Creation-Date: 2006-05-31 06:18+0300\n"
+"POT-Creation-Date: 2006-06-04 15:15+0300\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"
@@ -2210,87 +2210,88 @@ msgid ""
 "Usage: %s [<option>]\n"
 "\n"
 "Options:\n"
+"  -l<changelog>       use <changelog> as the file name when reporting.\n"
 "  -v<versionsince>    print changes since <versionsince>.\n"
 "  -h, --help          print this help message.\n"
 "      --version       print program version.\n"
 msgstr ""
 
-#: scripts/changelog/debian.pl:56
+#: scripts/changelog/debian.pl:59
 #, perl-format
 msgid "unknown option or argument `%s'"
 msgstr ""
 
-#: scripts/changelog/debian.pl:77
+#: scripts/changelog/debian.pl:80
 msgid "-v<since> option specifies most recent version"
 msgstr ""
 
-#: scripts/changelog/debian.pl:84
+#: scripts/changelog/debian.pl:87
 #, perl-format
 msgid "found start of entry where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:90
+#: scripts/changelog/debian.pl:93
 #, perl-format
 msgid "bad key-value after `;': `%s'"
 msgstr ""
 
-#: scripts/changelog/debian.pl:92
+#: scripts/changelog/debian.pl:95
 #, perl-format
 msgid "repeated key-value %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:95
+#: scripts/changelog/debian.pl:98
 msgid "badly formatted urgency value"
 msgstr ""
 
-#: scripts/changelog/debian.pl:99
+#: scripts/changelog/debian.pl:102
 #, perl-format
 msgid "unknown urgency value %s - comparing very low"
 msgstr ""
 
-#: scripts/changelog/debian.pl:102
+#: scripts/changelog/debian.pl:105
 #, perl-format
 msgid "urgency >%s<"
 msgstr ""
 
-#: scripts/changelog/debian.pl:120
+#: scripts/changelog/debian.pl:123
 #, perl-format
 msgid "unknown key-value key %s - copying to %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:127
+#: scripts/changelog/debian.pl:130
 msgid "badly formatted heading line"
 msgstr ""
 
-#: scripts/changelog/debian.pl:130
+#: scripts/changelog/debian.pl:133
 #, perl-format
 msgid "found trailer where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:137
+#: scripts/changelog/debian.pl:140
 msgid "badly formatted trailer line"
 msgstr ""
 
-#: scripts/changelog/debian.pl:140
+#: scripts/changelog/debian.pl:143
 #, perl-format
 msgid "found change data where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:146
+#: scripts/changelog/debian.pl:149
 #, perl-format
 msgid "found blank line where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:149
+#: scripts/changelog/debian.pl:152
 msgid "unrecognised line"
 msgstr ""
 
-#: scripts/changelog/debian.pl:153
+#: scripts/changelog/debian.pl:156
 #, perl-format
 msgid "found eof where expected %s"
 msgstr ""
 
-#: scripts/changelog/debian.pl:165 scripts/changelog/debian.pl:166
+#: scripts/changelog/debian.pl:170 scripts/changelog/debian.pl:175
 #, perl-format
-msgid "%s, at changelog line %d"
+msgid "%s, at file %s line %d"
 msgstr ""