Dpkg: Remove internal lowercase variables

Bump module version to 2.00.

2 files changed, 7 insertions, 16 deletions

diff --git a/debian/changelog b/debian/changelog
index 8b5317f07..d2a040681 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -46,6 +46,8 @@ dpkg (1.20.0) UNRELEASED; urgency=medium
       for C++. Closes: #939969
     - Dpkg::Deps: Check for valid virtual package version relations. Do not
       allow non-equal version relations in virtual provides. Closes: #930317
+    - Dpkg: Remove internal lowercase variables $version, $progname,
+      $admindir, $dpkglibdir and $pkgdatadir.
   * Documentation:
     - man: Fix uncommon wording constructs.
     - man: Use a minus sign for a literal string.
diff --git a/scripts/Dpkg.pm b/scripts/Dpkg.pm
index 21444b802..9d06b4145 100644
--- a/scripts/Dpkg.pm
+++ b/scripts/Dpkg.pm
@@ -31,7 +31,7 @@ It is also the entry point to the Dpkg module hierarchy.
 use strict;
 use warnings;
 
-our $VERSION = '1.03';
+our $VERSION = '2.00';
 our @EXPORT_OK = qw(
     $PROGNAME
     $PROGVERSION
@@ -43,13 +43,6 @@ our @EXPORT_OK = qw(
     $LIBDIR
     $DATADIR
 );
-our @EXPORT = qw(
-    $version
-    $progname
-    $admindir
-    $dpkglibdir
-    $pkgdatadir
-);
 
 use Exporter qw(import);
 
@@ -113,14 +106,6 @@ our $DATADIR = '../data';
 
 $DATADIR = $ENV{DPKG_DATADIR} if defined $ENV{DPKG_DATADIR};
 
-# XXX: Backwards compatibility, to be removed on VERSION 2.00.
-## no critic (Variables::ProhibitPackageVars)
-our $version = $PROGVERSION;
-our $admindir = $ADMINDIR;
-our $dpkglibdir = $LIBDIR;
-our $pkgdatadir = $DATADIR;
-## use critic
-
 =head1 MODULES
 
 The following is the list of public modules within the Dpkg hierarchy. Only
@@ -290,6 +275,10 @@ Parse and manipulate Debian package versions.
 
 =head1 CHANGES
 
+=head2 Version 2.00 (dpkg 1.20.0)
+
+Remove variables: $version, $progname, $admindir, $dpkglibdir and $pkgdatadir.
+
 =head2 Version 1.03 (dpkg 1.18.24)
 
 New variable: $PROGPATCH.