[maemo-commits] [maemo-commits] r18190 - in projects/haf/trunk/sqlite3: . debian debian/patches

[From: subversion at stage.maemo.org]

Author: ifrade
Date: 2009-04-29 16:47:57 +0300 (Wed, 29 Apr 2009)
New Revision: 18190

Added:
   projects/haf/trunk/sqlite3/sqlite-3.6.13.tar.gz
Modified:
   projects/haf/trunk/sqlite3/debian/changelog
   projects/haf/trunk/sqlite3/debian/patches/01-qemu-threads-checking.patch
   projects/haf/trunk/sqlite3/debian/rules
Log:
Upgrading to upstream 3.6.13

Modified: projects/haf/trunk/sqlite3/debian/changelog
===================================================================
--- projects/haf/trunk/sqlite3/debian/changelog	2009-04-29 12:32:50 UTC (rev 18189)
+++ projects/haf/trunk/sqlite3/debian/changelog	2009-04-29 13:47:57 UTC (rev 18190)
@@ -1,3 +1,9 @@
+sqlite3 (3.6.13-1~unreleased~maemo1) stable; urgency=low
+
+  * Upgrade to upstream 3.6.13
+
+ -- Ivan Frade (frade) <ivan.frade at nokia.com>  Thu, 29 Apr 2009 16:19:03 +0300
+	
 sqlite3 (3.6.10-0maemo0) stable; urgency=low
 
   * Upgraded to upstream 3.6.10

Modified: projects/haf/trunk/sqlite3/debian/patches/01-qemu-threads-checking.patch
===================================================================
--- projects/haf/trunk/sqlite3/debian/patches/01-qemu-threads-checking.patch	2009-04-29 12:32:50 UTC (rev 18189)
+++ projects/haf/trunk/sqlite3/debian/patches/01-qemu-threads-checking.patch	2009-04-29 13:47:57 UTC (rev 18190)
@@ -1,19 +1,18 @@
---- build-tree/sqlite-3.6.10/src/os_unix.c.orig	2009-01-15 16:01:46.000000000 +0200
-+++ build-tree/sqlite-3.6.10/src/os_unix.c	2009-01-21 14:44:21.000000000 +0200
-@@ -947,9 +947,16 @@ static int findLockInfo(
+--- build-tree/sqlite-3.6.13/src/os_unix.c.orig	2009-04-29 16:24:19.000000000 +0300
++++ build-tree/sqlite-3.6.13/src/os_unix.c	2009-04-29 16:25:37.000000000 +0300
+@@ -959,9 +959,15 @@ static int findLockInfo(
    lockKey.fid.ino = statbuf.st_ino;
  #endif
  #if SQLITE_THREADSAFE && defined(__linux__)
-+
-+  /* HACK: skip this test because it breaks QEMU      */
-+  /* Use value obtained from real HW instead          */
-+#if 0
++  /* HACK: skip this test because it breaks QEMU */
++  /* Use value obtained from real HW instead     */
++  #if 0
    if( threadsOverrideEachOthersLocks<0 ){
      testThreadLockingBehavior(fd);
    }
-+#else
-+  threadsOverrideEachOthersLocks = 1;
-+#endif
++  #else
++  threadsOverrideEachOthersLocks=1;
++  #endif
    lockKey.tid = threadsOverrideEachOthersLocks ? 0 : pthread_self();
  #endif
    fileId = lockKey.fid;

Modified: projects/haf/trunk/sqlite3/debian/rules
===================================================================
--- projects/haf/trunk/sqlite3/debian/rules	2009-04-29 12:32:50 UTC (rev 18189)
+++ projects/haf/trunk/sqlite3/debian/rules	2009-04-29 13:47:57 UTC (rev 18190)
@@ -7,7 +7,7 @@
 
 so_version := 0
 
-DEB_TAR_SRCDIR := sqlite-3.6.10
+DEB_TAR_SRCDIR := sqlite-3.6.13
 include /usr/share/cdbs/1/rules/tarball.mk
 
 # Make sure libsqlite0 is built before packages depending on it
@@ -48,4 +48,4 @@
 
 CFLAGS = -Wall -g
 
-DEB_DH_STRIP_ARGS := --dbg-package=libsqlite3-0
\ No newline at end of file
+DEB_DH_STRIP_ARGS := --dbg-package=libsqlite3-0

Added: projects/haf/trunk/sqlite3/sqlite-3.6.13.tar.gz
===================================================================
(Binary files differ)


Property changes on: projects/haf/trunk/sqlite3/sqlite-3.6.13.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream