Adjust Dpkg::Changelog::parse_changelog() search list of parser

* scripts/Dpkg/Changelog.pm (parse_changelog): Fallback
into /usr/lib/dpkg/parsechangelog to find a changelog parser
in case $dpkglibdir points to another directory (for example
when DPKG_DATADIR is manually set).

diff --git a/ChangeLog b/ChangeLog
index 92a2adb16828052264dfac6c7b422bb3ebc8d151..4b804c08b30d89faa4bec5e601da1c76653e06c5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-02-20  Raphael Hertzog  <hertzog@debian.org>
+
+       * scripts/Dpkg/Changelog.pm (parse_changelog): Fallback
+       into /usr/lib/dpkg/parsechangelog to find changelog parser
+       in case $dpkglibdir points to another directory (for example
+       when DPKG_DATADIR is manually set).
+
 2008-02-19  Frank Lichtenheld  <djpig@debian.org>
 
        * m4/libs.m4 (DPKG_LIB_CURSES): Use libncursesw if

diff --git a/scripts/Dpkg/Changelog.pm b/scripts/Dpkg/Changelog.pm
index ffa1740eea09b3cbee2f3bd2f4019443f40d402c..98f9fe648d0d6276421a046e6021e35b0038343d 100644 (file)
--- a/scripts/Dpkg/Changelog.pm
+++ b/scripts/Dpkg/Changelog.pm
@@ -725,7 +725,8 @@ it's passed as the parameter that follows.
 sub parse_changelog {
     my (%options) = @_;
     my @parserpath = ("/usr/local/lib/dpkg/parsechangelog",
-                      "$dpkglibdir/parsechangelog");
+                      "$dpkglibdir/parsechangelog",
+                      "/usr/lib/dpkg/parsechangelog");
     my $format = "debian";
     my $changelogfile = "debian/changelog";
     my $force = 0;