r52371 - in /trunk/dh-make-perl: ./ debian/ t/ t/dists/Strange-0.1/wanted-debian--refresh/ t/dists/Strange-2.1/wanted-debian--refresh/
dmn at users.alioth.debian.org
dmn at users.alioth.debian.org
Tue Feb 9 07:10:42 UTC 2010
Author: dmn
Date: Tue Feb 9 07:10:25 2010
New Revision: 52371
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=52371
Log:
dists.t: test --refresh
we use special wanted-debian--refresh directories, as wanted-debian has
overrides applied and --refresh ignores these
TODO--
Added:
trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/
trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/changelog
trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/compat
trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/control
trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/copyright
trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/rules (with props)
trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/watch
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/changelog
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/compat
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/control
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/copyright
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/libstrange-perl.docs
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/rules (with props)
trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/watch
Modified:
trunk/dh-make-perl/TODO
trunk/dh-make-perl/debian/changelog
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=52371&op=diff
==============================================================================
--- trunk/dh-make-perl/TODO (original)
+++ trunk/dh-make-perl/TODO Tue Feb 9 07:10:25 2010
@@ -1,7 +1,5 @@
* investigate using App::Cmd
* ensure (with a test) that dependency lists are indented with one space
-* ensure (with a test) that doing a refresh over the debian/ directory produced
- by --make doesn't change anything
* --refresh on MIME-Charset 1.007 can't detect the dist name and cries.
May be similar to #525847
* when ITP for the package is found, try to deduce short/long description from
Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=52371&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Tue Feb 9 07:10:25 2010
@@ -7,6 +7,7 @@
* when finding dist version, convert "v1.002003" as "1.2.3"
* --directory now accepts an optional directory argument
* document that override mechanism is not used with --refresh
+ * add tests for --refresh
-- Damyan Ivanov <dmn at debian.org> Fri, 05 Feb 2010 09:05:25 +0200
Modified: trunk/dh-make-perl/t/dists.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists.t?rev=52371&op=diff
==============================================================================
--- trunk/dh-make-perl/t/dists.t (original)
+++ trunk/dh-make-perl/t/dists.t Tue Feb 9 07:10:25 2010
@@ -3,18 +3,19 @@
use strict;
use warnings;
-use Test::More tests => 15;
+use Test::More tests => 30;
use FindBin qw($Bin);
use File::Spec::Functions qw(splitpath);
sub compare {
- my ( $dist, $path ) = @_;
+ my ( $dist, $path, $refresh ) = @_;
my ( $vol, $dir, $name ) = splitpath($path);
return unless -f $path;
my $real = $path;
+ $path =~ s{/wanted-debian/}{/wanted-debian--refresh/} if $refresh;
$real =~ s{/wanted-debian/}{/debian/};
my $diff = diff($path, $real);
@@ -48,7 +49,8 @@
$diff = '' if $only_date_differs;
}
- is($diff, '', "$dist/debian/$name is OK");
+ is( $diff, '',
+ "$dist/debian/$name is OK" . ( $refresh ? " after --refresh" : '' ) );
}
sub dist_ok($) {
@@ -78,6 +80,19 @@
->in("$dist/wanted-debian");
compare( $dist_dir, $_) for @files;
+ system( "$Bin/../dh-make-perl", "--verbose",
+ "--home-dir", "$Bin/contents",
+ "--apt-contents-dir", "$Bin/contents",
+ "--data-dir", "$Bin/../share",
+ "--sources-list",
+ "$Bin/contents/sources.list", "--email", "joemaint\@test.local",
+ "--refresh",
+ $dist );
+
+ is( $?, 0, "$dist_dir --refresh: system returned 0" );
+
+ compare( $dist_dir, $_, 1) for @files;
+
# clean after the test
File::Find::Rule->file
->exec( sub{ unlink $_[2]
Added: trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/changelog?rev=52371&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/changelog (added)
+++ trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/changelog Tue Feb 9 07:10:25 2010
@@ -1,0 +1,5 @@
+libstrange-perl (0.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-0.1/wanted-debian--refresh/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/compat?rev=52371&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/compat (added)
+++ trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/compat Tue Feb 9 07:10:25 2010
@@ -1,0 +1,1 @@
+7
Added: trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/control?rev=52371&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/control (added)
+++ trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/control Tue Feb 9 07:10:25 2010
@@ -1,0 +1,17 @@
+Source: libstrange-perl
+Section: misc
+Priority: Extra
+Build-Depends: debhelper (>= 7), perl6, xlib-dev
+Maintainer: Joe Maintainer <joemaint at test.local>
+Standards-Version: 3.8.4
+Homepage: http://search.cpan.org/dist/Strange/
+
+Package: libstrange-perl
+Architecture: all
+Depends: ${misc:Depends}, ${perl:Depends}, perl6
+Conflicts: ba-ba-buma
+Description: really ugly module to test dh-make-perl
+ A really ugly long description
+ for a really ugly perl module.
+ .
+ This description was automagically extracted from the module by dh-make-perl.
Added: trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/copyright?rev=52371&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/copyright (added)
+++ trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/copyright Tue Feb 9 07:10:25 2010
@@ -1,0 +1,36 @@
+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: 2007, Joe Maintainer <joemaint at test.local>
+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 GNU/Linux 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 GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
Added: trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/rules?rev=52371&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/rules (added)
+++ trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/rules Tue Feb 9 07:10:25 2010
@@ -1,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+ dh $@
Propchange: trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/rules
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/watch?rev=52371&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/watch (added)
+++ trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/watch Tue Feb 9 07:10:25 2010
@@ -1,0 +1,2 @@
+version=3
+http://search.cpan.org/dist/Strange/ .*/Strange-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$
Added: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/changelog?rev=52371&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/changelog (added)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/changelog Tue Feb 9 07:10:25 2010
@@ -1,0 +1,5 @@
+libstrange-perl (2.1-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Joe Maintainer <joemaint at test.local> Sun, 30 Nov 2008 12:20:18 +0200
Added: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/compat?rev=52371&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/compat (added)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/compat Tue Feb 9 07:10:25 2010
@@ -1,0 +1,1 @@
+7
Added: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/control?rev=52371&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/control (added)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/control Tue Feb 9 07:10:25 2010
@@ -1,0 +1,17 @@
+Source: libstrange-perl
+Section: misc
+Priority: Extra
+Build-Depends: debhelper (>= 7), perl6, xlib-dev
+Maintainer: Joe Maintainer <joemaint at test.local>
+Standards-Version: 3.8.4
+Homepage: http://search.cpan.org/dist/Strange/
+
+Package: libstrange-perl
+Architecture: any
+Depends: ${misc:Depends}, ${perl:Depends}, perl6
+Conflicts: ba-ba-buma
+Description: really ugly module to test dh-make-perl
+ A really ugly long description
+ for a really ugly perl module.
+ .
+ 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/copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/copyright?rev=52371&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/copyright (added)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/copyright Tue Feb 9 07:10:25 2010
@@ -1,0 +1,36 @@
+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: 2007, Joe Maintainer <joemaint at test.local>
+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 GNU/Linux 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 GNU/Linux systems, the complete text of the GNU General
+ Public License can be found in `/usr/share/common-licenses/GPL'
Added: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/libstrange-perl.docs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/libstrange-perl.docs?rev=52371&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/libstrange-perl.docs (added)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/libstrange-perl.docs Tue Feb 9 07:10:25 2010
@@ -1,0 +1,1 @@
+README
Added: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/rules?rev=52371&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/rules (added)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/rules Tue Feb 9 07:10:25 2010
@@ -1,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+ dh $@
Propchange: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/rules
------------------------------------------------------------------------------
svn:executable = *
Added: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/watch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/watch?rev=52371&op=file
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/watch (added)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/watch Tue Feb 9 07:10:25 2010
@@ -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