[SCM] Debian packaging of libpar-packer-perl branch, master, updated. debian/1.012-1-2-gde39e8e

gregor herrmann gregoa at debian.org
Thu Dec 22 16:30:16 UTC 2011


The following commit has been merged in the master branch:
commit f872c2abf472f2d61ca833bd3dbc652a294c64c0
Author: gregor herrmann <gregoa at debian.org>
Date:   Thu Dec 22 17:21:43 2011 +0100

    Unify "sameperl" substvar generation in libclass-xsaccessor-perl, libdevel-cover-perl, libpar-packer-perl.

diff --git a/debian/control b/debian/control
index e8e99f2..236b0cc 100644
--- a/debian/control
+++ b/debian/control
@@ -22,8 +22,7 @@ Homepage: http://par.perl.org/
 
 Package: libpar-packer-perl
 Architecture: any
-Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends},
- perl (>= ${perl:current}), perl (<< ${perl:next}),
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}, ${sameperl:Depends},
  libarchive-zip-perl,
  libgetopt-argvfile-perl,
  libmodule-scandeps-perl (>= 1.05),
diff --git a/debian/rules b/debian/rules
index 1d18a3f..3534df8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,11 +3,8 @@
 PACKAGE = $(shell dh_listpackages)
 TMP     = $(CURDIR)/debian/$(PACKAGE)
 
-PERLVER   := $(shell perl -e 'printf "%vd\n", $$^V')
-VMAJOR    := $(shell echo $(PERLVER) | cut -f 1 -d .)
-VMINOR    := $(shell echo $(PERLVER) | cut -f 2 -d .)
-VPATCH    := $(shell echo $(PERLVER) | cut -f 3 -d .)
-NEXTPATCH := $(shell expr $(VPATCH) + 1 2>/dev/null)
+PERL_CURRENT := $(shell perl -MConfig -e 'print "$$Config{revision}.$$Config{patchlevel}.$$Config{subversion}"')
+PERL_NEXT    := $(shell perl -MConfig -e 'print "$$Config{revision}.$$Config{patchlevel}." . ($$Config{subversion} + 1)')
 
 %:
 	dh $@
@@ -39,6 +36,4 @@ override_dh_auto_install:
 		$(TMP)/usr/lib/perl5/PAR/StrippedPARL/
 
 override_dh_gencontrol:
-	dh_gencontrol -- \
-		-Vperl:current="$(VMAJOR).$(VMINOR).$(VPATCH)" \
-		-Vperl:next="$(VMAJOR).$(VMINOR).$(NEXTPATCH)~"
+	dh_gencontrol -- -V'sameperl:Depends=perl (>= $(PERL_CURRENT)), perl (<< $(PERL_NEXT)~)'

-- 
Debian packaging of libpar-packer-perl



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