[SCM] Debian packaging of dh-make-perl branch, master, updated. debian/0.75-1-19-g2230bf9
Damyan Ivanov
dmn at debian.org
Tue Apr 24 05:20:49 UTC 2012
The following commit has been merged in the master branch:
commit 6f8382c6da5ba28d54943c6fb0f9553dfa777143
Author: Damyan Ivanov <dmn at debian.org>
Date: Tue Apr 24 08:04:07 2012 +0300
Packaging.pm: centralize version sanitazation
diff --git a/lib/DhMakePerl/Command/Packaging.pm b/lib/DhMakePerl/Command/Packaging.pm
index 4e5fa1a..2c3d781 100644
--- a/lib/DhMakePerl/Command/Packaging.pm
+++ b/lib/DhMakePerl/Command/Packaging.pm
@@ -292,6 +292,21 @@ sub extract_basic {
);
}
+sub sanitize_version {
+ my $self = shift;
+ my ($ver) = @_;
+
+ return undef unless defined($ver);
+
+ $ver =~ s/^v//;
+ $ver =~ s/\.(\d\d\d)(\d\d\d)/.$1.$2/; # 2.003004 -> 2.003.004
+ $ver =~ s/\.0+/./g; # 2.003.004 -> 2.3.4
+ $ver =~ s/[^-.+a-zA-Z0-9]+/-/g;
+ $ver = "0$ver" unless $ver =~ /^\d/;
+
+ return $ver;
+}
+
sub extract_name_ver {
my ($self) = @_;
@@ -300,10 +315,6 @@ sub extract_name_ver {
if ( defined $self->meta->{name} and defined $self->meta->{version} ) {
$name = $self->meta->{name};
$ver = $self->meta->{version};
- if ( $ver =~ s/^v// ) { # v4.43.43?
- $ver =~ s/\.(\d\d\d)(\d\d\d)/.$1.$2/; # 2.003004 -> 2.003.004
- $ver =~ s/\.0+/./g; # 2.003.004 -> 2.3.4
- }
}
else {
if ( -e $self->build_pl ) {
@@ -336,10 +347,8 @@ sub extract_name_ver {
}
# final sanitazing of name and version
- $ver =~ s/[^-.+a-zA-Z0-9]+/-/g;
- $ver = "0$ver" unless $ver =~ /^\d/;
-
$name =~ s/::/-/g;
+ $ver = $self->sanitize_version($ver);
$name
or $ver
--
Debian packaging of dh-make-perl
More information about the Pkg-perl-cvs-commits
mailing list