Switch perl 822-date and changelog/debian as well to use the new Dpkg

module and its variables.

diff --git a/ChangeLog b/ChangeLog
index e79bda5733035e65967f2fe800b375284c959f2a..479cd29d6d0ce0e7204a65a3dff7f627c5be7dc6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@
        * scripts/dpkg-statoverride.pl: Likewise.
        * scripts/install-info.pl: Likewise.
        * scripts/update-alternatives.pl: Likewise.
+       * scripts/822-date.pl: Likewise.
+       * changelog/debian.pl: Likewise.
 
        * scripts/controllib.pl (init_substvars): Remove comment about
        $version needing to be a global variable set elsewhere.

diff --git a/scripts/822-date.pl b/scripts/822-date.pl
index 4da7da43d5065ff9da9e4117fb6d83630550af54..c3145451225b675b5f54f789af3ef229b1891a7e 100755 (executable)
--- a/scripts/822-date.pl
+++ b/scripts/822-date.pl
@@ -3,7 +3,8 @@
 use strict;
 use warnings;
 
-our $dpkglibdir = "."; # This line modified by Makefile
+use Dpkg;
+
 push(@INC, $dpkglibdir);
 require 'dpkg-gettext.pl';
 textdomain("dpkg-dev");

diff --git a/scripts/changelog/debian.pl b/scripts/changelog/debian.pl
index 6504a088ce76c03c1353e5ee11124b7141134ed5..0c8a094fbf58efedbecbaae679a2da92b2554215 100755 (executable)
--- a/scripts/changelog/debian.pl
+++ b/scripts/changelog/debian.pl
@@ -7,9 +7,7 @@
 use strict;
 use warnings;
 
-our $progname;
-our $version = '1.3.0'; # This line modified by Makefile
-our $dpkglibdir = "."; # This line modified by Makefile
+use Dpkg;
 
 push(@INC,$dpkglibdir);
 require 'controllib.pl';