summaryrefslogtreecommitdiff
path: root/scripts/dpkg-mergechangelogs.pl
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2013-01-02 00:39:08 +0100
committerGuillem Jover <guillem@debian.org>2013-06-22 05:07:34 +0200
commitfb5285f56924fdf84d3281bbf6046f8b4bb00048 (patch)
treea3030aec8a2891a811d7803034a383dd8c33c6ed /scripts/dpkg-mergechangelogs.pl
parenta55de1500d33db1192e5c2ace48e58baf252f8b9 (diff)
downloaddpkg-fb5285f56924fdf84d3281bbf6046f8b4bb00048.tar.gz
Dpkg: Deprecate lowercase exported by default variables
Rename, uppercase and do not export new variables by default, to avoid cluttering the caller namespace, and to give them consistent names. We'll keep the old variables for a while, to not break uses from external modules. Addresses Variables::ProhibitPackageVars.
Diffstat (limited to 'scripts/dpkg-mergechangelogs.pl')
-rwxr-xr-xscripts/dpkg-mergechangelogs.pl6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/dpkg-mergechangelogs.pl b/scripts/dpkg-mergechangelogs.pl
index 997786945..0dc4f62dd 100755
--- a/scripts/dpkg-mergechangelogs.pl
+++ b/scripts/dpkg-mergechangelogs.pl
@@ -19,7 +19,7 @@
use warnings;
use strict;
-use Dpkg;
+use Dpkg qw();
use Dpkg::Changelog::Debian;
use Dpkg::ErrorHandling;
use Dpkg::Gettext;
@@ -51,7 +51,7 @@ BEGIN {
}
sub version {
- printf _g("Debian %s version %s.\n"), $progname, $version;
+ printf _g("Debian %s version %s.\n"), $Dpkg::PROGNAME, $Dpkg::PROGVERSION;
printf "\n" . _g(
'This is free software; see the GNU General Public License version 2 or
@@ -68,7 +68,7 @@ Options:
after the last '~' in the version.
-?, --help show this help message.
--version show the version.
-"), $progname);
+"), $Dpkg::PROGNAME);
}
my $merge_prereleases;