r47722 - in /trunk/libdbd-sqlite3-perl: Makefile.PL debian/changelog debian/control debian/patches/use_system_sqlite
ryan at users.alioth.debian.org
ryan at users.alioth.debian.org
Tue Nov 24 04:13:34 UTC 2009
Author: ryan
Date: Tue Nov 24 04:12:05 2009
New Revision: 47722
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=47722
Log:
refresh patch
Modified:
trunk/libdbd-sqlite3-perl/Makefile.PL
trunk/libdbd-sqlite3-perl/debian/changelog
trunk/libdbd-sqlite3-perl/debian/control
trunk/libdbd-sqlite3-perl/debian/patches/use_system_sqlite
Modified: trunk/libdbd-sqlite3-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/Makefile.PL?rev=47722&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/Makefile.PL (original)
+++ trunk/libdbd-sqlite3-perl/Makefile.PL Tue Nov 24 04:12:05 2009
@@ -123,7 +123,7 @@
# a system sqlite is also sophisticated enough to have a patching system
# that can change the if ( 0 ) to if ( 1 )
my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
-if ( 0 ) {
+if ( 1 ) {
require File::Spec;
if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
$sqlite_base =~ /=(.*)/;
@@ -172,11 +172,7 @@
}
}
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";
- $sqlite_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";
} else {
print "Looks good\n" if $ENV{AUTOMATED_TESTING};
}
Modified: trunk/libdbd-sqlite3-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/debian/changelog?rev=47722&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/debian/changelog (original)
+++ trunk/libdbd-sqlite3-perl/debian/changelog Tue Nov 24 04:12:05 2009
@@ -1,8 +1,13 @@
libdbd-sqlite3-perl (1.27-1) UNRELEASED; urgency=low
- * New upstream release
-
- -- Jonathan Yu <jawnsy at cpan.org> Mon, 23 Nov 2009 19:12:25 -0500
+ [ Jonathan Yu ]
+ * New upstream release
+
+ [ Ryan Niebur ]
+ * Add myself to Uploaders
+ * refresh patch
+
+ -- Ryan Niebur <ryan at debian.org> Mon, 23 Nov 2009 20:10:42 -0800
libdbd-sqlite3-perl (1.25-4) unstable; urgency=low
Modified: trunk/libdbd-sqlite3-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libdbd-sqlite3-perl/debian/control?rev=47722&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/debian/control (original)
+++ trunk/libdbd-sqlite3-perl/debian/control Tue Nov 24 04:12:05 2009
@@ -9,7 +9,7 @@
Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>,
Niko Tyni <ntyni at debian.org>, gregor herrmann <gregoa at debian.org>,
Maximilian Gass <mxey at cloudconnected.org>,
- Gunnar Wolf <gwolf at debian.org>
+ Gunnar Wolf <gwolf at debian.org>, Ryan Niebur <ryan at debian.org>
Standards-Version: 3.8.3
Homepage: http://search.cpan.org/dist/DBD-SQLite/
Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libdbd-sqlite3-perl/
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=47722&op=diff
==============================================================================
--- trunk/libdbd-sqlite3-perl/debian/patches/use_system_sqlite (original)
+++ trunk/libdbd-sqlite3-perl/debian/patches/use_system_sqlite Tue Nov 24 04:12:05 2009
@@ -1,49 +1,28 @@
DBD::SQLite3 ships its own copy of SQLite. That makes Debian sad and so we
patched it away.
+Index: b/Makefile.PL
+===================================================================
--- 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);
+@@ -123,7 +123,7 @@
+ # a system sqlite is also sophisticated enough to have a patching system
+ # that can change the if ( 0 ) to if ( 1 )
+ my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc);
-if ( 0 ) {
+if ( 1 ) {
require File::Spec;
if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) {
$sqlite_base =~ /=(.*)/;
-@@ -128,21 +119,16 @@
+@@ -172,11 +172,7 @@
}
}
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;
+- $sqlite_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;
++ 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";
} else {
print "Looks good\n" if $ENV{AUTOMATED_TESTING};
}
- }
- }
-
--# 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 );
-
More information about the Pkg-perl-cvs-commits
mailing list