r52370 - in /trunk/dh-make-perl: dh-make-perl lib/DhMakePerl.pm lib/DhMakePerl/Config.pm t/dists.t

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Tue Feb 9 07:09:57 UTC 2010


Author: dmn
Date: Tue Feb  9 07:09:47 2010
New Revision: 52370

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=52370
Log:
add --apt-contents-dir option

Useful mainly for tests

Modified:
    trunk/dh-make-perl/dh-make-perl
    trunk/dh-make-perl/lib/DhMakePerl.pm
    trunk/dh-make-perl/lib/DhMakePerl/Config.pm
    trunk/dh-make-perl/t/dists.t

Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/dh-make-perl?rev=52370&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Tue Feb  9 07:09:47 2010
@@ -131,6 +131,11 @@
 
 =over
 
+=item B<--apt-contents-dir> I<dir>
+
+Location of L<apt-file> Contents directory. Default is
+F</var/cache/apt/apt-file>
+
 =item B<--arch> I<any> | I<all>
 
 This switches between arch-dependent and arch-independet packages. If B<--arch>

Modified: trunk/dh-make-perl/lib/DhMakePerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl.pm?rev=52370&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Tue Feb  9 07:09:47 2010
@@ -407,10 +407,11 @@
         if $self->apt_contents;
 
     my $apt_c = Debian::AptContents->new(
-        {   homedir => $self->cfg->home_dir,
-            dist    => $self->cfg->dist,
-            sources => $self->cfg->sources_list,
-            verbose => $self->cfg->verbose,
+        {   homedir      => $self->cfg->home_dir,
+            dist         => $self->cfg->dist,
+            sources      => $self->cfg->sources_list,
+            verbose      => $self->cfg->verbose,
+            contents_dir => $self->cfg->apt_contents_dir,
         }
     );
 

Modified: trunk/dh-make-perl/lib/DhMakePerl/Config.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Config.pm?rev=52370&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Config.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Config.pm Tue Feb  9 07:09:47 2010
@@ -13,6 +13,7 @@
 use Dpkg::Source::Package;
 
 use constant options => (
+    'apt-contents-dir=s',
     'arch=s',          'backups!',
     'basepkgs=s',
     'bdepends=s',      'bdependsi=s',

Modified: trunk/dh-make-perl/t/dists.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists.t?rev=52370&op=diff
==============================================================================
--- trunk/dh-make-perl/t/dists.t (original)
+++ trunk/dh-make-perl/t/dists.t Tue Feb  9 07:09:47 2010
@@ -56,7 +56,9 @@
     my $dist = "$Bin/dists/$dist_dir";
 
     system( "$Bin/../dh-make-perl", "--no-verbose",
-            "--home-dir", "$Bin/contents", "--data-dir", "$Bin/../share",
+            "--home-dir", "$Bin/contents",
+            "--apt-contents-dir", "$Bin/contents",
+            "--data-dir", "$Bin/../share",
             "--sources-list",
             "$Bin/contents/sources.list", "--email", "joemaint\@test.local",
             $dist );
@@ -83,6 +85,8 @@
                     ->in("$dist/debian");
 
     rmdir "$dist/debian" or die "rmdir($dist/debian): $!";
+
+    unlink "$Bin/contents/Contents.cache" or die "unlink($Bin/contents.cache): $!";
 }
 
 $ENV{DEBFULLNAME} = "Joe Maintainer";




More information about the Pkg-perl-cvs-commits mailing list