r44238 - in /trunk/libembperl-perl/debian: changelog control patches/ patches/cgi_pm.patch patches/series rules

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Fri Sep 18 16:01:20 2009
New Revision: 44238

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=44238
Log:
Add patch cgi_pm.patch by Niko Tyni to avoid FTBFS if a newer CGI.pm is
present at test time (closes: #521971).

Added:
    trunk/libembperl-perl/debian/patches/
    trunk/libembperl-perl/debian/patches/cgi_pm.patch
    trunk/libembperl-perl/debian/patches/series
Modified:
    trunk/libembperl-perl/debian/changelog
    trunk/libembperl-perl/debian/control
    trunk/libembperl-perl/debian/rules

Modified: trunk/libembperl-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libembperl-perl/debian/changelog?rev=44238&op=diff
==============================================================================
--- trunk/libembperl-perl/debian/changelog (original)
+++ trunk/libembperl-perl/debian/changelog Fri Sep 18 16:01:20 2009
@@ -25,6 +25,10 @@
   [ Ryan Niebur ]
   * Update jawnsy's email address
 
+  [ gregor herrmann ]
+  * Add patch cgi_pm.patch by Niko Tyni to avoid FTBFS if a newer CGI.pm is
+    present at test time (closes: #521971).
+
  -- Ryan Niebur <ryanryan52 at gmail.com>  Tue, 01 Sep 2009 21:18:46 -0700
 
 libembperl-perl (2.2.0-3.1) unstable; urgency=low

Modified: trunk/libembperl-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libembperl-perl/debian/control?rev=44238&op=diff
==============================================================================
--- trunk/libembperl-perl/debian/control (original)
+++ trunk/libembperl-perl/debian/control Fri Sep 18 16:01:20 2009
@@ -1,7 +1,7 @@
 Source: libembperl-perl
 Section: web
 Priority: optional
-Build-Depends: debhelper (>= 5)
+Build-Depends: debhelper (>= 5), quilt
 Build-Depends-Indep: perl, apache2-prefork-dev, apache2-mpm-prefork,
  libapache2-mod-perl2, libwww-perl, libapache-sessionx-perl,
  libxslt1-dev, netbase

Added: trunk/libembperl-perl/debian/patches/cgi_pm.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libembperl-perl/debian/patches/cgi_pm.patch?rev=44238&op=file
==============================================================================
--- trunk/libembperl-perl/debian/patches/cgi_pm.patch (added)
+++ trunk/libembperl-perl/debian/patches/cgi_pm.patch Fri Sep 18 16:01:20 2009
@@ -1,0 +1,15 @@
+Author: Niko Tyni <ntyni at debian.org>
+Description: FTBFS: Test failure with CGI.pm >= 3.38
+Bug: #521971
+
+--- a/Embperl.pm
++++ b/Embperl.pm
+@@ -319,7 +319,7 @@
+ 	{
+     	# the param_fetch needs CGI.pm 2.43
+ 	#$params = $cgi->param_fetch( $_ ) ;
+-    	$params = $cgi->{$_} ;
++    	$params = $CGI::VERSION >= 2.43 ? $cgi->param_fetch( $_ ) : $cgi->{$_} ;
+ 	if ($#$params > 0)
+ 	    {
+ 	    $fdat->{ $_ } = join ("\t", @$params) ;

Added: trunk/libembperl-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libembperl-perl/debian/patches/series?rev=44238&op=file
==============================================================================
--- trunk/libembperl-perl/debian/patches/series (added)
+++ trunk/libembperl-perl/debian/patches/series Fri Sep 18 16:01:20 2009
@@ -1,0 +1,1 @@
+cgi_pm.patch

Modified: trunk/libembperl-perl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libembperl-perl/debian/rules?rev=44238&op=diff
==============================================================================
--- trunk/libembperl-perl/debian/rules (original)
+++ trunk/libembperl-perl/debian/rules Fri Sep 18 16:01:20 2009
@@ -3,6 +3,8 @@
 # Made with the aid of dh_make, by Craig Small
 # Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess.
 # Some lines taken from debmake, by Christoph Lameter.
+
+include /usr/share/quilt/quilt.make
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -58,7 +60,7 @@
 	$(PERL) Makefile.PL $(DEBUG) INSTALLDIRS=vendor
 
 build: build-stamp
-build-stamp: $(POD2TEXT) config-stamp
+build-stamp: $(POD2TEXT) config-stamp $(QUILT_STAMPFN)
 	dh_testdir
 	$(MAKE) OPTIMIZE="$(OPTIMIZE)" LD_RUN_PATH=""
 	$(MAKE) TESTARGS="$(TESTARGS)" test
@@ -89,7 +91,7 @@
 	install -m 644 debian/zembperl.conf debian/zembperl.load \
 	    debian/libembperl-perl/etc/apache2/mods-available/
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot