[SCM] geos branch, master, updated. upstream/3.3.1-41-g2168782

Francesco Paolo Lovergine frankie at debian.org
Tue Feb 21 22:47:21 UTC 2012


The following commit has been merged in the master branch:
commit 216878271f27a5662920f7f23e710da46957f4a3
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Feb 21 23:38:22 2012 +0100

    Fixed for C++/C separation.

diff --git a/debian/NEWS b/debian/NEWS
index 2fdb5f6..3d400e1 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -4,7 +4,7 @@ geos (3.3.1-4) unstable; urgency=low
    the stable interface. See http://trac.osgeo.org/geos/wiki/Applications for
    details. Starting from this version we are trying to short the list of
    reverse build-deps that require erroneously linking both C/C++ and binary
-   NMUs.
+   NMUs frequency.
 
    A program which depends on the C++ API has to b-depend on the libgeos++-dev
    which in turn depends on the right libgeos-VERSION lib. All
@@ -12,7 +12,7 @@ geos (3.3.1-4) unstable; urgency=low
    depends strictly on the C stable interface (currently libgeos1).
 
    Note that geos-config has some problems on those regards, so current 
-   version also provides the C lib only for --libs. 
-   See http://trac.osgeo.org/geos/ticket/497 about that.
+   version also provides the C lib only for --clibs, with the same approach
+   adopted by upstream. See http://trac.osgeo.org/geos/ticket/497 about that.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 30 Nov 2011 17:27:23 +0100
diff --git a/debian/changelog b/debian/changelog
index 9219115..a27372c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ geos (3.3.1-4) unstable; urgency=low
   * Changed the C/C++ chain for development. See NEWS file for an explanation.
     (closes: #643658)
   * Patches refreshed and merged with upstream changes.
+  * Added patch geos-config to fix library paths. This is coherent with
+    upstream approach too.
 
- -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 02 Dec 2011 15:43:28 +0100
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 21 Feb 2012 23:33:45 +0100
 
 geos (3.2.2-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index c4c9a4f..ea61bab 100644
--- a/debian/control
+++ b/debian/control
@@ -27,13 +27,15 @@ Section: libdevel
 Architecture: any
 Depends: libgeos-3.3.1 (= ${binary:Version}), ${misc:Depends}
 Suggests: libgdal-doc
-Description: Geometry engine for GIS - Development files
+Description: Geometry engine for GIS - C++ development files
  GEOS provides a spatial object model and fundamental geometric
  functions. It implements the geometry model defined in the
  OpenGIS Consortium Simple Features Specification for SQL. 
  .
  This package contains the headers and libraries needed to 
- develop programs using GEOS.
+ develop programs using GEOS in C++. Note that third-parties
+ programs should use the stable C API instead of the 
+ unstable C++ one.
 
 Package: libgeos-c1
 Section: libs
@@ -54,7 +56,7 @@ Description: Geometry engine for Geographic Information Systems - C Library
    * topological validity checking
  .
  This package contains the C library. A C++ library is provided
- by the libgeos* package.
+ by the libgeos-* package.
 
 Package: libgeos-3.3.1
 Section: libs
@@ -74,7 +76,7 @@ Description: Geometry engine for Geographic Information Systems - C++ Library
    * area and distance functions, and
    * topological validity checking
  .
- This package contains the C++ library. A C library is provided
+ This package contains the C++ library. A stable C library is provided
  by the libgeos-c* package.
 
 Package: libgeos-doc
diff --git a/debian/control.in b/debian/control.in
index 92579b0..180cf88 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -27,13 +27,15 @@ Section: libdevel
 Architecture: any
 Depends: libgeos- at VERSION@ (= ${binary:Version}), ${misc:Depends}
 Suggests: libgdal-doc
-Description: Geometry engine for GIS - Development files
+Description: Geometry engine for GIS - C++ development files
  GEOS provides a spatial object model and fundamental geometric
  functions. It implements the geometry model defined in the
  OpenGIS Consortium Simple Features Specification for SQL. 
  .
  This package contains the headers and libraries needed to 
- develop programs using GEOS.
+ develop programs using GEOS in C++. Note that third-parties
+ programs should use the stable C API instead of the 
+ unstable C++ one.
 
 Package: libgeos-c1
 Section: libs
@@ -54,7 +56,7 @@ Description: Geometry engine for Geographic Information Systems - C Library
    * topological validity checking
  .
  This package contains the C library. A C++ library is provided
- by the libgeos* package.
+ by the libgeos-* package.
 
 Package: libgeos- at VERSION@
 Section: libs
@@ -74,7 +76,7 @@ Description: Geometry engine for Geographic Information Systems - C++ Library
    * area and distance functions, and
    * topological validity checking
  .
- This package contains the C++ library. A C library is provided
+ This package contains the C++ library. A stable C library is provided
  by the libgeos-c* package.
 
 Package: libgeos-doc
diff --git a/debian/patches/geos-config b/debian/patches/geos-config
new file mode 100644
index 0000000..ca1adee
--- /dev/null
+++ b/debian/patches/geos-config
@@ -0,0 +1,24 @@
+Index: geos/tools/geos-config.in
+===================================================================
+--- geos.orig/tools/geos-config.in	2012-02-21 23:31:52.000000000 +0100
++++ geos/tools/geos-config.in	2012-02-21 23:33:29.000000000 +0100
+@@ -11,6 +11,7 @@
+      [--prefix]
+      [--version]
+      [--libs]
++     [--clibs]
+      [--cflags]
+      [--ldflags]
+      [--includes]
+@@ -37,7 +38,10 @@
+     echo -I${prefix}/include 
+       ;;
+     --libs)
+-      echo -L${libdir} -lgeos
++      echo -L${libdir} -lgeos- at VERSION@
++      ;;
++    --clibs)
++      echo -L${libdir} -lgeos_c
+       ;;
+     --ldflags)
+       echo -L${libdir}
diff --git a/debian/patches/series b/debian/patches/series
index a9214bf..be57c8e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ DouglasPeuckerLineSimplifier.h
 TaggedLineString.cpp
 TaggedLineString.h
 TaggedLineStringSimplifier.h
+geos-config

-- 
Geometry engine for Geographic Information Systems



More information about the Pkg-grass-devel mailing list