[dh-make-perl-cvs-dev] CVS dh-make-perl

[CVS User gwolf]

Update of /cvsroot/dh-make-perl/dh-make-perl
In directory haydn:/tmp/cvs-serv9317

Modified Files:
	dh-make-perl 
Log Message:
Two bugs closed. I've neglected too long this poor pkg


--- /cvsroot/dh-make-perl/dh-make-perl/dh-make-perl	2006/03/08 20:20:11	1.40
+++ /cvsroot/dh-make-perl/dh-make-perl/dh-make-perl	2006/08/14 01:26:25	1.41
@@ -138,25 +138,31 @@
 use Module::Depends::Intrusive;
 use strict;
 
-my $debstdversion = '3.6.1';
+my $debstdversion = '3.7.2';
 my $priority = 'optional';
 #my $section = 'interpreters';
 my $section = 'perl';
 my $depends = '${perl:Depends}';
 my $bdependsi = 'perl (>= 5.8.0-7)';
-my $bdepends = 'debhelper (>= 4.0.2)';
+my $bdepends = 'debhelper (>= 5.0.0)';
 my $maintainer = get_maintainer();
 my $arch = 'all';
 my $date = `822-date`;
 my $debiandir;
 my $startdir = getcwd();
-my $dh_compat = 4;
+my $dh_compat = 5;
 
 our %overrides;
 my $datadir = '/usr/share/dh-make-perl';
 my $homedir = "$ENV{HOME}/.dh-make-perl";
 my ($perlname, $maindir, $modulepm, $meta);
-my ($pkgname, $srcname, $version, $desc, $longdesc, $copyright, $author);
+my ($pkgname, $srcname, 
+    # $version is the version from the perl module itself
+    $version, 
+    # $pkgversion is the resulting version of the package: User's
+    # --version=s or "$version-1"
+    $pkgversion, 
+    $desc, $longdesc, $copyright, $author);
 my ($extrasfields, $extrapfields);
 my (@docs, $changelog, @args);
 my ($cpanmodule, $cpanplusmodule, $cpanmirror, $build, $install, $dbflags, 
@@ -173,7 +179,7 @@
 	"cpan-mirror=s" => \$cpanmirror,
 	"desc=s" => \$desc,
 	"arch=s" => \$arch,
-	"version=s" => \$version,
+	"version=s" => \$pkgversion,
 	"help" => sub {die "\n"},
 	# disabled: see build_package()
 	"dbflags=s" => \$dbflags,
@@ -196,6 +202,9 @@
 my $tarball = setup_dir();
 $meta = process_meta("$maindir/META.yml") if (-f "$maindir/META.yml");
 ($pkgname, $version) = extract_basic();
+if (! defined $pkgversion) {
+	$pkgversion = $version . "-1";
+}
 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";
 $bdepends .= ', libmodule-build-perl' if ($module_build eq "Module-Build");
@@ -420,9 +429,9 @@
 	$name = $cpanplusmodule if ($name eq '__PACKAGE__' && $cpanplusmodule);
 
 	# Get the version
-	if (defined $version) {
+	if (defined $pkgversion) {
 	    # Explicitly specified
-	    $ver = $version;
+	    $ver = $pkgversion;
 
 	} elsif ($file =~ /([\'\"]?)VERSION\1\s*(=>|,)\s*([\'\"]?)(\S+)\3/s) {
 	    # Regular MakeMaker
@@ -669,7 +678,7 @@
 sub create_changelog {
 	my ($file) = shift;
 	open(C, ">$file") || die "Cannot open $file: $!\n";
-	print C "$srcname ($version-1) unstable; urgency=low\n";
+	print C "$srcname ($pkgversion) unstable; urgency=low\n";
 	print C "\n  * Initial Release.\n\n";
 	print C " -- $maintainer  $date\n\n";
 	#print C "Local variables:\nmode: debian-changelog\nEnd:\n";
@@ -801,7 +810,7 @@
 	$bdependsi = $val if (defined($val=get_override_val($data, $subkey, 'bdependsi')));	
 	$desc = $val if (defined($val=get_override_val($data, $subkey, 'desc')));
 	$longdesc = $val if (defined($val=get_override_val($data, $subkey, 'longdesc')));
-	$version = $val if (defined($val=get_override_val($data, $subkey, 'version')));
+	$pkgversion = $val if (defined($val=get_override_val($data, $subkey, 'version')));
 	$arch = $val if (defined($val=get_override_val($data, $subkey, 'arch')));
 	$changelog = $val if (defined($val=get_override_val($data, $subkey, 'changelog')));
 	@docs = split(/\s+/, $val) if (defined($val=get_override_val($data, $subkey, 'docs')));
@@ -830,7 +839,7 @@
 		die "checkver not a function\n" unless (ref($checkver) eq 'CODE');
 		$subkey = &$checkver($maindir);
 	} else {
-		$subkey = $version;
+		$subkey = $pkgversion;
 	}
 	return ($data, $subkey);
 }