The following commit has been merged in the upstream branch: commit 77023550ec26b38e27369647dd1f281e133e65f2 Author: Alan Boudreault <aboudrea...@mapgears.com> Date: Thu May 17 18:48:32 2012 +0000
Removing debian dir in upstream diff --git a/debian/Makefile.example b/debian/Makefile.example deleted file mode 100644 index 8186037..0000000 --- a/debian/Makefile.example +++ /dev/null @@ -1,8 +0,0 @@ -example: - g++ -g -O -lgeos -o example example.cpp - -clean: - rm example - -.PHONY: - clean diff --git a/debian/NEWS b/debian/NEWS deleted file mode 100644 index 804741e..0000000 --- a/debian/NEWS +++ /dev/null @@ -1,18 +0,0 @@ -geos (3.3.1-1) unstable; urgency=low - - GEOS provides a (stable) C API and an unstable C++ one. Most programs use - 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 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 - other programs have to b-depend on the C libgeos-dev package, which - 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 --clibs, with the same approach - adopted by upstream. See http://trac.osgeo.org/geos/ticket/497 about that. - - -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 30 Nov 2011 17:27:23 +0100 diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index f38f0a4..0000000 --- a/debian/changelog +++ /dev/null @@ -1,282 +0,0 @@ -geos (3.3.3-1) unstable; urgency=low - - * New upstream release - - -- Jerome Villeneuve Larouche <jlarou...@mapgears.com> Thu, 17 May 2012 17:36:39 +0000 - -geos (3.3.2-1) unstable; urgency=low - - * New upstream release. - * Dropped geos-config patch, merged upstream. - - -- Francesco Paolo Lovergine <fran...@debian.org> Sun, 26 Feb 2012 23:29:37 +0100 - -geos (3.3.1-1) unstable; urgency=low - - * New upstream major release. - (closes: #648611) - * Changed the C/C++ chain for development. See NEWS file for an explanation. - Thanks strk for a useful discussion about that. - (closes: #643658) - * Patches refreshed and merged with upstream changes. - * Added patch geos-config to fix library paths. This is coherent with - upstream approach too. - * Moved the C++ headers under libgeos++-dev automagically and added a break - against the old libgeos-dev all-in-one package. - * The libgeos++-dev package depends on libgeos-dev for a couple of reasons: - - a common header (geos/extern.h) - - a program using C++ API could mixup C and C++ APIs so better being - safe about that. - * Merged NMU change in debian/rules to fix armhf FTBS. - (closes: #641387) - - -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 22 Feb 2012 14:20:57 +0100 - -geos (3.2.2-3) unstable; urgency=low - - * New patch: swig. Fixed for strong version detection in ac_pkg_swig.m4. - Merged from 3.3 series. Thanks strk. (closes: #631819) - * Removed obsolete python build-deps, because now the suggested binding - is via shapely. (closes: #616823) - - -- Francesco Paolo Lovergine <fran...@debian.org> Mon, 18 Jul 2011 12:23:11 +0200 - -geos (3.2.2-2) unstable; urgency=low - - * Policy bumped to 3.9.2, no changes. - * Fixed previous changelog entry. - * Added CoordinateSequenceFactory.h patch to fix a missing declaration. - (closes: #624949) - * Added Bintree.cpp, Node.cpp, MonotoneChainBuilder.h, AbstractNode.cpp, - and other patches to fix a missing cstddef header file inclusion in - some files and use of std namespace. This is required in current - default gcc flavor. - * Use -fpermessive at building time to work around some minor compatibility - problems which prevent a successuful building. - - -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 25 May 2011 15:33:37 +0200 - -geos (3.2.2-1) unstable; urgency=low - - [ Alan Boudreault ] - * New upstream release. - - [ Francesco Paolo Lovergine ] - * Policy set to 3.9.1, without changes. - * Merged log for post squeeze release. - * Repository moved to git and changed Vcs-* fields as required. - * Source format moved to 3.0 with quilt support. - * Added ${misc:Depends} to bin pkgs due to dh use. - * Added -dbg package for debugging symbols. - (closes: #582273) - - -- Francesco Paolo Lovergine <fran...@debian.org> Thu, 03 Mar 2011 13:40:04 +0100 - -geos (3.2.0-1) unstable; urgency=low - - * New upstream release. - * Removed kobold among uploaders because no more active on DebianGIS packages. - * Policy bumped to 3.8.3, without changes. - * Changed a bit debian/rules to manage RC patch version. - * Now, it does not install libtool helper file .la, as currently deprecated. - * Revised licenses around and updated the debian/copyright file. - - -- Francesco Paolo Lovergine <fran...@debian.org> Thu, 21 Jan 2010 17:05:45 +0100 - -geos (3.1.1-1) unstable; urgency=low - - * New upstream release (bug fixes only). - * Added me as an uploader. - * Policy bumped to 3.8.2 (no changes). - * Introduced a debian/control.in template to version automagically - the C++ binding package and dependencies. - - -- Francesco Paolo Lovergine <fran...@debian.org> Fri, 26 Jun 2009 14:28:42 +0200 - -geos (3.1.0-1) unstable; urgency=low - - * New upstream release. - * This version includes also a missing header inclusion, which caused FTBFS - on armel. (Closes: #520447) - - -- Fabio Tranchitella <kob...@debian.org> Fri, 27 Mar 2009 15:54:54 +0100 - -geos (3.0.3-2) unstable; urgency=low - - * debian/control: do not build the python bindings, they are deprecated by - upstream and superseded by python-shapely. - - -- Fabio Tranchitella <kob...@debian.org> Fri, 06 Mar 2009 13:28:29 +0100 - -geos (3.0.3-1) unstable; urgency=low - - [ Francesco Paolo Lovergine ] - * New upstream release. - * Updated debian/copyright adding copyright notice [lintian]. - * Policy bumped to 3.8.0 (no changes) - * C++ version bumped in package name. - * Updated homepage fields in debian/control to reflect moving into OSGeo - infrastracture. - * Watch file updated. - (closes: #504470) - * Patch gcc43.dpatch removed, merged upstream. - * Moved to debhelper level 7. - * Some minor clean up in debian/rules. - - [ Fabio Tranchitella ] - * debian/control: added libgeos-ruby1.8 and python-geos. (Closes: #509679) - * debian/copyright: updated. - - -- Fabio Tranchitella <kob...@debian.org> Thu, 05 Mar 2009 20:18:57 +0100 - -geos (3.0.0-5) unstable; urgency=low - - * debian/rules: fixed a FTBFS on arm eabi; patch from Riku Voipio. - (Closes: #480345) - - -- Fabio Tranchitella <kob...@debian.org> Mon, 12 May 2008 12:33:47 +0200 - -geos (3.0.0-4) unstable; urgency=low - - * [PATCH] gcc4.3.dpatch added to manage GCC 4.3 issue. - (closes: #456089) - - -- Francesco Paolo Lovergine <fran...@debian.org> Thu, 10 Apr 2008 14:27:56 +0200 - -geos (3.0.0-3) unstable; urgency=low - - * debian/rules: the library itself (.so file) shouldn't be in the -dev - package. (Closes: #471745) - - -- Fabio Tranchitella <kob...@debian.org> Thu, 20 Mar 2008 08:30:03 +0100 - -geos (3.0.0-2) unstable; urgency=low - - * Upload to unstable. - - -- Fabio Tranchitella <kob...@debian.org> Wed, 19 Mar 2008 19:18:41 +0100 - -geos (3.0.0-1) experimental; urgency=low - - [ Francesco Paolo Lovergine ] - * Added Vcs-* fields to debian/control - * Policy bumped to 3.7.3 without changes - * Removed Steve Halasz among Uploaders (last contribute is almost 2 years ago). - * Fixed debian/watch. - (closes: #460009) - * Now using ${binary:Version} instead of obsoleted ${Source-Version} - - [ Fabio Tranchitella ] - * New upstream release. (Closes: #458893, #456089) - * Renamed binary package libgeos2c2a to libgeos-3.0.0 for C++ ABI transition. - - -- Fabio Tranchitella <kob...@debian.org> Mon, 28 Jan 2008 17:42:00 +0100 - -geos (2.2.3-4) unstable; urgency=low - - [ Fabio Tranchitella ] - * debian/watch: fixed. - - [ Paul Wise ] - * Switch to the new Homepage field - - [ Francesco Paolo Lovergine ] - * Fixed lintian error: debian-rules-ignores-make-clean-error - - -- Francesco Paolo Lovergine <fran...@debian.org> Wed, 17 Oct 2007 12:30:10 +0200 - -geos (2.2.3-3) unstable; urgency=low - - * debian/control: move doxygen from build-depends-indep to build-depends. - - -- Fabio Tranchitella <kob...@debian.org> Mon, 6 Nov 2006 21:35:52 +0100 - -geos (2.2.3-2) unstable; urgency=low - - * Upload to unstable. - * debian/rules: added -V switch to dh_makeshlibs, since 2.2.3 doesn't bump - the SONAME but provides new functions. Packages which depend on this - version or above should have a versioned build-dependency on this release. - - -- Fabio Tranchitella <kob...@debian.org> Wed, 1 Nov 2006 08:46:54 +0100 - -geos (2.2.3-1) experimental; urgency=low - - * New upstream release. (Closes: #370498) - - -- Fabio Tranchitella <kob...@debian.org> Tue, 10 Oct 2006 19:56:09 +0200 - -geos (2.2.1-1) unstable; urgency=low - - [ Steve Halasz ] - * New upstream release - * Convert to team maintenance by DebianGIS group - * 2.2.1 introduces a new C API in the libgeos-c1 package - * Apply patch from Martin Michlmayr for FTBFS with g++ - (Closes: #356111) - * Don't put empty ChangeLog file in packages - - [ Paul Wise ] - * Add homepages to the package descriptions. - * Add a watchfile - - * Upload sponsored by Peter Reinholdtsen - - -- Steve Halasz <deb...@adkgis.org> Sun, 15 Jan 2006 13:53:40 +0800 - -geos (2.1.4-2) unstable; urgency=low - - * Rename to libgeos2c2a for the libstdc++ transition. - Transitions are fun. Wheeeeee! - - -- Steve Halasz <deb...@adkgis.org> Fri, 18 Nov 2005 13:22:44 -0500 - -geos (2.1.4-1) unstable; urgency=low - - * New upstream release - - -- Steve Halasz <deb...@adkgis.org> Sat, 5 Nov 2005 20:15:22 -0500 - -geos (2.1.3-2) unstable; urgency=low - - * libgeos-dev should depend on libgeos2c2 rather than libgeos2 - (Closes: #318990) - * bump standards version to 3.6.2 - - -- Steve Halasz <deb...@adkgis.org> Tue, 19 Jul 2005 13:18:19 -0400 - -geos (2.1.3-1) unstable; urgency=low - - * New upstream release - * Renaming libgeos2 to libgeos2c2 for C++ ABI transition - * Removed cp config.{guess,sub} from clean: target and - put it into configure target (change from ubuntu bug #11183) - - -- Steve Halasz <deb...@adkgis.org> Mon, 11 Jul 2005 11:17:32 -0400 - -geos (2.1.2-1) unstable; urgency=low - - * New upstream release - - -- Steve Halasz <deb...@adkgis.org> Thu, 9 Jun 2005 15:36:33 -0400 - -geos (2.1.1-2) unstable; urgency=low - - * Fix bug in isvalid(), backport from geos CVS (Closes: #303737). - Thanks to Markus Shaber for the patch. - - -- Steve Halasz <deb...@adkgis.org> Fri, 8 Apr 2005 10:51:36 -0400 - -geos (2.1.1-1) unstable; urgency=low - - * New upstream release - * Create libgeos-doc with the binary-indep target (Closes: #284361) - - -- Steve Halasz <deb...@adkgis.org> Wed, 9 Mar 2005 10:34:56 -0500 - -geos (2.0.1-1) unstable; urgency=low - - * Initial Release. (Closes: #277514). - - -- Steve Halasz <deb...@adkgis.org> Fri, 22 Oct 2004 23:24:25 -0400 - diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 45a4fb7..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -8 diff --git a/debian/control b/debian/control deleted file mode 100644 index 033bf81..0000000 --- a/debian/control +++ /dev/null @@ -1,118 +0,0 @@ -Source: geos -Section: science -Priority: optional -Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> -Uploaders: Francesco Paolo Lovergine <fran...@debian.org> -Build-Depends: debhelper (>= 8), doxygen, swig, ruby, ruby-dev -Standards-Version: 3.9.2 -Homepage: http://trac.osgeo.org/geos/ -Vcs-Browser: http://git.debian.org/?p=pkg-grass/geos.git -Vcs-Git: git://git.debian.org/git/pkg-grass/geos - -Package: libgeos-dev -Section: libdevel -Architecture: any -Depends: libgeos-c1 (= ${binary:Version}), ${misc:Depends} -Suggests: libgdal-doc -Description: Geometry engine for GIS - 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. - -Package: libgeos++-dev -Section: libdevel -Architecture: any -Depends: libgeos-3.3.3 (= ${binary:Version}), libgeos-dev, ${misc:Depends} -Suggests: libgdal-doc -Breaks: libgeos-dev (<< 3.3.1-1~) -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 in C++. Note that third-parties - programs should use the stable C API instead of the - unstable C++ one. - -Package: libgeos-c1 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Geometry engine for Geographic Information Systems - C Library - 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. - Functions provided include: - . - * spatial predicates (based on the DE-9IM model), - * overlay functions (intersection, difference, union, - symmetric difference), - * buffer, - * convex hull, - * area and distance functions, and - * topological validity checking - . - This package contains the C library. A C++ library is provided - by the libgeos-* package. - -Package: libgeos-3.3.3 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Geometry engine for Geographic Information Systems - C++ Library - 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. - Functions provided include: - . - * spatial predicates (based on the DE-9IM model), - * overlay functions (intersection, difference, union, - symmetric difference), - * buffer, - * convex hull, - * area and distance functions, and - * topological validity checking - . - This package contains the C++ library. A stable C library is provided - by the libgeos-c* package and should be preferred by third-parties - programs. - -Package: libgeos-doc -Section: doc -Architecture: all -Depends: ${misc:Depends} -Suggests: libgeos-dev (= ${binary:Version}) -Homepage: http://download.osgeo.org/geos/doxygen/ -Description: Documentation for the GEOS GIS geometry engine library - 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 documentation for the GEOS API. - -Package: libgeos-ruby1.8 -Section: ruby -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: GEOS bindings for Ruby - 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 Ruby bindings for GEOS. - -Package: libgeos-dbg -Architecture: any -Section: debug -Priority: extra -Depends: libgeos-3.3.3 (= ${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 - OpenGIS Consortium Simple Features Specification for SQL. - . - This package contains the debugging symbols for C/C++ GEOS library. diff --git a/debian/control.in b/debian/control.in deleted file mode 100644 index e3a2c24..0000000 --- a/debian/control.in +++ /dev/null @@ -1,118 +0,0 @@ -Source: geos -Section: science -Priority: optional -Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> -Uploaders: Francesco Paolo Lovergine <fran...@debian.org> -Build-Depends: debhelper (>= 8), doxygen, swig, ruby, ruby-dev -Standards-Version: 3.9.2 -Homepage: http://trac.osgeo.org/geos/ -Vcs-Browser: http://git.debian.org/?p=pkg-grass/geos.git -Vcs-Git: git://git.debian.org/git/pkg-grass/geos - -Package: libgeos-dev -Section: libdevel -Architecture: any -Depends: libgeos-c1 (= ${binary:Version}), ${misc:Depends} -Suggests: libgdal-doc -Description: Geometry engine for GIS - 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. - -Package: libgeos++-dev -Section: libdevel -Architecture: any -Depends: libgeos-@VERSION@ (= ${binary:Version}), libgeos-dev, ${misc:Depends} -Suggests: libgdal-doc -Breaks: libgeos-dev (<< 3.3.1-1~) -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 in C++. Note that third-parties - programs should use the stable C API instead of the - unstable C++ one. - -Package: libgeos-c1 -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Geometry engine for Geographic Information Systems - C Library - 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. - Functions provided include: - . - * spatial predicates (based on the DE-9IM model), - * overlay functions (intersection, difference, union, - symmetric difference), - * buffer, - * convex hull, - * area and distance functions, and - * topological validity checking - . - This package contains the C library. A C++ library is provided - by the libgeos-* package. - -Package: libgeos-@VERSION@ -Section: libs -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Geometry engine for Geographic Information Systems - C++ Library - 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. - Functions provided include: - . - * spatial predicates (based on the DE-9IM model), - * overlay functions (intersection, difference, union, - symmetric difference), - * buffer, - * convex hull, - * area and distance functions, and - * topological validity checking - . - This package contains the C++ library. A stable C library is provided - by the libgeos-c* package and should be preferred by third-parties - programs. - -Package: libgeos-doc -Section: doc -Architecture: all -Depends: ${misc:Depends} -Suggests: libgeos-dev (= ${binary:Version}) -Homepage: http://download.osgeo.org/geos/doxygen/ -Description: Documentation for the GEOS GIS geometry engine library - 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 documentation for the GEOS API. - -Package: libgeos-ruby1.8 -Section: ruby -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends} -Description: GEOS bindings for Ruby - 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 Ruby bindings for GEOS. - -Package: libgeos-dbg -Architecture: any -Section: debug -Priority: extra -Depends: libgeos-@VERSION@ (= ${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 - OpenGIS Consortium Simple Features Specification for SQL. - . - This package contains the debugging symbols for C/C++ GEOS library. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 9561e40..0000000 --- a/debian/copyright +++ /dev/null @@ -1,60 +0,0 @@ -This package was debianized by Steve Halasz <deb...@adkgis.org> on -Fri, 22 Oct 2004 23:24:25 -0400. - -It was downloaded from: http://trac.osgeo.org/geos/ - -The package is distributed as a bzip2 compressed tarball. -The Debian maintainer repacked the tarball to be gzip compressed. - -The upstream contributors are listed in the AUTHORS file. - -Copyright: - - Copyright (C) 2001-2004 Vivid Solutions Inc. - Copyright (C) 2005-2007 Refractions Research Inc. - Copyright (C) 2009 Sandro Santilli - Copyright (C) 2008 Sean Gillies - Copyright (C) 2009 Ragi Y. Burhum - Copyright (C) 2005-2007 Charlie Savage - Copyright (C) 2000-2006 Lee Thomason - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public License as -published by the Free Software Foundation; either version 2.1 of -the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -On Debian systems, the complete text of the GNU Lesser General Public -License can be found in the /usr/share/common-licenses/LGPL file. - - - - -Other licenses follow. ----------------------------------------------------------------------- - -tests/xmltester/tinyxml: - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any -damages arising from the use of this software. - -Permission is granted to anyone to use this software for any -purpose, including commercial applications, and to alter it and -redistribute it freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must -not claim that you wrote the original software. If you use this -software in a product, an acknowledgment in the product documentation -would be appreciated but is not required. - -2. Altered source versions must be plainly marked as such, and -must not be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source -distribution. - diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index cd4ea07..0000000 --- a/debian/dirs +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/libgeos-dev/html diff --git a/debian/docs b/debian/docs deleted file mode 100644 index a016fd6..0000000 --- a/debian/docs +++ /dev/null @@ -1,4 +0,0 @@ -NEWS -README -TODO -AUTHORS diff --git a/debian/geos-config.1 b/debian/geos-config.1 deleted file mode 100644 index 123f3a5..0000000 --- a/debian/geos-config.1 +++ /dev/null @@ -1,31 +0,0 @@ -.TH "geos-config" "1" "October 25, 2004" "geos-config" "User Commands" -.SH "NAME" -geos\-config \- returns information about installed GEOS libraries and binaries -.SH "SYNOPSIS" -.PP -.B geos\-config -[OPTIONS] -.SH "DESCRIPTION" -.PP -The \fIgeos\-config\fP shell script displays configuration information for installed GEOS libraries and binaries. - -.SH "OPTIONS" -.TP -\fB\-\-prefix\fR -print the prefix used by geos -.TP -\fB\-\-version\fR -print the GEOS version -.TP -\fB\-\-libs\fR -print the linker flags that are necessary to link to GEOS -.TP -\fB\-\-cflags\fR -print the compiler flags that are necessary to compile a -plug\-in -.TP -\fB\-\-includes\fR -show location of C++ header files -.TP -\fB\-\-jtsport\fR -show the version of the Java Topology Suite this version of GEOS was ported from diff --git a/debian/libgeos++-dev.dirs b/debian/libgeos++-dev.dirs deleted file mode 100644 index 31e7131..0000000 --- a/debian/libgeos++-dev.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib -usr/include/geos diff --git a/debian/libgeos++-dev.install.in b/debian/libgeos++-dev.install.in deleted file mode 100644 index 0d9629d..0000000 --- a/debian/libgeos++-dev.install.in +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib/libgeos.a -usr/lib/libgeos.so diff --git a/debian/libgeos-c++.dirs b/debian/libgeos-c++.dirs deleted file mode 100644 index 6845771..0000000 --- a/debian/libgeos-c++.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/debian/libgeos-c++.install b/debian/libgeos-c++.install deleted file mode 100644 index 0b3179d..0000000 --- a/debian/libgeos-c++.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libgeos-* diff --git a/debian/libgeos-c1.dirs b/debian/libgeos-c1.dirs deleted file mode 100644 index 6845771..0000000 --- a/debian/libgeos-c1.dirs +++ /dev/null @@ -1 +0,0 @@ -usr/lib diff --git a/debian/libgeos-c1.install b/debian/libgeos-c1.install deleted file mode 100644 index f071273..0000000 --- a/debian/libgeos-c1.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/libgeos_c.so.1* diff --git a/debian/libgeos-dev.README.Debian b/debian/libgeos-dev.README.Debian deleted file mode 100644 index 35d69cd..0000000 --- a/debian/libgeos-dev.README.Debian +++ /dev/null @@ -1,23 +0,0 @@ -GEOS for Debian ---------------- - -To compile programs against GEOS: - - CFLAGS += -I`geos-config --includes` - LDFLAGS += `geos-config --libs` - -Headers: - - #include <geos.h> - -Example usage: - - The libgeos-doc package provides basic usage examples in - /usr/share/doc/libgeos-doc/ - -Documentation: - - The libgeos-doc package provides API documentation in - /usr/share/doc/libgeos-doc/ - - -- Steve Halasz (deb...@adkgis.org), Fri, 5 Nov 2004 diff --git a/debian/libgeos-dev.dirs b/debian/libgeos-dev.dirs deleted file mode 100644 index 9a4ceb9..0000000 --- a/debian/libgeos-dev.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin -usr/lib -usr/include diff --git a/debian/libgeos-dev.install b/debian/libgeos-dev.install deleted file mode 100644 index 204ced0..0000000 --- a/debian/libgeos-dev.install +++ /dev/null @@ -1,5 +0,0 @@ -usr/bin/geos-config -usr/include/geos_c.h -usr/include/geos/export.h -usr/lib/libgeos_c.a -usr/lib/libgeos_c.so diff --git a/debian/libgeos-doc.README.Debian b/debian/libgeos-doc.README.Debian deleted file mode 100644 index d99968e..0000000 --- a/debian/libgeos-doc.README.Debian +++ /dev/null @@ -1,8 +0,0 @@ -GEOS documentation for Debian ------------------------------ - -To access the GEOS API Documentation open index.html in a web browser. - -There is example code in examples/example.cpp. It requires the libgeos2 package to be installed to compile and run. Invoke 'make' to compile it. - - -- Steve Halasz (deb...@adkgis.org), Fri, 5 Nov 2004 diff --git a/debian/libgeos-doc.dirs b/debian/libgeos-doc.dirs deleted file mode 100644 index 4d5cac2..0000000 --- a/debian/libgeos-doc.dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/share/doc/libgeos-doc/html -usr/share/doc/libgeos-doc/examples diff --git a/debian/libgeos-doc.links b/debian/libgeos-doc.links deleted file mode 100644 index 9498789..0000000 --- a/debian/libgeos-doc.links +++ /dev/null @@ -1 +0,0 @@ -usr/share/doc/libgeos-doc/html/index.html usr/share/doc/libgeos-doc/index.html diff --git a/debian/patches/CoordinateSequenceFactory.h b/debian/patches/CoordinateSequenceFactory.h deleted file mode 100644 index a5a8a29..0000000 --- a/debian/patches/CoordinateSequenceFactory.h +++ /dev/null @@ -1,13 +0,0 @@ -Index: geos/include/geos/geom/CoordinateSequenceFactory.h -=================================================================== ---- geos.orig/include/geos/geom/CoordinateSequenceFactory.h 2011-05-24 15:51:50.000000000 +0200 -+++ geos/include/geos/geom/CoordinateSequenceFactory.h 2011-05-24 15:51:53.000000000 +0200 -@@ -24,7 +24,7 @@ - #include <geos/export.h> - #include <vector> - --//#include <geos/geom/Coordinate.h> -+#include <geos/geom/Coordinate.h> - #include <geos/inline.h> - - // Forward declarations diff --git a/debian/patches/DirectedEdgeStar.h b/debian/patches/DirectedEdgeStar.h deleted file mode 100644 index 8221a4b..0000000 --- a/debian/patches/DirectedEdgeStar.h +++ /dev/null @@ -1,21 +0,0 @@ -Index: geos/include/geos/planargraph/DirectedEdgeStar.h -=================================================================== ---- geos.orig/include/geos/planargraph/DirectedEdgeStar.h 2011-11-30 16:54:52.000000000 +0100 -+++ geos/include/geos/planargraph/DirectedEdgeStar.h 2011-12-02 14:40:45.000000000 +0100 -@@ -20,6 +20,7 @@ - #include <geos/export.h> - - #include <vector> -+#include <cstddef> - - #ifdef _MSC_VER - #pragma warning(push) -@@ -40,6 +41,8 @@ - namespace geos { - namespace planargraph { // geos.planargraph - -+using namespace std; -+ - /// A sorted collection of DirectedEdge which leave a Node in a PlanarGraph. - class GEOS_DLL DirectedEdgeStar { - protected: diff --git a/debian/patches/DouglasPeuckerLineSimplifier.h b/debian/patches/DouglasPeuckerLineSimplifier.h deleted file mode 100644 index 15caa11..0000000 --- a/debian/patches/DouglasPeuckerLineSimplifier.h +++ /dev/null @@ -1,21 +0,0 @@ -Index: geos/include/geos/simplify/DouglasPeuckerLineSimplifier.h -=================================================================== ---- geos.orig/include/geos/simplify/DouglasPeuckerLineSimplifier.h 2011-11-30 16:54:52.000000000 +0100 -+++ geos/include/geos/simplify/DouglasPeuckerLineSimplifier.h 2011-12-02 14:40:59.000000000 +0100 -@@ -23,6 +23,7 @@ - #include <geos/export.h> - #include <vector> - #include <memory> // for auto_ptr -+#include <cstddef> - - #ifdef _MSC_VER - #pragma warning(push) -@@ -39,6 +40,8 @@ - namespace geos { - namespace simplify { // geos::simplify - -+using namespace std; -+ - /** \brief - * Simplifies a linestring (sequence of points) using - * the standard Douglas-Peucker algorithm. diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp deleted file mode 100644 index 7b16feb..0000000 --- a/debian/patches/Node.cpp +++ /dev/null @@ -1,69 +0,0 @@ -Index: geos/src/index/bintree/Node.cpp -=================================================================== ---- geos.orig/src/index/bintree/Node.cpp 2011-11-30 16:54:52.000000000 +0100 -+++ geos/src/index/bintree/Node.cpp 2011-12-02 14:36:08.000000000 +0100 -@@ -16,6 +16,7 @@ - - #include <cstddef> - #include <cassert> -+#include <cstddef> - - #include <geos/index/bintree/Node.h> - #include <geos/index/bintree/Key.h> -@@ -25,6 +26,8 @@ - namespace index { // geos.index - namespace bintree { // geos.index.bintree - -+using namespace std; -+ - Node* - Node::createNode(Interval *itemInterval) - { -Index: geos/src/geomgraph/Node.cpp -=================================================================== ---- geos.orig/src/geomgraph/Node.cpp 2011-11-30 16:54:52.000000000 +0100 -+++ geos/src/geomgraph/Node.cpp 2011-12-02 14:36:08.000000000 +0100 -@@ -32,6 +32,7 @@ - #include <sstream> - #include <vector> - #include <algorithm> -+#include <cstddef> - - #ifndef GEOS_DEBUG - #define GEOS_DEBUG 0 -@@ -40,12 +41,13 @@ - #define COMPUTE_Z 1 - #endif - --using namespace std; - using namespace geos::geom; - - namespace geos { - namespace geomgraph { // geos.geomgraph - -+using namespace std; -+ - /*public*/ - Node::Node(const Coordinate& newCoord, EdgeEndStar* newEdges) - : -Index: geos/src/index/quadtree/Node.cpp -=================================================================== ---- geos.orig/src/index/quadtree/Node.cpp 2011-11-30 16:54:52.000000000 +0100 -+++ geos/src/index/quadtree/Node.cpp 2011-12-02 14:36:08.000000000 +0100 -@@ -25,6 +25,7 @@ - #include <string> - #include <sstream> - #include <cassert> -+#include <cstddef> - - #ifndef GEOS_DEBUG - #define GEOS_DEBUG 0 -@@ -41,6 +42,8 @@ - namespace index { // geos.index - namespace quadtree { // geos.index.quadtree - -+using namespace std; -+ - /* public static */ - std::auto_ptr<Node> - Node::createNode(const Envelope& env) diff --git a/debian/patches/Root.cpp b/debian/patches/Root.cpp deleted file mode 100644 index 88d6635..0000000 --- a/debian/patches/Root.cpp +++ /dev/null @@ -1,40 +0,0 @@ -Index: geos/src/index/bintree/Root.cpp -=================================================================== ---- geos.orig/src/index/bintree/Root.cpp 2011-11-30 16:54:52.000000000 +0100 -+++ geos/src/index/bintree/Root.cpp 2011-12-02 14:36:34.000000000 +0100 -@@ -21,11 +21,14 @@ - - #include <cstddef> - #include <cassert> -+#include <cstddef> - - namespace geos { - namespace index { // geos.index - namespace bintree { // geos.index.bintree - -+using namespace std; -+ - double Root::origin=0.0; - - void -Index: geos/src/index/quadtree/Root.cpp -=================================================================== ---- geos.orig/src/index/quadtree/Root.cpp 2011-11-30 16:54:52.000000000 +0100 -+++ geos/src/index/quadtree/Root.cpp 2011-12-02 14:36:34.000000000 +0100 -@@ -25,6 +25,7 @@ - #include <geos/geom/Envelope.h> - - #include <cassert> -+#include <cstddef> - - #ifndef GEOS_DEBUG - #define GEOS_DEBUG 0 -@@ -40,6 +41,8 @@ - namespace index { // geos.index - namespace quadtree { // geos.index.quadtree - -+using namespace std; -+ - // the singleton root quad is centred at the origin. - //Coordinate* Root::origin=new Coordinate(0.0, 0.0); - const Coordinate Root::origin(0.0, 0.0); diff --git a/debian/patches/SimpleNestedRingTester.h b/debian/patches/SimpleNestedRingTester.h deleted file mode 100644 index 5375c39..0000000 --- a/debian/patches/SimpleNestedRingTester.h +++ /dev/null @@ -1,21 +0,0 @@ -Index: geos/include/geos/operation/valid/SimpleNestedRingTester.h -=================================================================== ---- geos.orig/include/geos/operation/valid/SimpleNestedRingTester.h 2011-11-30 16:54:52.000000000 +0100 -+++ geos/include/geos/operation/valid/SimpleNestedRingTester.h 2011-12-02 14:40:21.000000000 +0100 -@@ -25,6 +25,7 @@ - - #include <cstddef> - #include <vector> -+#include <cstddef> - - #ifdef _MSC_VER - #pragma warning(push) -@@ -46,6 +47,8 @@ - namespace operation { // geos::operation - namespace valid { // geos::operation::valid - -+using namespace std; -+ - /** \brief - * Tests whether any of a set of {@link LinearRing}s are - * nested inside another ring in the set, using a simple O(n^2) diff --git a/debian/patches/TaggedLineString.cpp b/debian/patches/TaggedLineString.cpp deleted file mode 100644 index 38faa85..0000000 --- a/debian/patches/TaggedLineString.cpp +++ /dev/null @@ -1,21 +0,0 @@ -Index: geos/src/simplify/TaggedLineString.cpp -=================================================================== ---- geos.orig/src/simplify/TaggedLineString.cpp 2011-11-30 16:54:52.000000000 +0100 -+++ geos/src/simplify/TaggedLineString.cpp 2011-12-02 14:41:08.000000000 +0100 -@@ -27,6 +27,7 @@ - - #include <cassert> - #include <memory> -+#include <cstddef> - - #ifndef GEOS_DEBUG - #define GEOS_DEBUG 0 -@@ -42,6 +43,8 @@ - namespace geos { - namespace simplify { // geos::simplify - -+using namespace std; -+ - /*public*/ - TaggedLineString::TaggedLineString(const geom::LineString* nParentLine, - std::size_t nMinimumSize) diff --git a/debian/patches/TaggedLineString.h b/debian/patches/TaggedLineString.h deleted file mode 100644 index 37dbf5a..0000000 --- a/debian/patches/TaggedLineString.h +++ /dev/null @@ -1,20 +0,0 @@ -Index: geos/include/geos/simplify/TaggedLineString.h -=================================================================== ---- geos.orig/include/geos/simplify/TaggedLineString.h 2011-11-30 16:54:52.000000000 +0100 -+++ geos/include/geos/simplify/TaggedLineString.h 2011-12-02 14:41:17.000000000 +0100 -@@ -29,6 +29,7 @@ - #include <geos/export.h> - #include <vector> - #include <memory> -+#include <cstddef> - - #ifdef _MSC_VER - #pragma warning(push) -@@ -52,6 +53,7 @@ - namespace geos { - namespace simplify { // geos::simplify - -+using namespace std; - - /** \brief - * diff --git a/debian/patches/TaggedLineStringSimplifier.h b/debian/patches/TaggedLineStringSimplifier.h deleted file mode 100644 index 0e254d9..0000000 --- a/debian/patches/TaggedLineStringSimplifier.h +++ /dev/null @@ -1,20 +0,0 @@ -Index: geos/include/geos/simplify/TaggedLineStringSimplifier.h -=================================================================== ---- geos.orig/include/geos/simplify/TaggedLineStringSimplifier.h 2011-11-30 16:54:52.000000000 +0100 -+++ geos/include/geos/simplify/TaggedLineStringSimplifier.h 2011-12-02 14:41:32.000000000 +0100 -@@ -29,6 +29,7 @@ - #include <cstddef> - #include <vector> - #include <memory> -+#include <cstddef> - - #ifdef _MSC_VER - #pragma warning(push) -@@ -54,6 +55,7 @@ - namespace geos { - namespace simplify { // geos::simplify - -+using namespace std; - - /** \brief - * Simplifies a TaggedLineString, preserving topology diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index a9214bf..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,9 +0,0 @@ -CoordinateSequenceFactory.h -Node.cpp -Root.cpp -SimpleNestedRingTester.h -DirectedEdgeStar.h -DouglasPeuckerLineSimplifier.h -TaggedLineString.cpp -TaggedLineString.h -TaggedLineStringSimplifier.h diff --git a/debian/rules b/debian/rules deleted file mode 100755 index f2a032d..0000000 --- a/debian/rules +++ /dev/null @@ -1,162 +0,0 @@ -#!/usr/bin/make -f -# -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. - -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 - -# These are used for cross-compiling and for saving the configure script -# from having to guess our platform (since we know it already) -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -# Guessing geos version, which is required for C++ binding support -VER_MAJOR=$(shell grep ^VERSION_MAJOR configure.in|cut -d= -f2) -VER_MINOR=$(shell grep ^VERSION_MINOR configure.in|cut -d= -f2) -VER_PATCH=$(shell grep ^VERSION_PATCH configure.in|cut -d= -f2|cut -dr -f1) -VER=$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH) -ifeq (..,$(VER)) -$(error configure.in not found or version cannot be guessed) -else -$(info Guessed geos version is $(VER)) -endif - -CFLAGS = -Wall -g -CXX = g++ -fpermissive - -ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) - CFLAGS += -O0 -else - CFLAGS += -O2 -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif -# catch both armel and armhf -ifneq (,$(findstring arm-linux-gnueabi,$(DEB_HOST_GNU_TYPE))) - CONFFLAGS += --disable-inline -endif - -debian/control: - @sed -e 's/@VERSION@/$(VER)/' debian/control.in >$@ - -config.status: debian/control configure - dh_testdir - # Add here commands to configure the package. -ifneq "$(wildcard /usr/share/misc/config.sub)" "" - mv config.sub config.sub.bak - cp -f /usr/share/misc/config.sub config.sub -endif -ifneq "$(wildcard /usr/share/misc/config.guess)" "" - mv config.guess config.guess.bak - cp -f /usr/share/misc/config.guess config.guess -endif - CXX="$(CXX)" CFLAGS="$(CFLAGS)" ./configure \ - --host=$(DEB_HOST_GNU_TYPE) \ - --build=$(DEB_BUILD_GNU_TYPE) \ - --enable-ruby \ - --prefix=/usr \ - --mandir=\$${prefix}/share/man \ - --infodir=\$${prefix}/share/info $(CONFFLAGS) - cp debian/libgeos-c++.install debian/libgeos-$(VER).install - cp debian/libgeos-c++.dirs debian/libgeos-$(VER).dirs - -#Architecture -build: build-arch build-indep - -build-arch: build-arch-stamp -build-arch-stamp: config.status - # Add here commands to compile the arch part of the package. - CXX="$(CXX)" CFLAGS="$(CFLAGS)" $(MAKE) - touch $@ - -build-indep: build-indep-stamp -build-indep-stamp: config.status - # Add here commands to compile the indep part of the package. - $(MAKE) -C doc doxygen-html - touch $@ - -clean: - dh_testdir - dh_testroot - [ ! -f Makefile ] || $(MAKE) distclean - [ -f config.sub.bak ] && mv config.sub.bak config.sub || true - [ -f config.guess.bak ] && mv config.guess.bak config.guess || true - dh_clean - rm -f debian/libgeos-$(VER).install debian/libgeos-$(VER).dirs debian/libgeos++-dev.install - -install: install-indep install-arch -install-indep: - dh_testdir - dh_testroot - dh_prep -i - dh_installdirs -i - dh_install -i - # debian/libgeos-doc - # Install doxygen html files - install -m 644 doc/doxygen_docs/html/* debian/libgeos-doc/usr/share/doc/libgeos-doc/html - # Install example program source - install -m 644 doc/example.cpp debian/libgeos-doc/usr/share/doc/libgeos-doc/examples - install -m 644 debian/Makefile.example debian/libgeos-doc/usr/share/doc/libgeos-doc/examples/Makefile - -install-arch: - dh_testdir - dh_testroot - dh_prep -s - dh_installdirs -s - # Add here commands to install the arch part of the package into - # debian/tmp. - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp - - # add C++ headers to C++ dev package install file - cp debian/libgeos++-dev.install.in debian/libgeos++-dev.install - find debian/tmp/usr/include/geos -name "*.h" -a ! -name "export.h" | sed -e 's/^debian\/tmp\///' >>debian/libgeos++-dev.install - - dh_install -s --sourcedir=debian/tmp - dh_installman -plibgeos-dev debian/geos-config.1 - # remove the library from the -dev package - rm -f $(CURDIR)/debian/libgeos-dev/usr/lib/libgeos-*.so - # debian/libgeos-ruby1.8 - mkdir -p debian/libgeos-ruby1.8/usr/lib/ruby/ - cp -ax debian/tmp/usr/local/lib/site_ruby/1.8 \ - debian/libgeos-ruby1.8/usr/lib/ruby/1.8 - find debian/libgeos-ruby*/usr/lib/ruby -name "*.la" -delete || true - -# Must not depend on anything. This is to be called by -# binary-arch/binary-indep -# in another 'make' thread. -binary-common: - dh_testdir - dh_testroot - dh_installchangelogs - dh_installdocs - dh_installexamples - dh_installman - dh_link - dh_strip --dbg-package=libgeos-dbg - dh_compress - dh_fixperms - dh_makeshlibs -V - dh_installdeb - dh_shlibdeps - for i in $$(grep ^Package: debian/control|cut -d' ' -f2); do \ - echo "geos:Version=$(VER)" >> $$i.substvars; \ - done - dh_gencontrol - dh_md5sums - dh_builddeb - -# Build architecture independant packages using the common target. -binary-indep: build-indep install-indep - $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common - -# Build architecture dependant packages using the common target. -binary-arch: build-arch install-arch - $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch debian/control diff --git a/debian/source/format b/debian/source/format deleted file mode 100644 index 163aaf8..0000000 --- a/debian/source/format +++ /dev/null @@ -1 +0,0 @@ -3.0 (quilt) diff --git a/debian/watch b/debian/watch deleted file mode 100644 index 5b0b08f..0000000 --- a/debian/watch +++ /dev/null @@ -1,2 +0,0 @@ -version=3 -http://download.osgeo.org/geos/geos-([\d\.]+)\.tar\.bz2 debian uupdate -- 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