r68139 - in /trunk/dh-make-perl: ./ debian/ lib/DhMakePerl/Command/ t/ t/dists/Strange-2.1/wanted-debian--refresh-email/ t/dists/Strange-2.1/wanted-debian--refresh-email/source/
periapt-guest at users.alioth.debian.org
periapt-guest at users.alioth.debian.org
Mon Feb 7 22:59:58 UTC 2011
Author: periapt-guest
Date: Mon Feb 7 22:59:50 2011
New Revision: 68139
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=68139
Log:
* Various fixes for t/dists.t:
- Added fix for .svn at the end of a filename rather than the middle
- Second /dev/null check was attempting to diff an undefined value
- Setting PERL5LIB (unsatisfactory work around for system(dh-make-perl) )
Added:
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/changelog
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/compat
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/control
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/copyright
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/libstrange-perl.docs
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/rules (with props)
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/source/
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/source/format
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/watch
Modified:
trunk/dh-make-perl/TODO
trunk/dh-make-perl/debian/changelog
trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm
trunk/dh-make-perl/t/dists.t
Modified: trunk/dh-make-perl/TODO
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/TODO?rev=68139&op=diff
==============================================================================
--- trunk/dh-make-perl/TODO (original)
+++ trunk/dh-make-perl/TODO Mon Feb 7 22:59:50 2011
@@ -26,3 +26,14 @@
* Add a test case for finding (build) dependencies with META.yml.
* different rules files: do we still need share/rules.*?
and: is the POD still correct about rules.MakeMaker and rules.Module-Build?
+* The build is not 100% lintian clean to the same standard that would be
+ expected from packages. This essentially seems to be confusion over whether
+ it is a native package or not. Could we come down on the side of native
+ even if the reverse upstream is maintained. ~periapt
+* I noticed a problem with the dists.t test script. It essentially does
+ a system("dh-make-perl"). This causes two problems. Firstly it is a pain to
+ debug if something goes wrong. More seriously there is a tendency to pick
+ up the wrong DhMakePerl library invalidating the tests. Really the DhMakePerl
+ API should be used directly. ~periapt
+* Really minor issue. The AptContents.t test can be thrown off if the contents
+ directory has stuff lying around from a failed run. ~periapt
Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=68139&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Mon Feb 7 22:59:50 2011
@@ -1,7 +1,4 @@
dh-make-perl (0.72-1) UNRELEASED; urgency=low
-
- TODO: problem with extra new line,
- - Really need a test for new functionality
[ gregor herrmann ]
* Fix "Tries to mkdir directory in home of building user": set HOME to a
@@ -11,7 +8,10 @@
* Added logic to parse special email change directives in the changelog
so that the refresh command respects email changes (Closes: #609409)
* Added myself to Uploaders
- * Added fix for .svn at the end of a filename rather than the middle
+ * Various fixes for t/dists.t:
+ - Added fix for .svn at the end of a filename rather than the middle
+ - Second /dev/null check was attempting to diff an undefined value
+ - Setting PERL5LIB (unsatisfactory work around for system(dh-make-perl) )
[ Salvatore Bonaccorso ]
* Email change: Salvatore Bonaccorso -> carnil at debian.org
Modified: trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm?rev=68139&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm Mon Feb 7 22:59:50 2011
@@ -1037,7 +1037,13 @@
my $year = $date_pieces[3];
if (my %changes = ($_->Changes =~ m/$EMAIL_CHANGES_RE/xmsg)) {
# This way round since we are going backward in time thru changelog
- %email_changes = (%changes, %email_changes);
+ foreach my $p (keys %changes) {
+ $changes{$p} =~ s{[\s\n]+$}{}xms;
+ }
+ %email_changes = (
+ %changes,
+ %email_changes
+ );
}
if (my ($name) = ($person =~ $PERSON_PARSE_RE)) {
if (exists $email_changes{$name}) {
Modified: trunk/dh-make-perl/t/dists.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists.t?rev=68139&op=diff
==============================================================================
--- trunk/dh-make-perl/t/dists.t (original)
+++ trunk/dh-make-perl/t/dists.t Mon Feb 7 22:59:50 2011
@@ -3,7 +3,7 @@
use strict;
use warnings;
-use Test::More tests => 12;
+use Test::More tests => 16;
use FindBin qw($Bin);
use File::Compare ();
@@ -33,7 +33,7 @@
return;
}
unless ( defined($a) ) {
- push @errors, diff( $a, '/dev/null' );
+ push @errors, diff( $b, '/dev/null' );
return;
}
push @errors, diff( $a, $b );
@@ -46,12 +46,25 @@
# different copyright years are normal
# (test written in 2002 and run in 2020
- return 0
- if $a
- =~ /^Copyright: \d+, Joe Maintainer <joemaint\@test\.local>$/
- and $b
- =~ /^Copyright: \d+, Joe Maintainer <joemaint\@test\.local>$/;
-
+ if ($hint eq 'email') {
+ return 0
+ if $a
+ =~ /^Copyright: \d+, Florian Geekwurt <florian\@\.geekwort\.org>$/
+ and $b
+ =~ /^Copyright: \d+, Florian Geekwurt <florian\@\.geekwort\.org>$/;
+ return 0
+ if $a
+ =~ /^ \d+, Joe Maintainer <joe\@debian\.org>$/
+ and $b
+ =~ /^ \d+, Joe Maintainer <joe\@debian\.org>$/;
+ }
+ else {
+ return 0
+ if $a
+ =~ /^Copyright: \d+, Joe Maintainer <joemaint\@test\.local>$/
+ and $b
+ =~ /^Copyright: \d+, Joe Maintainer <joemaint\@test\.local>$/;
+ }
# likewise, it is normal that the timestamp in the changelog differs
return 0
if $a
@@ -85,7 +98,7 @@
is( $?, 0, "$dist_dir: system returned 0" );
- compare_tree( "$dist/debian", "$dist/wanted-debian" );
+ compare_tree( "$dist/debian", "$dist/wanted-debian", 'initital' );
system( "$Bin/../dh-make-perl", "--no-verbose",
"--home-dir", "$Bin/contents",
@@ -123,6 +136,26 @@
'refresh --source-format 3.0 (quilt)'
);
+ modify_changelog($dist);
+
+ local $ENV{DEBFULLNAME} = 'Florian Geekwurt';
+ local $ENV{DEBEMAIL} = 'florian at geekwurt.org';
+ system( "$Bin/../dh-make-perl", "--no-verbose",
+ "--home-dir", "$Bin/contents",
+ "--apt-contents-dir", "$Bin/contents",
+ "--data-dir", "$Bin/../share",
+ $ENV{NO_NETWORK} ? '--no-network' : (),
+ "--sources-list",
+ "$Bin/contents/sources.list",
+ "refresh",
+ $dist );
+
+ is( $?, 0, "$dist_dir refresh: system returned 0" );
+
+ compare_tree( "$dist/debian", "$dist/wanted-debian--refresh-email", 'email' );
+
+ unlink File::Find::Rule->file->name('*.bak')->in("$dist/debian");
+
# clean after the test
File::Path::rmtree("$dist/debian");
@@ -131,6 +164,24 @@
or die "unlink($Bin/contents/wnpp.cache): $!" );
}
+sub modify_changelog {
+ my $dist = shift;
+ my $changelog_name = "$dist/debian/changelog";
+ open my $chfh, '<', $changelog_name or die "cannot open $changelog_name";
+ my @changelog = <$chfh>;
+ unshift @changelog, "\n";
+ unshift @changelog, " -- Florian Geekwurt <florian\@geekwurt.org> Sun, 6 Mar 2011 14:02:37 +0000\n";
+ unshift @changelog, "\n";
+ unshift @changelog, " * Email change: Joe Maintainer -> joe\@debian.org\n";
+ unshift @changelog, "\n";
+ unshift @changelog, "libstrange-perl (3.1-1) UNRELEASED; urgency=low\n";
+ close $chfh;
+ open $chfh, '>', $changelog_name or die "cannot open $changelog_name";
+ print {$chfh} @changelog;
+ close $chfh;
+}
+
+$ENV{PERL5LIB} = "lib";
$ENV{DEBFULLNAME} = "Joe Maintainer";
for( qw( Strange-0.1 Strange-2.1 ) ) {
Added: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/changelog?rev=68139&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/changelog (added)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/changelog Mon Feb 7 22:59:50 2011
@@ -1,0 +1,11 @@
+libstrange-perl (3.1-1) UNRELEASED; urgency=low
+
+ * Email change: Joe Maintainer -> joe at debian.org
+
+ -- Florian Geekwurt <florian at geekwurt.org> Sun, 6 Mar 2011 14:02:37 +0000
+
+libstrange-perl (2.1-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Joe Maintainer <joemaint at test.local> Sat, 29 Nov 2008 23:17:07 +0200
Added: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/compat?rev=68139&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/compat (added)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/compat Mon Feb 7 22:59:50 2011
@@ -1,0 +1,1 @@
+7
Added: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/control?rev=68139&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/control (added)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/control Mon Feb 7 22:59:50 2011
@@ -1,0 +1,19 @@
+Source: libstrange-perl
+Section: perl
+Priority: optional
+Build-Depends: debhelper (>= 7),
+ perl
+Maintainer: Florian Geekwurt <florian at geekwurt.org>
+Standards-Version: 3.9.1
+Homepage: http://search.cpan.org/dist/Strange/
+
+Package: libstrange-perl
+Architecture: any
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
+Description: Perl extension for blah blah blah
+ Stub documentation for Strange was created by h2xs. It looks like the author
+ of the extension was negligent enough to leave the stub unedited.
+ .
+ Blah blah blah.
+ .
+ This description was automagically extracted from the module by dh-make-perl.
Added: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/copyright?rev=68139&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/copyright (added)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/copyright Mon Feb 7 22:59:50 2011
@@ -1,0 +1,37 @@
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Maintainer: A. U. Thor, a.u.thor at a.galaxy.far.far.away
+Source: http://search.cpan.org/dist/Strange/
+Name: Strange
+DISCLAIMER: This copyright info was automatically extracted
+ from the perl module. It may not be accurate, so you better
+ check the module sources in order to ensure the module for its
+ inclusion in Debian or for general legal information. Please,
+ if licensing information is incorrectly generated, file a bug
+ on dh-make-perl.
+ NOTE: Don't forget to remove this disclaimer once you are happy
+ with this file.
+
+Files: *
+Copyright: A. U. Thor, a.u.thor at a.galaxy.far.far.away
+License:
+
+Files: debian/*
+Copyright: 2011, Florian Geekwurt <florian at geekwurt.org>
+ 2008, Joe Maintainer <joe at debian.org>
+License: Artistic or GPL-1+
+
+License: Artistic
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the Artistic License, which comes with Perl.
+ .
+ On Debian systems, the complete text of the Artistic License can be
+ found in `/usr/share/common-licenses/Artistic'.
+
+License: GPL-1+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+ .
+ On Debian systems, the complete text of version 1 of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL-1'.
Added: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/libstrange-perl.docs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/libstrange-perl.docs?rev=68139&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/libstrange-perl.docs (added)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/libstrange-perl.docs Mon Feb 7 22:59:50 2011
@@ -1,0 +1,1 @@
+README
Added: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/rules?rev=68139&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/rules (added)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/rules Mon Feb 7 22:59:50 2011
@@ -1,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+ dh $@
Propchange: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/rules
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/source/format
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/source/format?rev=68139&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/source/format (added)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/source/format Mon Feb 7 22:59:50 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)
Added: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/watch?rev=68139&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/watch (added)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh-email/watch Mon Feb 7 22:59:50 2011
@@ -1,0 +1,2 @@
+version=3
+http://search.cpan.org/dist/Strange/ .*/Strange-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$
More information about the Pkg-perl-cvs-commits
mailing list