dpkg-parsechangelog: Make the -L option actually work

diff --git a/ChangeLog b/ChangeLog
index b1193af05d8a9da98a0656e713ffef4c3c4cef78..790f99f1207fa335f3458d1b5ca96e9be6b23621 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-12-06  Frank Lichtenheld  <djpig@debian.org>
 
+       * scripts/dpkg-parsechangelog.pl: Make the
+       -L option actually work (it's only been eleven
+       years...)
+
        * scripts/Dpkg/ErrorHandling.pm (report): export.
 
 2007-11-29  Frank Lichtenheld  <djpig@debian.org>

diff --git a/debian/changelog b/debian/changelog
index 1195aeb2d11106a4f1c5f6449bad4ad63038edd3..6623e39b37d77b0a3a64aa504593315705626853 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,18 @@ dpkg (1.14.13) UNRELEASED; urgency=low
   * Fix control file parsing for field values starting with a colon.
     Apparently nobody ever needed this until Vcs-Cvs came along.
     Closes: #453364
+  * Copy the usr/share/doc directory to dpkg-dev and dselect (Instead
+    of using symlinks). The space requirements are minimal and adding
+    the needed dependencies to comply with policy would be way more
+    inconvenient. Pointed out by Rene Engelhard. Closes: #452730
+  * Allow more than one arch and more than one type of a package
+    in debian/files. Parts of the patch by Goswin von Brederlow
+    and Bastian Blank. Closes: #356299, #377400, #229143
+  * Allow building only architecture independent packages (-A).
+    Closes: #109794, #200454
+  * Bump Standards-Version to 3.7.3 (no changes)
+  * Make the -L option of dpkg-parsechangelog actually work (it's
+    only been eleven years...)
 
   [ Updated man pages translations ]
   * Swedish (Peter Karlsson)

diff --git a/scripts/dpkg-parsechangelog.pl b/scripts/dpkg-parsechangelog.pl
index be4db97983873949a41ca579891270661587bae8..40be5389ab5fbbe8e51c467a782417c960dc33b6 100755 (executable)
--- a/scripts/dpkg-parsechangelog.pl
+++ b/scripts/dpkg-parsechangelog.pl
@@ -17,7 +17,7 @@ my $changelogfile = 'debian/changelog';
 my @parserpath = ("/usr/local/lib/dpkg/parsechangelog",
                   "$dpkglibdir/parsechangelog");
 
-my $libdir;    # XXX: Not used!?
+my $libdir;
 my $force;
 
 
@@ -79,6 +79,7 @@ if (not $force and $changelogfile ne "-") {
 
 my ($pa, $pf);
 
+unshift(@parserpath, $libdir) if $libdir;
 for my $pd (@parserpath) {
     $pa= "$pd/$format";
     if (!stat("$pa")) {