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

From: subversion at stage.maemo.org subversion at stage.maemo.org
Date: Wed May 13 14:35:31 EEST 2009 
Author: ifrade
Date: 2009-05-13 14:35:20 +0300 (Wed, 13 May 2009)
New Revision: 18348

Added:
   projects/haf/trunk/sqlite3/sqlite-amalgamation-3.6.14.tar.gz
Removed:
   projects/haf/trunk/sqlite3/debian/lemon.1
   projects/haf/trunk/sqlite3/debian/lemon.dirs
   projects/haf/trunk/sqlite3/debian/lemon.install
   projects/haf/trunk/sqlite3/debian/lemon.manpages
   projects/haf/trunk/sqlite3/sqlite-3.6.13.tar.gz
Modified:
   projects/haf/trunk/sqlite3/debian/changelog
   projects/haf/trunk/sqlite3/debian/control
   projects/haf/trunk/sqlite3/debian/libsqlite3-dev.install
   projects/haf/trunk/sqlite3/debian/patches/01-qemu-threads-checking.patch
   projects/haf/trunk/sqlite3/debian/rules
   projects/haf/trunk/sqlite3/debian/sqlite3.install
Log:
Upgrade to sqlite 3.6.14 and using amalgamation distribution. Removed lemon package

Modified: projects/haf/trunk/sqlite3/debian/changelog
===================================================================
--- projects/haf/trunk/sqlite3/debian/changelog	2009-05-13 10:28:48 UTC (rev 18347)
+++ projects/haf/trunk/sqlite3/debian/changelog	2009-05-13 11:35:20 UTC (rev 18348)
@@ -1,3 +1,11 @@
+sqlite3 (3.6.14-1maemo1) stable; urgency=low
+
+  * Upgrade to upstream 3.6.14
+  * Fixes: NB#112414, Link sqlite command line tool with readline
+  * Fixes: NB#111220, libsqlite3-dev missing static library file
+
+ -- Ivan Frade (frade) <ivan.frade at nokia.com>  Thu, 13 May 2009 14:22:03 +0300
+
 sqlite3 (3.6.13-1maemo2) stable; urgency=low
 
   * Fixed compilation in ARM env.

Modified: projects/haf/trunk/sqlite3/debian/control
===================================================================
--- projects/haf/trunk/sqlite3/debian/control	2009-05-13 10:28:48 UTC (rev 18347)
+++ projects/haf/trunk/sqlite3/debian/control	2009-05-13 11:35:20 UTC (rev 18348)
@@ -2,27 +2,13 @@
 Section: devel
 Priority: optional
 Maintainer: Laszlo Boszormenyi (GCS) <gcs at debian.hu>
-Build-Depends: cdbs (>= 0.4.15), debhelper (>= 4.1.16), autoconf (>= 2.59), libtool (>= 1.5.2), automake1.9, autotools-dev
+Build-Depends: cdbs (>= 0.4.15), debhelper (>= 4.1.16), autoconf (>= 2.59), libtool (>= 1.5.2), automake1.9, autotools-dev, libreadline5-dev
 Standards-Version: 3.7.2
 
-Package: lemon
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: The Lemon Parser Generator
- Lemon is an LALR(1) parser generator for C or C++. It does the same
- job as bison and yacc. But lemon is not another bison or yacc
- clone. It uses a different grammar syntax which is designed to reduce
- the number of coding errors. Lemon also uses a more sophisticated
- parsing engine that is faster than yacc and bison and which is both
- reentrant and thread-safe. Furthermore, Lemon implements features
- that can be used to eliminate resource leaks, making is suitable for
- use in long-running programs such as graphical user interfaces or
- embedded controllers.
-
 Package: sqlite3
 Section: misc
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, libreadline5
 Suggests: sqlite3-doc
 Description: A command line interface for SQLite 3
  SQLite is a C library that implements an SQL database engine. 

Deleted: projects/haf/trunk/sqlite3/debian/lemon.1
===================================================================
--- projects/haf/trunk/sqlite3/debian/lemon.1	2009-05-13 10:28:48 UTC (rev 18347)
+++ projects/haf/trunk/sqlite3/debian/lemon.1	2009-05-13 11:35:20 UTC (rev 18348)
@@ -1,63 +0,0 @@
-.Dd 2002-10-04
-.Dt LEMON 1
-.Os "Debian GNU/Linux"
-.\" Manual page created by Guus Sliepen <guus at debian.org>
-.Sh NAME
-.Nm lemon
-.Nd The Lemon Parser Generator
-.Sh SYNOPSIS
-.Nm
-.Op Fl bcgmqsx
-.Ar input
-.Sh DESCRIPTION
-.Nm
-is an LALR(1) parser generator for C or C++.
-It does the same job as bison and yacc.
-But 
-.Nm
-is not another bison or yacc clone.
-It uses a different grammar syntax which is designed to reduce the number of coding errors.
-.Nm
-also uses a more sophisticated parsing engine that is faster than yacc and bison
-and which is both reentrant and thread-safe.
-Furthermore, 
-.Nm
-implements features that can be used to eliminate resource leaks,
-making is suitable for use in long-running programs such as graphical user interfaces or embedded controllers.
-.Pp
-.Nm
-will read the grammer from
-.Ar input
-and write out a parser for that grammar in the C language.
-.Sh OPTIONS
-.Bl -tag -width indent
-.It Fl b
-Print only the basis in report.
-.It Fl c
-Don't compress the action table.
-.It Fl g
-Print grammar without actions.
-.It Fl m
-Output a makeheaders compatible file.
-.It Fl q
-(Quiet) Don't print the report file.
-.It Fl s
-Print parser stats to standard output.
-.It Fl x
-Print the version number.
-.El
-.Sh FILES
-.Bl -tag -width indent
-.It Pa /usr/share/lemon/lempar.c
-Driver template for the
-.Nm
-parser generator.
-.El
-.Sh AUTHOR
-.Nm
-has been written by
-.An D. Richard Hipp Aq drh at hwaci.com .
-.Pp
-This manual page was written by
-.An Guus Sliepen Aq guus at debian.org
-for the Debian GNU/Linux system.

Deleted: projects/haf/trunk/sqlite3/debian/lemon.dirs
===================================================================
--- projects/haf/trunk/sqlite3/debian/lemon.dirs	2009-05-13 10:28:48 UTC (rev 18347)
+++ projects/haf/trunk/sqlite3/debian/lemon.dirs	2009-05-13 11:35:20 UTC (rev 18348)
@@ -1,2 +0,0 @@
-usr/bin
-usr/share/lemon

Deleted: projects/haf/trunk/sqlite3/debian/lemon.install
===================================================================
--- projects/haf/trunk/sqlite3/debian/lemon.install	2009-05-13 10:28:48 UTC (rev 18347)
+++ projects/haf/trunk/sqlite3/debian/lemon.install	2009-05-13 11:35:20 UTC (rev 18348)
@@ -1,2 +0,0 @@
-usr/share/lemon/lempar.c
-usr/bin/lemon

Deleted: projects/haf/trunk/sqlite3/debian/lemon.manpages
===================================================================
--- projects/haf/trunk/sqlite3/debian/lemon.manpages	2009-05-13 10:28:48 UTC (rev 18347)
+++ projects/haf/trunk/sqlite3/debian/lemon.manpages	2009-05-13 11:35:20 UTC (rev 18348)
@@ -1 +0,0 @@
-debian/lemon.1

