[Pkg-kde-commits] rev 398 - in people/dato/packages/trunk/amarok/debian: . patches

[Adeodato Simó]

Author: dato-guest
Date: 2005-01-14 01:22:27 +0100 (Fri, 14 Jan 2005)
New Revision: 398

Added:
   people/dato/packages/trunk/amarok/debian/patches/sqlite3_in_configure.in.patch
Modified:
   people/dato/packages/trunk/amarok/debian/changelog
Log:
The 1.1 series didn't check for sqlite3, but sqlite. Patch added.


Modified: people/dato/packages/trunk/amarok/debian/changelog
===================================================================
--- people/dato/packages/trunk/amarok/debian/changelog	2005-01-13 23:38:28 UTC (rev 397)
+++ people/dato/packages/trunk/amarok/debian/changelog	2005-01-14 00:22:27 UTC (rev 398)
@@ -24,6 +24,8 @@
     + SQLite 3 is now in the archive:
       - changed Build-Depends on libsqlite0-dev to libsqlite3-dev.
       - pass --without-included-sqlite to ./configure.
+      - patch configure.in to check for sqlite3 (>= 3.0). Upstream forgot to
+        update this check in the 1.1 series. [sqlite3_in_configure.in.patch]
   
   * New package relationships:
 
@@ -54,7 +56,7 @@
     + debian/amarok.1:
       - correct "hyphen vs. minus sign" usage.
 
- -- Adeodato Simó <asp16@alu.ua.es>  Fri, 14 Jan 2005 00:43:18 +0100
+ -- Adeodato Simó <asp16@alu.ua.es>  Fri, 14 Jan 2005 01:27:40 +0100
 
 amarok (1.1.1-1) unstable; urgency=low
 

Added: people/dato/packages/trunk/amarok/debian/patches/sqlite3_in_configure.in.patch
===================================================================
--- people/dato/packages/trunk/amarok/debian/patches/sqlite3_in_configure.in.patch	2005-01-13 23:38:28 UTC (rev 397)
+++ people/dato/packages/trunk/amarok/debian/patches/sqlite3_in_configure.in.patch	2005-01-14 00:22:27 UTC (rev 398)
@@ -0,0 +1,11 @@
+--- configure.in
++++ configure.in
+@@ -443,7 +443,7 @@
+ 
+ if test x$included_sqlite = xno; then
+     if test x$PKGCONFIGFOUND = xyes; then
+-        KDE_PKG_CHECK_MODULES(SQLITE, sqlite >= 2.8, have_sqlite=yes,have_sqlite=no)
++        KDE_PKG_CHECK_MODULES(SQLITE, sqlite3 >= 3.0, have_sqlite=yes,have_sqlite=no)
+ 
+         if test x$have_sqlite = xyes; then
+             ## AC_DEFINE(HAVE_SQLITE, 1, [have SQLite database library])