r39961 - in /trunk/libdbd-sqlite3-perl/debian: changelog patches/hurd-locking.patch patches/series patches/use_system_sqlite

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

Author: mxey-guest
Date: Wed Jul 15 16:26:45 2009
New Revision: 39961

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=39961
Log:
Build against system sqlite

Added:
    trunk/libdbd-sqlite3-perl/debian/patches/use_system_sqlite
Removed:
    trunk/libdbd-sqlite3-perl/debian/patches/hurd-locking.patch
Modified:
    trunk/libdbd-sqlite3-perl/debian/changelog
    trunk/libdbd-sqlite3-perl/debian/patches/series

Modified: trunk/libdbd-sqlite3-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/debian/changelog?rev=39961&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/debian/changelog (original)
+++ trunk/libdbd-sqlite3-perl/debian/changelog Wed Jul 15 16:26:45 2009
@@ -1,8 +1,14 @@
 libdbd-sqlite3-perl (1.25-3) UNRELEASED; urgency=low
 
+  [ Nathan Handler ]
   * debian/watch: Update to ignore development releases.
 
- -- Nathan Handler <nhandler at ubuntu.com>  Sat, 06 Jun 2009 01:33:45 +0000
+  [ Maximilian Gaß ]
+  * Added use_system_sqlite patch to make it build against the sqlite3
+    package.
+  * Removed hurd-locking.patch, included SQLite sources are no longer used.
+
+ -- Maximilian Gaß <mxey at cloudconnected.org>  Wed, 15 Jul 2009 18:22:04 +0200
 
 libdbd-sqlite3-perl (1.25-2) unstable; urgency=low
 

Modified: trunk/libdbd-sqlite3-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/debian/patches/series?rev=39961&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/debian/patches/series (original)
+++ trunk/libdbd-sqlite3-perl/debian/patches/series Wed Jul 15 16:26:45 2009
@@ -1,1 +1,1 @@
-hurd-locking.patch
+use_system_sqlite

Added: 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=39961&op=file
==============================================================================
--- trunk/libdbd-sqlite3-perl/debian/patches/use_system_sqlite (added)
+++ trunk/libdbd-sqlite3-perl/debian/patches/use_system_sqlite Wed Jul 15 16:26:45 2009
@@ -1,0 +1,32 @@
+--- a/Makefile.PL
++++ b/Makefile.PL
+@@ -69,17 +69,8 @@
+ # In absense of either of those, expect SQLite 3.X.X libs and headers in the
+ # common places known to Perl or the C compiler.
+ 
+-# 2009/04/02
+-# But why do we need to use an older, system-installed library?
+-# Let's always use the bundled one. -- ISHIGAKI
+-# 2009/04/03
+-# For the moment, while we're fixing things, this is reasonable.
+-# However, logic in the form "I lack knowledge, thereforce lets do
+-# it this way" is not a sufficiently robust decision making process. 
+-# Let's find out the full story first, so we can make an informed
+-# decision to whether to do this. -- ADAMK
+ my ($force_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
+-if ( 0 ) {
++if ( 1 ) {
+ 	require File::Spec;
+ 	if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
+ 		$sqlite_base =~ /=(.*)/;
+@@ -139,10 +130,6 @@
+ 	}
+ }
+ 
+-# Use always the bundled one.
+-# XXX: ... and this message should be more informative.
+-$force_local = 1;
+-print "We're using the bundled sqlite library.\n" if $ENV{AUTOMATED_TESTING};
+ 
+ @ARGV = grep( ! /SQLITE_LOCATION|USE_LOCAL_SQLITE/, @ARGV );
+