tag 316172 patch
thanks

The attached patch should fix this, however it needs some testing for
apache2.

.debs with the patch applied are at
http://rzlab.ucr.edu/debian/archive/unstable


Don Armstrong

-- 
Grimble left his mother in the food store and went to the launderette
and watched the clothes go round. It was a bit like colour television
only with less plot.
 -- Clement Freud _Grimble_

http://www.donarmstrong.com              http://rzlab.ucr.edu
diff -u libapache-gallery-perl-0.99-svn050524/debian/changelog 
libapache-gallery-perl-0.99-svn050524/debian/changelog
--- libapache-gallery-perl-0.99-svn050524/debian/changelog
+++ libapache-gallery-perl-0.99-svn050524/debian/changelog
@@ -1,3 +1,10 @@
+libapache-gallery-perl (0.99-svn050524-2) unstable; urgency=low
+
+  * Fix upstream's check for mod_perl2 to use $ENV{MOD_PERL_API_VERSION}
+    as suggested. (Closes: #316172)
+
+ -- Don Armstrong <[EMAIL PROTECTED]>  Wed,  7 Sep 2005 18:08:24 -0700
+
 libapache-gallery-perl (0.99-svn050524-1) unstable; urgency=low
 
   * The "Pissing Manoj has its consecuences" release.
only in patch2:
unchanged:
--- libapache-gallery-perl-0.99-svn050524.orig/lib/Apache/Gallery.pm
+++ libapache-gallery-perl-0.99-svn050524/lib/Apache/Gallery.pm
@@ -10,16 +10,8 @@
 $VERSION = "1.0";
 
 BEGIN {
-
-       eval('require mod_perl;');
-       if ( $@ ) {
-               require mod_perl2;
-       }
-
-       print STDERR $mod_perl::VERSION."\n";
-       $::MP2 = ($mod_perl::VERSION >= 1.99);
-       
-       if ($::MP2) {
+       if (exists $ENV{MOD_PERL_API_VERSION}) {
+               require mod_perl2;
                require Apache2::ServerRec;
                require Apache2::RequestRec;
                require Apache2::Log;
@@ -29,9 +21,9 @@
                require Apache2::Const;
        
                Apache2::Const->import(-compile => 
'OK','DECLINED','FORBIDDEN','NOT_FOUND');
-       
        }
        else {
+               require mod_perl;
                require Apache;
                require Apache::Constants;
                require Apache::Request;
@@ -39,7 +31,6 @@
                
Apache::Constants->import('OK','DECLINED','FORBIDDEN','NOT_FOUND');
 
        }
-
 }
 
 use Image::Info qw(image_info);

Attachment: signature.asc
Description: Digital signature

Reply via email to