The following commit has been merged in the master branch: commit b4f33585dfe0e534aad666794f7184cf6a1cb369 Author: Francesco Paolo Lovergine <fran...@debian.org> Date: Tue Apr 3 16:12:49 2012 +0200
Removed obsolete patches. diff --git a/debian/patches/05-dont_relink.patch b/debian/patches/05-dont_relink.patch deleted file mode 100644 index e83d21d..0000000 --- a/debian/patches/05-dont_relink.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: spatialite/configure -=================================================================== ---- spatialite.orig/configure 2012-03-02 11:56:59.000000000 +0100 -+++ spatialite/configure 2012-03-02 11:57:28.000000000 +0100 -@@ -17205,7 +17205,7 @@ - ac_res="none required" - else - ac_res=-l$ac_lib -- LIBS="-l$ac_lib -lm -lgeos $ac_func_search_save_LIBS" -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_GEOSTopologyPreserveSimplify=$ac_res -@@ -17275,7 +17275,7 @@ - ac_res="none required" - else - ac_res=-l$ac_lib -- LIBS="-l$ac_lib -lm -lgeos $ac_func_search_save_LIBS" -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" - fi - if ac_fn_c_try_link "$LINENO"; then : - ac_cv_search_GEOSCoveredBy=$ac_res -Index: spatialite/configure.ac -=================================================================== ---- spatialite.orig/configure.ac 2012-03-02 11:56:59.000000000 +0100 -+++ spatialite/configure.ac 2012-03-02 11:57:28.000000000 +0100 -@@ -128,7 +128,7 @@ - if test x"$enable_geos" != "xno"; then - OMIT_GEOS_FLAGS= - AC_CHECK_HEADERS(geos_c.h,, [AC_MSG_ERROR([cannot find geos_c.h, bailing out])]) -- AC_SEARCH_LIBS(GEOSTopologyPreserveSimplify,geos_c,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seem to be installed on this system.]),-lm -lgeos) -+ AC_SEARCH_LIBS(GEOSTopologyPreserveSimplify,geos_c,,AC_MSG_ERROR(['libgeos_c' is required but it doesn't seem to be installed on this system.]),) - #----------------------------------------------------------------------- - # --enable-geosadvanced - # -@@ -137,7 +137,7 @@ - [], [enable_geosadvanced=yes]) - if test x"$enable_geosadvanced" != "xno"; then - GEOSADVANCED_FLAGS=-DGEOS_ADVANCED -- AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([obsolete 'libgeos_c' (< v.3.3.0). please retry specifying: --disable-geosadvanced.]),-lm -lgeos) -+ AC_SEARCH_LIBS(GEOSCoveredBy,geos_c,,AC_MSG_ERROR([obsolete 'libgeos_c' (< v.3.3.0). please retry specifying: --disable-geosadvanced.]),) - else - GEOSADVANCED_FLAGS= - fi diff --git a/debian/patches/06-fix_soname.patch b/debian/patches/06-fix_soname.patch deleted file mode 100644 index 0f8116d..0000000 --- a/debian/patches/06-fix_soname.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: spatialite/src/Makefile.am -=================================================================== ---- spatialite.orig/src/Makefile.am 2012-03-02 11:53:36.000000000 +0100 -+++ spatialite/src/Makefile.am 2012-03-02 11:59:04.000000000 +0100 -@@ -27,7 +27,7 @@ - if MINGW - libspatialite_la_LDFLAGS = -version-info 3:0:0 -no-undefined - else --libspatialite_la_LDFLAGS = -version-info 4:3:0 -+libspatialite_la_LDFLAGS = -version-info 5:0:2 - libspatialite_la_LIBADD += -lpthread -ldl - endif - -Index: spatialite/src/Makefile.in -=================================================================== ---- spatialite.orig/src/Makefile.in 2012-03-02 11:53:36.000000000 +0100 -+++ spatialite/src/Makefile.in 2012-03-02 12:00:00.000000000 +0100 -@@ -282,7 +282,7 @@ - ./spatialite/libsplite.la ./shapefiles/libshapefiles.la \ - ./srsinit/libsrsinit.la ./virtualtext/libvirtualtext.la \ - $(am__append_1) --@MINGW_FALSE@libspatialite_la_LDFLAGS = -version-info 4:3:0 -+@MINGW_FALSE@libspatialite_la_LDFLAGS = -version-info 5:0:2 - @MINGW_TRUE@libspatialite_la_LDFLAGS = -version-info 3:0:0 -no-undefined - MOSTLYCLEANFILES = *.gcna *.gcno *.gcda - all: all-recursive diff --git a/debian/patches/series b/debian/patches/series index b017ba2..4a07f17 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ 00-add_automake_foreign.patch 04-fix_missing_define.patch -#05-dont_relink.patch -#06-fix_soname.patch 07-fix_spatialite_pc.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