r53674 - in /trunk/dh-make-perl: ./ debian/ lib/DhMakePerl/Command/ share/ t/dists/Strange-0.1/wanted-debian--refresh--source-format=3.0_quilt/ t/dists/Strange-0.1/wanted-debian--refresh/ t/dists/Strange-0.1/wanted-debian/ t/dists/Strange-2.1/wanted-debian--refresh--source-format=3.0_quilt/ t/dists/Strange-2.1/wanted-debian--refresh/ t/dists/Strange-2.1/wanted-debian/

dmn at users.alioth.debian.org dmn at users.alioth.debian.org
Sat Mar 6 12:42:42 UTC 2010


Author: dmn
Date: Sat Mar  6 12:42:27 2010
New Revision: 53674

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=53674
Log:
overrides mechanism deprecated

Removed:
    trunk/dh-make-perl/share/overrides
Modified:
    trunk/dh-make-perl/debian/NEWS
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/dh-make-perl
    trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm
    trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh--source-format=3.0_quilt/control
    trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/control
    trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian/control
    trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh--source-format=3.0_quilt/control
    trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/control
    trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian/control

Modified: trunk/dh-make-perl/debian/NEWS
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/NEWS?rev=53674&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/NEWS (original)
+++ trunk/dh-make-perl/debian/NEWS Sat Mar  6 12:42:27 2010
@@ -1,3 +1,11 @@
+dh-make-perl (0.65) unstable; urgency=low
+
+  The overrides mechanism is now deprecated. A warning is issued if 'overrides'
+  file is found in the home directory (~/.dh-make-perl) and its contents are
+  ignored.
+
+ -- Damyan Ivanov <dmn at debian.org>  Sat, 06 Mar 2010 13:48:56 +0200
+
 dh-make-perl (0.54) unstable; urgency=low
 
   --notest is now ignored. If you use --build and want to skip tests, put

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=53674&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Sat Mar  6 12:42:27 2010
@@ -10,6 +10,7 @@
   * fix build-system detection when Module::Build::Compat is in play
   * package_already_exists: fix a 'Can't modify non-lvalue subroutine call'
     warning. Thanks to Jozef Kutej for the report and the patch.
+  * overrides mechanism deprecated
 
  -- Damyan Ivanov <dmn at debian.org>  Fri, 19 Feb 2010 22:47:26 +0200
 

Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/dh-make-perl?rev=53674&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Sat Mar  6 12:42:27 2010
@@ -47,11 +47,6 @@
 is given as argument, B<dh-make-perl> tries to create a
 Perl package from the data in the current directory.
 
-There is an override mechanism in place to handle most of
-the little changes that may be needed for some modules
-(this hasn't been tested much, though, and the override
-database needs to be filled in).
-
 You can build and install the debian package using the L</--build>
 and L</--install> command line switches.
 
@@ -90,8 +85,6 @@
 --refresh also tries to update dependency lists in F<debian/control> from
 F<META.yml>. It hooks L<quilt(1)> into F<debian/rules> and creates
 F<debian/README.source>
-
-B<Note:> override mechanism is not used during refresh.
 
 =item B<--only> | B<-o> I<control|copyright|docs|examples|rules>
 
@@ -293,7 +286,7 @@
 
 =item B<--home-dir> I<DIRECTORY>
 
-Where user overrides and APT Contents cache is stored.
+Where APT Contents and other caches are stored.
 
 Default: ~/.dh-make-perl
 
@@ -359,14 +352,6 @@
 See the output of C<dh-make-perl --dump-config>, which can also be used for
 population of F<dh-make-perl.conf>.
 
-=item * overrides
-
-File that overrides information retreived (or guessed) about the package.
-All the files in the library directories are loaded: entries in the home
-take precedence. See the distributed overrides file for usage information.
-
-B<Note:> override mechanism is not used during B<--refresh> operation.
-
 =item * rules.MakeMaker.noxs
 
 A debian/rules makefile for modules that use ExtUtils::MakeMaker, but don't

Modified: trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm?rev=53674&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Command/make.pm Sat Mar  6 12:42:27 2010
@@ -9,7 +9,7 @@
 __PACKAGE__->mk_accessors(
     qw(
         cfg apt_contents main_dir debian_dir meta bdepends bdependsi depends
-        priority section maintainer arch start_dir overrides
+        priority section maintainer arch start_dir
         perlname version pkgversion pkgname srcname
         desc longdesc copyright author
         extrasfields  extrapfields
@@ -87,18 +87,32 @@
     }
 }
 
