r7597 - in /trunk/dh-make-perl: debian/changelog dh-make-perl
djpig at users.alioth.debian.org
djpig at users.alioth.debian.org
Sat Sep 15 19:37:00 UTC 2007
Author: djpig
Date: Sat Sep 15 19:37:00 2007
New Revision: 7597
URL: http://svn.debian.org/wsvn/?sc=1&rev=7597
Log:
Unbreak handling of --version which was broken by the
getopts overhaul in 0.27
Modified:
trunk/dh-make-perl/debian/changelog
trunk/dh-make-perl/dh-make-perl
Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/debian/changelog?rev=7597&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Sat Sep 15 19:37:00 2007
@@ -1,3 +1,11 @@
+dh-make-perl (0.32) UNRELEASED; urgency=low
+
+ [ Frank Lichtenheld ]
+ * Unbreak handling of --version which was broken by the
+ getopts overhaul in 0.27
+
+ -- Frank Lichtenheld <djpig at debian.org> Sat, 15 Sep 2007 21:33:42 +0200
+
dh-make-perl (0.31) unstable; urgency=low
[ David Paleino ]
Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/trunk/dh-make-perl/dh-make-perl?rev=7597&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Sat Sep 15 19:37:00 2007
@@ -147,8 +147,10 @@
$desc = $opts{desc};
}
($pkgname, $version) = extract_basic();
-if (! defined $pkgversion) {
+unless (defined $opts{version}) {
$pkgversion = $version . "-1";
+} else {
+ $pkgversion = $opts{version};
}
move ($tarball, dirname($tarball) . "/${pkgname}_${version}.orig.tar.gz") if ($tarball && $tarball =~ /(?:\.tar\.gz|\.tgz)$/);
my $module_build = (-f "$maindir/Build.PL") ? "Module-Build" : "MakeMaker";
@@ -474,9 +476,9 @@
$name = $opts{cpanplus} if ($name eq '__PACKAGE__' && $opts{cpanplus});
# Get the version
- if (defined $pkgversion) {
+ if (defined $opts{version}) {
# Explicitly specified
- $ver = $pkgversion;
+ $ver = $opts{version};
} elsif ($file =~ /([\'\"]?)VERSION\1\s*(=>|,)\s*([\'\"]?)(\S+)\3/s) {
# Regular MakeMaker
More information about the Pkg-perl-cvs-commits
mailing list