r17444 - in /trunk/libparams-validate-perl/debian: changelog control patches/ patches/coverage_trust.patch patches/prototype.patch patches/series rules

gregoa-guest at users.alioth.debian.org gregoa-guest at users.alioth.debian.org
Fri Mar 14 15:24:38 UTC 2008


Author: gregoa-guest
Date: Fri Mar 14 15:24:37 2008
New Revision: 17444

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=17444
Log:
NOTE to potential uploaders: please check if debian/patches/prototype.patch
is sane and remove it otherwise

* Add libtest-pod-coverage-perl to build dependencies and create patch
  coverage_trust.patch which adds more naked subroutines to the "trustme"
  array (closes: #462752).
* Add patch prototype.patch which fixes a warning about a prototype
  mismatch when running the pod-coverage test (cf. #462752).
* Add quilt framework to debian/rules and debian/control.
* debian/rules: update based on dh-make-perl's templates.

Added:
    trunk/libparams-validate-perl/debian/patches/
    trunk/libparams-validate-perl/debian/patches/coverage_trust.patch
    trunk/libparams-validate-perl/debian/patches/prototype.patch
    trunk/libparams-validate-perl/debian/patches/series
Modified:
    trunk/libparams-validate-perl/debian/changelog
    trunk/libparams-validate-perl/debian/control
    trunk/libparams-validate-perl/debian/rules

Modified: trunk/libparams-validate-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libparams-validate-perl/debian/changelog?rev=17444&op=diff
==============================================================================
--- trunk/libparams-validate-perl/debian/changelog (original)
+++ trunk/libparams-validate-perl/debian/changelog Fri Mar 14 15:24:37 2008
@@ -1,3 +1,18 @@
+libparams-validate-perl (0.89-3) UNRELEASED; urgency=low
+
+  NOTE to potential uploaders: please check if debian/patches/prototype.patch
+  is sane and remove it otherwise
+  
+  * Add libtest-pod-coverage-perl to build dependencies and create patch
+    coverage_trust.patch which adds more naked subroutines to the "trustme"
+    array (closes: #462752).
+  * Add patch prototype.patch which fixes a warning about a prototype
+    mismatch when running the pod-coverage test (cf. #462752).
+  * Add quilt framework to debian/rules and debian/control.
+  * debian/rules: update based on dh-make-perl's templates.
+
+ -- gregor herrmann <gregor+debian at comodo.priv.at>  Fri, 14 Mar 2008 16:22:27 +0100
+
 libparams-validate-perl (0.89-2) unstable; urgency=low
 
   * debian/rules:

Modified: trunk/libparams-validate-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libparams-validate-perl/debian/control?rev=17444&op=diff
==============================================================================
--- trunk/libparams-validate-perl/debian/control (original)
+++ trunk/libparams-validate-perl/debian/control Fri Mar 14 15:24:37 2008
@@ -2,7 +2,8 @@
 Section: perl
 Priority: optional
 Build-Depends: perl (>= 5.8.0-17) | perl-base (>= 5.8.0-17), debhelper (>= 6),
- libreadonly-xs-perl, libreadonly-perl, libtest-pod-perl
+ libreadonly-xs-perl, libreadonly-perl, libtest-pod-perl,
+ libtest-pod-coverage-perl, quilt (>= 0.40)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jay Bonci <jaybonci at debian.org>, 
  gregor herrmann <gregor+debian at comodo.priv.at>

Added: trunk/libparams-validate-perl/debian/patches/coverage_trust.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libparams-validate-perl/debian/patches/coverage_trust.patch?rev=17444&op=file
==============================================================================
--- trunk/libparams-validate-perl/debian/patches/coverage_trust.patch (added)
+++ trunk/libparams-validate-perl/debian/patches/coverage_trust.patch Fri Mar 14 15:24:37 2008
@@ -1,0 +1,8 @@
+--- libparams-validate-perl.orig/t/pod-coverage.t
++++ libparams-validate-perl/t/pod-coverage.t
+@@ -11,4 +11,4 @@
+ plan skip_all => "Test::Pod::Coverage 1.04 required for testing POD coverage"
+     if $@;
+ 
+-all_pod_coverage_ok( { trustme => [ qr/validation_options/ ] } );
++all_pod_coverage_ok( { trustme => [ qr/validation_options|validate_pos|validate|validate_with|set_options|UNKNOWN/ ] } );

Added: trunk/libparams-validate-perl/debian/patches/prototype.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libparams-validate-perl/debian/patches/prototype.patch?rev=17444&op=file
==============================================================================
--- trunk/libparams-validate-perl/debian/patches/prototype.patch (added)
+++ trunk/libparams-validate-perl/debian/patches/prototype.patch Fri Mar 14 15:24:37 2008
@@ -1,0 +1,13 @@
+--- libparams-validate-perl.orig/lib/Params/ValidateXS.pm
++++ libparams-validate-perl/lib/Params/ValidateXS.pm
+@@ -128,8 +128,8 @@
+     }
+     else
+     {
+-        *validate      = \&_validate;
+-        *validate_pos  = \&_validate_pos;
++        *validate      = \&_validate(\@$);
++        *validate_pos  = \&_validate_pos(\@@);
+         *validate_with = \&_validate_with;
+     }
+ }

Added: trunk/libparams-validate-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libparams-validate-perl/debian/patches/series?rev=17444&op=file
==============================================================================
--- trunk/libparams-validate-perl/debian/patches/series (added)
+++ trunk/libparams-validate-perl/debian/patches/series Fri Mar 14 15:24:37 2008
@@ -1,0 +1,2 @@
+coverage_trust.patch
+prototype.patch

Modified: trunk/libparams-validate-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libparams-validate-perl/debian/rules?rev=17444&op=diff
==============================================================================
--- trunk/libparams-validate-perl/debian/rules (original)
+++ trunk/libparams-validate-perl/debian/rules Fri Mar 14 15:24:37 2008
@@ -1,50 +1,85 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
+# This debian/rules file is provided as a template for normal perl
+# packages. It was created by Marc Brockschmidt <marc at dch-faq.de> for
+# the Debian Perl Group (http://pkg-perl.alioth.debian.org/) but may
+# be used freely wherever it is useful.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+include /usr/share/quilt/quilt.make
+
+# If set to a true value then MakeMaker's prompt function will
+# always return the default without waiting for user input.
+export PERL_MM_USE_DEFAULT=1
+
 PACKAGE=$(shell dh_listpackages)
 
+ifndef PERL
+PERL = /usr/bin/perl
+endif
+
+TMP     =$(CURDIR)/debian/$(PACKAGE)
+
+# Allow disabling build optimisation by setting noopt in
+# $DEB_BUILD_OPTIONS
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+        CFLAGS += -O0
+else
+        CFLAGS += -O2
+endif
+
 build: build-stamp
-build-stamp:
+build-stamp: $(QUILT_STAMPFN)
 	dh_testdir
-	perl Makefile.PL verbose INSTALLDIRS=vendor
-	$(MAKE) OPTIMIZE="-O2 -g -Wall"
+
+	$(PERL) Makefile.PL INSTALLDIRS=vendor
+	$(MAKE) OPTIMIZE="$(CFLAGS)" LD_RUN_PATH=""
 	IS_MAINTAINER=1 $(MAKE) test
+
 	touch $@
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
+
 	dh_clean build-stamp install-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
+	[ ! -f Makefile ] || $(MAKE) realclean
 
 install: install-stamp
 install-stamp: build-stamp
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	$(MAKE) PREFIX=/usr DESTDIR=$(CURDIR)/debian/$(PACKAGE) install
-	[ ! -d $(CURDIR)/debian/$(PACKAGE)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(CURDIR)/debian/$(PACKAGE)/usr/share/perl5
+
+	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
+	[ ! -d $(TMP)/usr/share/perl5 ] || rmdir --ignore-fail-on-non-empty --parents --verbose $(TMP)/usr/share/perl5
+
 	touch $@
 
-binary-indep:;
-binary-arch: build install;
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do here for an architecture-dependent package
+
+# Build architecture-dependent files here.
+binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installdocs
 	dh_installchangelogs Changes
+	dh_shlibdeps
 	dh_strip
+	dh_perl
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_perl
-	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
 
+source diff:
+	@echo >&2 'source and diff are obsolete - use dpkg-source -b'; false
+
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install




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