The following commit has been merged in the master branch:
commit 8d4223170a333992654a566f9e0797eed2359829
Author: David Paleino <da...@debian.org>
Date:   Sat Apr 14 11:51:39 2012 +0200

    Refreshed patch style

diff --git a/debian/patches/00-add_automake_foreign.patch 
b/debian/patches/00-add_automake_foreign.patch
index ca05679..758b9dc 100644
--- a/debian/patches/00-add_automake_foreign.patch
+++ b/debian/patches/00-add_automake_foreign.patch
@@ -4,28 +4,22 @@ 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-tools/Makefile.am
-===================================================================
---- spatialite.orig/Makefile.am        2012-02-17 16:53:36.000000000 +0100
-+++ spatialite/Makefile.am     2012-02-17 17:02:17.000000000 +0100
-@@ -48,5 +48,5 @@
+--- spatialite-tools.orig/Makefile.am
++++ spatialite-tools/Makefile.am
+@@ -48,5 +48,5 @@ EXTRA_DIST = makefile.vc nmake.opt \
        Makefile-static-Linux \
        Makefile-static-MacOsX
  
 -AUTOMAKE_OPTIONS = dist-zip
 +AUTOMAKE_OPTIONS = dist-zip foreign
  
-Index: spatialite-tools/Makefile.in
-===================================================================
---- spatialite.orig/Makefile.in        2012-02-17 16:53:36.000000000 +0100
-+++ spatialite/Makefile.in     2012-02-17 17:02:17.000000000 +0100
-@@ -294,7 +294,7 @@
+--- spatialite-tools.orig/Makefile.in
++++ spatialite-tools/Makefile.in
+@@ -294,7 +294,7 @@ EXTRA_DIST = makefile.vc nmake.opt \
        Makefile-static-Linux \
        Makefile-static-MacOsX
  
diff --git a/debian/patches/03-fix_typos.patch 
b/debian/patches/03-fix_typos.patch
index 6b23ef0..b5b4bb6 100644
--- a/debian/patches/03-fix_typos.patch
+++ b/debian/patches/03-fix_typos.patch
@@ -4,20 +4,15 @@ Origin: vendor
 Forwarded: no
 
 ---
- libspatialite/src/spatialite/spatialite.c |   24 ++++++++++++------------
- libspatialite/src/srsinit/srs_init.c      |    2 +-
- spatialite-tools/exif_loader.c            |    4 ++--
- spatialite-tools/spatialite_gml.c         |    2 +-
- spatialite-tools/spatialite_osm_map.c     |    4 ++--
- spatialite-tools/spatialite_osm_net.c     |    4 ++--
- spatialite-tools/spatialite_osm_raw.c     |    2 +-
- 7 files changed, 21 insertions(+), 21 deletions(-)
+ spatialite_gml.c     |    2 +-
+ spatialite_osm_map.c |    4 ++--
+ spatialite_osm_net.c |    4 ++--
+ spatialite_osm_raw.c |    2 +-
+ 4 files changed, 6 insertions(+), 6 deletions(-)
 
-Index: spatialite/spatialite_gml.c
-===================================================================
---- spatialite.orig/spatialite_gml.c   2012-02-17 16:53:36.000000000 +0100
-+++ spatialite/spatialite_gml.c        2012-02-22 11:09:03.000000000 +0100
-@@ -1919,7 +1919,7 @@
+--- spatialite-tools.orig/spatialite_gml.c
++++ spatialite-tools/spatialite_gml.c
+@@ -1919,7 +1919,7 @@ main (int argc, char *argv[])
          ret = sqlite3_backup_finish (backup);
          sqlite3_close (handle);
          handle = disk_db_handle;
@@ -26,11 +21,9 @@ Index: spatialite/spatialite_gml.c
        }
  
      sqlite3_close (handle);
-Index: spatialite/spatialite_osm_map.c
-===================================================================
---- spatialite.orig/spatialite_osm_map.c       2012-02-17 16:53:36.000000000 
+0100
-+++ spatialite/spatialite_osm_map.c    2012-02-22 11:09:03.000000000 +0100
-@@ -2038,7 +2038,7 @@
+--- spatialite-tools.orig/spatialite_osm_map.c
++++ spatialite-tools/spatialite_osm_map.c
+@@ -2038,7 +2038,7 @@ db_vacuum (sqlite3 * db_handle)
          sqlite3_free (sql_err);
          return;
        }
@@ -39,7 +32,7 @@ Index: spatialite/spatialite_osm_map.c
  }
  
  static void
-@@ -2870,7 +2870,7 @@
+@@ -2870,7 +2870,7 @@ main (int argc, char *argv[])
          ret = sqlite3_backup_finish (backup);
          sqlite3_close (handle);
          handle = disk_db_handle;
@@ -48,11 +41,9 @@ Index: spatialite/spatialite_osm_map.c
        }
  
  /* VACUUMing */
-Index: spatialite/spatialite_osm_net.c
-===================================================================
---- spatialite.orig/spatialite_osm_net.c       2011-10-27 12:17:39.000000000 
+0200
-+++ spatialite/spatialite_osm_net.c    2012-02-22 11:09:03.000000000 +0100
-@@ -2030,7 +2030,7 @@
+--- spatialite-tools.orig/spatialite_osm_net.c
++++ spatialite-tools/spatialite_osm_net.c
+@@ -2030,7 +2030,7 @@ db_vacuum (sqlite3 * handle)
          sqlite3_free (sql_err);
          return;
        }
@@ -61,7 +52,7 @@ Index: spatialite/spatialite_osm_net.c
  }
  
  static void
-@@ -2644,7 +2644,7 @@
+@@ -2644,7 +2644,7 @@ main (int argc, char *argv[])
          ret = sqlite3_backup_finish (backup);
          sqlite3_close (handle);
          handle = disk_handle;
@@ -70,11 +61,9 @@ Index: spatialite/spatialite_osm_net.c
        }
  /* VACUUMing */
      db_vacuum (handle);
-Index: spatialite/spatialite_osm_raw.c
-===================================================================
---- spatialite.orig/spatialite_osm_raw.c       2012-02-17 16:53:36.000000000 
+0100
-+++ spatialite/spatialite_osm_raw.c    2012-02-22 11:09:03.000000000 +0100
-@@ -1649,7 +1649,7 @@
+--- spatialite-tools.orig/spatialite_osm_raw.c
++++ spatialite-tools/spatialite_osm_raw.c
+@@ -1649,7 +1649,7 @@ main (int argc, char *argv[])
          ret = sqlite3_backup_finish (backup);
          sqlite3_close (handle);
          handle = disk_db_handle;
diff --git a/debian/patches/05-dont_relink.patch 
b/debian/patches/05-dont_relink.patch
index d1442c7..98a98af 100644
--- a/debian/patches/05-dont_relink.patch
+++ b/debian/patches/05-dont_relink.patch
@@ -1,8 +1,11 @@
-Index: spatialite-tools/configure
-===================================================================
---- spatialite-tools.orig/configure    2012-02-27 15:38:30.000000000 +0100
-+++ spatialite-tools/configure 2012-02-29 13:00:39.000000000 +0100
-@@ -17153,7 +17153,7 @@
+---
+ configure    |    2 +-
+ configure.ac |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- spatialite-tools.orig/configure
++++ spatialite-tools/configure
+@@ -17153,7 +17153,7 @@ if ${ac_cv_lib_geos_c_GEOSTopologyPreser
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -11,11 +14,9 @@ Index: spatialite-tools/configure
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-Index: spatialite-tools/configure.ac
-===================================================================
---- spatialite-tools.orig/configure.ac 2012-02-27 15:38:30.000000000 +0100
-+++ spatialite-tools/configure.ac      2012-02-29 13:00:18.000000000 +0100
-@@ -72,7 +72,7 @@
+--- spatialite-tools.orig/configure.ac
++++ spatialite-tools/configure.ac
+@@ -72,7 +72,7 @@ AC_SUBST(READLINE_LIBS)
  
  AC_CHECK_LIB(expat,XML_ParserCreate,,AC_MSG_ERROR(['expat' is required but it 
doesn't seem to be installed on this system.]))
  AC_CHECK_LIB(proj,pj_init_plus,,AC_MSG_ERROR(['libproj' is required but it 
doesn't seem to be installed on this system.]),-lm)

-- 
Spatialite Tools

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to