From 36bcbc47a4d0a83550bbc93e014fc979b65a916b Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Tue, 13 Aug 2013 15:54:00 -0400 Subject: fix patches for new upstream version, which includes some of our patches --- debian/patches/10-520478-squash-bad-deps.patch | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'debian/patches/10-520478-squash-bad-deps.patch') diff --git a/debian/patches/10-520478-squash-bad-deps.patch b/debian/patches/10-520478-squash-bad-deps.patch index 96c57ef..62262d3 100644 --- a/debian/patches/10-520478-squash-bad-deps.patch +++ b/debian/patches/10-520478-squash-bad-deps.patch @@ -1,23 +1,23 @@ ---- 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) +--- sqlcipher-2.2.1.orig/Makefile.in ++++ sqlcipher-2.2.1/Makefile.in +@@ -521,18 +521,20 @@ sqlcipher.pc: $(TOP)/sqlcipher.pc.in + libsqlcipher.la: $(LIBOBJ) $(LTLINK) -o $@ $(LIBOBJ) $(TLIBS) \ ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8" + sed -i "/dependency_libs/s/'.*'/''/" $@ - libtclsqlite3.la: tclsqlite.lo libsqlite3.la + libtclsqlite3.la: tclsqlite.lo libsqlcipher.la $(LTLINK) -o $@ tclsqlite.lo \ -- libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ -+ libsqlite3.la @TCL_STUB_LIB_SPEC@ \ +- libsqlcipher.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \ ++ libsqlcipher.la @TCL_STUB_LIB_SPEC@ \ -rpath "$(TCLLIBDIR)" \ -version-info "8:6:8" \ -avoid-version + sed -i "/dependency_libs/s/'.*'/''/" $@ - sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h + sqlcipher$(TEXE): $(TOP)/src/shell.c libsqlcipher.la sqlite3.h $(LTLINK) $(READLINE_FLAGS) \ - -o $@ $(TOP)/src/shell.c libsqlite3.la \ + -o $@ $(TOP)/src/shell.c libsqlcipher.la \ - $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)" + $(LIBREADLINE) -rpath "$(libdir)" -- cgit v1.2.3