[SCM] Debian packaging of libembperl-perl branch, master, updated. upstream/2.5.0_rc2-71-g4d9b45b

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 7e1f5502522059fab3a87e80a3e65f2615d0dcd8
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Tue Oct 2 21:08:53 2012 +0200

    deleted remaining Makefile.PL.patch: with hardening flags enabled, there is nothing left in the output of `apxs2 -q CFLAGS` that makes a difference

diff --git a/debian/patches/Makefile.PL.patch b/debian/patches/Makefile.PL.patch
deleted file mode 100644
index ff5d12a..0000000
--- a/debian/patches/Makefile.PL.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: 
- - add the output of `apxs2 -q CFLAGS` to CCFLAGS
-
---- a/Makefile.PL
-+++ b/Makefile.PL
-@@ -247,8 +247,9 @@
-             { # with Apache 2, make sure we have the same defines as mod_perl
-             $txt =~ s/-O\d//g if ($ccdebug =~ /-O\d/) ;
-             $txt =~ /CCFLAGS\s*=(.*?)\n/s ;
-+            my $extra = "$Config{cppflags} " . `apxs2 -q CFLAGS` ;
- 	    my $flags = $mp2cfg->{MODPERL_CCOPTS} || $1 ;
--            $txt =~ s/CCFLAGS\s*=(.*?)\n/CCFLAGS = $ccdebug $flags $addcflags\n/s ;
-+            $txt =~ s/CCFLAGS\s*=(.*?)\n/CCFLAGS = $ccdebug $flags $addcflags $extra\n/s ;
-             }
-         else
-             {
-@@ -1337,6 +1341,7 @@
-     'INC'	   => "-I$EPPATH $i",     			 
-     'VERSION'      => undef,
-     'VERSION_FROM' => "$EPPATH/Embperl.pm",
-+    'CCFLAGS'      => $Config{cppflags}.`apxs2 -q CFLAGS`,
-     $optdebug?('OPTIMIZE' => $ccdebug):(),
-     ) ;
- 
diff --git a/debian/patches/series b/debian/patches/series
index 0c90fda..3e04984 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 delay.patch
-Makefile.PL.patch

-- 
Debian packaging of libembperl-perl