[spatialite] 04/06: Drop patches applied upstream.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sat Jun 27 14:04:24 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository spatialite.
commit fe4ce09642ab3e5b3a7b5a856d89060245fa27dc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Jun 27 15:21:04 2015 +0200
Drop patches applied upstream.
---
debian/changelog | 1 +
debian/patches/00-add_automake_foreign.patch | 31 ---------------------
debian/patches/07-fix_spatialite_pc.patch | 14 ----------
debian/patches/11-link-libxml2.patch | 16 -----------
debian/patches/12-link-pthread.patch | 26 ------------------
debian/patches/series | 5 ----
debian/patches/soversion.patch | 40 ----------------------------
7 files changed, 1 insertion(+), 132 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8412dd8..4785d04 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
spatialite (4.3.0~rc1-1) UNRELEASED; urgency=medium
* New upstream release candidate.
+ * Drop patches applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Sat, 27 Jun 2015 15:16:28 +0200
diff --git a/debian/patches/00-add_automake_foreign.patch b/debian/patches/00-add_automake_foreign.patch
deleted file mode 100644
index a63dda9..0000000
--- a/debian/patches/00-add_automake_foreign.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Francesco Paolo Lovergine <frankie at debian.org>
-Subject: add 'foreign' to AUTOMAKE_OPTIONS
-Origin: vendor
-Forwarded: https://groups.google.com/d/msg/spatialite-users/kIZA-n4f9kk/IoaxSGjUWZEJ
-
----
- Makefile.am | 2 +-
- Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,6 @@
- ACLOCAL_AMFLAGS = -I m4
-
--AUTOMAKE_OPTIONS = dist-zip
-+AUTOMAKE_OPTIONS = dist-zip foreign
-
- EXTRA_DIST = makefile.vc nmake.opt Android.mk Android_4.3.0.mk \
- spatialite-4.3.0.mk mainpage.doxy README.coverage \
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -366,7 +366,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- ACLOCAL_AMFLAGS = -I m4
--AUTOMAKE_OPTIONS = dist-zip
-+AUTOMAKE_OPTIONS = dist-zip foreign
- EXTRA_DIST = makefile.vc nmake.opt Android.mk Android_4.3.0.mk \
- spatialite-4.3.0.mk mainpage.doxy README.coverage \
- spatialite-sql-latest.html config-msvc.h
diff --git a/debian/patches/07-fix_spatialite_pc.patch b/debian/patches/07-fix_spatialite_pc.patch
deleted file mode 100644
index f330c11..0000000
--- a/debian/patches/07-fix_spatialite_pc.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-From: Francesco Paolo Lovergine <frankie at debian.org>
-Subject: avoid relinking sqlite3 and math libraries
-Origin: vendor
-Forwarded: https://groups.google.com/d/msg/spatialite-users/kIZA-n4f9kk/IoaxSGjUWZEJ
-
---- a/spatialite.pc.in
-+++ b/spatialite.pc.in
-@@ -8,5 +8,5 @@ includedir=@includedir@
- Name: spatialite
- Description: Spatial SQL database engine based on SQLite
- Version: @VERSION@
--Libs: -L${libdir} -lspatialite -lsqlite3 -lm -lz
-+Libs: -L${libdir} -lspatialite
- Cflags: -I${includedir}
diff --git a/debian/patches/11-link-libxml2.patch b/debian/patches/11-link-libxml2.patch
deleted file mode 100644
index 1d7e2bc..0000000
--- a/debian/patches/11-link-libxml2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Link libxml2 for successfull test case build.
-Author: Bas Couwenberg <sebastic at debian.org>
-Last-Update: 2013-12-14
-Forwarded: https://groups.google.com/d/msg/spatialite-users/kIZA-n4f9kk/IoaxSGjUWZEJ
-
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -89,7 +89,7 @@ check_PROGRAMS += \
- endif
-
- AM_CFLAGS = -I at srcdir@/../src/headers -I at srcdir@
--AM_LDFLAGS = -L../src -lspatialite -lm $(GCOV_FLAGS)
-+AM_LDFLAGS = -L../src -lspatialite -lm -lxml2 $(GCOV_FLAGS)
-
- TESTS = $(check_PROGRAMS)
-
diff --git a/debian/patches/12-link-pthread.patch b/debian/patches/12-link-pthread.patch
deleted file mode 100644
index 9e7f1e1..0000000
--- a/debian/patches/12-link-pthread.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Link libpthread to fix check_multithread build failure
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://groups.google.com/d/msg/spatialite-users/kIZA-n4f9kk/IoaxSGjUWZEJ
-
---- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -89,7 +89,7 @@ check_PROGRAMS += \
- endif
-
- AM_CFLAGS = -I at srcdir@/../src/headers -I at srcdir@
--AM_LDFLAGS = -L../src -lspatialite -lm -lxml2 $(GCOV_FLAGS)
-+AM_LDFLAGS = -L../src -lpthread -lspatialite -lm -lxml2 $(GCOV_FLAGS)
-
- TESTS = $(check_PROGRAMS)
-
---- a/test/Makefile.in
-+++ b/test/Makefile.in
-@@ -996,7 +996,7 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- AM_CPPFLAGS = @CFLAGS@ @GEOS_CFLAGS@ @LIBXML2_CFLAGS@
- AM_CFLAGS = -I at srcdir@/../src/headers -I at srcdir@
--AM_LDFLAGS = -L../src -lspatialite -lm $(GCOV_FLAGS)
-+AM_LDFLAGS = -L../src -lpthread -lspatialite -lm $(GCOV_FLAGS)
- TESTS = $(check_PROGRAMS)
- MOSTLYCLEANFILES = *.gcna *.gcno *.gcda
- EXTRA_DIST = asprintf4win.h \
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7459c74..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-00-add_automake_foreign.patch
-07-fix_spatialite_pc.patch
-11-link-libxml2.patch
-12-link-pthread.patch
-soversion.patch
diff --git a/debian/patches/soversion.patch b/debian/patches/soversion.patch
deleted file mode 100644
index 2cf969a..0000000
--- a/debian/patches/soversion.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Description: Fix -version-info option to keep SOVERSION at 7.
- In 4.2.1-RC0 the libtool version-info was changed from 7:0:0 to 7:0:1,
- causing the SOVERSION to decrement from 7 to 6.
- SpatiaLite 4.2.1 only introduced symbols,
- for which a SOVERSION change is not required.
- .
- In 4.3.0-RC0 the libtool version-info was changed from 7:0:1 to 8:0:1,
- but the missing - in the version-info option caused the SOVERSION
- to decrement from 6 to 0.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://groups.google.com/d/msg/spatialite-users/oAzONsvEK08/rjzErEKVsuUJ
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -42,10 +42,10 @@ libspatialite_la_LDFLAGS = -version-info
- libspatialite_la_LIBADD += -lm
- else
- if ANDROID
--libspatialite_la_LDFLAGS = version-info 8:0:1
-+libspatialite_la_LDFLAGS = -version-info 8:0:1
- libspatialite_la_LIBADD += -ldl -lm
- else
--libspatialite_la_LDFLAGS = version-info 8:0:1
-+libspatialite_la_LDFLAGS = -version-info 8:0:1
- libspatialite_la_LIBADD += -lpthread -ldl -lm
- endif
- endif
-@@ -76,10 +76,10 @@ mod_spatialite_la_LDFLAGS = -module -avo
- mod_spatialite_la_LIBADD += -lm
- else
- if ANDROID
--mod_spatialite_la_LDFLAGS = -module version-info 8:0:1
-+mod_spatialite_la_LDFLAGS = -module -version-info 8:0:1
- mod_spatialite_la_LIBADD += -ldl -lm
- else
--mod_spatialite_la_LDFLAGS = -module version-info 8:0:1
-+mod_spatialite_la_LDFLAGS = -module -version-info 8:0:1
- mod_spatialite_la_LIBADD += -lpthread -ldl -lm
- endif
- endif
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/spatialite.git
More information about the Pkg-grass-devel
mailing list