Modified: projects/haf/trunk/sqlite3/debian/libsqlite3-dev.install
===================================================================
--- projects/haf/trunk/sqlite3/debian/libsqlite3-dev.install	2009-05-13 10:28:48 UTC (rev 18347)
+++ projects/haf/trunk/sqlite3/debian/libsqlite3-dev.install	2009-05-13 11:35:20 UTC (rev 18348)
@@ -1,3 +1,4 @@
 usr/include/*.h
 usr/lib/libsqlite3.so
+usr/lib/libsqlite3.a
 usr/lib/pkgconfig/sqlite3.pc

Modified: projects/haf/trunk/sqlite3/debian/patches/01-qemu-threads-checking.patch
===================================================================
--- projects/haf/trunk/sqlite3/debian/patches/01-qemu-threads-checking.patch	2009-05-13 10:28:48 UTC (rev 18347)
+++ projects/haf/trunk/sqlite3/debian/patches/01-qemu-threads-checking.patch	2009-05-13 11:35:20 UTC (rev 18348)
@@ -1,11 +1,11 @@
---- 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(
+--- sqlite3.c.orig	2009-05-13 13:42:17.000000000 +0300
++++ sqlite3.c	2009-05-13 13:43:43.000000000 +0300
+@@ -21805,9 +21805,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     */
++ /* HACK: skip this test because it breaks QEMU */
++ /* Use value obtained from real HW instead     */
 +  #if 0
    if( threadsOverrideEachOthersLocks<0 ){
      testThreadLockingBehavior(fd);

Modified: projects/haf/trunk/sqlite3/debian/rules
===================================================================
--- projects/haf/trunk/sqlite3/debian/rules	2009-05-13 10:28:48 UTC (rev 18347)
+++ projects/haf/trunk/sqlite3/debian/rules	2009-05-13 11:35:20 UTC (rev 18348)
@@ -7,7 +7,7 @@
 
 so_version := 0
 
-DEB_TAR_SRCDIR := sqlite-3.6.13
+DEB_TAR_SRCDIR := sqlite-3.6.14
 include /usr/share/cdbs/1/rules/tarball.mk
 
 # Make sure libsqlite0 is built before packages depending on it
@@ -17,11 +17,8 @@
 	install -d debian/tmp/usr/lib/sqlite3
 	install -m 0664 debian/pkgIndex.tcl debian/tmp/usr/lib/sqlite3
 #./libtool --mode=install install libtclsqlite3.la `pwd`/debian/tmp/usr/lib/sqlite3
-	install -d debian/tmp/usr/share/lemon
-	install -m 664 $(DEB_BUILDDIR)/tool/lempar.c debian/tmp/usr/share/lemon
-	install -m 775 $(DEB_BUILDDIR)/lemon debian/tmp/usr/bin
-	install -d debian/tmp/usr/share/man/man1/
-	install -m 644 $(DEB_BUILDDIR)/sqlite3.1 debian/tmp/usr/share/man/man1
+#	install -d debian/tmp/usr/share/man/man1/
+#	install -m 644 $(DEB_BUILDDIR)/sqlite3.1 debian/tmp/usr/share/man/man1
 
 #install/sqlite3-doc::
 #	doc/ >doc/lang.html
@@ -30,9 +27,11 @@
 DEB_AUTO_UPDATE_AUTOCONF = 2.50
 DEB_AUTO_UPDATE_AUTOMAKE = 1.9 # We don't use automake, but aclocal
 
-DEB_CONFIGURE_EXTRA_FLAGS = --disable-tcl --enable-threadsafe --enable-load-extension
+DEB_CONFIGURE_EXTRA_FLAGS = --disable-tcl --enable-threadsafe --enable-dynamic-extensions --enable-readline --enable-static
 
-DEB_BUILD_MAKE_TARGET = all doc
+
+DEB_BUILD_MAKE_TARGET = all
+#DEB_BUILD_MAKE_TARGET = all doc
 #DEB_MAKE_CHECK_TARGET = test
 
 DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp

Modified: projects/haf/trunk/sqlite3/debian/sqlite3.install
===================================================================
--- projects/haf/trunk/sqlite3/debian/sqlite3.install	2009-05-13 10:28:48 UTC (rev 18347)
+++ projects/haf/trunk/sqlite3/debian/sqlite3.install	2009-05-13 11:35:20 UTC (rev 18348)
@@ -1,2 +1 @@
 usr/bin/sqlite3
-usr/share/man/man1/sqlite3.1

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

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


Property changes on: projects/haf/trunk/sqlite3/sqlite-amalgamation-3.6.14.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream
More information about the maemo-commits mailing list