r19360 - in /trunk/libapache-db-perl: Changes DB.pm DB.xs META.yml debian/changelog lib/Apache/DProf.pm lib/Apache/SmallProf.pm

[gregoa at users.alioth.debian.org]

Author: gregoa
Date: Sat May  3 18:16:36 2008
New Revision: 19360

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=19360
Log:
New upstream release, no longer FTBFS with Perl 5.10 (closes: #466734).

Modified:
    trunk/libapache-db-perl/Changes
    trunk/libapache-db-perl/DB.pm
    trunk/libapache-db-perl/DB.xs
    trunk/libapache-db-perl/META.yml
    trunk/libapache-db-perl/debian/changelog
    trunk/libapache-db-perl/lib/Apache/DProf.pm
    trunk/libapache-db-perl/lib/Apache/SmallProf.pm

Modified: trunk/libapache-db-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-db-perl/Changes?rev=19360&op=diff
==============================================================================
--- trunk/libapache-db-perl/Changes (original)
+++ trunk/libapache-db-perl/Changes Sat May  3 18:16:36 2008
@@ -1,3 +1,7 @@
+=item 0.14 - April 27, 2008
+
+Added patch from Niko Tyni which fixes Apache::DB for use with Perl 5.10
+
 =item 0.13 - April 17, 2006 
 
 Fixed Apache::DProf and Apache::SmallProf to work when using taint mode. 

Modified: trunk/libapache-db-perl/DB.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-db-perl/DB.pm?rev=19360&op=diff
==============================================================================
--- trunk/libapache-db-perl/DB.pm (original)
+++ trunk/libapache-db-perl/DB.pm Sat May  3 18:16:36 2008
@@ -20,7 +20,7 @@
 {
     no strict;
     @ISA = qw(DynaLoader);
-    $VERSION = '0.13';
+    $VERSION = '0.14';
     __PACKAGE__->bootstrap($VERSION);
 }
 

Modified: trunk/libapache-db-perl/DB.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-db-perl/DB.xs?rev=19360&op=diff
==============================================================================
--- trunk/libapache-db-perl/DB.xs (original)
+++ trunk/libapache-db-perl/DB.xs Sat May  3 18:16:36 2008
@@ -56,4 +56,8 @@
 ApacheSIGINT(...)
 
     CODE:
+#if ((PERL_REVISION == 5) && (PERL_VERSION >= 10))
+    if (ApacheSIGINT) (*ApacheSIGINT)(SIGINT, NULL, NULL); 
+#else 
     if (ApacheSIGINT) (*ApacheSIGINT)(SIGINT);
+#endif 

Modified: trunk/libapache-db-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-db-perl/META.yml?rev=19360&op=diff
==============================================================================
--- trunk/libapache-db-perl/META.yml (original)
+++ trunk/libapache-db-perl/META.yml Sat May  3 18:16:36 2008
@@ -1,10 +1,10 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         Apache-DB
-version:      0.13
+version:      0.14
 version_from: DB.pm
 installdirs:  site
 requires:
 
 distribution_type: module
-generated_by: ExtUtils::MakeMaker version 6.17
+generated_by: ExtUtils::MakeMaker version 6.30

Modified: trunk/libapache-db-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-db-perl/debian/changelog?rev=19360&op=diff
==============================================================================
--- trunk/libapache-db-perl/debian/changelog (original)
+++ trunk/libapache-db-perl/debian/changelog Sat May  3 18:16:36 2008
@@ -1,4 +1,4 @@
-libapache-db-perl (0.13-2) UNRELEASED; urgency=low
+libapache-db-perl (0.14-1) UNRELEASED; urgency=low
 
   * Take over for the Debian Perl Group on maintainer's request
     (closes: #479124)
@@ -9,8 +9,9 @@
     debian at 420.am>); Ivan Kohler <ivan-debian at 420.am> moved to
     Uploaders.
   * debian/watch: use dist-based URL.
+  * New upstream release, no longer FTBFS with Perl 5.10 (closes: #466734).
 
- -- gregor herrmann <gregoa at debian.org>  Sat, 03 May 2008 20:11:28 +0200
+ -- gregor herrmann <gregoa at debian.org>  Sat, 03 May 2008 20:15:38 +0200
 
 libapache-db-perl (0.13-1) unstable; urgency=low
 

Modified: trunk/libapache-db-perl/lib/Apache/DProf.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-db-perl/lib/Apache/DProf.pm?rev=19360&op=diff
==============================================================================
--- trunk/libapache-db-perl/lib/Apache/DProf.pm (original)
+++ trunk/libapache-db-perl/lib/Apache/DProf.pm Sat May  3 18:16:36 2008
@@ -177,7 +177,7 @@
 
 B<NOTE:> I<$ServerRoot/logs/dprof/> will need to be writable by the user 
 Apache is running as (i.e. nobody, apache, etc.).  If you can not write
-to $ServerRoto as this user, set $ENV{APACHE_DPROF_PATH_ABSOLUTE} to
+to $ServerRoot as this user, set $ENV{APACHE_DPROF_PATH_ABSOLUTE} to
 an absolute path of a directory this user can.
 
 =head1 AUTHOR

Modified: trunk/libapache-db-perl/lib/Apache/SmallProf.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libapache-db-perl/lib/Apache/SmallProf.pm?rev=19360&op=diff
==============================================================================
--- trunk/libapache-db-perl/lib/Apache/SmallProf.pm (original)
+++ trunk/libapache-db-perl/lib/Apache/SmallProf.pm Sat May  3 18:16:36 2008
@@ -27,7 +27,7 @@
     my $r = shift;
     my $dir;
     
-    if(MP2) { 
+    if (MP2) { 
         $dir = Apache2::ServerUtil::server_root(); 
     }
     else { 
@@ -42,9 +42,8 @@
 
     mkdir $dir, 0755 unless -d $dir;
 
-    unless (-d $dir) {
-	die "$dir does not exist: $!";
-    }
+    # Die if we can't make the directory 
+	die "$dir does not exist: $!" if !-d $dir; 
 
     (my $uri = $r->uri) =~ s,/,::,g;
     $uri =~ s/^:+//;