diff -Nru dh-make-perl-0.74/Build.PL dh-make-perl-0.75/Build.PL --- dh-make-perl-0.74/Build.PL 2011-09-12 19:27:04.000000000 +0000 +++ dh-make-perl-0.75/Build.PL 2012-01-15 17:37:14.000000000 +0000 @@ -10,6 +10,7 @@ 'Git' => 0, 'IO::Dir' => 0, }, + configure_requires => { 'Module::Build' => 0.38 }, requires => { perl => '5.010', @@ -29,6 +30,7 @@ 'File::Find::Rule' => 0, 'File::Spec' => 0, 'File::Spec::Functions' => 0, + 'File::Which' => 0, 'FindBin' => 0, 'Getopt::Long' => 0, 'IO::File' => 0, @@ -67,6 +69,12 @@ share => '/usr/share/dh-make-perl', }, share_files => { map( ( $_ => $_ ), glob 'share/*' ) }, + meta_merge => { + resources => { + repository => 'http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/dh-make-perl.git', + }, + keywords => [ qw(debian package helper) ], + }, ); $builder->add_build_element('share'); diff -Nru dh-make-perl-0.74/Changes dh-make-perl-0.75/Changes --- dh-make-perl-0.74/Changes 2011-09-12 19:27:04.000000000 +0000 +++ dh-make-perl-0.75/Changes 2012-01-15 17:37:13.000000000 +0000 @@ -1,3 +1,80 @@ +0.75 (2012-01-15) + + [ Damyan Ivanov ] + * setup Git repository in --vcs=git even without --pkg-perl + * when setting up Git repository, add 'origin' remote only in --pkg-perl + mode + * fail gracefuly if pristine-tar is not available + * add libfile-which-perl to (build-)dependencies + * fix typo in --pristine-tar description + * Apply patch from Dima Kogan, avoiding confusion when the version string is + not quoted (RT#71224) + * META: + + add explicit configure_requires on Module::Build + + add repository URL + + add keywords + * when warning about missing apt-file, state the minimum required version + + [ gregor herrmann ] + * Swap order of alternative (build) dependencies after the perl 5.14 + transition. + * DhMakePerl/Command/make.pm: setup_dir(): change back to original + directory after CPAN.pm changes it; thanks to Dima Kogan + (cf. RT#71708). + * Fix POD: --pkg-perl sets Vcs-Git, of course. + * Treat META.json like META.yml (i.e. rm/unlink/ignore it). + * DhMakePerl::Command::Packaging: don't initialize CPAN if --no-network + is set. Otherwise t/cache.t fails because CPAN tries to update its + config and goes out hunting for CPAN mirrors. + * t/dists.t: allow multiple years in Copyright line. + "refresh" adds the current year to the years of copyright. + In other words: This was a "New Year's Bug". + * t/dists: fix the regexp for matching the email address of our maintainer. + * DhMakePerl::Command::Packaging: don't initialize CPAN if --no-network is set. + * Treat META.json like META.yml (i.e. rm/unlink/ignore it). + + [ Dima Kogan ] + * When making recursively, build/install this package only AFTER its + dependencies have been built/installed + * find_debs_for_modules() no longer reports installed-but-not-in-aptfile + packages as missing + * when installing a package, $arch now comes from the control file + (Closes Debian bug #651343) + +0.74 (2011-09-12) + + [ Tim Retout ] + * t/cache.t: New test for handling unreadable cache files. + * Debian::WNPP::Query: return an empty hashref rather than undef after + failing to read cache file. + * DhMakePerl::Config: Change default source format to 3.0 (quilt). + + [ Damyan Ivanov ] + * Packaging.pm: extend the examples regular expression to match demo/demos. + Thanks to Kevin Ryde. Closes Debian bug #634932 + * add pristine-tar to Recommends. Thanks to Tim. + * fix t/debian-version.t to not plan twice in case debian/changelog does not + exist (e.g. when testing the CPAN distribution, which lacks debian/ stuff) + RT#66214 + * setup_git_repository: streamline import of upstream sources + + [ gregor herrmann ] + * Update created Vcs-Browser URLs for Debian Perl Group repositories. + * Change URLs for DEP5 Format-Specification to point to + http://anonscm.debian.org. + * Update list of contributors/copyright holders in dh-make-perl and + debian/copyright. + + [ Ansgar Burchardt ] + * debian/control: Convert Vcs-* fields to Git. + * DhMakePerl::Config: Change default VCS to Git. + + [ Salvatore Bonaccorso ] + * Debian::AptContents: Fix typo in POD. + + [ Maximilian Gass ] + * Fix Debian::AptContents for file name changes in apt-file 2.5.0 + 0.73 (2011-07-03) [ gregor herrmann ] diff -Nru dh-make-perl-0.74/debian/changelog dh-make-perl-0.75/debian/changelog --- dh-make-perl-0.74/debian/changelog 2012-02-05 14:24:30.000000000 +0000 +++ dh-make-perl-0.75/debian/changelog 2012-02-05 14:24:30.000000000 +0000 @@ -1,3 +1,51 @@ +dh-make-perl (0.75-1) unstable; urgency=low + + [ Damyan Ivanov ] + * setup Git repository in --vcs=git even without --pkg-perl + * when setting up Git repository, add 'origin' remote only in --pkg-perl + mode + * fail gracefuly if pristine-tar is not available + * add libfile-which-perl to (build-)dependencies + * fix typo in --pristine-tar description + * document the change of the default value of --vcs from 'svn' to 'git' + * Apply patch from Dima Kogan, avoiding confusion when the version string is + not quoted (RT#71224) + * META: + + add explicit configure_requires on Module::Build + + add repository URL + + add keywords + * remove t/contents/wnpp.cache (added by mistake) + * really test the missing version quotes fix + * when warning about missing apt-file, state the minimum required version + + [ gregor herrmann ] + * Swap order of alternative (build) dependencies after the perl 5.14 + transition. + * DhMakePerl/Command/make.pm: setup_dir(): change back to original + directory after CPAN.pm changes it; thanks to Dima Kogan + (cf. RT#71708). + * Fix POD: --pkg-perl sets Vcs-Git, of course. + + [ Dima Kogan ] + * Updated Dima Kogan's email address + * When making recursively, I build/install this package only AFTER I + built/installed its dependencies + * find_debs_for_modules() no longer reports installed-but-not-in-aptfile + packages as missing + * when installing a package, $arch now comes from the control file + (Closes: #651343) + + [ gregor herrmann ] + * Treat META.json like META.yml (i.e. rm/unlink/ignore it). + * DhMakePerl::Command::Packaging: don't initialize CPAN if --no-network + is set. Otherwise t/cache.t fails because CPAN tries to update its + config and goes out hunting for CPAN mirrors. + * t/dists.t: allow multiple years in Copyright line. "refresh" adds the + current year to the years of copyright. In other words: This was a + "New Year's Bug". Closes: #655805 + + -- Damyan Ivanov Sun, 15 Jan 2012 19:44:27 +0200 + dh-make-perl (0.74-1) unstable; urgency=low [ Tim Retout ] diff -Nru dh-make-perl-0.74/debian/control dh-make-perl-0.75/debian/control --- dh-make-perl-0.74/debian/control 2012-02-05 14:24:30.000000000 +0000 +++ dh-make-perl-0.75/debian/control 2012-02-05 14:24:30.000000000 +0000 @@ -6,13 +6,14 @@ libapt-pkg-perl, libarray-unique-perl, libclass-accessor-perl, - libcpan-meta-perl | perl (>= 5.14), + perl (>= 5.14) | libcpan-meta-perl, libdpkg-perl, libemail-address-perl, libemail-date-format-perl, libfile-dircompare-perl, libfile-find-rule-perl, libfile-touch-perl, + libfile-which-perl, liblist-moreutils-perl, libmodule-depends-perl (>= 0.15), libparse-debcontrol-perl, @@ -51,10 +52,11 @@ libapt-pkg-perl, libarray-unique-perl, libclass-accessor-perl, - libcpan-meta-perl | perl (>= 5.14), + perl (>= 5.14) | libcpan-meta-perl, libdpkg-perl, libemail-address-perl, libemail-date-format-perl, + libfile-which-perl, liblist-moreutils-perl, libmodule-depends-perl (>= 0.15), libparse-debcontrol-perl, diff -Nru dh-make-perl-0.74/dh-make-perl dh-make-perl-0.75/dh-make-perl --- dh-make-perl-0.74/dh-make-perl 2011-09-12 19:27:04.000000000 +0000 +++ dh-make-perl-0.75/dh-make-perl 2012-01-15 17:37:14.000000000 +0000 @@ -40,10 +40,10 @@ This works for most simple packages and is also useful for getting started with packaging Perl modules. -You can specify a module or distribution name with the L<--cpan|/cpan_module> +You can specify a module or distribution name with the L<--cpan> switch and B will download it for you from a CPAN mirror, or you can specify the directory with the already unpacked sources. If neither -L<--cpan|/cpan_module> nor a directory is given as argument, B +L<--cpan> nor a directory is given as argument, B tries to create a Perl package from the data in the current directory. You can build and install the debian package using the L @@ -250,12 +250,12 @@ =item B<--dh> I -Set desired debhelper version. If C is 7, generated debian/rules is +Set desired debhelper version. If C is >=7, generated debian/rules is minimalistic, using the auto-mode of debhelper. Also, any additional documentation and examples are listed in additional files under debian/, instead of being listed in debian/rules. -Since version 0.60, B<7> is the only supported debhelper compatibility level. +Since version 0.60, B only supports debhelper compatibility levels B<>=7>. =item B<--dist> I @@ -318,8 +318,9 @@ Useful when preparing a package for the Debian Perl Group L. -Sets C, C, C and C fields in -F accordingly. +Sets C, C, C and C fields in +F accordingly. Also, when C<--vcs git> is used (the default), +sets up a Git remote pointing to the right place on I. =item B<--recursive> @@ -354,7 +355,7 @@ =item B<--vcs> I In B<--pkg-perl> mode, use the specified version control system in the -generated I fields. The default is C (still). +generated I fields. The default is C. If I is C, C will setup a Git repository with three branches: @@ -372,11 +373,12 @@ =item pristine-tar -A pranch to keep L data. +A branch to keep L data. =back -Also, an C remote is added pointing to the repository on I. +If B<--pkg-perl> is also given, an C remote is added pointing to the +repository on I. =item B<--verbose> | B<--no-verbose> @@ -475,6 +477,8 @@ =item David Pashley Edavid@davidpashley.comE +=item Dima Kogan Edima@secretsauce.netE + =item Edward Betts Eedward@debian.orgE =item Fermin Galan Egalan@dit.upm.esE diff -Nru dh-make-perl-0.74/HOWTO.release dh-make-perl-0.75/HOWTO.release --- dh-make-perl-0.74/HOWTO.release 1970-01-01 00:00:00.000000000 +0000 +++ dh-make-perl-0.75/HOWTO.release 2012-01-15 17:37:14.000000000 +0000 @@ -0,0 +1,29 @@ +* run + make orig + this will create ../dh-make-perl_$VERSION.orig.tar.gz and + ../DhMakePerl-$VERSION.tar.gz (hardlinked to each other). + +* build the package as usual and watch for failing tests + +* apply the usual quality checks, e.g. lintian + +* make sure Changes is populated for the new release. Good source of changes to + include there is debian/changelog and/or git logs + + (assuming debian/changelog is already updated with the list of changes) + +* if everything seems ok, run + dch -r + and build again + +* upload + - ../dh-make-perl_$VERSION.orig.tar.gz to alioth, naming the release $VERSION + - ../DhMakePerl-$VERSION.tar.gz to PAUSE, e.g. with cpan-upload + +* tag + debcommit -a -r + +* push + git push origin master debian/$VERSION-1 + +* serve yourself a piece of cake :) diff -Nru dh-make-perl-0.74/lib/Debian/Control/FromCPAN.pm dh-make-perl-0.75/lib/Debian/Control/FromCPAN.pm --- dh-make-perl-0.74/lib/Debian/Control/FromCPAN.pm 2011-09-12 19:27:04.000000000 +0000 +++ dh-make-perl-0.75/lib/Debian/Control/FromCPAN.pm 2012-01-15 17:37:14.000000000 +0000 @@ -246,9 +246,10 @@ =item find_debs_for_modules I[, APT contents[, verbose ]] -Scans the given hash of dependencies ( module => version ) and returns matching -Debian package dependency specification (as an instance of -L class) and a list of missing modules. +Scans the given hash of dependencies ( module => version ) and returns +matching Debian package dependency specification (as an instance of +L class) and a list of missing modules. Installed +packages are searched first, then the APT contents, then the perl core. =cut @@ -270,22 +271,21 @@ my $dep; - if ($apt_contents) { + require Debian::DpkgLists; + if ( my @pkgs = Debian::DpkgLists->scan_perl_mod($module) ) { + $dep = Debian::Dependency->new( + ( @pkgs > 1 ) + ? [ map { { pkg => $_, ver => $version } } @pkgs ] + : ( $pkgs[0], $version ) + ); + } + elsif ($apt_contents) { $dep = $apt_contents->find_perl_module_package( $module, $version ); } elsif ( my $ver = is_core_module( $module, $version ) ) { $dep = Debian::Dependency->new( 'perl', $ver ); } - else { - require Debian::DpkgLists; - if ( my @pkgs = Debian::DpkgLists->scan_perl_mod($module) ) { - $dep = Debian::Dependency->new( - ( @pkgs > 1 ) - ? [ map { { pkg => $_, ver => $version } } @pkgs ] - : ( $pkgs[0], $version ) - ); - } - } + $dep->rel($ver_rel) if $dep and $ver_rel and $dep->ver; diff -Nru dh-make-perl-0.74/lib/DhMakePerl/Command/make.pm dh-make-perl-0.75/lib/DhMakePerl/Command/make.pm --- dh-make-perl-0.74/lib/DhMakePerl/Command/make.pm 2011-09-12 19:27:04.000000000 +0000 +++ dh-make-perl-0.75/lib/DhMakePerl/Command/make.pm 2012-01-15 17:37:14.000000000 +0000 @@ -195,17 +195,8 @@ #create_readme("$debiandir/README.Debian"); $self->create_copyright( $self->debian_file('copyright') ); $self->update_file_list( docs => $self->docs, examples => $self->examples ); - $self->build_package - if $self->cfg->build or $self->cfg->install; - $self->install_package if $self->cfg->install; - print "--- Done\n" if $self->cfg->verbose; - $self->setup_git_repository($tarball) - if $self->cfg->{pkg_perl} - and $self->cfg->{vcs} eq 'git'; - $self->package_already_exists($apt_contents) - or $self->modules_already_packaged($apt_contents); if ( $self->cfg->recursive ) { $already_done //= {}; @@ -230,6 +221,17 @@ } } + $self->build_package + if $self->cfg->build or $self->cfg->install; + $self->install_package if $self->cfg->install; + print "--- Done\n" if $self->cfg->verbose; + + $self->setup_git_repository($tarball) + if $self->cfg->{vcs} eq 'git'; + + $self->package_already_exists($apt_contents) + or $self->modules_already_packaged($apt_contents); + return(0); } @@ -276,6 +278,7 @@ } $dist->get || die "Cannot get ", $dist->pretty_id, "\n"; # <- here $ENV{'PWD'} gets set to $HOME/.cpan/build + chdir $orig_pwd; # so set it back $dist->pretty_id =~ /^(.)(.)/; $tarball = $CPAN::Config->{'keep_source_where'} . "/authors/id/$1/$1$2/"; # the file is under authors/id/A/AU/AUTHOR directory @@ -346,12 +349,14 @@ my ( $archspec, $debname ); - if ( $self->arch eq 'any' ) { + my $arch = $self->control->binary->Values(0)->Architecture; + + if ( !defined $arch || $arch eq 'any' ) { $archspec = `dpkg --print-architecture`; chomp($archspec); } else { - $archspec = $self->arch; + $archspec = $arch; } $debname = sprintf( "%s_%s-1_%s.deb", $self->pkgname, $self->version, @@ -591,6 +596,7 @@ require Git; require IO::Dir; + require File::Which; Git::command( 'init', $self->main_dir ); @@ -610,11 +616,20 @@ qw( remote add origin ), sprintf( "ssh://git.debian.org/git/pkg-perl/packages/%s.git", $self->pkgname ), - ); + ) if $self->cfg->pkg_perl; - $ENV{GIT_DIR} = File::Spec->catdir( $self->main_dir, '.git' ); - system( 'pristine-tar', 'commit', $tarball, "upstream/".$self->version ) >= 0 - or warn "error running pristine-tar: $!\n"; + if ( File::Which::which('pristine-tar') ) { + $ENV{GIT_DIR} = File::Spec->catdir( $self->main_dir, '.git' ); + system( 'pristine-tar', 'commit', $tarball, "upstream/".$self->version ) >= 0 + or warn "error running pristine-tar: $!\n"; + } + else { + warn "W: pristine-tar not available. Please run\n"; + warn "W: apt-get install pristine-tar\n"; + warn "W: followed by\n"; + warn "W: pristine-tar commit $tarball upstream/" + . $self->version . "\n"; + } } =item warning I ... diff -Nru dh-make-perl-0.74/lib/DhMakePerl/Command/Packaging.pm dh-make-perl-0.75/lib/DhMakePerl/Command/Packaging.pm --- dh-make-perl-0.74/lib/DhMakePerl/Command/Packaging.pm 2011-09-12 19:27:04.000000000 +0000 +++ dh-make-perl-0.75/lib/DhMakePerl/Command/Packaging.pm 2012-01-15 17:37:14.000000000 +0000 @@ -410,16 +410,16 @@ $ver = $self->cfg->version; } - elsif ( $file =~ /([\'\"]?)\sdist_version\1\s*(=>|,)\s*([\'\"]?)(\S+)\3/s ) { + elsif ( $file =~ /([\'\"]?)\sdist_version\1\s*(=>|,)\s*([\'\"]?)([^\s,]*)\3/s ) { $ver = $4; # Where is the version taken from? $vfrom = $4 if $file - =~ /([\'\"]?)dist_version_from\1\s*(=>|,)\s*([\'\"]?)(\S+)\3/s; + =~ /([\'\"]?)dist_version_from\1\s*(=>|,)\s*([\'\"]?)([^\s,]*)\3/s; } - elsif ( $file =~ /([\'\"]?)dist_version_from\1\s*(=>|,)\s*([\'\"]?)(\S+)\3/s ) + elsif ( $file =~ /([\'\"]?)dist_version_from\1\s*(=>|,)\s*([\'\"]?)([^\s,]*)\3/s ) { $vfrom = $4; @@ -553,7 +553,7 @@ $ver = $self->cfg->version; } - elsif ( $file =~ /([\'\"]?)\bVERSION\1\s*(=>|,)\s*([\'\"]?)(\S+)\3/s ) { + elsif ( $file =~ /([\'\"]?)\bVERSION\1\s*(=>|,)\s*([\'\"]?)([^\s,]*)\3/s ) { # Regular MakeMaker $ver = $4; @@ -561,10 +561,10 @@ # Where is the version taken from? $vfrom = $4 if $file - =~ /([\'\"]?)VERSION_FROM\1\s*(=>|,)\s*([\'\"]?)(\S+)\3/s; + =~ /([\'\"]?)VERSION_FROM\1\s*(=>|,)\s*([\'\"]?)([^\s,]*)\3/s; } - elsif ( $file =~ /([\'\"]?)VERSION_FROM\1\s*(=>|,)\s*([\'\"]?)(\S+)\3/s ) + elsif ( $file =~ /([\'\"]?)VERSION_FROM\1\s*(=>|,)\s*([\'\"]?)([^\s,]*)\3/s ) { # Regular MakeMaker pointing to where the version is taken from @@ -1311,7 +1311,8 @@ return if $CPAN::Config_loaded; - CPAN::HandleConfig->load( be_silent => not $self->cfg->verbose ); + CPAN::HandleConfig->load( be_silent => not $self->cfg->verbose ) + if $self->cfg->network; unshift( @{ $CPAN::Config->{'urllist'} }, $self->cfg->cpan_mirror ) if $self->cfg->cpan_mirror; @@ -1356,8 +1357,8 @@ } else { warn "No APT contents can be loaded.\n"; - warn "Please install 'apt-file' package and run 'apt-file update'\n"; - warn "as root.\n"; + warn "Please install 'apt-file' package (at least version 2.5.0) and\n"; + warn "run 'apt-file update' as root.\n"; warn "Dependencies not updated.\n"; return (); diff -Nru dh-make-perl-0.74/lib/DhMakePerl.pm dh-make-perl-0.75/lib/DhMakePerl.pm --- dh-make-perl-0.74/lib/DhMakePerl.pm 2011-09-12 19:27:04.000000000 +0000 +++ dh-make-perl-0.75/lib/DhMakePerl.pm 2012-01-15 17:37:14.000000000 +0000 @@ -14,11 +14,11 @@ =head1 VERSION -Version 0.74 +Version 0.75 =cut -our $VERSION = '0.74'; +our $VERSION = '0.75'; =head1 SYNOPSIS diff -Nru dh-make-perl-0.74/Makefile dh-make-perl-0.75/Makefile --- dh-make-perl-0.74/Makefile 2011-09-12 19:27:04.000000000 +0000 +++ dh-make-perl-0.75/Makefile 2012-01-15 17:37:14.000000000 +0000 @@ -22,8 +22,9 @@ [ ! -e Build ] || ./Build $@ realclean distclean: clean - [ ! -e MANIFEST ] || rm MANIFEST - [ ! -e META.yml ] || rm META.yml + [ ! -e MANIFEST ] || rm MANIFEST + [ ! -e META.yml ] || rm META.yml + [ ! -e META.json ] || rm META.json .PHONY: all build install test orig dist manifest clean realclean distclean # vim: noet diff -Nru dh-make-perl-0.74/MANIFEST dh-make-perl-0.75/MANIFEST --- dh-make-perl-0.74/MANIFEST 2011-09-12 19:27:04.000000000 +0000 +++ dh-make-perl-0.75/MANIFEST 2012-01-15 17:37:14.000000000 +0000 @@ -2,6 +2,7 @@ Changes COPYING dh-make-perl +HOWTO.release lib/Debian/AptContents.pm lib/Debian/Control.pm lib/Debian/Control/FromCPAN.pm @@ -30,7 +31,6 @@ Makefile MANIFEST This list of files MANIFEST.SKIP -META.json privinc/My/Builder.pm README share/rules.dh7+quilt.xs+noxs @@ -44,7 +44,6 @@ t/contents/sources.list t/contents/test_debian_dists_sid_main_Contents t/contents/test_debian_dists_testing_main_Contents -t/contents/wnpp.cache t/Control.t t/core-modules.t t/corelist.t @@ -139,3 +138,4 @@ TODO xt/pod-spelling.t META.yml +META.json diff -Nru dh-make-perl-0.74/META.json dh-make-perl-0.75/META.json --- dh-make-perl-0.74/META.json 2011-09-12 19:27:04.000000000 +0000 +++ dh-make-perl-0.75/META.json 2012-01-15 17:37:14.000000000 +0000 @@ -4,7 +4,12 @@ "unknown" ], "dynamic_config" : 1, - "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.112150", + "generated_by" : "Module::Build version 0.38, CPAN::Meta::Converter version 2.113640", + "keywords" : [ + "debian", + "package", + "helper" + ], "license" : [ "open_source" ], @@ -60,6 +65,7 @@ "File::Find::Rule" : 0, "File::Spec" : 0, "File::Spec::Functions" : 0, + "File::Which" : 0, "FindBin" : 0, "Getopt::Long" : 0, "IO::File" : 0, @@ -140,7 +146,7 @@ }, "DhMakePerl" : { "file" : "lib/DhMakePerl.pm", - "version" : "0.74" + "version" : "0.75" }, "DhMakePerl::Command::Packaging" : { "file" : "lib/DhMakePerl/Command/Packaging.pm", @@ -187,7 +193,10 @@ "resources" : { "license" : [ "http://www.gnu.org/licenses/old-licenses/gpl-1.0.txt" - ] + ], + "repository" : { + "url" : "http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/dh-make-perl.git" + } }, - "version" : "0.74" + "version" : "0.75" } diff -Nru dh-make-perl-0.74/META.yml dh-make-perl-0.75/META.yml --- dh-make-perl-0.74/META.yml 2011-09-12 19:27:04.000000000 +0000 +++ dh-make-perl-0.75/META.yml 2012-01-15 17:37:14.000000000 +0000 @@ -13,7 +13,11 @@ configure_requires: Module::Build: 0.38 dynamic_config: 1 -generated_by: 'Module::Build version 0.38, CPAN::Meta::Converter version 2.112150' +generated_by: 'Module::Build version 0.38, CPAN::Meta::Converter version 2.113640' +keywords: + - debian + - package + - helper license: open_source meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html @@ -67,7 +71,7 @@ version: 0 DhMakePerl: file: lib/DhMakePerl.pm - version: 0.74 + version: 0.75 DhMakePerl::Command::Packaging: file: lib/DhMakePerl/Command/Packaging.pm version: 0 @@ -118,6 +122,7 @@ File::Find::Rule: 0 File::Spec: 0 File::Spec::Functions: 0 + File::Which: 0 FindBin: 0 Getopt::Long: 0 IO::File: 0 @@ -142,4 +147,5 @@ version: 0 resources: license: http://www.gnu.org/licenses/old-licenses/gpl-1.0.txt -version: 0.74 + repository: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/dh-make-perl.git +version: 0.75 diff -Nru dh-make-perl-0.74/privinc/My/Builder.pm dh-make-perl-0.75/privinc/My/Builder.pm --- dh-make-perl-0.74/privinc/My/Builder.pm 2011-09-12 19:27:04.000000000 +0000 +++ dh-make-perl-0.75/privinc/My/Builder.pm 2012-01-15 17:37:14.000000000 +0000 @@ -22,7 +22,7 @@ print "Linking ../$orig to ../$dist\n"; link "../$dist", "../$orig" or die "link( ../$dist, ../$orig ): $!"; $self->ACTION_distclean; - unlink 'MANIFEST', 'MANIFEST.bak', 'META.yml'; + unlink 'MANIFEST', 'MANIFEST.bak', 'META.yml', 'META.json'; } sub ACTION_dist { diff -Nru dh-make-perl-0.74/t/cache.t dh-make-perl-0.75/t/cache.t --- dh-make-perl-0.74/t/cache.t 2011-09-12 19:27:04.000000000 +0000 +++ dh-make-perl-0.75/t/cache.t 2012-01-15 17:37:14.000000000 +0000 @@ -29,6 +29,7 @@ "--apt-contents-dir", "$Bin/contents", "--data-dir", "$Bin/../share", $ENV{NO_NETWORK} ? '--no-network' : (), + "--vcs", "none", "--sources-list", "$Bin/contents/sources.list", "--email", "joemaint\@test.local", $dist ); Binary files /tmp/C_KR2jVF7B/dh-make-perl-0.74/t/contents/wnpp.cache and /tmp/zCjvTw7f_m/dh-make-perl-0.75/t/contents/wnpp.cache differ diff -Nru dh-make-perl-0.74/t/dists/Strange-2.1/Makefile.PL dh-make-perl-0.75/t/dists/Strange-2.1/Makefile.PL --- dh-make-perl-0.74/t/dists/Strange-2.1/Makefile.PL 2011-09-12 19:27:04.000000000 +0000 +++ dh-make-perl-0.75/t/dists/Strange-2.1/Makefile.PL 2012-01-15 17:37:14.000000000 +0000 @@ -3,7 +3,7 @@ # the contents of the Makefile that is written. WriteMakefile( 'NAME' => 'Strange', - 'VERSION_FROM' => 'Strange.pm', # finds $VERSION + 'VERSION' => 2.1, 'LIBS' => [''], # e.g., '-lm' 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING' 'INC' => '', # e.g., '-I/usr/include/other' diff -Nru dh-make-perl-0.74/t/dists/Strange-2.1/Strange.pm dh-make-perl-0.75/t/dists/Strange-2.1/Strange.pm --- dh-make-perl-0.74/t/dists/Strange-2.1/Strange.pm 2011-09-12 19:27:04.000000000 +0000 +++ dh-make-perl-0.75/t/dists/Strange-2.1/Strange.pm 2012-01-15 17:37:14.000000000 +0000 @@ -15,7 +15,7 @@ @EXPORT = qw( ); -$VERSION = '2.1'; +$VERSION = 2.1; sub AUTOLOAD { # This AUTOLOAD is used to 'autoload' constants from the constant() diff -Nru dh-make-perl-0.74/t/dists.t dh-make-perl-0.75/t/dists.t --- dh-make-perl-0.74/t/dists.t 2011-09-12 19:27:04.000000000 +0000 +++ dh-make-perl-0.75/t/dists.t 2012-01-15 17:37:14.000000000 +0000 @@ -46,12 +46,13 @@ # different copyright years are normal # (test written in 2002 and run in 2020 + # after refreshing there can also be several years if ($hint eq 'email') { return 0 if $a - =~ /^Copyright: \d+, Florian Geekwurt $/ + =~ /^Copyright: (\d+, )+Florian Geekwurt $/ and $b - =~ /^Copyright: \d+, Florian Geekwurt $/; + =~ /^Copyright: (\d+, )+Florian Geekwurt $/; return 0 if $a =~ /^ \d+, Joe Maintainer $/ @@ -92,6 +93,7 @@ "--apt-contents-dir", "$Bin/contents", "--data-dir", "$Bin/../share", $ENV{NO_NETWORK} ? '--no-network' : (), + "--vcs", "none", "--sources-list", "$Bin/contents/sources.list", "--email", "joemaint\@test.local", $dist ); @@ -105,6 +107,7 @@ "--apt-contents-dir", "$Bin/contents", "--data-dir", "$Bin/../share", $ENV{NO_NETWORK} ? '--no-network' : (), + "--vcs", "none", "--sources-list", "$Bin/contents/sources.list", "--email", "joemaint\@test.local", "refresh", @@ -121,6 +124,7 @@ "--apt-contents-dir", "$Bin/contents", "--data-dir", "$Bin/../share", $ENV{NO_NETWORK} ? '--no-network' : (), + "--vcs", "none", "--sources-list", "$Bin/contents/sources.list", "--email", "joemaint\@test.local", "refresh", '--source-format', '3.0 (quilt)', @@ -145,6 +149,7 @@ "--apt-contents-dir", "$Bin/contents", "--data-dir", "$Bin/../share", $ENV{NO_NETWORK} ? '--no-network' : (), + "--vcs", "none", "--sources-list", "$Bin/contents/sources.list", "refresh",