diff -Nru sqliteodbc-0.9996/debian/changelog sqliteodbc-0.9996/debian/changelog --- sqliteodbc-0.9996/debian/changelog 2019-10-16 22:10:19.000000000 +0000 +++ sqliteodbc-0.9996/debian/changelog 2020-01-21 23:43:44.000000000 +0000 @@ -1,3 +1,12 @@ +sqliteodbc (0.9996-3) unstable; urgency=medium + + * Refresh patch: no-distro-work + * Refresh patch: lib-location + * Use pkg-config to find libxml2 (Closes: #949500) + * Bump Standards Version to 4.5.0 + + -- Chris Hofstaedtler Tue, 21 Jan 2020 23:43:44 +0000 + sqliteodbc (0.9996-2) unstable; urgency=medium * Use debhelper compat v12 diff -Nru sqliteodbc-0.9996/debian/control sqliteodbc-0.9996/debian/control --- sqliteodbc-0.9996/debian/control 2019-10-16 22:10:19.000000000 +0000 +++ sqliteodbc-0.9996/debian/control 2020-01-21 23:43:44.000000000 +0000 @@ -5,9 +5,10 @@ Build-Depends: debhelper-compat (= 12), libsqlite3-dev, libxml2-dev, + pkg-config, unixodbc-dev, zlib1g-dev | libz-dev -Standards-Version: 4.4.1 +Standards-Version: 4.5.0 Section: libs Vcs-Browser: https://salsa.debian.org/debian/sqliteodbc Vcs-Git: https://salsa.debian.org/debian/sqliteodbc.git diff -Nru sqliteodbc-0.9996/debian/libsqliteodbc.install sqliteodbc-0.9996/debian/libsqliteodbc.install --- sqliteodbc-0.9996/debian/libsqliteodbc.install 2019-10-16 22:10:19.000000000 +0000 +++ sqliteodbc-0.9996/debian/libsqliteodbc.install 2020-01-21 23:43:44.000000000 +0000 @@ -1,2 +1,2 @@ -usr/lib/*/odbc/*.so* debian/unixodbc.ini /usr/share/sqliteodbc +usr/lib/*/odbc/*.so* diff -Nru sqliteodbc-0.9996/debian/patches/lib-location sqliteodbc-0.9996/debian/patches/lib-location --- sqliteodbc-0.9996/debian/patches/lib-location 2019-10-16 22:10:19.000000000 +0000 +++ sqliteodbc-0.9996/debian/patches/lib-location 2020-01-21 23:43:44.000000000 +0000 @@ -7,11 +7,11 @@ Makefile.in | 35 ++++++++++++++++++++--------------- 1 file changed, 20 insertions(+), 15 deletions(-) -diff --git a/Makefile.in b/Makefile.in -index ac96b79..1e49b76 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -65,27 +65,27 @@ libsqlite4odbc.la: sqlite4odbc.lo $(SQLITE4_A10N_O) +Index: sqliteodbc/Makefile.in +=================================================================== +--- sqliteodbc.orig/Makefile.in ++++ sqliteodbc/Makefile.in +@@ -67,27 +67,27 @@ libsqlite4odbc.la: sqlite4odbc.lo $(SQLI libsqlite3_mod_blobtoxy.la: blobtoxy.lo $(LIBTOOL) --mode=link $(CC) $(CFLAGS) \ -o libsqlite3_mod_blobtoxy.la \ @@ -44,7 +44,7 @@ sqliteodbc.lo: sqliteodbc.c sqliteodbc.h $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c \ -@@ -135,6 +135,7 @@ xpath.lo: xpath.c +@@ -137,6 +137,7 @@ xpath.lo: xpath.c $(SQLITE3_FLAGS) $(XML2_FLAGS) xpath.c install-2: libsqliteodbc.la @@ -52,7 +52,7 @@ $(LIBTOOL) --mode=install $(INSTALL) \ libsqliteodbc.la $(DESTDIR)$(drvdir) -@@ -151,42 +152,45 @@ uninstall-2: +@@ -153,42 +154,45 @@ uninstall-2: install-3: libsqlite3odbc.la @EXT_BLOBTOXY@ @EXT_IMPEXP@ \ @EXT_CSVTABLE@ @EXT_ZIPFILE@ @EXT_XPATH@ @@ -108,7 +108,7 @@ drvinst-3: install-3 sh drvdsninst.sh SQLITE3 "SQLite3 Datasource" \ -@@ -197,6 +201,7 @@ drvuninst-3: uninstall-3 +@@ -199,6 +203,7 @@ drvuninst-3: uninstall-3 install-4: libsqlite4odbc.la diff -Nru sqliteodbc-0.9996/debian/patches/libxml2-pkg-config sqliteodbc-0.9996/debian/patches/libxml2-pkg-config --- sqliteodbc-0.9996/debian/patches/libxml2-pkg-config 1970-01-01 00:00:00.000000000 +0000 +++ sqliteodbc-0.9996/debian/patches/libxml2-pkg-config 2020-01-21 23:43:44.000000000 +0000 @@ -0,0 +1,68 @@ +Index: sqliteodbc/Makefile.in +=================================================================== +--- sqliteodbc.orig/Makefile.in ++++ sqliteodbc/Makefile.in +@@ -43,7 +43,7 @@ ODBC_FLAGS = @ODBC_FLAGS@ + ODBC_LIB = @ODBC_LIB@ @LDFLAGS@ + VER_INFO = @VER_INFO@ + +-XML2_FLAGS = @XML2_FLAGS@ ++XML2_FLAGS = @XML2_CFLAGS@ + XML2_LIBS = @XML2_LIBS@ + + all: @LIB_TARGETS@ +Index: sqliteodbc/configure.in +=================================================================== +--- sqliteodbc.orig/configure.in ++++ sqliteodbc/configure.in +@@ -348,38 +348,16 @@ AC_SUBST(SQLITE4_A10N_FLAGS) + # libxml2 support for XPath virtual table module + AC_ARG_WITH(libxml2, [ --with-libxml2=SCR use xml2-config script SCR], + XML2_CONFIG=$withval) +-XML2_FLAGS="" +-XML2_LIBS="" + EXT_XPATH="" + if test "$SQLITE3_LOADEXTENSION" = "1" ; then + if test "$with_libxml2" = "no" ; then + XML2_CONFIG="" + else +- AC_MSG_CHECKING([for libxml2 header and library]) +- if test "$with_libxml2" != "no" ; then +- if test -z "$XML2_CONFIG" ; then +- XML2_CONFIG=`which xml2-config 2>/dev/null` +- fi +- fi +- xml2_err1=1 +- xml2_err2=1 +- if test -n "$XML2_CONFIG" ; then +- XML2_FLAGS="`$XML2_CONFIG --cflags 2>/dev/null`" +- xml2_err1=$? +- XML2_LIBS="`$XML2_CONFIG --libs 2>/dev/null`" +- xml2_err2=$? +- fi +- if test $xml2_err1 -eq 0 -a $xml2_err2 -eq 0 ; then +- EXT_XPATH=libsqlite3_mod_xpath.la +- LIB_TARGETS="$LIB_TARGETS $EXT_XPATH" +- AC_MSG_RESULT(yes) +- else +- AC_MSG_RESULT(no) +- fi ++ PKG_CHECK_MODULES([XML2], [libxml-2.0]) ++ EXT_XPATH=libsqlite3_mod_xpath.la ++ LIB_TARGETS="$LIB_TARGETS $EXT_XPATH" + fi + fi +-AC_SUBST(XML2_FLAGS) +-AC_SUBST(XML2_LIBS) + AC_SUBST(EXT_XPATH) + + ######### +Index: sqliteodbc/aclocal.m4 +=================================================================== +--- sqliteodbc.orig/aclocal.m4 ++++ sqliteodbc/aclocal.m4 +@@ -1,3 +1,4 @@ ++# generated by aclocal + # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- + # + # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, diff -Nru sqliteodbc-0.9996/debian/patches/no-distro-work sqliteodbc-0.9996/debian/patches/no-distro-work --- sqliteodbc-0.9996/debian/patches/no-distro-work 2019-10-16 22:10:19.000000000 +0000 +++ sqliteodbc-0.9996/debian/patches/no-distro-work 2020-01-21 23:43:44.000000000 +0000 @@ -11,11 +11,11 @@ configure.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) -diff --git a/configure.in b/configure.in -index 5911886..db620a1 100644 ---- a/configure.in -+++ b/configure.in -@@ -738,8 +738,4 @@ AC_SUBST(SQLITE4_A10N_O) +Index: sqliteodbc/configure.in +=================================================================== +--- sqliteodbc.orig/configure.in ++++ sqliteodbc/configure.in +@@ -748,8 +748,4 @@ AC_SUBST(SQLITE4_A10N_O) ######### # Generate the output files. # diff -Nru sqliteodbc-0.9996/debian/patches/series sqliteodbc-0.9996/debian/patches/series --- sqliteodbc-0.9996/debian/patches/series 2019-10-16 22:10:19.000000000 +0000 +++ sqliteodbc-0.9996/debian/patches/series 2020-01-21 23:43:44.000000000 +0000 @@ -1,3 +1,4 @@ no-distro-work lib-location makefile-flags +libxml2-pkg-config