+sub check_deprecated_overrides {
+    my $self = shift;
+
+    my $overrides = catfile( $self->cfg->data_dir, 'overrides' );
+
+    if ( -e $overrides ) {
+        warn "*** deprecated overrides file ignored\n";
+        warn "***\n";
+        warn "*** Overrides mechanism is deprecated in dh-make-perl 0.65\n";
+        warn "*** You may want to remove $overrides\n";
+    }
+}
+
 sub execute {
     my ($self) = @_;
 
     die "CPANPLUS support disabled, sorry" if $self->cfg->cpanplus;
 
+    $self->check_deprecated_overrides;
+
     $self->arch( $self->cfg->arch ) if $self->cfg->arch;
 
     $self->maintainer( $self->get_maintainer( $self->cfg->email ) );
 
     $self->desc( $self->cfg->desc || '' );
 
-    $self->load_overrides();
     my $tarball = $self->setup_dir();
     $self->process_meta;
     $self->findbin_fix();
@@ -169,8 +183,6 @@
         Debian::Dependencies->new( $self->cfg->bdependsi ) )
         if $self->cfg->bdependsi;
     $self->bdependsi->add($extrabdependsi);
-
-    $self->apply_overrides();
 
     die "Cannot find a description for the package: use the --desc switch\n"
         unless $self->desc;
@@ -199,7 +211,6 @@
     #create_readme("$debiandir/README.Debian");
     $self->create_copyright( $self->debian_file('copyright') );
     $self->update_file_list( docs => $self->docs, examples => $self->examples );
-    $self->apply_final_overrides();
     $self->build_package
         if $self->cfg->build or $self->cfg->install;
     $self->install_package if $self->cfg->install;
@@ -737,163 +748,6 @@
     $fh->close;
 }
 
