[dh-make-perl] 03/05: remove more occurrences of (apt-)contents-dir and sources-list

[gregor herrmann]

This is an automated email from the git hooks/post-receive script.

gregoa pushed a commit to branch gregoa/apt-file-3
in repository dh-make-perl.

commit 5eeb9762382097454193bc2a293cbc98b0ebd710
Author: gregor herrmann <gregoa at debian.org>
Date:   Wed Mar 23 23:40:52 2016 +0100

    remove more occurrences of (apt-)contents-dir and sources-list
    
    Gbp-Dch: Ignore
---
 dh-make-perl             | 14 --------------
 lib/DhMakePerl.pm        |  2 --
 lib/DhMakePerl/Config.pm |  3 +--
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/dh-make-perl b/dh-make-perl
index 2f05683..6c47109 100755
--- a/dh-make-perl
+++ b/dh-make-perl
@@ -151,11 +151,6 @@ Displays short usage information.
 
 =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>
@@ -372,15 +367,6 @@ requires the apt-file package installed and updated)
 When creating or refreshing packaging, use the specified source format.
 Defaults to C<3.0 (quilt)>.
 
-=item B<--sources-list> I<FILE>
-
-Instruct the C<Contents> file parser to use this B<file> when determining if a
-given file should be parsed or not. Contents files not matching any line in
-B<sources.list> are not parsed in order to save you time parsing old files from
-mirrors you no longer use.
-
-Default: apt's default.
-
 =item B<--vcs> I<VCS>
 
 In B<--pkg-perl> mode, use the specified version control system in the
diff --git a/lib/DhMakePerl.pm b/lib/DhMakePerl.pm
index 3547a82..bf388f8 100644
--- a/lib/DhMakePerl.pm
+++ b/lib/DhMakePerl.pm
@@ -100,9 +100,7 @@ sub get_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,
-            contents_dir => $self->cfg->apt_contents_dir,
         }
     );
 
diff --git a/lib/DhMakePerl/Config.pm b/lib/DhMakePerl/Config.pm
index 9f3752a..9639b6a 100644
--- a/lib/DhMakePerl/Config.pm
+++ b/lib/DhMakePerl/Config.pm
@@ -15,7 +15,6 @@ use base 'Class::Accessor';
 use Dpkg::Source::Package;
 
 my @OPTIONS = (
-    'apt-contents-dir=s',
     'arch=s',          'backups!',
     'basepkgs=s',
     'bdepends=s',      'bdependsi=s',
@@ -36,7 +35,7 @@ my @OPTIONS = (
     'only|o=s@',
     'packagename|p=s', 'pkg-perl!',
     'recursive!',
-    'requiredeps',     'sources-list=s',
+    'requiredeps',
     'source-format=s', 'vcs=s',
     'verbose!',        'version=s',
 );

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/dh-make-perl.git