r4175 - in /tools/dh-make-perl/trunk: debian/changelog
debian/control dh-make-perl
gwolf at users.alioth.debian.org
gwolf at users.alioth.debian.org
Sat Oct 28 02:38:27 CEST 2006
Author: gwolf
Date: Sat Oct 28 02:38:27 2006
New Revision: 4175
URL: http://svn.debian.org/wsvn/?sc=1&rev=4175
Log:
Couple of bugs fixed, ready to upload 0.24
Modified:
tools/dh-make-perl/trunk/debian/changelog
tools/dh-make-perl/trunk/debian/control
tools/dh-make-perl/trunk/dh-make-perl
Modified: tools/dh-make-perl/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/tools/dh-make-perl/trunk/debian/changelog?rev=4175&op=diff
==============================================================================
--- tools/dh-make-perl/trunk/debian/changelog (original)
+++ tools/dh-make-perl/trunk/debian/changelog Sat Oct 28 02:38:27 2006
@@ -1,3 +1,16 @@
+dh-make-perl (0.24) unstable; urgency=low
+
+ * Transferred package ownership to the Debian Perl Group
+ * Added patch by Fermin Galan, allowing to specify the maintainer from
+ the overrides file
+ * Fixed Perl package version parsing (Closes: #386086, #393438)
+ * Fixed: Was not properly ignoring Subversion/CVS directories when
+ called with an implicit --exclude/-i (Closes: #394314)
+ * Fixes the cases where Makefile.PL depends on FindBin (Closes:
+ #375146)
+
+ -- Gunnar Wolf <gwolf at debian.org> Fri, 27 Oct 2006 13:22:17 -0500
+
dh-make-perl (0.23) unstable; urgency=low
* Added --requiredeps option, to force dh-make-perl to choke on
@@ -24,7 +37,7 @@
dh-make-perl (0.21) unstable; urgency=low
- * Added patch by Adam Sjoergen/Damyan Ivanov fixing newlines in
+ * Added patch by Adam Sjoegren/Damyan Ivanov fixing newlines in
descriptions that broke the generated debian/control files (Closes:
#350728)
Modified: tools/dh-make-perl/trunk/debian/control
URL: http://svn.debian.org/wsvn/tools/dh-make-perl/trunk/debian/control?rev=4175&op=diff
==============================================================================
--- tools/dh-make-perl/trunk/debian/control (original)
+++ tools/dh-make-perl/trunk/debian/control Sat Oct 28 02:38:27 2006
@@ -3,8 +3,8 @@
Priority: optional
Build-Depends: debhelper (>= 5.0.0)
Build-Depends-Indep: perl
-Maintainer: Gunnar Wolf <gwolf at debian.org>
-Uploaders: Wolfgang Schemmel <debian at 37.org>, Christopher Sacca <csacca at thecsl.org>
+Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
+Uploaders: Gunnar Wolf <gwolf at debian.org>, Wolfgang Schemmel <debian at 37.org>, Christopher Sacca <csacca at thecsl.org>
Standards-Version: 3.7.2
Package: dh-make-perl
Modified: tools/dh-make-perl/trunk/dh-make-perl
URL: http://svn.debian.org/wsvn/tools/dh-make-perl/trunk/dh-make-perl?rev=4175&op=diff
==============================================================================
--- tools/dh-make-perl/trunk/dh-make-perl (original)
+++ tools/dh-make-perl/trunk/dh-make-perl Sat Oct 28 02:38:27 2006
@@ -138,12 +138,14 @@
use Module::Depends::Intrusive;
use strict;
+my $perl_pkg = get_perl_pkg_details();
+
my $debstdversion = '3.7.2';
my $priority = 'optional';
#my $section = 'interpreters';
my $section = 'perl';
my $depends = '${perl:Depends}';
-my $bdependsi = 'perl (>= ' . `dpkg -p perl|grep ^Version:|cut -f 2 -d \ ` . ')';
+my $bdependsi = $perl_pkg->{Version};
my $bdepends = 'debhelper (>= 5.0.0)';
my $maintainer = get_maintainer();
my $arch = 'all';
@@ -183,7 +185,7 @@
"help" => sub {die "\n"},
# disabled: see build_package()
"dbflags=s" => \$dbflags,
- "exclude|i" => \$excludeRE,
+ "exclude|i:s{,}" => \$excludeRE,
"build!" => \$build,
"install!" => \$install,
"notest" => \$notest,
@@ -197,11 +199,13 @@
[ --nometa ] [ --requiredeps ]
USAGE
-$excludeRE = '(?:\/|^)(?:CVS|.svn)\/' if ($excludeRE && $excludeRE == 1);
+$excludeRE = '(?:\/|^)(?:CVS|.svn)\/' if (defined $excludeRE &&
+ $excludeRE eq '');
load_overrides();
my $tarball = setup_dir();
$meta = process_meta("$maindir/META.yml") if (-f "$maindir/META.yml");
+findbin_fix();
($pkgname, $version) = extract_basic();
if (! defined $pkgversion) {
$pkgversion = $version . "-1";
@@ -241,6 +245,12 @@
print "Done\n";
exit(0);
+sub get_perl_pkg_details {
+ my (@dpkg_info);
+ @dpkg_info = map {chomp; s/\s*:\s*/:/; $_} `dpkg -p perl`;
+ return { map {split /:/, $_} @dpkg_info };
+}
+
sub setup_dir {
my $tarball;
$mod_cpan_version = '';
@@ -382,16 +392,32 @@
extract_desc($modulepm);
}
+ $excludeRE = '^$' unless $excludeRE;
find(sub {
- (! $excludeRE || ! $File::Find::name =~ /$excludeRE/) && /\.(pm|pod)$/ && do { extract_desc($_) };
+ $File::Find::name !~ /$excludeRE/ &&
+ /\.(pm|pod)$/ &&
+ extract_desc($_);
}, $maindir);
return ($pkgname, $version);
}
+sub makefile_pl {
+ return "$maindir/Makefile.PL";
+}
+
+sub findbin_fix {
+ # FindBin requires to know the name of the invoker - and requires it to be
+ # Makefile.PL to function properly :-/
+ $0 = makefile_pl();
+ if (exists $FindBin::{Bin}) {
+ FindBin::again();
+ }
+}
+
sub extract_name_ver {
- my $makefile = "$maindir/Makefile.PL";
my ($name, $ver);
+ my $makefile = makefile_pl();
if (defined $meta->{name} and defined $meta->{version}) {
$name = $meta->{name};
@@ -833,6 +859,7 @@
$extrasfields = $val if (defined($val=get_override_val($data, $subkey, 'sfields')));
$extrapfields = $val if (defined($val=get_override_val($data, $subkey, 'pfields')));
+ $maintainer = $val if (defined($val=get_override_val($data, $subkey, 'maintainer')));
# fix longdesc if needed
$longdesc =~ s/^\s*/ /mg;
}
@@ -901,8 +928,9 @@
=item B<--exclude> | B<-i> [I<REGEX>]
This allows you to specify a PCRE to exclude some files from the search for
-docs and stuff like that. If no argument is given, it uses a default to
-exclude CVS and .svn directories.
+docs and stuff like that. If no argument is given (but the switch is specified
+- not specifying the switch will include everything), it defaults to exclude
+CVS and .svn directories.
=item B<--build>
@@ -1013,14 +1041,25 @@
Now maintained by Gunnar Wolf E<lt>gwolf at gwolf.orgE<gt>.
Patches from:
- Gergely Nagy E<lt>algernon at bonehunter.rulez.orgE<gt>
+
+ Adam Sjoegren E<lt>asjo at koldfront.dkE<gt>
Adrian Phillips E<lt>adrianp at powertech.noE<gt>
- Ton Nijkes E<lt>tonn at wau.mis.ah.nlE<gt>
- Matt Hope E<lt>dopey at debian.orgE<gt>
- Juerd E<lt>juerd at ouranos.juerd.netE<gt>
+ Amos Shapira E<lt>amos.shapira at gmail.comE<gt>
Christian Kurz E<lt>shorty at debian.orgE<gt>
+ Damyan Ivanov E<lt>divanov at creditreform.bgE<gt>
David Pashley E<lt>david at davidpashley.comE<gt>
Edward Betts E<lt>edward at debian.orgE<gt>
+ Fermin Galan E<lt>galan at dit.upm.esE<gt>
+ Geoff Richards E<lt>qef at ungwe.orgE<gt>
+ Gergely Nagy E<lt>algernon at bonehunter.rulez.orgE<gt>
+ Juerd E<lt>juerd at ouranos.juerd.netE<gt>
+ Matt Hope E<lt>dopey at debian.orgE<gt>
+ Noel Maddy E<lt>noel at zhtwn.comE<gt>
+ Peter Moerch E<lt>mn3k66i02 at sneakemail.comE<gt>
+ Stephen Oberholtzer E<lt>oliverklozoff at gmail.comE<gt>
+ Ton Nijkes E<lt>tonn at wau.mis.ah.nlE<gt>
+
+ ...And others who, sadly, we have forgot to add :-/
=cut
More information about the Pkg-perl-cvs-commits
mailing list