r27328 - in /trunk/dh-make-perl: debian/control dh-make-perl

[dmn at users.alioth.debian.org]

Author: dmn
Date: Thu Nov 27 08:34:11 2008
New Revision: 27328

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=27328
Log:
AptContents: with without 'apt-file' binary; drop File::Which

apt-file is not realy required. we only need the Contents files which
may be given as parameters.

the object still refuses to be created if no contents file contained useful
information

Modified:
    trunk/dh-make-perl/debian/control
    trunk/dh-make-perl/dh-make-perl

Modified: trunk/dh-make-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/control?rev=27328&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/control (original)
+++ trunk/dh-make-perl/debian/control Thu Nov 27 08:34:11 2008
@@ -6,7 +6,6 @@
  libapt-pkg-perl,
  libclass-accessor-perl,
  libemail-date-format-perl,
- libfile-which-perl,
  libmodule-corelist-perl,
  libmodule-depends-perl,
  libwww-mechanize-perl,
@@ -28,7 +27,6 @@
  libapt-pkg-perl,
  libclass-accessor-perl,
  libemail-date-format-perl,
- libfile-which-perl,
  libmodule-corelist-perl,
  libmodule-depends-perl,
  libwww-mechanize-perl,

Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/dh-make-perl?rev=27328&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Thu Nov 27 08:34:11 2008
@@ -96,7 +96,6 @@
 __PACKAGE__->mk_accessors(qw(cache homedir cache_file contents_dir contents_files ));
 
 use Storable;
-use File::Which qw(which);
 use File::Spec::Functions qw( catfile catpath splitpath );
 
 sub new
@@ -117,13 +116,8 @@
     $self->cache_file( catfile( $self->homedir, 'Contents.cache' ) )
         unless $self->cache_file;
 
-    if ( which('apt-file') ) {
-        $self->read_cache();
-        $self->cache or return undef;
-    }
-    else {
-        return undef;
-    }
+    $self->read_cache();
+    $self->cache or return undef;
 
     return $self;
 }