r60508 - in /trunk/dh-make-perl: debian/changelog lib/DhMakePerl/Command/Packaging.pm

[carnil-guest at users.alioth.debian.org]

Author: carnil-guest
Date: Fri Jul 23 20:22:49 2010
New Revision: 60508

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=60508
Log:
Build-Depends only on perl when Build.PL and Module::Build is used,
instead of an alternate Build-Depends on perl (>= 5.10) |
libmodule-build-perl. This is as support for Etch is now discontinued and
Lenny already contains perl (>= 5.10) (Closes: #590114).

Modified:
    trunk/dh-make-perl/debian/changelog
    trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=60508&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Fri Jul 23 20:22:49 2010
@@ -28,12 +28,16 @@
   * Fix debian/copyright text templates in t/dist/Strange-0.1 and
     t/dist/Strange-2.1.
   * Add support for perl_dbi addon for dh.
+  * Build-Depends only on perl when Build.PL and Module::Build is used,
+    instead of an alternate Build-Depends on perl (>= 5.10) |
+    libmodule-build-perl. This is as support for Etch is now discontinued and
+    Lenny already contains perl (>= 5.10) (Closes: #590114).
 
   [ Chris Butler ]
   * Fixed DhMakePerl::Utils to cope with modules in Module::CoreList where the
     version is unspecified. (Closes: #585755)
 
- -- Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com>  Thu, 22 Jul 2010 15:23:42 +0200
+ -- Salvatore Bonaccorso <salvatore.bonaccorso at gmail.com>  Fri, 23 Jul 2010 22:11:45 +0200
 
 dh-make-perl (0.68-1) unstable; urgency=low
 

Modified: trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm?rev=60508&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl/Command/Packaging.pm Fri Jul 23 20:22:49 2010
@@ -1200,7 +1200,10 @@
 
 The proper build-dependency in this case is
 
-    perl (>= 5.10 ) | libmodule-build-perl
+    perl
+
+The unversioned dependency on perl is set as Lenny has already 5.10 which
+includes first Module::Build.
 
 =back
 
@@ -1269,16 +1272,20 @@
             'Compatibility Makefile.PL',
             $deps,
             'debhelper (>= 7.0.17)',
-            'perl (>= 5.10) | libmodule-build-perl'
+            'perl'
         ) if $self->makefile_pl_is_MBC;
     }
 
     # there are old packages that still build-depend on libmodule-build-perl
+    # or perl (>= 5.10) | libmodule-build-perl.
     # Since M::B is part of perl 5.10, the build-dependency needs correction
+    # and we replace this Build-Depends with simply perl, as lenny has the 
+    # required version.
     if ( $self->module_build eq 'Module-Build' ) {
+        $deps->remove('perl (>= 5.10) | libmodule-build-perl');
         $deps->remove('libmodule-build-perl');
         $self->explained_dependency( 'Module::Build', $deps,
-            'perl (>= 5.10) | libmodule-build-perl' );
+            'perl' );
     }
 
     # some mandatory dependencies