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

parser. Closes: #368961

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.

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).

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, $.));
+}
+

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); }

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.

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 ""