summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-06-08 04:23:54 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-06-08 04:24:20 +0000
commit7c86db87134e7ffdc62268adea4da632fcbf3e4e (patch)
treeadb372fe27115eed05211f71ce4090c865493c26
parentMerging upstream version 3.24.0. (diff)
downloadsqlite3-7c86db87134e7ffdc62268adea4da632fcbf3e4e.zip
sqlite3-7c86db87134e7ffdc62268adea4da632fcbf3e4e.tar.xz
Merging debian version 3.24.0-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog10
-rw-r--r--debian/compat2
-rw-r--r--debian/control4
-rw-r--r--debian/libsqlite3-0.install2
-rw-r--r--debian/libsqlite3-0.install.in1
-rw-r--r--debian/libsqlite3-0.symbols14
-rw-r--r--debian/libsqlite3-dev.install5
-rwxr-xr-xdebian/rules14
-rw-r--r--debian/sqlite3-doc.doc-base4
9 files changed, 44 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog
index d422f14..e6b66d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+sqlite3 (3.24.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update libsqlite3-0 symbols.
+ * Update debhelper level to 11:
+ - update documentation path.
+ * Update Standards-Version to 4.1.4 .
+
+ -- Laszlo Boszormenyi (GCS) <gcs@debian.org> Tue, 05 Jun 2018 21:47:02 +0000
+
sqlite3 (3.23.1-1~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index 1822087..ec28775 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,10 @@ Maintainer: Progress Linux Maintainers <maintainers@lists.progress-linux.org>
XSBC-Uploaders: Daniel Baumann <daniel.baumann@progress-linux.org>
XSBC-Original-Maintainer: Laszlo Boszormenyi (GCS) <gcs@debian.org>
Bugs: mailto:maintainers@lists.progress-linux.org
-Build-Depends: debhelper (>= 10), autoconf (>= 2.59), libtool (>= 1.5.2), automake, chrpath, libreadline-dev, tcl8.6-dev
+Build-Depends: debhelper (>= 11), autoconf (>= 2.59), libtool (>= 1.5.2), automake, chrpath, libreadline-dev, tcl8.6-dev
Build-Conflicts: tcl8.4, tcl8.4-dev, tcl8.5, tcl8.5-dev
Homepage: http://www.sqlite.org/
-Standards-Version: 4.1.3
+Standards-Version: 4.1.4
Vcs-Browser: https://sources.progress-linux.org/distributions/dschinn-backports/packages/sqlite3
Vcs-Git: https://sources.progress-linux.org/distributions/dschinn-backports/packages/sqlite3
diff --git a/debian/libsqlite3-0.install b/debian/libsqlite3-0.install
new file mode 100644
index 0000000..d3a6524
--- /dev/null
+++ b/debian/libsqlite3-0.install
@@ -0,0 +1,2 @@
+usr/lib/*/libsqlite3.so.*
+#usr/lib/*/sqlite/csv.so
diff --git a/debian/libsqlite3-0.install.in b/debian/libsqlite3-0.install.in
index 7a4156b..42e732d 100644
--- a/debian/libsqlite3-0.install.in
+++ b/debian/libsqlite3-0.install.in
@@ -1 +1,2 @@
usr/lib/${DEB_HOST_MULTIARCH}/libsqlite3.so.*
+usr/lib/${DEB_HOST_MULTIARCH}/sqlite/csv.so
diff --git a/debian/libsqlite3-0.symbols b/debian/libsqlite3-0.symbols
index 4a841b4..41dd2a1 100644
--- a/debian/libsqlite3-0.symbols
+++ b/debian/libsqlite3-0.symbols
@@ -107,6 +107,9 @@ libsqlite3.so.0 libsqlite3-0 #MINVER#
sqlite3_global_recover@Base 3.5.9
sqlite3_initialize@Base 3.6.0
sqlite3_interrupt@Base 3.5.9
+ sqlite3_keyword_check@Base 3.24.0
+ sqlite3_keyword_count@Base 3.24.0
+ sqlite3_keyword_name@Base 3.24.0
sqlite3_last_insert_rowid@Base 3.5.9
sqlite3_libversion@Base 3.5.9
sqlite3_libversion_number@Base 3.5.9
@@ -191,6 +194,17 @@ libsqlite3.so.0 libsqlite3-0 #MINVER#
sqlite3_stmt_busy@Base 3.7.10
sqlite3_stmt_readonly@Base 3.7.4
sqlite3_stmt_status@Base 3.6.4
+ sqlite3_str_append@Base 3.24.0
+ sqlite3_str_appendall@Base 3.24.0
+ sqlite3_str_appendchar@Base 3.24.0
+ sqlite3_str_appendf@Base 3.24.0
+ sqlite3_str_errcode@Base 3.24.0
+ sqlite3_str_finish@Base 3.24.0
+ sqlite3_str_length@Base 3.24.0
+ sqlite3_str_new@Base 3.24.0
+ sqlite3_str_reset@Base 3.24.0
+ sqlite3_str_value@Base 3.24.0
+ sqlite3_str_vappendf@Base 3.24.0
sqlite3_strglob@Base 3.7.17
sqlite3_stricmp@Base 3.7.11
sqlite3_strlike@Base 3.10.0
diff --git a/debian/libsqlite3-dev.install b/debian/libsqlite3-dev.install
new file mode 100644
index 0000000..66da164
--- /dev/null
+++ b/debian/libsqlite3-dev.install
@@ -0,0 +1,5 @@
+usr/include/*.h
+usr/lib/*/libsqlite3.a
+usr/lib/*/libsqlite3.so
+usr/lib/*/libsqlite3.la
+usr/lib/*/pkgconfig/sqlite3.pc
diff --git a/debian/rules b/debian/rules
index 5457cd1..bcdc5e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -80,6 +80,7 @@ build-stamp: configure
ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
$(MAKE) lemon
endif
+ cd ext/misc && $(CC) -g -fPIC -I../.. -shared csv.c -o csv.so
touch $@
@@ -90,7 +91,7 @@ clean:
rm -f config.log config.h pkgIndex.tcl configure
[ ! -f Makefile ] || $(MAKE) distclean
rm -f config.h sqlite3session.h mksourceid
- rm -f debian/libsqlite3-0.install debian/libsqlite3-dev.install
+ rm -f ext/misc/csv.so
dh_autoreconf_clean
dh_clean
@@ -104,8 +105,11 @@ install: build
install -m 0664 libtclsqlite3.la $(DESTDIR)/usr/lib/tcltk/sqlite3/
install -d $(DESTDIR)/usr/share/lemon
install -m 0664 tool/lempar.c $(DESTDIR)/usr/share/lemon/
- install -m 0775 sqldiff $(DESTDIR)/usr/bin
- install -m 0775 lemon $(DESTDIR)/usr/bin
+ install -m 0775 sqldiff $(DESTDIR)/usr/bin/
+ install -m 0775 lemon $(DESTDIR)/usr/bin/
+ install -d $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/sqlite/
+ install -m 0775 ext/misc/csv.so \
+ $(DESTDIR)/usr/lib/$(DEB_HOST_MULTIARCH)/sqlite/
# Remove *.la files per policy 3.9.1.0
sed -i "/dependency_libs/ s/'.*'/''/" `find $(DESTDIR) -name '*.la'`
@@ -141,10 +145,6 @@ binary-arch: build install
dh_testdir
dh_testroot
- for file in libsqlite3-0.install libsqlite3-dev.install; do \
- sed -e"s,\$${DEB_HOST_MULTIARCH},${DEB_HOST_MULTIARCH},g" \
- debian/$${file}.in > debian/$$file; \
- done
dh_install -a --sourcedir=$(DESTDIR)
dh_installman -a
dh_installdocs -a
diff --git a/debian/sqlite3-doc.doc-base b/debian/sqlite3-doc.doc-base
index 3aebe2f..1a78d86 100644
--- a/debian/sqlite3-doc.doc-base
+++ b/debian/sqlite3-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: Overview of SQLite3
Section: Data Management
Format: HTML
-Index: /usr/share/doc/sqlite3-doc/index.html
-Files: /usr/share/doc/sqlite3-doc/*.html
+Index: /usr/share/doc/sqlite3/index.html
+Files: /usr/share/doc/sqlite3/*.html