Author: guillem
Date: 2006-06-04 12:24:47 + (Sun, 04 Jun 2006)
New Revision: 375
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/scripts/changelog/debian.pl
trunk/scripts/dpkg-parsechangelog.pl
trunk/scripts/po/ChangeLog
trunk/scripts/po/dpkg-dev.pot
Log:
Print the correct file being parsed by dpkg-parsechangelog's debian
parser. Closes: #368961
Modified: trunk/ChangeLog
===
--- trunk/ChangeLog 2006-06-04 12:17:53 UTC (rev 374)
+++ trunk/ChangeLog 2006-06-04 12:24:47 UTC (rev 375)
@@ -1,3 +1,12 @@
+2006-06-04 Guillem Jover [EMAIL PROTECTED]
+
+ * 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 [EMAIL PROTECTED]
* scripts/install-info.pl: Do not use English non-essential module.
Modified: trunk/debian/changelog
===
--- trunk/debian/changelog 2006-06-04 12:17:53 UTC (rev 374)
+++ trunk/debian/changelog 2006-06-04 12:24:47 UTC (rev 375)
@@ -8,6 +8,8 @@
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).
Modified: trunk/scripts/changelog/debian.pl
===
--- trunk/scripts/changelog/debian.pl 2006-06-04 12:17:53 UTC (rev 374)
+++ trunk/scripts/changelog/debian.pl 2006-06-04 12:24:47 UTC (rev 375)
@@ -38,6 +38,7 @@
Usage: %s [option]
Options:
+ -lchangelog use changelog as the file name when reporting.
-vversionsinceprint changes since versionsince.
-h, --help print this help message.
--version print program version.
@@ -48,6 +49,8 @@
$_=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 @@
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, $.));
+}
+
Modified: trunk/scripts/dpkg-parsechangelog.pl
===
--- trunk/scripts/dpkg-parsechangelog.pl2006-06-04 12:17:53 UTC (rev
374)
+++ trunk/scripts/dpkg-parsechangelog.pl2006-06-04 12:24:47 UTC (rev
375)
@@ -50,8 +50,8 @@
$_= shift(@ARGV);
if (m/^-L/ length($_)2) { $libdir=$'; next; }
if (m/^-F([0-9a-z]+)$/) { $force=1; $format=$1; next; }
+push(@ap,$_);
if (m/^-l/ length($_)2) { $changelogfile=$'; next; }
-push(@ap,$_);
m/^--$/ last;
m/^-v/ next;
if (m/^-(h|-help)$/) { usage; exit(0); }
Modified: trunk/scripts/po/ChangeLog
===
--- trunk/scripts/po/ChangeLog 2006-06-04 12:17:53 UTC (rev 374)
+++ trunk/scripts/po/ChangeLog 2006-06-04 12:24:47 UTC (rev 375)
@@ -1,3 +1,7 @@
+2006-06-04 Guillem Jover [EMAIL PROTECTED]
+
+ * dpkg-dev.pot: Regenerated.
+
2006-05-31 Guillem Jover [EMAIL PROTECTED]
* dpkg-dev.pot: Regenerated.
Modified: trunk/scripts/po/dpkg-dev.pot
===
--- trunk/scripts/po/dpkg-dev.pot 2006-06-04 12:17:53 UTC (rev 374)
+++ trunk/scripts/po/dpkg-dev.pot 2006-06-04 12:24:47 UTC (rev 375)
@@ -8,7 +8,7 @@
msgstr
Project-Id-Version: PACKAGE VERSION\n
Report-Msgid-Bugs-To: [EMAIL PROTECTED]
-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 PROTECTED]\n
Language-Team: LANGUAGE [EMAIL PROTECTED]\n
@@ -2210,87 +2210,88 @@
Usage: %s [option]\n
\n
Options:\n
+ -lchangelog use changelog as the file name when reporting.\n
-vversionsinceprint 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 -vsince option specifies most recent