-# a package glocal is needed here so that the 'do $overrides' below sees it
-our %overrides;
-
-sub load_overrides {
-    my ($self) = @_;
-
-    eval {
-        my $overrides = catfile( $self->cfg->data_dir, 'overrides' );
-        do $overrides if -f $overrides;
-        $overrides = catfile( $self->cfg->home_dir, 'overrides');
-        do $overrides if -f $overrides;
-
-        $self->overrides( \%overrides );
-    };
-    if ($@) {
-        die "Error when processing the overrides files: $@";
-    }
-}
-
-sub apply_overrides {
-    my ($self) = @_;
-
-    my ( $data, $val, $subkey );
-
-    ( $data, $subkey ) = $self->get_override_data();
-    return unless defined $data;
-    $self->pkgname($val)
-        if (
-        defined(
-            $val = $self->get_override_val( $data, $subkey, 'pkgname' )
-        )
-        );
-    $self->srcname($val)
-        if (
-        defined(
-            $val = $self->get_override_val( $data, $subkey, 'srcname' )
-        )
-        );
-    $self->section($val)
-        if (
-        defined(
-            $val = $self->get_override_val( $data, $subkey, 'section' )
-        )
-        );
-    $self->priority($val)
-        if (
-        defined(
-            $val = $self->get_override_val( $data, $subkey, 'priority' )
-        )
-        );
-    $self->depends( Debian::Dependencies->new($val) )
-        if (
-        defined(
-            $val = $self->get_override_val( $data, $subkey, 'depends' )
-        )
-        );
-    $self->bdepends( Debian::Dependencies->new($val) )
-        if (
-        defined(
-            $val = $self->get_override_val( $data, $subkey, 'bdepends' )
-        )
-        );
-    $self->bdependsi( Debian::Dependencies->new($val) )
-        if (
-        defined(
-            $val = $self->get_override_val( $data, $subkey, 'bdependsi' )
-        )
-        );
-    $self->desc($val)
-        if (
-        defined( $val = $self->get_override_val( $data, $subkey, 'desc' ) ) );
-    $self->longdesc($val)
-        if (
-        defined(
-            $val = $self->get_override_val( $data, $subkey, 'longdesc' )
-        )
-        );
-    $self->pkgversion($val)
-        if (
-        defined(
-            $val = $self->get_override_val( $data, $subkey, 'version' )
-        )
-        );
-    $self->arch($val)
-        if (
-        defined( $val = $self->get_override_val( $data, $subkey, 'arch' ) ) );
-    $self->docs( [ split( /\s+/, $val ) ] )
-        if (
-        defined( $val = $self->get_override_val( $data, $subkey, 'docs' ) ) );
-
-    $self->extrasfields($val)
-        if (
-        defined(
-            $val = $self->get_override_val( $data, $subkey, 'sfields' )
-        )
-        );
-    $self->extrapfields($val)
-        if (
-        defined(
-            $val = $self->get_override_val( $data, $subkey, 'pfields' )
-        )
-        );
-    $self->maintainer($val)
-        if (
-        defined(
-            $val = $self->get_override_val( $data, $subkey, 'maintainer' )
-        )
-        );
-
-    # fix longdesc if needed
-    my $ld = $self->longdesc;
-    $ld =~ s/^\s*/ /mg;
-    $self->longdesc($ld);
-}
-
-sub apply_final_overrides {
-    my ($self) = @_;
-
-    my ( $data, $val, $subkey );
-
-    ( $data, $subkey ) = $self->get_override_data();
-    return unless defined $data;
-    $self->get_override_val( $data, $subkey, 'finish' );
-}
-
-sub get_override_data {
-    my ($self) = @_;
-
-    my ( $data, $checkver, $subkey );
-    $data = $self->overrides->{ $self->perlname };
-
-    return unless defined $data;
-    die sprintf( "Value of '%s' in overrides not a hashref\n",
-        $self->perlname )
-        unless ref($data) eq 'HASH';
-    if ( defined( $checkver = $data->{checkver} ) ) {
-        die "checkver not a function\n" unless ( ref($checkver) eq 'CODE' );
-        $subkey = &$checkver( $self->main_dir );
-    }
-    else {
-        $subkey = $self->pkgversion;
-    }
-    return ( $data, $subkey );
-}
-
-sub get_override_val {
-    my ( $self, $data, $subkey, $key ) = @_;
-
-    my $val;
-    $val
-        = defined( $data->{ $subkey . $key } )
-        ? $data->{ $subkey . $key }
-        : $data->{$key};
-    return &$val() if ( defined($val) && ref($val) eq 'CODE' );
-    return $val;
-}
-
 sub package_already_exists {
     my( $self, $apt_contents ) = @_;
 

Modified: trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh--source-format=3.0_quilt/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh--source-format%3D3.0_quilt/control?rev=53674&op=diff
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh--source-format=3.0_quilt/control (original)
+++ trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh--source-format=3.0_quilt/control Sat Mar  6 12:42:27 2010
@@ -1,7 +1,7 @@
 Source: libstrange-perl
-Section: misc
-Priority: Extra
-Build-Depends: debhelper (>= 7), perl6, xlib-dev
+Section: perl
+Priority: optional
+Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: perl
 Maintainer: Joe Maintainer <joemaint at test.local>
 Standards-Version: 3.8.4
@@ -9,10 +9,11 @@
 
 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.
+Depends: ${misc:Depends}, ${perl: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.

Modified: 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=53674&op=diff
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/control (original)
+++ trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian--refresh/control Sat Mar  6 12:42:27 2010
@@ -1,7 +1,7 @@
 Source: libstrange-perl
-Section: misc
-Priority: Extra
-Build-Depends: debhelper (>= 7), perl6, xlib-dev
+Section: perl
+Priority: optional
+Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: perl
 Maintainer: Joe Maintainer <joemaint at test.local>
 Standards-Version: 3.8.4
@@ -9,10 +9,11 @@
 
 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.
+Depends: ${misc:Depends}, ${perl: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.

Modified: trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian/control?rev=53674&op=diff
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian/control (original)
+++ trunk/dh-make-perl/t/dists/Strange-0.1/wanted-debian/control Sat Mar  6 12:42:27 2010
@@ -1,7 +1,7 @@
 Source: libstrange-perl
-Section: misc
-Priority: Extra
-Build-Depends: perl6, xlib-dev
+Section: perl
+Priority: optional
+Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: perl
 Maintainer: Joe Maintainer <joemaint at test.local>
 Standards-Version: 3.8.4
@@ -9,10 +9,11 @@
 
 Package: libstrange-perl
 Architecture: all
-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.
+Depends: ${perl:Depends}, ${misc: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.

Modified: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh--source-format=3.0_quilt/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh--source-format%3D3.0_quilt/control?rev=53674&op=diff
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh--source-format=3.0_quilt/control (original)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh--source-format=3.0_quilt/control Sat Mar  6 12:42:27 2010
@@ -1,17 +1,18 @@
 Source: libstrange-perl
-Section: misc
-Priority: Extra
-Build-Depends: debhelper (>= 7), perl, perl6, xlib-dev
+Section: perl
+Priority: optional
+Build-Depends: debhelper (>= 7), perl
 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.
+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.

Modified: 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=53674&op=diff
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/control (original)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian--refresh/control Sat Mar  6 12:42:27 2010
@@ -1,17 +1,18 @@
 Source: libstrange-perl
-Section: misc
-Priority: Extra
-Build-Depends: debhelper (>= 7), perl, perl6, xlib-dev
+Section: perl
+Priority: optional
+Build-Depends: debhelper (>= 7), perl
 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.
+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.

Modified: trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian/control?rev=53674&op=diff
==============================================================================
--- trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian/control (original)
+++ trunk/dh-make-perl/t/dists/Strange-2.1/wanted-debian/control Sat Mar  6 12:42:27 2010
@@ -1,17 +1,18 @@
 Source: libstrange-perl
-Section: misc
-Priority: Extra
-Build-Depends: perl6, xlib-dev, perl
+Section: perl
+Priority: optional
+Build-Depends: debhelper (>= 7), perl
 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: 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.
+Depends: ${perl:Depends}, ${shlibs:Depends}, ${misc: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.




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