The following commit has been merged in the master branch: commit f74d1517875469a251b734517de92cfa50a27070 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Thu Feb 23 14:31:05 2012 +0100
Updated patchset for new source structure. diff --git a/debian/patches/00-add_automake_foreign.patch b/debian/patches/00-add_automake_foreign.patch index ef098d1..2e3ed66 100644 --- a/debian/patches/00-add_automake_foreign.patch +++ b/debian/patches/00-add_automake_foreign.patch @@ -10,10 +10,10 @@ Forwarded: no spatialite-tools/Makefile.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) -Index: spatialite/libspatialite/Makefile.am +Index: spatialite/Makefile.am =================================================================== ---- spatialite.orig/libspatialite/Makefile.am 2012-02-17 16:53:35.000000000 +0100 -+++ spatialite/libspatialite/Makefile.am 2012-02-17 17:02:17.000000000 +0100 +--- spatialite.orig/Makefile.am 2012-02-17 16:53:35.000000000 +0100 ++++ spatialite/Makefile.am 2012-02-17 17:02:17.000000000 +0100 @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 @@ -22,21 +22,10 @@ Index: spatialite/libspatialite/Makefile.am EXTRA_DIST = makefile.vc nmake.opt mainpage.doxy README.coverage -Index: spatialite/spatialite-tools/Makefile.am +Index: spatialite/Makefile.in =================================================================== ---- spatialite.orig/spatialite-tools/Makefile.am 2012-02-17 16:53:36.000000000 +0100 -+++ spatialite/spatialite-tools/Makefile.am 2012-02-17 17:02:17.000000000 +0100 -@@ -48,5 +48,5 @@ - Makefile-static-Linux \ - Makefile-static-MacOsX - --AUTOMAKE_OPTIONS = dist-zip -+AUTOMAKE_OPTIONS = dist-zip foreign - -Index: spatialite/libspatialite/Makefile.in -=================================================================== ---- spatialite.orig/libspatialite/Makefile.in 2012-02-17 16:53:35.000000000 +0100 -+++ spatialite/libspatialite/Makefile.in 2012-02-17 17:03:14.000000000 +0100 +--- spatialite.orig/Makefile.in 2012-02-17 16:53:35.000000000 +0100 ++++ spatialite/Makefile.in 2012-02-17 17:03:14.000000000 +0100 @@ -254,7 +254,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ @@ -46,16 +35,3 @@ Index: spatialite/libspatialite/Makefile.in EXTRA_DIST = makefile.vc nmake.opt mainpage.doxy README.coverage SUBDIRS = src test examples pkgconfigdir = $(libdir)/pkgconfig -Index: spatialite/spatialite-tools/Makefile.in -=================================================================== ---- spatialite.orig/spatialite-tools/Makefile.in 2012-02-17 16:53:36.000000000 +0100 -+++ spatialite/spatialite-tools/Makefile.in 2012-02-17 17:02:17.000000000 +0100 -@@ -294,7 +294,7 @@ - Makefile-static-Linux \ - Makefile-static-MacOsX - --AUTOMAKE_OPTIONS = dist-zip -+AUTOMAKE_OPTIONS = dist-zip foreign - all: all-am - - .SUFFIXES: diff --git a/debian/patches/04-fix_missing_define.patch b/debian/patches/04-fix_missing_define.patch index 00ba7a2..41dfb1e 100644 --- a/debian/patches/04-fix_missing_define.patch +++ b/debian/patches/04-fix_missing_define.patch @@ -1,7 +1,7 @@ -Index: spatialite/libspatialite/src/headers/spatialite/gaiaexif.h +Index: spatialite/src/headers/spatialite/gaiaexif.h =================================================================== ---- spatialite.orig/libspatialite/src/headers/spatialite/gaiaexif.h 2012-02-17 16:53:35.000000000 +0100 -+++ spatialite/libspatialite/src/headers/spatialite/gaiaexif.h 2012-02-22 11:10:40.000000000 +0100 +--- spatialite.orig/src/headers/spatialite/gaiaexif.h 2012-02-17 16:53:35.000000000 +0100 ++++ spatialite/src/headers/spatialite/gaiaexif.h 2012-02-22 11:10:40.000000000 +0100 @@ -87,6 +87,7 @@ #define GAIA_GEOMETRY_BLOB 8 /** this BLOB does actually contain a TIFF image */ diff --git a/debian/patches/series b/debian/patches/series index 7d5d2df..fa482c6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,2 @@ 00-add_automake_foreign.patch -01-fix_local_build.patch -03-fix_typos.patch 04-fix_missing_define.patch -- geospatial extension for SQLite _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel