r43901 - in /trunk/dh-make-perl: debian/changelog dh-make-perl lib/DhMakePerl.pm

[dmn at users.alioth.debian.org]

Author: dmn
Date: Fri Sep 11 04:59:04 2009
New Revision: 43901

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=43901
Log:
drop support for debhelper compatibility levels before 7

If somebody wants to use dh-make-perl on oldstable, they probably want
to use the version from oldstable.

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

Modified: trunk/dh-make-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/debian/changelog?rev=43901&op=diff
==============================================================================
--- trunk/dh-make-perl/debian/changelog (original)
+++ trunk/dh-make-perl/debian/changelog Fri Sep 11 04:59:04 2009
@@ -14,6 +14,9 @@
   * Re-add "NO_NETWORK=1" to tests in debian/rules, got lost somewhere.
   * Call dh with "--buildsystem=perl_build", otherwise dh_auto_install gets
     confused by the existing Makefile.PL without a Makefile.
+
+  [ Damyan Ivanov ]
+  * Drop support for debhelper compatibility levels other than 7
 
  -- Ryan Niebur <ryanryan52 at gmail.com>  Wed, 02 Sep 2009 23:04:47 -0700
 

Modified: trunk/dh-make-perl/dh-make-perl
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/dh-make-perl?rev=43901&op=diff
==============================================================================
--- trunk/dh-make-perl/dh-make-perl (original)
+++ trunk/dh-make-perl/dh-make-perl Fri Sep 11 04:59:04 2009
@@ -227,8 +227,10 @@
 
 Set desired debhelper version. If C<ver> is 7, generated debian/rules is
 minimalistic, using the auto-mode of debhelper. Also, any additional
-documentation and examples are listed in additional files under debian/, instead
-of being listed in debian/rules
+documentation and examples are listed in additional files under debian/,
+instead of being listed in debian/rules.
+
+Since version 0.60, B<7> is the only supported debhelper compatibility level.
 
 =item B<--dist> I<DISTRIBUTION>
 

Modified: trunk/dh-make-perl/lib/DhMakePerl.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/dh-make-perl/lib/DhMakePerl.pm?rev=43901&op=diff
==============================================================================
--- trunk/dh-make-perl/lib/DhMakePerl.pm (original)
+++ trunk/dh-make-perl/lib/DhMakePerl.pm Fri Sep 11 04:59:04 2009
@@ -1432,23 +1432,8 @@
         if $self->cfg->notest;
 
     if ( $self->cfg->dh < 7 ) {
-        $test_line
-            = ( $module_build eq 'Module-Build' )
-            ? '$(PERL) Build test'
-            : '$(MAKE) test';
-        $test_line = "ifeq (,\$(filter nocheck,\$(DEB_BUILD_OPTIONS)))\n"
-                   . "\t$test_line\n"
-                   . "endif";
-
-        for (@content) {
-            s/#CHANGES#/$changelog_file/g;
-            s/#EXAMPLES#/join " ", @examples/eg;
-            s/\s+dh_installexamples\s+$//g
-                ;    # no need for empty dh_installexamples
-            s/#DOCS#/join " ", @docs/eg;
-            s/#TEST#/$test_line/g;
-            $fh->print($_);
-        }
+        warn "debhelper compatibility levels before 7 are not supported.\n";
+        exit(1);
     }
     else {
         $fh->print($_) for @content;
@@ -1541,12 +1526,7 @@
     my ( $self, $file ) = @_;
 
     my ( $rulesname, $error );
-    $rulesname = (
-          ( $self->cfg->dh eq 7 )
-        ? 'rules.dh7.tiny'
-        : $arch eq 'all' ? "rules.$module_build.noxs"
-        : "rules.$module_build.xs"
-    );
+    $rulesname = 'rules.dh7.tiny';
 
     for my $source (
         catfile( $self->cfg->home_dir, $rulesname ),