diff -Nru sqlite-2.8.17/debian/changelog sqlite-2.8.17/debian/changelog --- sqlite-2.8.17/debian/changelog 2014-01-17 22:30:32.000000000 +0000 +++ sqlite-2.8.17/debian/changelog 2014-12-17 16:09:33.000000000 +0000 @@ -1,22 +1,28 @@ -sqlite (2.8.17-10ubuntu2) trusty; urgency=medium +sqlite (2.8.17-12fakesync1) vivid-proposed; urgency=medium - * Update config.{sub,guess} too, autoreconf isn't enough for this. + * Fake sync due to mismatching orig tarball. - -- Adam Conrad Fri, 17 Jan 2014 15:29:56 -0700 + -- Graham Inggs Wed, 17 Dec 2014 18:09:33 +0200 -sqlite (2.8.17-10ubuntu1) trusty; urgency=low +sqlite (2.8.17-12) unstable; urgency=low - * Because Debian unstable's tcl packaging differs from Ubuntu 14.04's, - adjust the build-dependencies and build targets to resolve FTBFS. - - Handle Tcl lib in multiarch path. + * Sync with Ubuntu. - -- Daniel T Chen Wed, 15 Jan 2014 09:43:13 -0500 + [ Adam Conrad ] + * Update config.{sub,guess} too, autoreconf isn't enough for this + (closes: #727510). -sqlite (2.8.17-10fakesync1) trusty-proposed; urgency=medium + -- Laszlo Boszormenyi (GCS) Thu, 28 Aug 2014 21:32:41 +0000 - * Fake sync due to mismatching orig tarball. +sqlite (2.8.17-11) unstable; urgency=low + + * Move to Tcl 8.6 . + + [ Peter Michael Green ] + * Add code in debian/rules to make build use appropriate tclsh + (closes: #746058). - -- Colin Watson Wed, 08 Jan 2014 11:25:24 +0000 + -- Laszlo Boszormenyi (GCS) Wed, 28 May 2014 12:14:25 +0000 sqlite (2.8.17-10) unstable; urgency=low diff -Nru sqlite-2.8.17/debian/clean sqlite-2.8.17/debian/clean --- sqlite-2.8.17/debian/clean 2013-10-18 13:23:18.000000000 +0000 +++ sqlite-2.8.17/debian/clean 2014-05-28 12:23:43.000000000 +0000 @@ -1 +1,2 @@ +bin/tclsh sqlite.pc diff -Nru sqlite-2.8.17/debian/control sqlite-2.8.17/debian/control --- sqlite-2.8.17/debian/control 2014-01-14 22:52:09.000000000 +0000 +++ sqlite-2.8.17/debian/control 2014-12-17 16:09:33.000000000 +0000 @@ -3,8 +3,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) -Build-Depends: debhelper (>= 8), autoconf (>= 2.59), libtool (>= 1.5.2), automake, dh-autoreconf, libreadline-dev, tcl8.5-dev, tcl, - dpkg-dev (>= 1.16.0~) +Build-Depends: debhelper (>= 8), autoconf (>= 2.59), libtool (>= 1.5.2), automake, autotools-dev, dh-autoreconf, libreadline-dev, tcl8.6-dev Standards-Version: 3.9.5 Package: sqlite diff -Nru sqlite-2.8.17/debian/patches/04-fix-sort-syntax.patch sqlite-2.8.17/debian/patches/04-fix-sort-syntax.patch --- sqlite-2.8.17/debian/patches/04-fix-sort-syntax.patch 1970-01-01 00:00:00.000000000 +0000 +++ sqlite-2.8.17/debian/patches/04-fix-sort-syntax.patch 2014-05-28 12:33:53.000000000 +0000 @@ -0,0 +1,22 @@ +Description: obsolete command line syntax + As well as the tclsh issue the log also shows: + sort: cannot read: +4: No such file or directory + Which seems to be down to the use of an obsolete command line syntax. + Seemingly the supported syntax is "sort -k 4". +Author: Ian Campbell +Bug-Debian: http://bugs.debian.org/746058 +Last-Update: 2014-05-28 + +--- + +--- sqlite-2.8.17.orig/Makefile.in ++++ sqlite-2.8.17/Makefile.in +@@ -183,7 +183,7 @@ Makefile: $(TOP)/Makefile.in + # of the most recently modified source code file + # + last_change: $(SRC) +- cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \ ++ cat $(SRC) | grep '$$Id: ' | sort -k 4 | tail -1 \ + | awk '{print $$5,$$6}' >last_change + + libsqlite.la: $(LIBOBJ) diff -Nru sqlite-2.8.17/debian/patches/series sqlite-2.8.17/debian/patches/series --- sqlite-2.8.17/debian/patches/series 2014-01-14 22:48:36.000000000 +0000 +++ sqlite-2.8.17/debian/patches/series 2014-05-28 12:32:40.000000000 +0000 @@ -1,3 +1,4 @@ 01-fix-CVE-2007-1888.patch 02-lemon-snprintf.patch 03-add-fprintf-format-argument.patch +04-fix-sort-syntax.patch diff -Nru sqlite-2.8.17/debian/rules sqlite-2.8.17/debian/rules --- sqlite-2.8.17/debian/rules 2014-01-17 22:36:06.000000000 +0000 +++ sqlite-2.8.17/debian/rules 2014-08-28 21:43:24.000000000 +0000 @@ -3,12 +3,12 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -CONFIGURE_EXTRA_FLAGS = config_TARGET_TCL_INC="-I/usr/include/tcl8.5" \ +export PATH:=$(PATH):$(CURDIR)/bin + +CONFIGURE_EXTRA_FLAGS = config_TARGET_TCL_INC="-I/usr/include/tcl8.6" \ config_BUILD_CFLAGS="$(CFLAGS) -DTHREADSAFE=1" \ - config_TARGET_LIBS="-ltcl8.5 -lpthread" \ - config_TARGET_TCL_LIBS="-L/usr/lib/$(DEB_HOST_MULTIARCH) -ltcl8.5 -lpthread" \ + config_TARGET_LIBS="-ltcl8.6 -lpthread" \ --enable-utf8 override_dh_clean: @@ -17,6 +17,8 @@ dh_clean override_dh_auto_configure: + mkdir -p $(CURDIR)/bin/ + ln -s $(shell which tclsh8.6) $(CURDIR)/bin/tclsh dh_autotools-dev_updateconfig dh_autoreconf dh_auto_configure -- $(CONFIGURE_EXTRA_FLAGS)