[SCM] spatialite branch, master, updated. debian/3.0.0_beta20110817-3-45-g30b6919

[David Paleino]

The following commit has been merged in the master branch:
commit 8e3748f9ab601b64dd2d56f8d709938907f09db3
Author: David Paleino <dapal at debian.org>
Date:   Thu Oct 4 11:37:34 2012 +0200

    Patchset refreshed, 04-fix_missing_define.patch dropped.

diff --git a/debian/changelog b/debian/changelog
index ccdff2b..bac1af1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ spatialite (4.0.0~rc1-1) UNRELEASED; urgency=low
 
   * New upstream release candidate.
   * Updated debian/watch
+  * Patchset refreshed, 04-fix_missing_define.patch dropped.
 
- -- David Paleino <dapal at debian.org>  Thu, 04 Oct 2012 11:33:55 +0200
+ -- David Paleino <dapal at debian.org>  Thu, 04 Oct 2012 11:37:18 +0200
 
 spatialite (3.1.0~rc2-1) unstable; urgency=low
 
diff --git a/debian/patches/00-add_automake_foreign.patch b/debian/patches/00-add_automake_foreign.patch
index 379a6aa..8b15324 100644
--- a/debian/patches/00-add_automake_foreign.patch
+++ b/debian/patches/00-add_automake_foreign.patch
@@ -4,16 +4,12 @@ Origin: vendor
 Forwarded: no
 
 ---
- libspatialite/Makefile.am    |    2 +-
- libspatialite/Makefile.in    |    2 +-
- spatialite-tools/Makefile.am |    2 +-
- spatialite-tools/Makefile.in |    2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
+ Makefile.am |    2 +-
+ Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
-Index: spatialite/Makefile.am
-===================================================================
---- spatialite.orig/Makefile.am	2012-04-03 14:22:32.000000000 +0200
-+++ spatialite/Makefile.am	2012-04-03 14:57:53.000000000 +0200
+--- spatialite.orig/Makefile.am
++++ spatialite/Makefile.am
 @@ -1,6 +1,6 @@
  ACLOCAL_AMFLAGS = -I m4
  
@@ -22,11 +18,9 @@ Index: spatialite/Makefile.am
  
  EXTRA_DIST = makefile.vc nmake.opt Android.mk mainpage.doxy README.coverage \
  	spatialite-sql-latest.html
-Index: spatialite/Makefile.in
-===================================================================
---- spatialite.orig/Makefile.in	2012-04-03 14:22:32.000000000 +0200
-+++ spatialite/Makefile.in	2012-04-03 14:58:36.000000000 +0200
-@@ -253,7 +253,7 @@
+--- spatialite.orig/Makefile.in
++++ spatialite/Makefile.in
+@@ -263,7 +263,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  ACLOCAL_AMFLAGS = -I m4
diff --git a/debian/patches/04-fix_missing_define.patch b/debian/patches/04-fix_missing_define.patch
deleted file mode 100644
index c5382a9..0000000
--- a/debian/patches/04-fix_missing_define.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: spatialite/src/headers/spatialite/gaiaexif.h
-===================================================================
---- spatialite.orig/src/headers/spatialite/gaiaexif.h	2012-03-02 11:56:59.000000000 +0100
-+++ spatialite/src/headers/spatialite/gaiaexif.h	2012-03-02 11:57:11.000000000 +0100
-@@ -87,6 +87,7 @@
- #define GAIA_GEOMETRY_BLOB	8
- /** this BLOB does actually contain a TIFF image */
- #define GAIA_TIFF_BLOB		9
-+#define GAIA_WAVELET_BLOB	10
- 
- /* constants used for EXIF value types */
- /** unrecognized EXIF value */
diff --git a/debian/patches/series b/debian/patches/series
index 4a07f17..27d2927 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 00-add_automake_foreign.patch
-04-fix_missing_define.patch
 07-fix_spatialite_pc.patch

-- 
geospatial extension for SQLite