[SCM] spatialite-tools branch, master, updated. debian/3.0.0-1-3-gfca6a9f

2012-02-29 Thread Francesco Paolo Lovergine
The following commit has been merged in the master branch:
commit 1f630e9bb45dbf20500d2267759ef5cdc92905a3
Author: Francesco Paolo Lovergine fran...@debian.org
Date:   Wed Feb 29 12:47:12 2012 +0100

Re-added a couple of build-deps.

diff --git a/debian/control b/debian/control
index 05fca82..d673a17 100644
--- a/debian/control
+++ b/debian/control
@@ -9,6 +9,8 @@ Build-Depends:
  , libspatialite-dev (= 3.0.1~)
  , libreadline-dev
  , pkg-config
+ , libexpat1-dev
+ , libfreexl-dev (= 1.0.0)
 Standards-Version: 3.9.3
 Homepage: http://www.gaia-gis.it/spatialite/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/spatialite-tools.git

-- 
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


[SCM] spatialite-tools branch, master, updated. debian/3.0.0-1-3-gfca6a9f

2012-02-29 Thread Francesco Paolo Lovergine
The following commit has been merged in the master branch:
commit 9ab9f3a59cced828f31434c8f32e87a485e18cd7
Author: Francesco Paolo Lovergine fran...@debian.org
Date:   Wed Feb 29 12:54:17 2012 +0100

Reset to use spatialite b-deps.

For quite misterious reasons tools need the same packages set used
by the library.

diff --git a/debian/control b/debian/control
index d673a17..e864413 100644
--- a/debian/control
+++ b/debian/control
@@ -7,10 +7,13 @@ Build-Depends:
  debhelper (= 8)
  , autotools-dev
  , libspatialite-dev (= 3.0.1~)
+ , libsqlite3-dev (= 3.6.11)
  , libreadline-dev
  , pkg-config
  , libexpat1-dev
  , libfreexl-dev (= 1.0.0)
+ , libgeos-dev (= 3.3.0)
+ , libproj-dev
 Standards-Version: 3.9.3
 Homepage: http://www.gaia-gis.it/spatialite/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/spatialite-tools.git

-- 
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


[SCM] spatialite-tools branch, master, updated. debian/3.0.0-1-3-gfca6a9f

2012-02-29 Thread Francesco Paolo Lovergine
The following commit has been merged in the master branch:
commit fca6a9f65174b191ee8829372d1018bdb5783b4b
Author: Francesco Paolo Lovergine fran...@debian.org
Date:   Wed Feb 29 13:02:08 2012 +0100

Added new patch for not relinking.

diff --git a/debian/changelog b/debian/changelog
index 499cf13..1fec3a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ spatialite-tools (3.0.0-1) unstable; urgency=low
   * Initial release.
   * Spatialite-tools used to be distributed with spatialite source, this
 is now different and this package is thought to be built apart.
+  * Added the same 05-dont_relink.patch new patch used in spatialite
+to avoid relinking.
 
- -- Francesco Paolo Lovergine fran...@debian.org  Wed, 22 Feb 2012 13:48:43 
+0100
-
+ -- Francesco Paolo Lovergine fran...@debian.org  Wed, 29 Feb 2012 13:00:58 
+0100
diff --git a/debian/patches/05-dont_relink.patch 
b/debian/patches/05-dont_relink.patch
new file mode 100644
index 000..d1442c7
--- /dev/null
+++ b/debian/patches/05-dont_relink.patch
@@ -0,0 +1,26 @@
+Index: spatialite-tools/configure
+===
+--- spatialite-tools.orig/configure2012-02-27 15:38:30.0 +0100
 spatialite-tools/configure 2012-02-29 13:00:39.0 +0100
+@@ -17153,7 +17153,7 @@
+   $as_echo_n (cached)  6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS=-lgeos_c -lm -lgeos $LIBS
++LIBS=-lgeos_c $LIBS
+ 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.0 +0100
 spatialite-tools/configure.ac  2012-02-29 13:00:18.0 +0100
+@@ -72,7 +72,7 @@
+ 
+ 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)
+-AC_CHECK_LIB(geos_c,GEOSTopologyPreserveSimplify,,AC_MSG_ERROR(['libgeos_c' 
is required but it doesn't seem to be installed on this system.]),-lm -lgeos)
++AC_CHECK_LIB(geos_c,GEOSTopologyPreserveSimplify,,AC_MSG_ERROR(['libgeos_c' 
is required but it doesn't seem to be installed on this system.]),)
+ 
+ PKG_CHECK_MODULES([LIBSPATIALITE], [spatialite], , 
AC_MSG_ERROR(['libspatialite' is required but it doesn't seem to be installed 
on this system.]))
+ AC_SUBST(LIBSPATIALITE_CFLAGS)
diff --git a/debian/patches/series b/debian/patches/series
index d6dbe7b..b96ee89 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 00-add_automake_foreign.patch
-#01-fix_local_build.patch
 03-fix_typos.patch
+05-dont_relink.patch

-- 
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