diff options
| author | Hans-Christoph Steiner <hans@eds.org> | 2013-08-13 16:15:23 -0400 |
|---|---|---|
| committer | Hans-Christoph Steiner <hans@eds.org> | 2013-08-13 18:10:27 -0400 |
| commit | 362e08e5b155bf8b08fde5adeabd5aa9c3208751 (patch) | |
| tree | 800201effc5e321fe7119d90173fc9a645f1adc9 | |
| parent | 0dad80b6d2a84c1ee5b824826e7ec46e7ab81abf (diff) | |
pull in updated patches from SQLite3 3.7.17 Debian packaging
| -rw-r--r-- | debian/patches/10-520466-libsqlite3-depends-on-libdl.patch | 6 | ||||
| -rw-r--r-- | debian/patches/10-520478-squash-bad-deps.patch | 10 | ||||
| -rw-r--r-- | debian/patches/20-hurd-locking-style.patch | 6 |
3 files changed, 12 insertions, 10 deletions
diff --git a/debian/patches/10-520466-libsqlite3-depends-on-libdl.patch b/debian/patches/10-520466-libsqlite3-depends-on-libdl.patch index 5ed0d04..150b8bd 100644 --- a/debian/patches/10-520466-libsqlite3-depends-on-libdl.patch +++ b/debian/patches/10-520466-libsqlite3-depends-on-libdl.patch @@ -1,5 +1,7 @@ ---- sqlite3-3.6.11.orig/configure.ac 2009-03-20 16:15:10.000000000 -0700 -+++ sqlite3-3.6.11/configure.ac 2009-03-20 16:37:59.000000000 -0700 +Index: sqlite3-3.7.17/configure.ac +=================================================================== +--- sqlite3-3.7.17.orig/configure.ac 2013-05-20 12:56:30.000000000 +0200 ++++ sqlite3-3.7.17/configure.ac 2013-05-21 22:20:46.000000000 +0200 @@ -233,6 +233,38 @@ AC_SUBST(BUILD_CC) diff --git a/debian/patches/10-520478-squash-bad-deps.patch b/debian/patches/10-520478-squash-bad-deps.patch index 71f6362..96c57ef 100644 --- a/debian/patches/10-520478-squash-bad-deps.patch +++ b/debian/patches/10-520478-squash-bad-deps.patch @@ -1,6 +1,6 @@ ---- sqlite3-3.6.11.orig/Makefile.in 2009-03-24 11:40:55.000000000 -0700 -+++ sqlite3-3.6.11/Makefile.in 2009-03-24 11:42:36.000000000 -0700 -@@ -487,18 +487,20 @@ +--- sqlite3-3.7.17.orig/Makefile.in ++++ sqlite3-3.7.17/Makefile.in +@@ -501,18 +501,20 @@ sqlite3.pc: $(TOP)/sqlite3.pc.in libsqlite3.la: $(LIBOBJ) $(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \ ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8" @@ -21,5 +21,5 @@ - $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" + $(LIBREADLINE) -rpath "$(libdir)" - # This target creates a directory named "tsrc" and fills it with - # copies of all of the C source code and header files needed to + mptester$(EXE): sqlite3.c $(TOP)/mptest/mptest.c + $(LTLINK) -o $@ -I. $(TOP)/mptest/mptest.c sqlite3.c \ diff --git a/debian/patches/20-hurd-locking-style.patch b/debian/patches/20-hurd-locking-style.patch index cfb3fde..73e72a3 100644 --- a/debian/patches/20-hurd-locking-style.patch +++ b/debian/patches/20-hurd-locking-style.patch @@ -9,7 +9,7 @@ # include <sys/ioctl.h> # if OS_VXWORKS # include <semaphore.h> -@@ -2124,7 +2124,7 @@ +@@ -2198,7 +2198,7 @@ ** Omit this section if SQLITE_ENABLE_LOCKING_STYLE is turned off or if ** compiling for VXWORKS. */ @@ -18,7 +18,7 @@ /* ** Retry flock() calls that fail with EINTR -@@ -4531,7 +4531,7 @@ +@@ -4927,7 +4927,7 @@ dotlockCheckReservedLock /* xCheckReservedLock method */ ) @@ -27,7 +27,7 @@ IOMETHODS( flockIoFinder, /* Finder function name */ flockIoMethods, /* sqlite3_io_methods object name */ -@@ -6969,6 +6969,8 @@ +@@ -7366,6 +7366,8 @@ static sqlite3_vfs aVfs[] = { #if SQLITE_ENABLE_LOCKING_STYLE && (OS_VXWORKS || defined(__APPLE__)) UNIXVFS("unix", autolockIoFinder ), |