[SCM] geos branch, master, updated. upstream/3.3.3-79-gca59f58
The following commit has been merged in the master branch: commit ca59f582e16466e1ccd3b4142637559d6d722b23 Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri Dec 6 15:25:12 2013 +0100 Added a simple patch in order to prevent a FTBS for Ruby binding. diff --git a/debian/changelog b/debian/changelog index 90f1993..aa9783b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,9 @@ geos (3.4.2-1) unstable; urgency=low (closes: #726455) * Update watch file, handle common mistakes. + [ Francesco Paolo Lovergine ] + * Added an idiot-proof ruby patch for libtool in order to avoid a FTBS. + -- Francesco Paolo Lovergine fran...@debian.org Fri, 06 Dec 2013 13:48:39 +0100 geos (3.3.3-1.1) unstable; urgency=low diff --git a/debian/patches/libruby b/debian/patches/libruby new file mode 100644 index 000..ce5f74a --- /dev/null +++ b/debian/patches/libruby @@ -0,0 +1,13 @@ +Index: geos/swig/ruby/Makefile.in +=== +--- geos.orig/swig/ruby/Makefile.in2013-12-06 09:09:30.741373190 +0100 geos/swig/ruby/Makefile.in 2013-12-06 15:23:44.520742796 +0100 +@@ -334,7 +334,7 @@ + # Build Ruby module as shared library + @ENABLE_RUBY_TRUE@rubyextensiondir_LTLIBRARIES = geos.la + @ENABLE_RUBY_TRUE@geos_la_SOURCES = geos_wrap.cxx +-@ENABLE_RUBY_TRUE@geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la -l$(RUBY_SO_NAME) ++@ENABLE_RUBY_TRUE@geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la /usr/lib/$(RUBY_SO_NAME) + + # Only need to grab the capi header files + @ENABLE_RUBY_TRUE@geos_la_CPPFLAGS = -I$(top_builddir)/capi diff --git a/debian/patches/series b/debian/patches/series index be57c8e..1286296 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -8,3 +8,4 @@ TaggedLineString.cpp TaggedLineString.h TaggedLineStringSimplifier.h geos-config +libruby -- Geometry engine for Geographic Information Systems ___ 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] geos branch, master, updated. upstream/3.3.3-79-gca59f58
The following commit has been merged in the master branch: commit 23b9571fd55c7a42ae85d977d15e67f8d5de5880 Merge: a51e1cfc04fd9307ec00a642fac1afb037697fac 258c9a98d2aae88294828284ae140c62199f1184 Author: Francesco Paolo Lovergine fran...@debian.org Date: Fri Dec 6 09:09:29 2013 +0100 Merge tag 'upstream/3.4.2' Upstream version 3.4.2 -- Geometry engine for Geographic Information Systems ___ 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] geos branch, master, updated. upstream/3.3.3-79-gca59f58
The following commit has been merged in the master branch:
commit f3c79ee706e12523d4242cadbdbcc3b5b8737ed2
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Fri Dec 6 14:30:27 2013 +0100
Updated debian/control
diff --git a/debian/control b/debian/control
index 7fd2cad..4e77bec 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Description: Geometry engine for GIS - Development files
Package: libgeos++-dev
Section: libdevel
Architecture: any
-Depends: libgeos-3.3.9 (= ${binary:Version}), libgeos-dev, ${misc:Depends}
+Depends: libgeos-3.4.2 (= ${binary:Version}), libgeos-dev, ${misc:Depends}
Suggests: libgdal-doc
Breaks: libgeos-dev ( 3.3.1-1~)
Description: Geometry engine for GIS - C++ development files
@@ -60,7 +60,7 @@ Description: Geometry engine for Geographic Information
Systems - C Library
This package contains the C library. A C++ library is provided
by the libgeos-* package.
-Package: libgeos-3.3.9
+Package: libgeos-3.4.2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -110,7 +110,7 @@ Package: libgeos-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: libgeos-3.3.9 (= ${binary:Version}), libgeos-c1 (=
${binary:Version}), ${misc:Depends}
+Depends: libgeos-3.4.2 (= ${binary:Version}), libgeos-c1 (=
${binary:Version}), ${misc:Depends}
Description: Debugging symbols for the GEOS library
GEOS provides a spatial object model and fundamental geometric
functions. It implements the geometry model defined in the
--
Geometry engine for Geographic Information Systems
___
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] geos branch, master, updated. upstream/3.3.3-79-gca59f58
The following commit has been merged in the master branch:
commit b09393f84162bf7c7dfb74631375a978332a5223
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Fri Dec 6 13:51:24 2013 +0100
Patches refreshed for 3.4.2
diff --git a/debian/changelog b/debian/changelog
index be10c76..90f1993 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-geos (3.3.9-1) unstable; urgency=low
+geos (3.4.2-1) unstable; urgency=low
- [ Markus Wanner ]
- * New upstream release. Closes: #693694.
- * Team upload.
+ [ Markus Wanner and Francesco Paolo Lovergine ]
+ * New upstream release.
+(closes: #693694)
+ * Patches just refreshed.
[ Bas Couwenberg ]
* Build-depend on autotools-dev so that the config.guess/config.sub update
@@ -10,7 +11,7 @@ geos (3.3.9-1) unstable; urgency=low
(closes: #726455)
* Update watch file, handle common mistakes.
- -- Markus Wanner mar...@bluegap.ch Wed, 02 Oct 2013 13:41:07 +0200
+ -- Francesco Paolo Lovergine fran...@debian.org Fri, 06 Dec 2013 13:48:39
+0100
geos (3.3.3-1.1) unstable; urgency=low
diff --git a/debian/patches/CoordinateSequenceFactory.h
b/debian/patches/CoordinateSequenceFactory.h
index a5a8a29..45b17f1 100644
--- a/debian/patches/CoordinateSequenceFactory.h
+++ b/debian/patches/CoordinateSequenceFactory.h
@@ -1,8 +1,8 @@
Index: geos/include/geos/geom/CoordinateSequenceFactory.h
===
geos.orig/include/geos/geom/CoordinateSequenceFactory.h2011-05-24
15:51:50.0 +0200
-+++ geos/include/geos/geom/CoordinateSequenceFactory.h 2011-05-24
15:51:53.0 +0200
-@@ -24,7 +24,7 @@
+--- geos.orig/include/geos/geom/CoordinateSequenceFactory.h2013-12-06
13:43:33.267931420 +0100
geos/include/geos/geom/CoordinateSequenceFactory.h 2013-12-06
13:43:33.263931411 +0100
+@@ -23,7 +23,7 @@
#include geos/export.h
#include vector
diff --git a/debian/patches/DirectedEdgeStar.h
b/debian/patches/DirectedEdgeStar.h
index 8221a4b..604393b 100644
--- a/debian/patches/DirectedEdgeStar.h
+++ b/debian/patches/DirectedEdgeStar.h
@@ -1,8 +1,8 @@
Index: geos/include/geos/planargraph/DirectedEdgeStar.h
===
geos.orig/include/geos/planargraph/DirectedEdgeStar.h 2011-11-30
16:54:52.0 +0100
-+++ geos/include/geos/planargraph/DirectedEdgeStar.h 2011-12-02
14:40:45.0 +0100
-@@ -20,6 +20,7 @@
+--- geos.orig/include/geos/planargraph/DirectedEdgeStar.h 2013-12-06
13:44:31.720065393 +0100
geos/include/geos/planargraph/DirectedEdgeStar.h 2013-12-06
13:44:31.716065384 +0100
+@@ -19,6 +19,7 @@
#include geos/export.h
#include vector
@@ -10,7 +10,7 @@ Index: geos/include/geos/planargraph/DirectedEdgeStar.h
#ifdef _MSC_VER
#pragma warning(push)
-@@ -40,6 +41,8 @@
+@@ -39,6 +40,8 @@
namespace geos {
namespace planargraph { // geos.planargraph
diff --git a/debian/patches/DouglasPeuckerLineSimplifier.h
b/debian/patches/DouglasPeuckerLineSimplifier.h
index 15caa11..5403e6e 100644
--- a/debian/patches/DouglasPeuckerLineSimplifier.h
+++ b/debian/patches/DouglasPeuckerLineSimplifier.h
@@ -1,8 +1,8 @@
Index: geos/include/geos/simplify/DouglasPeuckerLineSimplifier.h
===
geos.orig/include/geos/simplify/DouglasPeuckerLineSimplifier.h
2011-11-30 16:54:52.0 +0100
-+++ geos/include/geos/simplify/DouglasPeuckerLineSimplifier.h 2011-12-02
14:40:59.0 +0100
-@@ -23,6 +23,7 @@
+--- geos.orig/include/geos/simplify/DouglasPeuckerLineSimplifier.h
2013-12-06 13:44:45.868097879 +0100
geos/include/geos/simplify/DouglasPeuckerLineSimplifier.h 2013-12-06
13:44:45.864097871 +0100
+@@ -22,6 +22,7 @@
#include geos/export.h
#include vector
#include memory // for auto_ptr
@@ -10,7 +10,7 @@ Index:
geos/include/geos/simplify/DouglasPeuckerLineSimplifier.h
#ifdef _MSC_VER
#pragma warning(push)
-@@ -39,6 +40,8 @@
+@@ -38,6 +39,8 @@
namespace geos {
namespace simplify { // geos::simplify
diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp
index 7b16feb..31c8b77 100644
--- a/debian/patches/Node.cpp
+++ b/debian/patches/Node.cpp
@@ -1,8 +1,8 @@
Index: geos/src/index/bintree/Node.cpp
===
geos.orig/src/index/bintree/Node.cpp 2011-11-30 16:54:52.0
+0100
-+++ geos/src/index/bintree/Node.cpp2011-12-02 14:36:08.0 +0100
-@@ -16,6 +16,7 @@
+--- geos.orig/src/index/bintree/Node.cpp 2013-12-06 13:43:50.727971397
+0100
geos/src/index/bintree/Node.cpp2013-12-06 13:43:50.447970756 +0100
+@@ -15,6 +15,7 @@
#include cstddef
#include cassert
@@ -10,7 +10,7 @@ Index: geos/src/index/bintree/Node.cpp
#include geos/index/bintree/Node.h
#include geos/index/bintree/Key.h
-@@ -25,6 +26,8 @@
+@@ -24,6 +25,8 @@
namespace index
