[spatialite-tools] 05/06: Drop patches applied upstream.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch experimental
in repository spatialite-tools.

commit 6d3b607bb2eb77c214d5f39b08ec83e7f81ea06e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Jun 27 16:24:37 2015 +0200

    Drop patches applied upstream.
---
 debian/changelog                             |  1 +
 debian/patches/00-add_automake_foreign.patch | 30 ----------------------------
 debian/patches/01-link-sqlite3.patch         | 25 -----------------------
 debian/patches/10-no-sqlite-check.patch      | 25 -----------------------
 debian/patches/series                        |  3 ---
 5 files changed, 1 insertion(+), 83 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef19faf..70c4141 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ spatialite-tools (4.3.0~rc1-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate.
   * Bump minimum required libspatialite-dev version to 4.3.0~rc1.
+  * Drop patches applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 27 Jun 2015 16:06:24 +0200
 
diff --git a/debian/patches/00-add_automake_foreign.patch b/debian/patches/00-add_automake_foreign.patch
deleted file mode 100644
index f4e76bf..0000000
--- a/debian/patches/00-add_automake_foreign.patch
+++ /dev/null
@@ -1,30 +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
-@@ -85,5 +85,5 @@ EXTRA_DIST = makefile.vc nmake.opt \
- 	Makefile-static-Linux \
- 	Makefile-static-MacOsX
- 
--AUTOMAKE_OPTIONS = dist-zip
-+AUTOMAKE_OPTIONS = dist-zip foreign
- 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -500,7 +500,7 @@ EXTRA_DIST = makefile.vc nmake.opt \
- 	Makefile-static-Linux \
- 	Makefile-static-MacOsX
- 
--AUTOMAKE_OPTIONS = dist-zip
-+AUTOMAKE_OPTIONS = dist-zip foreign
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-am
- 
diff --git a/debian/patches/01-link-sqlite3.patch b/debian/patches/01-link-sqlite3.patch
deleted file mode 100644
index cde4cab..0000000
--- a/debian/patches/01-link-sqlite3.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Link sqlite3 to fix FTBFS.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://groups.google.com/d/msg/spatialite-users/kIZA-n4f9kk/IoaxSGjUWZEJ
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -67,6 +67,8 @@ AC_CHECK_HEADERS(stddef.h,, [AC_MSG_ERRO
- AC_CHECK_HEADERS(stdint.h,, [AC_MSG_ERROR([cannot find stdint.h, bailing out])])
- AC_CHECK_HEADERS(sys/time.h,, [AC_MSG_ERROR([cannot find sys/time.h, bailing out])])
- AC_CHECK_HEADERS(unistd.h,, [AC_MSG_ERROR([cannot find unistd.h, bailing out])])
-+AC_CHECK_HEADERS(sqlite3.h,, [AC_MSG_ERROR([cannot find sqlite3.h, bailing out])])
-+AC_CHECK_HEADERS(sqlite3ext.h,, [AC_MSG_ERROR([cannot find sqlite3ext.h, bailing out])])
- 
- # Checks for programs.
- AC_PROG_CXX
-@@ -94,6 +96,9 @@ AC_FUNC_STAT
- AC_FUNC_STRFTIME
- AC_CHECK_FUNCS([memset sqrt strcasecmp strerror strncasecmp strstr fdatasync ftruncate getcwd gettimeofday localtime_r memmove strerror])
- 
-+# Checks for installed libraries
-+AC_CHECK_LIB(sqlite3,sqlite3_prepare_v2,,AC_MSG_ERROR(['libsqlite3' is required but it doesn't seem to be installed on this system.]),-lm)
-+
- AC_CONFIG_FILES([Makefile])
- 
- #-----------------------------------------------------------------------
diff --git a/debian/patches/10-no-sqlite-check.patch b/debian/patches/10-no-sqlite-check.patch
deleted file mode 100644
index 1dced16..0000000
--- a/debian/patches/10-no-sqlite-check.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Don't require exact sqlite3 version match.
- SQLite allows cautious programmers to "insure that the application is
- compiled with matching library and header files."
- .
- spatialite shouldn't require this to allow it run.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug-Debian: https://bugs.debian.org/743999
-Forwarded: https://groups.google.com/d/msg/spatialite-users/kIZA-n4f9kk/IoaxSGjUWZEJ
-
---- a/shell.c
-+++ b/shell.c
-@@ -4192,11 +4192,13 @@ int main(int argc, char **argv){
- /* initializing the SpatiaLite's internal cache */
-   splite_cache = spatialite_alloc_connection ();
- 
-+/* Don't require exact sqlite3 version match
-   if( strcmp(sqlite3_sourceid(),SQLITE_SOURCE_ID)!=0 ){
-     fprintf(stderr, "SQLite header and source version mismatch\n%s\n%s\n",
-             sqlite3_sourceid(), SQLITE_SOURCE_ID);
-     exit(1);
-   }
-+*/
-   Argv0 = argv[0];
-   main_init(&data);
- /*
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index a9b095e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-00-add_automake_foreign.patch
-01-link-sqlite3.patch
-10-no-sqlite-check.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/spatialite-tools.git