[SCM] Debian packaging of dh-make-perl branch, master, updated. debian/0.76-1-51-g9772ba7

Damyan Ivanov dmn at debian.org
Wed May 22 05:45:26 UTC 2013


The following commit has been merged in the master branch:
commit 9772ba7a1b65005093c11f4488cf6fe6234c1004
Author: Damyan Ivanov <dmn at debian.org>
Date:   Wed May 22 08:45:17 2013 +0300

    drop documentation and support of rules files for dh7

diff --git a/TODO b/TODO
index 9a6242b..63abc3f 100644
--- a/TODO
+++ b/TODO
@@ -26,9 +26,6 @@
       The same question holds with core packages, but perhaps they behave beter
       wrt (not) changing versioning scheme.
 * Add a test case for finding (build) dependencies with META.yml.
-* different rules files: do we still need share/rules.*?
-  and: is the POD still correct about rules.MakeMaker and rules.Module-Build?
-  we depend on debhelper >= 7
 * Really minor issue. The AptContents.t test can be thrown off if the contents
   directory has stuff lying around from a failed run. ~periapt
 * Add a switch for "app" (foo-bar) vs. "lib" (libfoo-bar-perl) packages?
diff --git a/dh-make-perl b/dh-make-perl
index e986204..bbc5717 100755
--- a/dh-make-perl
+++ b/dh-make-perl
@@ -271,12 +271,14 @@ Uses the argument to --desc as short description for the package.
 
 =item B<--dh> I<VERSION>
 
-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.
+Set desired debhelper compatibility level. The default is 8 for
+architecture-independent packages, and 9 for architecture-dependent packages
+(XS).
 
-Since version 0.60, B<dh-make-perl> only supports debhelper compatibility levels B<>=7>.
+Since version 0.77, B<dh-make-perl> only supports debhelper compatibility
+levels B<< >=8 >>.
+
+See L<debhelper(1)>.
 
 =item B<--dist> I<DISTRIBUTION>
 
@@ -431,25 +433,6 @@ as documented in L</OPTIONS> (without leading I<-->).
 See the output of C<dh-make-perl --dump-config>, which can also be used for
 population of F<dh-make-perl.conf>.
 
-=item * rules.MakeMaker.noxs
-
-A debian/rules makefile for modules that use ExtUtils::MakeMaker, but don't
-have C/XS code.
-
-=item * rules.MakeMaker.xs
-
-A debian/rules makefile for modules that use ExtUtils::MakerMaker and
-C/XS code.
-
-=item * rules.Module-Build.noxs
-
-A debian/rules makefile for modules that use Module::Build, but don't have
-C/XS code.
-
-=item * rules.Module-Build.xs
-
-A debian/rules makefile for modules that use Module::Build and C/XS code.
-
 =back
 
 =head1 ENVIRONMENT
diff --git a/share/rules.dh7+quilt.xs+noxs b/share/rules.dh7+quilt.xs+noxs
deleted file mode 100755
index 4c37674..0000000
--- a/share/rules.dh7+quilt.xs+noxs
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/make -f
-
-USES_QUILT := $(shell if [ -f $(CURDIR)/debian/patches/series ]; then echo yes; else echo no; fi)
-ifeq ($(USES_QUILT),yes)
-	include /usr/share/quilt/quilt.make
-
-	PATCH_TARGET := $(QUILT_STAMPFN)
-	UNPATCH_TARGET := unpatch
-endif
-
-build: build-stamp
-build-stamp: $(PATCH_TARGET)
-	dh build
-	touch $@
-
-clean: $(UNPATCH_TARGET)
-	dh $@
-
-install: install-stamp
-install-stamp: build-stamp
-	dh install
-	touch $@
-
-binary-arch: install
-	dh $@
-
-binary-indep: install
-	dh $@
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep install clean build
diff --git a/share/rules.dh7.noxs b/share/rules.dh7.noxs
deleted file mode 100755
index 0d045f4..0000000
--- a/share/rules.dh7.noxs
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/make -f
-
-build: build-stamp
-build-stamp:
-	dh build
-	touch $@
-
-clean:
-	dh $@
-
-install: install-stamp
-install-stamp: build-stamp
-	dh install
-	touch $@
-
-binary-arch:
-
-binary-indep: install
-	dh $@
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep install clean build
diff --git a/share/rules.dh7.xs b/share/rules.dh7.xs
deleted file mode 100755
index 3850db1..0000000
--- a/share/rules.dh7.xs
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/make -f
-
-build: build-stamp
-build-stamp:
-	dh build
-	touch $@
-
-clean:
-	dh $@
-
-install: install-stamp
-install-stamp: build-stamp
-	dh install
-	touch $@
-
-binary-arch: install
-	dh $@
-
-binary-indep:
-
-binary: binary-arch binary-indep
-
-.PHONY: binary binary-arch binary-indep install clean build

-- 
Debian packaging of dh-make-perl



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