[SCM] Debian packaging of libembperl-perl branch, master, updated. 2baa7e615f09fcbd06b84978a8ea35db745636df

[Florian Schlichting]

The following commit has been merged in the master branch:
commit 31ff22cc23acddf5ce93e7c6a3a367488d8aa80f
Author: Florian Schlichting <fschlich at zedat.fu-berlin.de>
Date:   Tue Sep 25 20:31:24 2012 +0200

    deleted modperl.patch, mod_perl versions < 2 are history

diff --git a/debian/patches/Makefile.PL.patch b/debian/patches/Makefile.PL.patch
index a4c01ac..97c8504 100644
--- a/debian/patches/Makefile.PL.patch
+++ b/debian/patches/Makefile.PL.patch
@@ -53,15 +53,6 @@ Description:
  
   sub MY::post_constants
         {
-@@ -326,7 +343,7 @@
- 
-        my $txt = $self -> MM::post_constants (@_) ;
- 
--       $txt .= "\n# Change name of dynamic lib, in case we need two of them (with and w/o Apache support)\nINST_DYNAMIC = \$(INST_ARCHAUTODIR)\\\$(DLBASE).NoApache.\$(DLEXT)\n" if ($EPNOAPACHELIB) ;
-+       $txt .= "\n# Change name of dynamic lib, in case we need two of them (different Apache versions)\nINST_DYNAMIC = \$(INST_ARCHAUTODIR)/\$(DLBASE)-13.\$(DLEXT)\n" if ($mod_perl::VERSION and $mod_perl::VERSION < 1.99) ;
- 
-        return $txt ;
- 
 @@ -337,20 +354,7 @@
  sub GetString
  	{
diff --git a/debian/patches/modperl.patch b/debian/patches/modperl.patch
deleted file mode 100644
index 4864ba6..0000000
--- a/debian/patches/modperl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Embperl_BS: Make string compare mod_perl version number deal with
- '1.999.20'
-Author: Angus Lees <gus at debian.org>
-
---- a/Embperl_BS
-+++ b/Embperl_BS
-@@ -7,8 +7,12 @@
-     my $nafile = $file ;
-     $nafile =~ s/(.*)\./$1.NoApache./ ;
-     $file = $nafile if (-f $nafile) ;
--    #print STDERR "\n*** bs load file = $file ***\n" ;
-+    }
-+elsif ($ENV{MOD_PERL} =~ m,mod_perl/([\d.]+), and $1 lt '1.99')
-+    {
-+    $file =~ s/(.*)\./$1-13./ ;
-     }
- 
--] ;
-+    #print STDERR "\n*** bs load file = $file ***\n" ;
- 
-+] ;
diff --git a/debian/patches/series b/debian/patches/series
index c1869e8..0c90fda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 delay.patch
-modperl.patch
 Makefile.PL.patch

-- 
Debian packaging of libembperl-perl