r40083 - in /trunk/libdbd-sqlite3-perl/debian: control patches/use_system_sqlite

[ryan52-guest at users.alioth.debian.org]

Author: ryan52-guest
Date: Fri Jul 17 18:04:54 2009
New Revision: 40083

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=40083
Log:
improve the system library use patcha a little bit

Modified:
    trunk/libdbd-sqlite3-perl/debian/control
    trunk/libdbd-sqlite3-perl/debian/patches/use_system_sqlite

Modified: trunk/libdbd-sqlite3-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/debian/control?rev=40083&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/debian/control (original)
+++ trunk/libdbd-sqlite3-perl/debian/control Fri Jul 17 18:04:54 2009
@@ -2,7 +2,7 @@
 Section: perl
 Priority: optional
 Build-Depends: debhelper (>= 7.0.8), perl (>= 5.8), libdbi-perl (>= 1.03),
- libsqlite3-dev (>> 3.1.3), quilt (>= 0.46-7), libpod-simple-perl (>= 3.07),
+ libsqlite3-dev (>> 3.6.0), quilt (>= 0.46-7), libpod-simple-perl (>= 3.07),
  libperl-minimumversion-perl (>= 1.20), libtest-cpan-meta-perl (>= 0.12),
  libtest-minimumversion-perl (>= 0.008), libtest-pod-perl (>= 1.26)
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>

Modified: trunk/libdbd-sqlite3-perl/debian/patches/use_system_sqlite
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/debian/patches/use_system_sqlite?rev=40083&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/debian/patches/use_system_sqlite (original)
+++ trunk/libdbd-sqlite3-perl/debian/patches/use_system_sqlite Fri Jul 17 18:04:54 2009
@@ -21,7 +21,22 @@
  	require File::Spec;
  	if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
  		$sqlite_base =~ /=(.*)/;
-@@ -139,10 +130,6 @@
+@@ -128,21 +119,16 @@
+ 			}
+ 		}
+ 		unless ( $version && ($version >= 3006000) ) {
+-			warn "SQLite version must be at least 3.6.0. No header file at that\n";
+-			warn "version or higher was found. Using the local version instead.\n";
+-			$force_local = 1;
+-			undef $sqlite_lib;
+-			undef $sqlite_inc;
++			die "SQLite version must be at least 3.6.0. No header file at that\nversion or higher was found. Using the local version instead.\n";
++#			$force_local = 1;
++#			undef $sqlite_lib;
++#			undef $sqlite_inc;
+ 		} else {
+ 			print "Looks good\n" if $ENV{AUTOMATED_TESTING};
+ 		}
  	}
  }