[SCM] proj annotated tag, debian/4.6.1-4, created. debian/4.6.1-4
The annotated tag, debian/4.6.1-4 has been created at c6acd7005b8acb48f0a9df381a15213cdda4f1ff (tag) tagging cc52ebcaa6f93cdf30f8b66fc29d294291a3539d (commit) replaces debian/4.6.1-3 tagged by Francesco Paolo Lovergine on Fri Mar 27 12:35:56 2009 + - Shortlog [svn-buildpackage] Tagging proj (4.6.1-4) Francesco Paolo Lovergine (1): Fixing #521402 --- -- Proj.4 ___ 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] proj annotated tag, upstream/4.7.0, created. upstream/4.7.0
The annotated tag, upstream/4.7.0 has been created at 4db76f5e2a543f210c3dfc718aef3095224f8a01 (tag) tagging 959c70fdbcb11376bed18b840b76455c14a2f3e5 (commit) tagged by Francesco Paolo Lovergine on Wed May 23 13:52:13 2012 +0200 - Shortlog Upstream version 4.7.0 Francesco Paolo Lovergine (2): initial upstream branch Imported Upstream version 4.7.0 --- -- Proj.4 ___ 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] proj annotated tag, debian/4.6.1-3, created. debian/4.6.1-3
The annotated tag, debian/4.6.1-3 has been created at 7a53187521bcb2492efa44ba35148d50fd8184c2 (tag) tagging 506a456df8ee905f8a422f14e94c656152d6d555 (commit) replaces debian/4.6.1-1 tagged by Francesco Paolo Lovergine on Wed Mar 25 14:19:28 2009 + - Shortlog [svn-buildpackage] Tagging proj (4.6.1-3) Francesco Paolo Lovergine (9): (null) commit e18ee7f8f054bf243c410c7309d8ee09b4e8c3d8 Adding Swiss datum grids sharfile. Added a note about swiss datum grids. Fixing man page section. Updated conflicts and replaces commit 2ccedb61d7ab01cf3cbbc813554face523cada52 Splitted proj-data as asked by ftpmaster Fixes for indep packages --- -- Proj.4 ___ 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] proj annotated tag, debian/4.6.1-2, created. debian/4.6.1-2
The annotated tag, debian/4.6.1-2 has been created at 72699ff0276fcd7791f586ab4e3a59f2bcc7fc51 (tag) tagging 855fe41f8f2f0f44537a288d65bfb5591c899557 (commit) replaces debian/4.6.1-1 tagged by Francesco Paolo Lovergine on Sun Mar 15 22:54:05 2009 + - Shortlog [svn-buildpackage] Tagging proj (4.6.1-2) Francesco Paolo Lovergine (8): (null) commit e18ee7f8f054bf243c410c7309d8ee09b4e8c3d8 Adding Swiss datum grids sharfile. Added a note about swiss datum grids. Fixing man page section. [svn-buildpackage] Tagging proj (4.6.1-2) Updated conflicts and replaces [svn-buildpackage] Tagging proj (4.6.1-2) --- -- Proj.4 ___ 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] proj annotated tag, debian/4.6.1-1, created. debian/4.6.1-1
The annotated tag, debian/4.6.1-1 has been created at 6f575418f5b10706688772643afd693dc47dd3f5 (tag) tagging 405e3951c526ebd3522396a0ea04fe557a12e125 (commit) replaces debian/4.6.0-2 tagged by Francesco Paolo Lovergine on Tue Feb 17 15:37:24 2009 + - Shortlog [svn-buildpackage] Tagging proj (4.6.1-1) Francesco Paolo Lovergine (7): Tagged 4.6.0-2 new upstream release Added add-on datum grids. Some minor fixes Minor changes. Added missing file commit e993dfaa4760d3d90517c0e44c52fce3dafeb7b2 --- -- Proj.4 ___ 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] proj annotated tag, debian/4.6.0-2, created. debian/4.6.0-2
The annotated tag, debian/4.6.0-2 has been created at ec87d389cb86f144fac17718a96ea6782b2d9379 (tag) tagging d1b2634bf928f0c0288cdc488379854435a32cae (commit) replaces debian/4.5.0-2 tagged by Francesco Paolo Lovergine on Thu Aug 28 17:51:01 2008 + - Shortlog [svn-buildpackage] Tagging proj (4.6.0-2) Francesco Paolo Lovergine (1): Fixing documentation issues. Peter S Galbraith (1): 4.6.0-1 --- -- Proj.4 ___ 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] proj annotated tag, debian/4.5.0-2, created. debian/4.5.0-2
The annotated tag, debian/4.5.0-2 has been created at a09da75f3e2fa09cbd3e61d7cadc6db8b4d4d921 (tag) tagging a880a4a86dcd760b0da1cf8210990bc64066fca1 (commit) replaces debian/4.5.0-1 tagged by Francesco Paolo Lovergine on Sun Apr 8 09:27:55 2007 + - Shortlog [svn-buildpackage] Tagging proj (4.5.0-2) Francesco Paolo Lovergine (2): (null) Preparing for unstable --- -- Proj.4 ___ 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] proj annotated tag, debian/4.5.0-1, created. debian/4.5.0-1
The annotated tag, debian/4.5.0-1 has been created at 7d37b3c092a5940043216f24d8785f10732568cf (tag) tagging 9ac2bb2f36a7b9ddd23f1d9cbcd39f9ffada2db7 (commit) tagged by Francesco Paolo Lovergine on Wed Apr 4 18:24:30 2007 + - Shortlog [svn-buildpackage] Tagging proj (4.5.0-1) Francesco Paolo Lovergine (10): [svn-inject] Installing original source of proj [svn-inject] Forking proj source to Trunk [svn-inject] Applying Debian modifications to trunk Moving to team maintainership Added a watch file Starting 4.5.0 trunk First changes Added Uploaders and compat Some secondary fixes Final changes for releasing in experimental --- -- Proj.4 ___ 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] proj branch, svn-import/upstream, created. ebc7cd6968df6d5a141da898c865df1bc46a800f
The branch, svn-import/upstream has been created at ebc7cd6968df6d5a141da898c865df1bc46a800f (commit) - Shortlog commit ebc7cd6968df6d5a141da898c865df1bc46a800f Author: Francesco Paolo Lovergine Date: Mon Oct 5 14:28:07 2009 + [svn-upgrade] Tagging new upstream version, proj (4.7.0) commit 4b6c767d4704c28d232bb5e1d3720b9c7d934527 Author: Francesco Paolo Lovergine Date: Mon Oct 5 14:28:03 2009 + [svn-upgrade] Integrating new upstream version, proj (4.7.0) commit 89af9d4d36546172ecd05a5c6b2abe720d9b735b Author: Francesco Paolo Lovergine Date: Tue Nov 25 15:04:49 2008 + [svn-upgrade] Tagging new upstream version, proj (4.6.1) commit 8037921f8ed5df18eed759fac6a99f4ecb7c8bf4 Author: Francesco Paolo Lovergine Date: Tue Nov 25 15:04:44 2008 + [svn-upgrade] Integrating new upstream version, proj (4.6.1) commit 0e225099147de3eb47f5f4d2291a71d921b2bed5 Author: Peter S Galbraith Date: Sat Dec 22 21:45:13 2007 + [svn-upgrade] Tagging new upstream version, proj (4.6.0) commit 0f0f53d6081ec898b17e56ae16680a1a829b7c66 Author: Peter S Galbraith Date: Sat Dec 22 21:44:58 2007 + [svn-upgrade] Integrating new upstream version, proj (4.6.0) commit 25f37dc5eae2f6901eed3afdc72750ca74b2680b Author: Francesco Paolo Lovergine Date: Sun Apr 1 22:42:15 2007 + [svn-upgrade] Tagging new upstream version, proj (4.5.0) commit 4aedf765d217e00b6781cffbaecdbe3e00cc464a Author: Francesco Paolo Lovergine Date: Sun Apr 1 22:42:12 2007 + [svn-upgrade] Integrating new upstream version, proj (4.5.0) commit 189285642418a79d5810a1ecaf4805fc40ba0727 Author: Francesco Paolo Lovergine Date: Sun Apr 1 22:34:52 2007 + Reverting 4.5.0 importing commit 4c95ef5f4dc6cb9528da865efa6944ced4faccdb Author: Francesco Paolo Lovergine Date: Sun Apr 1 22:34:02 2007 + Reverting 4.5.0 importing commit 0e718f64fdc7be5b8fe5c72535b7a649b1887eec Author: Francesco Paolo Lovergine Date: Sun Apr 1 22:33:48 2007 + Reverting 4.5.0 importing commit 069f683f0962a94f4f73467513282e27f6ad60eb Author: Francesco Paolo Lovergine Date: Sun Apr 1 22:07:19 2007 + [svn-upgrade] Tagging new upstream version, proj (4.5.0) commit ed5dcb4a6c4035980c694ca2e3342695b9f8e6d0 Author: Francesco Paolo Lovergine Date: Sun Apr 1 22:07:15 2007 + [svn-upgrade] Integrating new upstream version, proj (4.5.0) commit 442157a4c211fd41890a1c17549d334dcb54c692 Author: Francesco Paolo Lovergine Date: Tue Mar 27 21:53:51 2007 + [svn-inject] Tagging upstream source version of proj commit aa758f1351292b99b7ac0efa61f587222c7bd190 Author: Francesco Paolo Lovergine Date: Tue Mar 27 21:53:44 2007 + [svn-inject] Installing original source of proj --- -- Proj.4 ___ 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] proj branch, upstream, created. 959c70fdbcb11376bed18b840b76455c14a2f3e5
The branch, upstream has been created at 959c70fdbcb11376bed18b840b76455c14a2f3e5 (commit) - Shortlog --- -- Proj.4 ___ 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] proj branch, master, created. 1bdd55773033dcaa59217afb4d79df192e541fba
The branch, master has been created at 1bdd55773033dcaa59217afb4d79df192e541fba (commit) - Shortlog commit 1bdd55773033dcaa59217afb4d79df192e541fba Merge: 8a4e833 959c70f Author: Francesco Paolo Lovergine Date: Wed May 23 13:52:54 2012 +0200 Merge tag 'upstream/4.7.0' Upstream version 4.7.0 Conflicts: config.guess config.sub commit 8a4e83311186efe3f9090d06c482551b7ddfd848 Merge: 48d8d5f c5239ed Author: Francesco Paolo Lovergine Date: Wed May 23 13:52:03 2012 +0200 Merge branch 'upstream' commit 48d8d5f1936878350bc5197a43988f13ef12673c Author: Francesco Paolo Lovergine Date: Mon Oct 5 21:48:54 2009 + New upstream release. commit 1c4b38d0bb32b9cfd9b410f126cbb202dc5ced32 Author: Francesco Paolo Lovergine Date: Fri May 29 11:15:41 2009 + Added NEWS commit a34a7a5ae0cece5d72ad5732318a5a47f833abe3 Author: Francesco Paolo Lovergine Date: Fri May 29 10:54:19 2009 + Fixed a bit man page. commit 9ba741705b212baacb9622e5a3b2b8d7f424ab5e Author: Francesco Paolo Lovergine Date: Fri May 29 10:48:54 2009 + commit e1d56533d95b8e0e5672cc80f847c4585e19532c Author: Francesco Paolo Lovergine Date: Fri May 29 10:48:11 2009 + Fixed datum shifts support. commit 6f74ef7f06601fa2702d99b1e2fef9a946035750 Author: Francesco Paolo Lovergine Date: Thu May 28 19:19:31 2009 + commit bc734eb228098d48e0b86bd46036561b759b99cb Author: Francesco Paolo Lovergine Date: Thu May 28 19:17:47 2009 + Fixed endianess issue. commit cc52ebcaa6f93cdf30f8b66fc29d294291a3539d Author: Francesco Paolo Lovergine Date: Fri Mar 27 12:02:51 2009 + Fixing #521402 commit 506a456df8ee905f8a422f14e94c656152d6d555 Author: Francesco Paolo Lovergine Date: Tue Mar 24 23:10:17 2009 + Fixes for indep packages commit 0fa96514a6b1ed8490afbdf6d9fc45418df42b05 Author: Francesco Paolo Lovergine Date: Sun Mar 15 22:44:46 2009 + Splitted proj-data as asked by ftpmaster commit 782ebc6c7292c37760d4d13b315cea8cc7495729 Author: Francesco Paolo Lovergine Date: Tue Mar 10 23:11:19 2009 + commit 2ccedb61d7ab01cf3cbbc813554face523cada52 Author: Francesco Paolo Lovergine Date: Tue Mar 10 22:19:46 2009 + Updated conflicts and replaces commit a4d61832873170dc70acd98215287a860124eece Author: Francesco Paolo Lovergine Date: Tue Mar 10 22:02:42 2009 + Fixing man page section. commit 3793ffaa713190831ae7d09738c41234a3c704b2 Author: Francesco Paolo Lovergine Date: Wed Feb 18 14:19:43 2009 + Added a note about swiss datum grids. commit 9595ef5189a41bdb9bcd9d4478877a967df9d3f5 Author: Francesco Paolo Lovergine Date: Wed Feb 18 14:15:59 2009 + Adding Swiss datum grids sharfile. commit 099821d4a3ec5e0ece4b41a17862d0b0a766f8b8 Author: Francesco Paolo Lovergine Date: Tue Feb 17 22:43:20 2009 + commit e18ee7f8f054bf243c410c7309d8ee09b4e8c3d8 Author: Francesco Paolo Lovergine Date: Tue Feb 17 22:42:28 2009 + commit 405e3951c526ebd3522396a0ea04fe557a12e125 Author: Francesco Paolo Lovergine Date: Sun Feb 15 10:49:41 2009 + commit e993dfaa4760d3d90517c0e44c52fce3dafeb7b2 Author: Francesco Paolo Lovergine Date: Sun Feb 15 10:48:25 2009 + Added missing file commit 42cb16d56ea8305797ad6d55d1d5d68c4b865816 Author: Francesco Paolo Lovergine Date: Sat Feb 14 22:09:21 2009 + Minor changes. commit d237c43b67207f35bab5bd6173f4c158fd397660 Author: Francesco Paolo Lovergine Date: Wed Nov 26 16:54:38 2008 + Some minor fixes commit 7d6e01151c29bec620d824d89c8f8b61e33dd422 Author: Francesco Paolo Lovergine Date: Tue Nov 25 16:38:14 2008 + Added add-on datum grids. commit 9356d6c35230f2b80945d512fb38ca278122538f Author: Francesco Paolo Lovergine Date: Tue Nov 25 15:33:03 2008 + new upstream release commit a6191ab7bb20833d75b52013cb658da9b6851abf Author: Francesco Paolo Lovergine Date: Thu Aug 28 17:51:29 2008 + Tagged 4.6.0-2 commit d1b2634bf928f0c0288cdc488379854435a32cae Author: Francesco Paolo Lovergine Date: Thu Aug 28 17:32:01 2008 + Fixing documentation issues. commit a9fccc6299c1ea03522c5283e244f979c331 Author: Peter S Galbraith Date: Sun Dec 30 17:09:18 2007 + 4.6.0-1 commit a880a4a86dcd760b0da1cf8210990bc64066fca1 Author: Francesco Paolo Lovergine Date: Sun Apr 8 09:25:14 2007 + Preparing for unstable commit 9a09ad590a87c743ab81cb523ebb8eb07fb4d4d3 Author: Francesco Paolo Lovergine Date: Wed Apr 4 18:37:20 2007 + commit 9ac2bb2f36a7b9ddd23f1d9cbcd39f9ffada2db7 Author: Francesco Paolo Lovergine Date: Wed Apr 4 18:19:03 2007 + Final changes for releasing in experimental commit 5af2f63cebeabe30468a0c162042f5c3fcb158c7 Author: Francesco Paolo Lovergine Date: Wed Apr 4 18:00:39 2007 + Some sec
[SCM] proj branch, svn-import/trunk@664, created. e3339ce9dc1cc7e2935cd58596c0c011b57474d1
The branch, svn-import/trunk@664 has been created at e3339ce9dc1cc7e2935cd58596c0c011b57474d1 (commit) - Shortlog --- -- Proj.4 ___ 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] mapserver tag, debian/6.0.1-4, created. upstream/6.0.1-29-g379df24
The tag, debian/6.0.1-4 has been created at 379df247b85194039cd45d3c11da4981eb3bc3ec (commit) - Shortlog commit 379df247b85194039cd45d3c11da4981eb3bc3ec Author: Francesco Paolo Lovergine Date: Wed Mar 14 21:48:31 2012 +0100 Minor changes for policies. --- -- Mapserver ___ 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] liblas tag, debian/1.2.1-5, created. debian/1.2.1-1-13-g71af4f5
The tag, debian/1.2.1-5 has been created at 71af4f54133c98aacc80091f7d68b51ba4fdae50 (commit) - Shortlog commit 71af4f54133c98aacc80091f7d68b51ba4fdae50 Author: Francesco Paolo Lovergine Date: Thu Mar 22 12:45:05 2012 +0100 Fixed FTBS due to new TIFF use. --- -- ASPRS LiDAR data translation library ___ 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 2df4f41a90109c1d687942ba5e1ec5250bc6e3b1
Merge: 248b798c0bb497c450e6bd081fa826be4862644e
e6d5a322b03c82337786890c2724ad077a540693
Author: Francesco Paolo Lovergine
Date: Sun Feb 26 23:46:19 2012 +0100
Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/geos
Conflicts:
debian/changelog
debian/control
diff --combined debian/changelog
index ee5cf64,cb85ff8..9da4cb3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,21 -1,23 +1,30 @@@
+geos (3.3.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Dropped geos-config patch, merged upstream.
+
+ -- Francesco Paolo Lovergine Sun, 26 Feb 2012 23:29:37
+0100
+
- geos (3.3.1-4) unstable; urgency=low
+ 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.
-
- -- Francesco Paolo Lovergine Tue, 21 Feb 2012 23:33:45
+0100
+ * 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 Wed, 22 Feb 2012 14:20:57
+0100
geos (3.2.2-3) unstable; urgency=low
diff --combined debian/control
index 1280b19,fa96776..eb6f2c1
--- a/debian/control
+++ b/debian/control
@@@ -25,8 -25,9 +25,9 @@@ Description: Geometry engine for GIS -
Package: libgeos++-dev
Section: libdevel
Architecture: any
- Depends: libgeos-3.3.2 (= ${binary:Version}), ${misc:Depends}
-Depends: libgeos-3.3.1 (= ${binary:Version}), libgeos-dev, ${misc:Depends}
++Depends: libgeos-3.3.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
GEOS provides a spatial object model and fundamental geometric
functions. It implements the geometry model defined in the
@@@ -58,7 -59,7 +59,7 @@@ Description: Geometry engine for Geogra
This package contains the C library. A C++ library is provided
by the libgeos-* package.
-Package: libgeos-3.3.1
+Package: libgeos-3.3.2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@@ -77,7 -78,8 +78,8 @@@ Description: Geometry engine for Geogra
* topological validity checking
.
This package contains the C++ library. A stable C library is provided
- by the libgeos-c* package.
+ by the libgeos-c* package and should be preferred by third-parties
+ programs.
Package: libgeos-doc
Section: doc
@@@ -107,7 -109,7 +109,7 @@@ Package: libgeos-db
Architecture: any
Section: debug
Priority: extra
-Depends: libgeos-3.3.1 (= ${binary:Version}), libgeos-c1 (=
${binary:Version}), ${misc:Depends}
+Depends: libgeos-3.3.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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 248b798c0bb497c450e6bd081fa826be4862644e
Author: Francesco Paolo Lovergine
Date: Sun Feb 26 23:33:03 2012 +0100
Regenerated debian/control.
diff --git a/debian/control b/debian/control
index ea61bab..1280b19 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Description: Geometry engine for GIS - Development files
Package: libgeos++-dev
Section: libdevel
Architecture: any
-Depends: libgeos-3.3.1 (= ${binary:Version}), ${misc:Depends}
+Depends: libgeos-3.3.2 (= ${binary:Version}), ${misc:Depends}
Suggests: libgdal-doc
Description: Geometry engine for GIS - C++ development files
GEOS provides a spatial object model and fundamental geometric
@@ -58,7 +58,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.1
+Package: libgeos-3.3.2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -107,7 +107,7 @@ Package: libgeos-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: libgeos-3.3.1 (= ${binary:Version}), libgeos-c1 (=
${binary:Version}), ${misc:Depends}
+Depends: libgeos-3.3.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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit aa07aef7ac0799ec784d493f6254319980ac122e
Author: Francesco Paolo Lovergine
Date: Sun Feb 26 23:30:49 2012 +0100
New upstream release.
diff --git a/debian/changelog b/debian/changelog
index a27372c..ee5cf64 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+geos (3.3.2-1) unstable; urgency=low
+
+ * New upstream release.
+ * Dropped geos-config patch, merged upstream.
+
+ -- Francesco Paolo Lovergine Sun, 26 Feb 2012 23:29:37
+0100
+
geos (3.3.1-4) unstable; urgency=low
* New upstream major release.
diff --git a/debian/patches/geos-config b/debian/patches/geos-config
deleted file mode 100644
index ca1adee..000
--- a/debian/patches/geos-config
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: geos/tools/geos-config.in
-===
geos.orig/tools/geos-config.in 2012-02-21 23:31:52.0 +0100
-+++ geos/tools/geos-config.in 2012-02-21 23:33:29.0 +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-@VERSION@
-+ ;;
-+--clibs)
-+ echo -L${libdir} -lgeos_c
- ;;
- --ldflags)
- echo -L${libdir}
diff --git a/debian/patches/series b/debian/patches/series
index be57c8e..a9214bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@ DouglasPeuckerLineSimplifier.h
TaggedLineString.cpp
TaggedLineString.h
TaggedLineStringSimplifier.h
-geos-config
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 300420500fddaab9639c5d10c20f1e1d99bcf868 Merge: 216878271f27a5662920f7f23e710da46957f4a3 09fc4e9cdd600fde1e24b40f2e16250ff721fc1f Author: Francesco Paolo Lovergine Date: Sun Feb 26 23:27:04 2012 +0100 Merge tag 'upstream/3.3.2' Upstream version 3.3.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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit e6d5a322b03c82337786890c2724ad077a540693 Author: Francesco Paolo Lovergine Date: Wed Feb 22 17:53:00 2012 +0100 Fixed version in NEWS file. diff --git a/debian/NEWS b/debian/NEWS index 3d400e1..804741e 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,4 +1,4 @@ -geos (3.3.1-4) unstable; urgency=low +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 -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 581129610f9de609c31e013d8a5c670522d97a0f Author: Francesco Paolo Lovergine Date: Wed Feb 22 17:43:38 2012 +0100 Removed duplicated lib in ++-dev package. diff --git a/debian/libgeos++-dev.install.in b/debian/libgeos++-dev.install.in index 29dd611..0d9629d 100644 --- a/debian/libgeos++-dev.install.in +++ b/debian/libgeos++-dev.install.in @@ -1,3 +1,2 @@ usr/lib/libgeos.a -usr/lib/libgeos-*.so usr/lib/libgeos.so -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 4100f1c946a4f0a8451b666254ef8c907bef8e40 Author: Francesco Paolo Lovergine Date: Wed Feb 22 15:29:31 2012 +0100 Fixed for missing .so file. diff --git a/debian/libgeos++-dev.install.in b/debian/libgeos++-dev.install.in index 969c437..29dd611 100644 --- a/debian/libgeos++-dev.install.in +++ b/debian/libgeos++-dev.install.in @@ -1,2 +1,3 @@ usr/lib/libgeos.a usr/lib/libgeos-*.so +usr/lib/libgeos.so -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 67042c37fcb85230a559c0712cdd8c5288a2176f Author: Francesco Paolo Lovergine Date: Wed Feb 22 15:21:21 2012 +0100 Fixed path for C++ static library. diff --git a/debian/libgeos++-dev.install.in b/debian/libgeos++-dev.install.in index fcc4dbe..969c437 100644 --- a/debian/libgeos++-dev.install.in +++ b/debian/libgeos++-dev.install.in @@ -1,2 +1,2 @@ -usr/lib/libgeos*.a +usr/lib/libgeos.a usr/lib/libgeos-*.so -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 44d40768750e758e028bfd1e828a646a3a2666db Author: Francesco Paolo Lovergine Date: Wed Feb 22 15:10:53 2012 +0100 Fixed order in debian/rules for dh_install. diff --git a/debian/libgeos++-dev.dirs b/debian/libgeos++-dev.dirs index 4418816..31e7131 100644 --- a/debian/libgeos++-dev.dirs +++ b/debian/libgeos++-dev.dirs @@ -1,2 +1,2 @@ usr/lib -usr/include +usr/include/geos diff --git a/debian/rules b/debian/rules index 3a1fc5c..f2a032d 100755 --- a/debian/rules +++ b/debian/rules @@ -111,6 +111,11 @@ install-arch: # 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 @@ -120,9 +125,6 @@ install-arch: 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 - # 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 # Must not depend on anything. This is to be called by # binary-arch/binary-indep -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit c39c3c1b4821e31e249db11102e8bc9f1682cb7c
Author: Francesco Paolo Lovergine
Date: Wed Feb 22 14:27:07 2012 +0100
Merged NMU for #641387
diff --git a/debian/changelog b/debian/changelog
index 791d3be..cb85ff8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,14 @@ geos (3.3.1-1) unstable; urgency=low
upstream approach too.
* Moved the C++ headers under libgeos++-dev automagically and added a break
against the old libgeos-dev all-in-one package.
-
- -- Francesco Paolo Lovergine Wed, 22 Feb 2012 10:57:57
+0100
+ * 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 Wed, 22 Feb 2012 14:20:57
+0100
geos (3.2.2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 7b907fd..fa96776 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Description: Geometry engine for GIS - Development files
Package: libgeos++-dev
Section: libdevel
Architecture: any
-Depends: libgeos-3.3.1 (= ${binary:Version}), ${misc:Depends}
+Depends: libgeos-3.3.1 (= ${binary:Version}), libgeos-dev, ${misc:Depends}
Suggests: libgdal-doc
Breaks: libgeos-dev (<< 3.3.1-1~)
Description: Geometry engine for GIS - C++ development files
diff --git a/debian/control.in b/debian/control.in
index a3842dd..e3a2c24 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -25,7 +25,7 @@ Description: Geometry engine for GIS - Development files
Package: libgeos++-dev
Section: libdevel
Architecture: any
-Depends: libgeos-@VERSION@ (= ${binary:Version}), ${misc:Depends}
+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
diff --git a/debian/rules b/debian/rules
index a818b17..3a1fc5c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,8 @@ endif
ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
INSTALL_PROGRAM += -s
endif
-ifeq ($(DEB_HOST_GNU_TYPE),arm-linux-gnueabi)
+# catch both armel and armhf
+ifneq (,$(findstring arm-linux-gnueabi,$(DEB_HOST_GNU_TYPE)))
CONFFLAGS += --disable-inline
endif
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit bc114b1f344da57d33f4deaf4b3cb12fbd0838df Author: Francesco Paolo Lovergine Date: Wed Feb 22 12:18:46 2012 +0100 Fixed typo in path name. diff --git a/debian/rules b/debian/rules index c37f083..a818b17 100755 --- a/debian/rules +++ b/debian/rules @@ -120,8 +120,8 @@ install-arch: debian/libgeos-ruby1.8/usr/lib/ruby/1.8 find debian/libgeos-ruby*/usr/lib/ruby -name "*.la" -delete || true # 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 + 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 # Must not depend on anything. This is to be called by # binary-arch/binary-indep -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit fd2c0532127bc7ad446c35eeebfd2e9257a2da2d
Author: Francesco Paolo Lovergine
Date: Wed Feb 22 12:04:01 2012 +0100
Now installs C++ headers in the correct package.
diff --git a/debian/changelog b/debian/changelog
index a27372c..791d3be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,17 @@
-geos (3.3.1-4) unstable; urgency=low
+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.
- -- Francesco Paolo Lovergine Tue, 21 Feb 2012 23:33:45
+0100
+ -- Francesco Paolo Lovergine Wed, 22 Feb 2012 10:57:57
+0100
geos (3.2.2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index ea61bab..7b907fd 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Section: libdevel
Architecture: any
Depends: libgeos-3.3.1 (= ${binary:Version}), ${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
@@ -77,7 +78,8 @@ Description: Geometry engine for Geographic Information
Systems - C++ Library
* topological validity checking
.
This package contains the C++ library. A stable C library is provided
- by the libgeos-c* package.
+ by the libgeos-c* package and should be preferred by third-parties
+ programs.
Package: libgeos-doc
Section: doc
diff --git a/debian/control.in b/debian/control.in
index 180cf88..a3842dd 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -27,6 +27,7 @@ Section: libdevel
Architecture: any
Depends: libgeos-@VERSION@ (= ${binary:Version}), ${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
@@ -77,7 +78,8 @@ Description: Geometry engine for Geographic Information
Systems - C++ Library
* topological validity checking
.
This package contains the C++ library. A stable C library is provided
- by the libgeos-c* package.
+ by the libgeos-c* package and should be preferred by third-parties
+ programs.
Package: libgeos-doc
Section: doc
diff --git a/debian/libgeos++-dev.dirs b/debian/libgeos++-dev.dirs
index 6845771..4418816 100644
--- a/debian/libgeos++-dev.dirs
+++ b/debian/libgeos++-dev.dirs
@@ -1 +1,2 @@
usr/lib
+usr/include
diff --git a/debian/libgeos++-dev.install b/debian/libgeos++-dev.install.in
similarity index 100%
rename from debian/libgeos++-dev.install
rename to debian/libgeos++-dev.install.in
diff --git a/debian/libgeos-dev.install b/debian/libgeos-dev.install
index 640cea9..204ced0 100644
--- a/debian/libgeos-dev.install
+++ b/debian/libgeos-dev.install
@@ -1,4 +1,5 @@
usr/bin/geos-config
-usr/include/*
+usr/include/geos_c.h
+usr/include/geos/export.h
usr/lib/libgeos_c.a
usr/lib/libgeos_c.so
diff --git a/debian/rules b/debian/rules
index 539a537..c37f083 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,7 +86,7 @@ clean:
[ -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
+ rm -f debian/libgeos-$(VER).install debian/libgeos-$(VER).dirs
debian/libgeos++-dev.install
install: install-indep install-arch
install-indep:
@@ -119,6 +119,9 @@ install-arch:
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
+ # 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
# Must not depend on anything. This is to be called by
# binary-arch/binary-indep
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 216878271f27a5662920f7f23e710da46957f4a3
Author: Francesco Paolo Lovergine
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 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 Fri, 02 Dec 2011 15:43:28
+0100
+ -- Francesco Paolo Lovergine 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-@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-@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
[SCM] geos branch, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit bf8aa9fa8323c141cdb6c5900a9c4e641f3bee3f
Author: Francesco Paolo Lovergine
Date: Fri Dec 2 15:43:49 2011 +0100
Removing superfluous patches
diff --git a/debian/changelog b/debian/changelog
index c2d1663..9219115 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,9 @@ geos (3.3.1-4) unstable; urgency=low
(closes: #648611)
* Changed the C/C++ chain for development. See NEWS file for an explanation.
(closes: #643658)
- * Patches refreshed.
+ * Patches refreshed and merged with upstream changes.
- -- Francesco Paolo Lovergine Fri, 02 Dec 2011 14:41:49
+0100
+ -- Francesco Paolo Lovergine Fri, 02 Dec 2011 15:43:28
+0100
geos (3.2.2-3) unstable; urgency=low
diff --git a/debian/patches/AbstractNode.cpp b/debian/patches/AbstractNode.cpp
deleted file mode 100644
index 0c4a61a..000
--- a/debian/patches/AbstractNode.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: geos/src/index/strtree/AbstractNode.cpp
-===
geos.orig/src/index/strtree/AbstractNode.cpp 2011-11-30
16:54:52.0 +0100
-+++ geos/src/index/strtree/AbstractNode.cpp2011-12-02 14:40:01.0
+0100
-@@ -19,6 +19,7 @@
- #include
- #include
- #include
-+#include
-
- using namespace std;
-
diff --git a/debian/patches/Bintree.cpp b/debian/patches/Bintree.cpp
deleted file mode 100644
index 118c15b..000
--- a/debian/patches/Bintree.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: geos/src/index/bintree/Bintree.cpp
-===
geos.orig/src/index/bintree/Bintree.cpp2011-11-30 16:54:52.0
+0100
-+++ geos/src/index/bintree/Bintree.cpp 2011-12-02 14:35:52.0 +0100
-@@ -19,6 +19,7 @@
- #include
- #include
- #include
-+#include
-
- namespace geos {
- namespace index { // geos.index
diff --git a/debian/patches/MonotoneChainBuilder.h
b/debian/patches/MonotoneChainBuilder.h
deleted file mode 100644
index 9878afa..000
--- a/debian/patches/MonotoneChainBuilder.h
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: geos/include/geos/index/chain/MonotoneChainBuilder.h
-===
geos.orig/include/geos/index/chain/MonotoneChainBuilder.h 2011-05-25
13:12:19.0 +0200
-+++ geos/include/geos/index/chain/MonotoneChainBuilder.h 2011-05-25
13:12:35.0 +0200
-@@ -22,6 +22,7 @@
-
- #include
- #include
-+#include
-
- // Forward declarations
- namespace geos {
-@@ -39,6 +40,8 @@
- namespace index { // geos::index
- namespace chain { // geos::index::chain
-
-+using namespace std;
-+
- /** \brief
- * Constructs {@link MonotoneChain}s
- * for sequences of {@link Coordinate}s.
diff --git a/debian/patches/series b/debian/patches/series
index 0849f79..a9214bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,13 +1,9 @@
CoordinateSequenceFactory.h
-Bintree.cpp
Node.cpp
Root.cpp
-#MonotoneChainBuilder.h
-AbstractNode.cpp
SimpleNestedRingTester.h
DirectedEdgeStar.h
DouglasPeuckerLineSimplifier.h
TaggedLineString.cpp
TaggedLineString.h
TaggedLineStringSimplifier.h
-#swig
diff --git a/debian/patches/swig b/debian/patches/swig
deleted file mode 100644
index 8f7c59c..000
--- a/debian/patches/swig
+++ /dev/null
@@ -1,44 +0,0 @@
-Index: geos/macros/ac_pkg_swig.m4
-===
geos.orig/macros/ac_pkg_swig.m42011-07-18 13:20:22.0 +0200
-+++ geos/macros/ac_pkg_swig.m4 2011-07-18 13:54:31.0 +0200
-@@ -24,6 +24,9 @@
- dnl @author Andrew Collier
- dnl @version 2004-09-20
- dnl @license GPLWithACException
-+dnl
-+dnl Fixed by Sandro Santilli to consider 2.0.0 > 1.3.37 (2010-06-15)
-+dnl
-
- AC_DEFUN([AC_PROG_SWIG],[
- AC_PATH_PROG([SWIG],[swig])
-@@ -67,9 +70,9 @@
- if test -z "$available_patch" ; then
- [available_patch=0]
- fi
--if test $available_major -ne $required_major \
---o $available_minor -ne $required_minor \
---o $available_patch -lt $required_patch ; then
-+ [required_full=`printf %2.2d%2.2d%2.2d%2.2d
$required_major $required_minor $required_patch]`
-+ [available_full=`printf %2.2d%2.2d%2.2d%2.2d
$available_major $available_minor $available_patch]`
-+if test $available_full -lt $required_full; then
- AC_MSG_WARN([SWIG version >= $1 is required.
You have $swig_version. You should look at http://www.swig.org])
- SWIG=''
- else
-Index: geos/configure
-===
geos.orig/configure201
[SCM] geos branch, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit abb70c74b157b68108e5cf85e4adef70a06f254a
Author: Francesco Paolo Lovergine
Date: Fri Dec 2 14:42:06 2011 +0100
Refreshed patches.
diff --git a/debian/changelog b/debian/changelog
index 764f51a..c2d1663 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ geos (3.3.1-4) unstable; urgency=low
(closes: #648611)
* Changed the C/C++ chain for development. See NEWS file for an explanation.
(closes: #643658)
+ * Patches refreshed.
- -- Francesco Paolo Lovergine Wed, 30 Nov 2011 17:01:19
+0100
+ -- Francesco Paolo Lovergine Fri, 02 Dec 2011 14:41:49
+0100
geos (3.2.2-3) unstable; urgency=low
diff --git a/debian/patches/AbstractNode.cpp b/debian/patches/AbstractNode.cpp
index 0b2a2d9..0c4a61a 100644
--- a/debian/patches/AbstractNode.cpp
+++ b/debian/patches/AbstractNode.cpp
@@ -1,10 +1,10 @@
-Index: geos/source/index/strtree/AbstractNode.cpp
+Index: geos/src/index/strtree/AbstractNode.cpp
===
geos.orig/source/index/strtree/AbstractNode.cpp2011-05-25
13:22:35.0 +0200
-+++ geos/source/index/strtree/AbstractNode.cpp 2011-05-25 13:22:52.0
+0200
-@@ -18,6 +18,7 @@
-
+--- geos.orig/src/index/strtree/AbstractNode.cpp 2011-11-30
16:54:52.0 +0100
geos/src/index/strtree/AbstractNode.cpp2011-12-02 14:40:01.0
+0100
+@@ -19,6 +19,7 @@
#include
+ #include
#include
+#include
diff --git a/debian/patches/Bintree.cpp b/debian/patches/Bintree.cpp
index 801eb4d..118c15b 100644
--- a/debian/patches/Bintree.cpp
+++ b/debian/patches/Bintree.cpp
@@ -1,8 +1,8 @@
-Index: geos/source/index/bintree/Bintree.cpp
+Index: geos/src/index/bintree/Bintree.cpp
===
geos.orig/source/index/bintree/Bintree.cpp 2011-05-25 12:56:17.0
+0200
-+++ geos/source/index/bintree/Bintree.cpp 2011-05-25 12:58:36.0
+0200
-@@ -18,6 +18,7 @@
+--- geos.orig/src/index/bintree/Bintree.cpp2011-11-30 16:54:52.0
+0100
geos/src/index/bintree/Bintree.cpp 2011-12-02 14:35:52.0 +0100
+@@ -19,6 +19,7 @@
#include
#include
#include
diff --git a/debian/patches/CoordinateSequenceFactory.h
b/debian/patches/CoordinateSequenceFactory.h
index 90b8669..a5a8a29 100644
--- a/debian/patches/CoordinateSequenceFactory.h
+++ b/debian/patches/CoordinateSequenceFactory.h
@@ -1,7 +1,7 @@
-Index: geos/source/headers/geos/geom/CoordinateSequenceFactory.h
+Index: geos/include/geos/geom/CoordinateSequenceFactory.h
===
geos.orig/source/headers/geos/geom/CoordinateSequenceFactory.h
2011-05-24 15:51:50.0 +0200
-+++ geos/source/headers/geos/geom/CoordinateSequenceFactory.h 2011-05-24
15:51:53.0 +0200
+--- 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 @@
#include
#include
diff --git a/debian/patches/DirectedEdgeStar.h
b/debian/patches/DirectedEdgeStar.h
index 5422464..8221a4b 100644
--- a/debian/patches/DirectedEdgeStar.h
+++ b/debian/patches/DirectedEdgeStar.h
@@ -1,16 +1,16 @@
-Index: geos/source/headers/geos/planargraph/DirectedEdgeStar.h
+Index: geos/include/geos/planargraph/DirectedEdgeStar.h
===
geos.orig/source/headers/geos/planargraph/DirectedEdgeStar.h
2011-05-25 15:32:28.0 +0200
-+++ geos/source/headers/geos/planargraph/DirectedEdgeStar.h2011-05-25
15:33:06.0 +0200
+--- 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 @@
#include
#include
+#include
- // Forward declarations
- namespace geos {
-@@ -35,6 +36,8 @@
+ #ifdef _MSC_VER
+ #pragma warning(push)
+@@ -40,6 +41,8 @@
namespace geos {
namespace planargraph { // geos.planargraph
diff --git a/debian/patches/DouglasPeuckerLineSimplifier.h
b/debian/patches/DouglasPeuckerLineSimplifier.h
index 3396826..15caa11 100644
--- a/debian/patches/DouglasPeuckerLineSimplifier.h
+++ b/debian/patches/DouglasPeuckerLineSimplifier.h
@@ -1,16 +1,16 @@
-Index: geos/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
+Index: geos/include/geos/simplify/DouglasPeuckerLineSimplifier.h
===
geos.orig/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
2011-05-25 16:11:31.0 +0200
-+++ geos/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
2011-05-25 16:12:10.0 +0200
+--- geos.orig/include/geos/simplify/DouglasPeuckerLineSimplifier.h
2011-11
[SCM] geos branch, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 86ad87871942fc7ad8d91fc73e049e19316f2418 Author: Francesco Paolo Lovergine Date: Fri Dec 2 15:16:01 2011 +0100 Fixed .a file name for C++ diff --git a/debian/libgeos++-dev.install b/debian/libgeos++-dev.install index 5d285b9..fcc4dbe 100644 --- a/debian/libgeos++-dev.install +++ b/debian/libgeos++-dev.install @@ -1,2 +1,2 @@ -usr/lib/libgeos-*.a +usr/lib/libgeos*.a usr/lib/libgeos-*.so -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 5b65c8370b89b9989d16702092ea543143bc333d Author: Francesco Paolo Lovergine Date: Fri Dec 2 14:22:38 2011 +0100 Added a note about changes. diff --git a/debian/NEWS b/debian/NEWS index 7b73d22..2fdb5f6 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -7,8 +7,12 @@ geos (3.3.1-4) unstable; urgency=low NMUs. A program which depends on the C++ API has to b-depend on the libgeos++-dev - which in turn depends on the right libgeosVERSION lib. All - other programs has to b-depend on the C libgeos-dev package, which - depends only on the C stable interface (currently libgeos1). + 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 --libs. + See http://trac.osgeo.org/geos/ticket/497 about that. -- Francesco Paolo Lovergine Wed, 30 Nov 2011 17:27:23 +0100 diff --git a/debian/changelog b/debian/changelog index 71c3858..764f51a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ geos (3.3.1-4) unstable; urgency=low * New upstream major release. (closes: #648611) * Changed the C/C++ chain for development. See NEWS file for an explanation. +(closes: #643658) -- Francesco Paolo Lovergine Wed, 30 Nov 2011 17:01:19 +0100 -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit e9f5163f564dfa4b458a4089abb59f1f84266e98 Author: Francesco Paolo Lovergine Date: Wed Nov 30 18:12:55 2011 +0100 Removed superfluous dirs diff --git a/debian/libgeos++-dev.dirs b/debian/libgeos++-dev.dirs index 9a4ceb9..6845771 100644 --- a/debian/libgeos++-dev.dirs +++ b/debian/libgeos++-dev.dirs @@ -1,3 +1 @@ -usr/bin usr/lib -usr/include -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit bb987fa3bbc246f6fcd3eee2b3dac27d4b75a792 Author: Francesco Paolo Lovergine Date: Wed Nov 30 18:12:30 2011 +0100 Added a new -dev package diff --git a/debian/NEWS b/debian/NEWS new file mode 100644 index 000..7b73d22 --- /dev/null +++ b/debian/NEWS @@ -0,0 +1,14 @@ +geos (3.3.1-4) 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. + + A program which depends on the C++ API has to b-depend on the libgeos++-dev + which in turn depends on the right libgeosVERSION lib. All + other programs has to b-depend on the C libgeos-dev package, which + depends only on the C stable interface (currently libgeos1). + + -- Francesco Paolo Lovergine Wed, 30 Nov 2011 17:27:23 +0100 diff --git a/debian/libgeos-dev.dirs b/debian/libgeos++-dev.dirs similarity index 100% copy from debian/libgeos-dev.dirs copy to debian/libgeos++-dev.dirs diff --git a/debian/libgeos++-dev.install b/debian/libgeos++-dev.install new file mode 100644 index 000..5d285b9 --- /dev/null +++ b/debian/libgeos++-dev.install @@ -0,0 +1,2 @@ +usr/lib/libgeos-*.a +usr/lib/libgeos-*.so -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit ea73a63690bdababd3f0c73a7bb4a2fc3566625d
Author: Francesco Paolo Lovergine
Date: Wed Nov 30 18:12:08 2011 +0100
Preparing 3.3.1
diff --git a/debian/changelog b/debian/changelog
index d70d870..71c3858 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+geos (3.3.1-4) unstable; urgency=low
+
+ * New upstream major release.
+(closes: #648611)
+ * Changed the C/C++ chain for development. See NEWS file for an explanation.
+
+ -- Francesco Paolo Lovergine Wed, 30 Nov 2011 17:01:19
+0100
+
geos (3.2.2-3) unstable; urgency=low
* New patch: swig. Fixed for strong version detection in ac_pkg_swig.m4.
diff --git a/debian/control b/debian/control
index 3662ee9..c4c9a4f 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,20 @@ Vcs-Git: git://git.debian.org/git/pkg-grass/geos
Package: libgeos-dev
Section: libdevel
Architecture: any
-Depends: libgeos-3.2.2 (= ${binary:Version}), libgeos-c1 (=
${binary:Version}), ${misc:Depends}
+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.1 (= ${binary:Version}), ${misc:Depends}
Suggests: libgdal-doc
Description: Geometry engine for GIS - Development files
GEOS provides a spatial object model and fundamental geometric
@@ -43,7 +56,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.2.2
+Package: libgeos-3.3.1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -80,7 +93,7 @@ Description: Documentation for the GEOS GIS geometry engine
library
Package: libgeos-ruby1.8
Section: ruby
Architecture: any
-Depends: libgeos-3.2.2 (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
+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
@@ -92,7 +105,7 @@ Package: libgeos-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: libgeos-3.2.2 (= ${binary:Version}), libgeos-c1 (=
${binary:Version}), ${misc:Depends}
+Depends: libgeos-3.3.1 (= ${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
diff --git a/debian/control.in b/debian/control.in
index 2cc578a..92579b0 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -12,7 +12,20 @@ Vcs-Git: git://git.debian.org/git/pkg-grass/geos
Package: libgeos-dev
Section: libdevel
Architecture: any
-Depends: libgeos-@VERSION@ (= ${binary:Version}), libgeos-c1 (=
${binary:Version}), ${misc:Depends}
+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}), ${misc:Depends}
Suggests: libgdal-doc
Description: Geometry engine for GIS - Development files
GEOS provides a spatial object model and fundamental geometric
@@ -80,7 +93,7 @@ Description: Documentation for the GEOS GIS geometry engine
library
Package: libgeos-ruby1.8
Section: ruby
Architecture: any
-Depends: libgeos-@VERSION@ (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
+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
diff --git a/debian/libgeos-dev.install b/debian/libgeos-dev.install
index 10e67e1..640cea9 100644
--- a/debian/libgeos-dev.install
+++ b/debian/libgeos-dev.install
@@ -1,4 +1,4 @@
usr/bin/geos-config
usr/include/*
-usr/lib/*.a
-usr/lib/*.so
+usr/lib/libgeos_c.a
+usr/lib/libgeos_c.so
--
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
[SCM] geos branch, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit b52d7897436540a8e3327b48e98d92315e71224b Merge: 4d70d7426fefbd099ebe4e25420a7af31c8ded37 217391dbd4eaae18a95484d5d76c81a376ef2f4e Author: Francesco Paolo Lovergine Date: Wed Nov 30 16:54:47 2011 +0100 Merge commit 'upstream/3.3.1' -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 4d70d7426fefbd099ebe4e25420a7af31c8ded37
Author: Francesco Paolo Lovergine
Date: Mon Jul 18 13:55:44 2011 +0200
Fixed syntax
diff --git a/debian/patches/swig b/debian/patches/swig
index 80e703b..8f7c59c 100644
--- a/debian/patches/swig
+++ b/debian/patches/swig
@@ -1,7 +1,7 @@
Index: geos/macros/ac_pkg_swig.m4
===
geos.orig/macros/ac_pkg_swig.m42011-07-18 12:57:26.0 +0200
-+++ geos/macros/ac_pkg_swig.m4 2011-07-18 13:15:30.0 +0200
+--- geos.orig/macros/ac_pkg_swig.m42011-07-18 13:20:22.0 +0200
geos/macros/ac_pkg_swig.m4 2011-07-18 13:54:31.0 +0200
@@ -24,6 +24,9 @@
dnl @author Andrew Collier
dnl @version 2004-09-20
@@ -27,8 +27,8 @@ Index: geos/macros/ac_pkg_swig.m4
else
Index: geos/configure
===
geos.orig/configure2011-07-18 13:15:37.0 +0200
-+++ geos/configure 2011-07-18 13:16:40.0 +0200
+--- geos.orig/configure2011-07-18 13:20:22.0 +0200
geos/configure 2011-07-18 13:55:27.0 +0200
@@ -16544,9 +16544,9 @@
if test -z "$available_patch" ; then
available_patch=0
@@ -36,8 +36,8 @@ Index: geos/configure
-if test $available_major -ne $required_major \
--o $available_minor -ne $required_minor \
--o $available_patch -lt $required_patch ; then
-+ [required_full=`printf %2.2d%2.2d%2.2d%2.2d
$required_major $required_minor $required_patch]`
-+ [available_full=`printf
%2.2d%2.2d%2.2d%2.2d $available_major $available_minor $available_patch]`
++ required_full=`printf %2.2d%2.2d%2.2d%2.2d
$required_major $required_minor $required_patch`
++ available_full=`printf %2.2d%2.2d%2.2d%2.2d
$available_major $available_minor $available_patch`
+if test $available_full -lt $required_full; then
{ $as_echo "$as_me:${as_lineno-$LINENO}:
WARNING: SWIG version >= 1.3.28 is required. You have $swig_version. You
should look at http://www.swig.org"; >&5
$as_echo "$as_me: WARNING: SWIG version >= 1.3.28 is required. You have
$swig_version. You should look at http://www.swig.org"; >&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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 20856e6ef8e3b5ae2ee1faebcb6b3d1b78a1f136
Author: Francesco Paolo Lovergine
Date: Mon Jul 18 13:20:32 2011 +0200
Applying the previous patch to the current configure :)
diff --git a/debian/patches/swig b/debian/patches/swig
index f326d58..80e703b 100644
--- a/debian/patches/swig
+++ b/debian/patches/swig
@@ -1,23 +1,44 @@
-Index: trunk/macros/ac_pkg_swig.m4
-===
trunk/macros/ac_pkg_swig.m4(revision 2013)
-+++ trunk/macros/ac_pkg_swig.m4(revision 3000)
-@@ -25,4 +25,7 @@
- dnl @version 2004-09-20
- dnl @license GPLWithACException
-+dnl
-+dnl Fixed by Sandro Santilli to consider 2.0.0 > 1.3.37 (2010-06-15)
-+dnl
-
- AC_DEFUN([AC_PROG_SWIG],[
-@@ -68,7 +71,7 @@
- [available_patch=0]
- fi
--if test $available_major -ne $required_major \
---o $available_minor -ne $required_minor \
---o $available_patch -lt $required_patch ; then
-+ [required_full=`printf %2.2d%2.2d%2.2d%2.2d
$required_major $required_minor $required_patch]`
-+ [available_full=`printf %2.2d%2.2d%2.2d%2.2d
$available_major $available_minor $available_patch]`
-+if test $available_full -lt $required_full; then
- AC_MSG_WARN([SWIG version >= $1 is required.
You have $swig_version. You should look at http://www.swig.org])
- SWIG=''
+Index: geos/macros/ac_pkg_swig.m4
+===
+--- geos.orig/macros/ac_pkg_swig.m42011-07-18 12:57:26.0 +0200
geos/macros/ac_pkg_swig.m4 2011-07-18 13:15:30.0 +0200
+@@ -24,6 +24,9 @@
+ dnl @author Andrew Collier
+ dnl @version 2004-09-20
+ dnl @license GPLWithACException
++dnl
++dnl Fixed by Sandro Santilli to consider 2.0.0 > 1.3.37 (2010-06-15)
++dnl
+
+ AC_DEFUN([AC_PROG_SWIG],[
+ AC_PATH_PROG([SWIG],[swig])
+@@ -67,9 +70,9 @@
+ if test -z "$available_patch" ; then
+ [available_patch=0]
+ fi
+-if test $available_major -ne $required_major \
+--o $available_minor -ne $required_minor \
+--o $available_patch -lt $required_patch ; then
++ [required_full=`printf %2.2d%2.2d%2.2d%2.2d
$required_major $required_minor $required_patch]`
++ [available_full=`printf %2.2d%2.2d%2.2d%2.2d
$available_major $available_minor $available_patch]`
++if test $available_full -lt $required_full; then
+ AC_MSG_WARN([SWIG version >= $1 is required.
You have $swig_version. You should look at http://www.swig.org])
+ SWIG=''
+ else
+Index: geos/configure
+===
+--- geos.orig/configure2011-07-18 13:15:37.0 +0200
geos/configure 2011-07-18 13:16:40.0 +0200
+@@ -16544,9 +16544,9 @@
+ if test -z "$available_patch" ; then
+ available_patch=0
+ fi
+-if test $available_major -ne $required_major \
+--o $available_minor -ne $required_minor \
+--o $available_patch -lt $required_patch ; then
++ [required_full=`printf %2.2d%2.2d%2.2d%2.2d
$required_major $required_minor $required_patch]`
++ [available_full=`printf
%2.2d%2.2d%2.2d%2.2d $available_major $available_minor $available_patch]`
++if test $available_full -lt $required_full; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}:
WARNING: SWIG version >= 1.3.28 is required. You have $swig_version. You
should look at http://www.swig.org"; >&5
+ $as_echo "$as_me: WARNING: SWIG version >= 1.3.28 is required. You have
$swig_version. You should look at http://www.swig.org"; >&2;}
+ SWIG=''
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 2b9bb4dc711177bfe957f63481bcf4070c52ebd0 Author: Francesco Paolo Lovergine Date: Mon Jul 18 12:41:27 2011 +0200 Fixed Swig support and removed obsolete python related stuff. diff --git a/debian/changelog b/debian/changelog index 9c91432..d70d870 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +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 Mon, 18 Jul 2011 12:23:11 +0200 + geos (3.2.2-2) unstable; urgency=low * Policy bumped to 3.9.2, no changes. diff --git a/debian/control b/debian/control index c820c9d..3662ee9 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,7 @@ Section: science Priority: optional Maintainer: Debian GIS Project Uploaders: Francesco Paolo Lovergine -Build-Depends: debhelper (>= 8), doxygen, swig, ruby, ruby-dev, - python-all, python-all-dev, python-central (>= 0.5) +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 diff --git a/debian/control.in b/debian/control.in index 5784870..2cc578a 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,8 +3,7 @@ Section: science Priority: optional Maintainer: Debian GIS Project Uploaders: Francesco Paolo Lovergine -Build-Depends: debhelper (>= 8), doxygen, swig, ruby, ruby-dev, - python-all, python-all-dev, python-central (>= 0.5) +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 diff --git a/debian/patches/series b/debian/patches/series index c778044..5f0826a 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -10,3 +10,4 @@ DouglasPeuckerLineSimplifier.h TaggedLineString.cpp TaggedLineString.h TaggedLineStringSimplifier.h +swig diff --git a/debian/patches/swig b/debian/patches/swig new file mode 100644 index 000..f326d58 --- /dev/null +++ b/debian/patches/swig @@ -0,0 +1,23 @@ +Index: trunk/macros/ac_pkg_swig.m4 +=== +--- trunk/macros/ac_pkg_swig.m4(revision 2013) trunk/macros/ac_pkg_swig.m4(revision 3000) +@@ -25,4 +25,7 @@ + dnl @version 2004-09-20 + dnl @license GPLWithACException ++dnl ++dnl Fixed by Sandro Santilli to consider 2.0.0 > 1.3.37 (2010-06-15) ++dnl + + AC_DEFUN([AC_PROG_SWIG],[ +@@ -68,7 +71,7 @@ + [available_patch=0] + fi +-if test $available_major -ne $required_major \ +--o $available_minor -ne $required_minor \ +--o $available_patch -lt $required_patch ; then ++ [required_full=`printf %2.2d%2.2d%2.2d%2.2d $required_major $required_minor $required_patch]` ++ [available_full=`printf %2.2d%2.2d%2.2d%2.2d $available_major $available_minor $available_patch]` ++if test $available_full -lt $required_full; then + AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org]) + SWIG='' -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 04972d8aedaf23df082f31d152f1ea4778dbdde6
Author: Francesco Paolo Lovergine
Date: Wed May 25 18:04:20 2011 +0200
Patch for TaggedLineStringSimplifier.h
diff --git a/debian/patches/TaggedLineStringSimplifier.h
b/debian/patches/TaggedLineStringSimplifier.h
new file mode 100644
index 000..61cbb03
--- /dev/null
+++ b/debian/patches/TaggedLineStringSimplifier.h
@@ -0,0 +1,20 @@
+Index: geos/source/headers/geos/simplify/TaggedLineStringSimplifier.h
+===
+--- geos.orig/source/headers/geos/simplify/TaggedLineStringSimplifier.h
2011-05-25 17:59:12.0 +0200
geos/source/headers/geos/simplify/TaggedLineStringSimplifier.h
2011-05-25 17:59:30.0 +0200
+@@ -28,6 +28,7 @@
+ #include
+ #include
+ #include
++#include
+
+ // Forward declarations
+ namespace geos {
+@@ -48,6 +49,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
index 3860547..c778044 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ DirectedEdgeStar.h
DouglasPeuckerLineSimplifier.h
TaggedLineString.cpp
TaggedLineString.h
+TaggedLineStringSimplifier.h
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 67f5cf6787e0a67cdee92ac3fb33616de8e9e267
Author: Francesco Paolo Lovergine
Date: Wed May 25 17:49:51 2011 +0200
Added TaggedLineString.h patch
diff --git a/debian/patches/TaggedLineString.h
b/debian/patches/TaggedLineString.h
new file mode 100644
index 000..a84458e
--- /dev/null
+++ b/debian/patches/TaggedLineString.h
@@ -0,0 +1,20 @@
+Index: geos/source/headers/geos/simplify/TaggedLineString.h
+===
+--- geos.orig/source/headers/geos/simplify/TaggedLineString.h 2011-05-25
17:49:06.0 +0200
geos/source/headers/geos/simplify/TaggedLineString.h 2011-05-25
17:49:28.0 +0200
+@@ -29,6 +29,7 @@
+ #include
+ #include
+ #include
++#include
+
+ // Forward declarations
+ namespace geos {
+@@ -47,6 +48,7 @@
+ namespace geos {
+ namespace simplify { // geos::simplify
+
++using namespace std;
+
+ /** \brief
+ *
diff --git a/debian/patches/series b/debian/patches/series
index b142917..3860547 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ SimpleNestedRingTester.h
DirectedEdgeStar.h
DouglasPeuckerLineSimplifier.h
TaggedLineString.cpp
+TaggedLineString.h
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit aa7b80f0f88e118c526432d9a07c4c00dc52bf8c
Author: Francesco Paolo Lovergine
Date: Wed May 25 17:05:20 2011 +0200
Added TaggedLineString.cpp patch
diff --git a/debian/patches/TaggedLineString.cpp
b/debian/patches/TaggedLineString.cpp
new file mode 100644
index 000..8749ddb
--- /dev/null
+++ b/debian/patches/TaggedLineString.cpp
@@ -0,0 +1,21 @@
+Index: geos/source/simplify/TaggedLineString.cpp
+===
+--- geos.orig/source/simplify/TaggedLineString.cpp 2011-05-25
17:04:12.0 +0200
geos/source/simplify/TaggedLineString.cpp 2011-05-25 17:04:31.0
+0200
+@@ -27,6 +27,7 @@
+
+ #include
+ #include
++#include
+
+ #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,
+ size_t nMinimumSize)
diff --git a/debian/patches/series b/debian/patches/series
index 692ceff..b142917 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ AbstractNode.cpp
SimpleNestedRingTester.h
DirectedEdgeStar.h
DouglasPeuckerLineSimplifier.h
+TaggedLineString.cpp
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 2511bc7a2bfce86715d99fcdd8fe279f07443fc8
Author: Francesco Paolo Lovergine
Date: Wed May 25 16:12:28 2011 +0200
Added DouglasPeuckerLineSimplifier.h patch.
diff --git a/debian/patches/DouglasPeuckerLineSimplifier.h
b/debian/patches/DouglasPeuckerLineSimplifier.h
new file mode 100644
index 000..3396826
--- /dev/null
+++ b/debian/patches/DouglasPeuckerLineSimplifier.h
@@ -0,0 +1,21 @@
+Index: geos/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
+===
+--- geos.orig/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
2011-05-25 16:11:31.0 +0200
geos/source/headers/geos/simplify/DouglasPeuckerLineSimplifier.h
2011-05-25 16:12:10.0 +0200
+@@ -23,6 +23,7 @@
+ #include
+ #include
+ #include // for auto_ptr
++#include
+
+ // Forward declarations
+ namespace geos {
+@@ -34,6 +35,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/series b/debian/patches/series
index f55ed3c..692ceff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ MonotoneChainBuilder.h
AbstractNode.cpp
SimpleNestedRingTester.h
DirectedEdgeStar.h
+DouglasPeuckerLineSimplifier.h
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit ef014a0a4cc50e3758f340092f8aca04cb313917
Author: Francesco Paolo Lovergine
Date: Wed May 25 15:35:00 2011 +0200
Added patch DirectedEdgeStar.h still for std namespace.
diff --git a/debian/changelog b/debian/changelog
index 86c075f..9c91432 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,12 +4,14 @@ geos (3.2.2-2) unstable; urgency=low
* Fixed previous changelog entry.
* Added CoordinateSequenceFactory.h patch to fix a missing declaration.
(closes: #624949)
- * Added Bintree.cpp, Node.cpp, MonotoneChainBuilder.h, AbstractNode.cpp
-patches to fix a missing header file inclusion in some files.
+ * 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 Wed, 25 May 2011 14:21:49
+0200
+ -- Francesco Paolo Lovergine Wed, 25 May 2011 15:33:37
+0200
geos (3.2.2-1) unstable; urgency=low
diff --git a/debian/patches/DirectedEdgeStar.h
b/debian/patches/DirectedEdgeStar.h
new file mode 100644
index 000..5422464
--- /dev/null
+++ b/debian/patches/DirectedEdgeStar.h
@@ -0,0 +1,21 @@
+Index: geos/source/headers/geos/planargraph/DirectedEdgeStar.h
+===
+--- geos.orig/source/headers/geos/planargraph/DirectedEdgeStar.h
2011-05-25 15:32:28.0 +0200
geos/source/headers/geos/planargraph/DirectedEdgeStar.h2011-05-25
15:33:06.0 +0200
+@@ -20,6 +20,7 @@
+ #include
+
+ #include
++#include
+
+ // Forward declarations
+ namespace geos {
+@@ -35,6 +36,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/series b/debian/patches/series
index a4edf69..f55ed3c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ Root.cpp
MonotoneChainBuilder.h
AbstractNode.cpp
SimpleNestedRingTester.h
+DirectedEdgeStar.h
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 4495372d93e1cd2d56a5db5bbad0ec66f65d02e7
Author: Francesco Paolo Lovergine
Date: Wed May 25 15:11:52 2011 +0200
Still another cstddef include missing.
diff --git a/debian/patches/SimpleNestedRingTester.h
b/debian/patches/SimpleNestedRingTester.h
new file mode 100644
index 000..77b49d4
--- /dev/null
+++ b/debian/patches/SimpleNestedRingTester.h
@@ -0,0 +1,21 @@
+Index: geos/source/headers/geos/operation/valid/SimpleNestedRingTester.h
+===
+--- geos.orig/source/headers/geos/operation/valid/SimpleNestedRingTester.h
2011-05-25 15:10:53.0 +0200
geos/source/headers/geos/operation/valid/SimpleNestedRingTester.h
2011-05-25 15:11:11.0 +0200
+@@ -24,6 +24,7 @@
+ #include
+
+ #include
++#include
+
+ // Forward declarations
+ namespace geos {
+@@ -40,6 +41,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/series b/debian/patches/series
index 2aba345..a4edf69 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ Node.cpp
Root.cpp
MonotoneChainBuilder.h
AbstractNode.cpp
+SimpleNestedRingTester.h
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 4460d055f078fb73ee4246789c93573dedfc54c2 Author: Francesco Paolo Lovergine Date: Wed May 25 15:02:37 2011 +0200 Overriding CXX in order to try forcing -fpermissive for true. diff --git a/debian/rules b/debian/rules index 0e93c13..539a537 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,8 @@ else $(info Guessed geos version is $(VER)) endif -CFLAGS = -Wall -g -fpermissive +CFLAGS = -Wall -g +CXX = g++ -fpermissive ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 @@ -53,7 +54,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" "" mv config.guess config.guess.bak cp -f /usr/share/misc/config.guess config.guess endif - CFLAGS="$(CFLAGS)" ./configure \ + CXX="$(CXX)" CFLAGS="$(CFLAGS)" ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --enable-ruby \ @@ -69,7 +70,7 @@ 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. - CFLAGS="$(CFLAGS)" $(MAKE) + CXX="$(CXX)" CFLAGS="$(CFLAGS)" $(MAKE) touch $@ build-indep: build-indep-stamp -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit b15b2e44645edac018cf7de08fea5e69a3ab5fa9 Author: Francesco Paolo Lovergine Date: Wed May 25 14:45:27 2011 +0200 Forcing CFLAGS at building time. diff --git a/debian/rules b/debian/rules index fa25675..0e93c13 100755 --- a/debian/rules +++ b/debian/rules @@ -69,7 +69,7 @@ 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. - $(MAKE) + CFLAGS="$(CFLAGS)" $(MAKE) touch $@ build-indep: build-indep-stamp -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 2e16daafe23bf02110d5f8fb32c4cd66a66aed28 Author: Francesco Paolo Lovergine Date: Wed May 25 14:25:37 2011 +0200 Typo fixed in debian/rules diff --git a/debian/rules b/debian/rules index 4ea057f..fa25675 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ else $(info Guessed geos version is $(VER)) endif -CFLAGS = -Wall -g -fpermessive +CFLAGS = -Wall -g -fpermissive ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 786f97f2021b181ff36310fcd8a6d00c7af7e85f Author: Francesco Paolo Lovergine Date: Wed May 25 14:22:38 2011 +0200 Added -fpermessive diff --git a/debian/changelog b/debian/changelog index 5b6cd53..86c075f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,10 @@ geos (3.2.2-2) unstable; urgency=low (closes: #624949) * Added Bintree.cpp, Node.cpp, MonotoneChainBuilder.h, AbstractNode.cpp patches to fix a missing header file inclusion in some files. + * Use -fpermessive at building time to work around some minor compatibility +problems which prevent a successuful building. - -- Francesco Paolo Lovergine Wed, 25 May 2011 13:23:46 +0200 + -- Francesco Paolo Lovergine Wed, 25 May 2011 14:21:49 +0200 geos (3.2.2-1) unstable; urgency=low diff --git a/debian/rules b/debian/rules index c68aca0..4ea057f 100755 --- a/debian/rules +++ b/debian/rules @@ -25,7 +25,7 @@ else $(info Guessed geos version is $(VER)) endif -CFLAGS = -Wall -g +CFLAGS = -Wall -g -fpermessive ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 34826d7c7415b4ae52dd0cb209dcff64c9e70711 Author: Francesco Paolo Lovergine Date: Wed May 25 13:24:28 2011 +0200 Added AbstractNode.cpp still for cstddef inclusion. diff --git a/debian/changelog b/debian/changelog index 0658792..5b6cd53 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,10 +4,10 @@ geos (3.2.2-2) unstable; urgency=low * Fixed previous changelog entry. * Added CoordinateSequenceFactory.h patch to fix a missing declaration. (closes: #624949) - * Added Bintree.cpp, Node.cpp, MonotoneChainBuilder.h patches to fix -a missing header file inclusion in some files. + * Added Bintree.cpp, Node.cpp, MonotoneChainBuilder.h, AbstractNode.cpp +patches to fix a missing header file inclusion in some files. - -- Francesco Paolo Lovergine Wed, 25 May 2011 13:13:03 +0200 + -- Francesco Paolo Lovergine Wed, 25 May 2011 13:23:46 +0200 geos (3.2.2-1) unstable; urgency=low diff --git a/debian/patches/AbstractNode.cpp b/debian/patches/AbstractNode.cpp new file mode 100644 index 000..0b2a2d9 --- /dev/null +++ b/debian/patches/AbstractNode.cpp @@ -0,0 +1,12 @@ +Index: geos/source/index/strtree/AbstractNode.cpp +=== +--- geos.orig/source/index/strtree/AbstractNode.cpp2011-05-25 13:22:35.0 +0200 geos/source/index/strtree/AbstractNode.cpp 2011-05-25 13:22:52.0 +0200 +@@ -18,6 +18,7 @@ + + #include + #include ++#include + + using namespace std; + diff --git a/debian/patches/series b/debian/patches/series index e2d44b6..2aba345 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ Bintree.cpp Node.cpp Root.cpp MonotoneChainBuilder.h +AbstractNode.cpp -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 0bf2e677899e9725e5f614e20021f16cd84abfa1
Author: Francesco Paolo Lovergine
Date: Wed May 25 13:13:30 2011 +0200
One more patch.
diff --git a/debian/changelog b/debian/changelog
index 5049b8c..0658792 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,10 @@ geos (3.2.2-2) unstable; urgency=low
* Fixed previous changelog entry.
* Added CoordinateSequenceFactory.h patch to fix a missing declaration.
(closes: #624949)
- * Added Bintree.cppi and Node.cpp patch to fix a missing header
-file inclusion in some files.
+ * Added Bintree.cpp, Node.cpp, MonotoneChainBuilder.h patches to fix
+a missing header file inclusion in some files.
- -- Francesco Paolo Lovergine Tue, 24 May 2011 17:31:19
+0200
+ -- Francesco Paolo Lovergine Wed, 25 May 2011 13:13:03
+0200
geos (3.2.2-1) unstable; urgency=low
diff --git a/debian/patches/MonotoneChainBuilder.h
b/debian/patches/MonotoneChainBuilder.h
new file mode 100644
index 000..67ded19
--- /dev/null
+++ b/debian/patches/MonotoneChainBuilder.h
@@ -0,0 +1,21 @@
+Index: geos/source/headers/geos/index/chain/MonotoneChainBuilder.h
+===
+--- geos.orig/source/headers/geos/index/chain/MonotoneChainBuilder.h
2011-05-25 13:12:19.0 +0200
geos/source/headers/geos/index/chain/MonotoneChainBuilder.h
2011-05-25 13:12:35.0 +0200
+@@ -22,6 +22,7 @@
+
+ #include
+ #include
++#include
+
+ // Forward declarations
+ namespace geos {
+@@ -39,6 +40,8 @@
+ namespace index { // geos::index
+ namespace chain { // geos::index::chain
+
++using namespace std;
++
+ /** \brief
+ * Constructs {@link MonotoneChain}s
+ * for sequences of {@link Coordinate}s.
diff --git a/debian/patches/series b/debian/patches/series
index 49fdacb..e2d44b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ CoordinateSequenceFactory.h
Bintree.cpp
Node.cpp
Root.cpp
+MonotoneChainBuilder.h
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit d5bd9aa0d7ec5f1c4935e5f28666ce431fab2775
Author: Francesco Paolo Lovergine
Date: Wed May 25 13:04:07 2011 +0200
Revised patchset.
diff --git a/debian/patches/Bintree.cpp b/debian/patches/Bintree.cpp
index 2dc9748..801eb4d 100644
--- a/debian/patches/Bintree.cpp
+++ b/debian/patches/Bintree.cpp
@@ -1,7 +1,7 @@
Index: geos/source/index/bintree/Bintree.cpp
===
geos.orig/source/index/bintree/Bintree.cpp 2011-05-24 18:10:41.0
+0200
-+++ geos/source/index/bintree/Bintree.cpp 2011-05-24 18:11:29.0
+0200
+--- geos.orig/source/index/bintree/Bintree.cpp 2011-05-25 12:56:17.0
+0200
geos/source/index/bintree/Bintree.cpp 2011-05-25 12:58:36.0
+0200
@@ -18,6 +18,7 @@
#include
#include
@@ -10,29 +10,3 @@ Index: geos/source/index/bintree/Bintree.cpp
namespace geos {
namespace index { // geos.index
-@@ -66,14 +67,14 @@
- int
- Bintree::depth()
- {
-- if (root!=NULL) return root->depth();
-+ if (root!=std::NULL) return root->depth();
- return 0;
- }
-
- int
- Bintree::size()
- {
-- if (root!=NULL) return root->size();
-+ if (root!=std::NULL) return root->size();
- return 0;
- }
-
-@@ -85,7 +86,7 @@
- int
- Bintree::nodeSize()
- {
-- if (root!=NULL) return root->nodeSize();
-+ if (root!=std::NULL) return root->nodeSize();
- return 0;
- }
-
diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp
index 506bb11..5d1b30c 100644
--- a/debian/patches/Node.cpp
+++ b/debian/patches/Node.cpp
@@ -1,7 +1,7 @@
Index: geos/source/index/bintree/Node.cpp
===
geos.orig/source/index/bintree/Node.cpp2011-05-25 12:45:36.0
+0200
-+++ geos/source/index/bintree/Node.cpp 2011-05-25 12:46:20.0 +0200
+--- geos.orig/source/index/bintree/Node.cpp2011-05-25 12:56:17.0
+0200
geos/source/index/bintree/Node.cpp 2011-05-25 12:58:49.0 +0200
@@ -15,6 +15,7 @@
**/
@@ -21,8 +21,8 @@ Index: geos/source/index/bintree/Node.cpp
{
Index: geos/source/geomgraph/Node.cpp
===
geos.orig/source/geomgraph/Node.cpp2011-05-25 12:45:36.0
+0200
-+++ geos/source/geomgraph/Node.cpp 2011-05-25 12:45:40.0 +0200
+--- geos.orig/source/geomgraph/Node.cpp2011-05-25 12:56:17.0
+0200
geos/source/geomgraph/Node.cpp 2011-05-25 13:00:59.0 +0200
@@ -30,6 +30,7 @@
#include
#include
@@ -31,28 +31,25 @@ Index: geos/source/geomgraph/Node.cpp
#ifndef GEOS_DEBUG
#define GEOS_DEBUG 0
-@@ -178,7 +179,7 @@
- void
- Node::setLabel(int argIndex, int onLocation)
- {
-- if (label==NULL) {
-+ if (label==std::NULL) {
- label=new Label(argIndex, onLocation);
- } else
- label->setLocation(argIndex, onLocation);
-@@ -191,7 +192,7 @@
- Node::setLabelBoundary(int argIndex)
- {
- int loc=Location::UNDEF;
-- if (label!=NULL)
-+ if (label!=std::NULL)
- loc=label->getLocation(argIndex);
- // flip the loc
- int newLoc;
+@@ -38,12 +39,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/source/index/quadtree/Node.cpp
===
geos.orig/source/index/quadtree/Node.cpp 2011-05-25 12:45:36.0
+0200
-+++ geos/source/index/quadtree/Node.cpp2011-05-25 12:45:40.0
+0200
+--- geos.orig/source/index/quadtree/Node.cpp 2011-05-25 12:56:17.0
+0200
geos/source/index/quadtree/Node.cpp2011-05-25 13:02:00.0
+0200
@@ -25,6 +25,7 @@
#include
#include
@@ -61,51 +58,12 @@ Index: geos/source/index/quadtree/Node.cpp
#ifndef GEOS_DEBUG
#define GEOS_DEBUG 0
-@@ -103,7 +104,7 @@
- int subnodeIndex=getSubnodeIndex(searchEnv, centre);
- if (subnodeIndex==-1)
- return this;
-- if (subnode[subnodeIndex]!=NULL) {
-+ if (subnode[subnodeIndex]!=std::NULL) {
- // query lies in subquad, so search it
- Node *node=subnode[subnodeIndex];
- return node->find(searchEnv);
-@@ -146,7 +147,7 @@
- Node::getSubnode(int index)
- {
- assert(index >=0 && index < 4);
-- if (subnode[index] == NULL)
-+ if (subnode[index] == std::NULL)
- {
- subnode[index] = createSubnode(index).release();
- }
[SCM] geos branch, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 804ceb67d6a5cf9b9fbc9a4ac813d5fdffe0
Author: Francesco Paolo Lovergine
Date: Wed May 25 12:47:01 2011 +0200
Changing qualification in Node.cpp
diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp
index bec4a7d..506bb11 100644
--- a/debian/patches/Node.cpp
+++ b/debian/patches/Node.cpp
@@ -1,7 +1,7 @@
Index: geos/source/index/bintree/Node.cpp
===
geos.orig/source/index/bintree/Node.cpp2011-05-24 18:16:35.0
+0200
-+++ geos/source/index/bintree/Node.cpp 2011-05-25 12:17:04.0 +0200
+--- geos.orig/source/index/bintree/Node.cpp2011-05-25 12:45:36.0
+0200
geos/source/index/bintree/Node.cpp 2011-05-25 12:46:20.0 +0200
@@ -15,6 +15,7 @@
**/
@@ -10,49 +10,19 @@ Index: geos/source/index/bintree/Node.cpp
#include
#include
-@@ -38,9 +39,9 @@
- Node::createExpanded(Node *node,Interval *addInterval)
- {
- Interval *expandInt=new Interval(addInterval);
-- if (node!=NULL) expandInt->expandToInclude(node->interval);
-+ if (node!=std::NULL) expandInt->expandToInclude(node->interval);
- Node *largerNode=createNode(expandInt);
-- if (node!=NULL) largerNode->insert(node);
-+ if (node!=std::NULL) largerNode->insert(node);
- delete expandInt;
- return largerNode;
- }
-@@ -99,7 +100,7 @@
- int subnodeIndex=getSubnodeIndex(searchInterval,centre);
- if (subnodeIndex==-1)
- return this;
-- if (subnode[subnodeIndex]!=NULL) {
-+ if (subnode[subnodeIndex]!=std::NULL) {
- // query lies in subnode, so search it
- Node *node=subnode[subnodeIndex];
- return node->find(searchInterval);
-@@ -111,7 +112,7 @@
- void
- Node::insert(Node *node)
- {
-- assert(interval==NULL || interval->contains(node->interval));
-+ assert(interval==std::NULL || interval->contains(node->interval));
- int index=getSubnodeIndex(node->interval,centre);
- if (node->level==level-1) {
- subnode[index]=node;
-@@ -131,7 +132,7 @@
+@@ -24,6 +25,8 @@
+ namespace index { // geos.index
+ namespace bintree { // geos.index.bintree
+
++using namespace std;
++
Node*
- Node::getSubnode(int index)
+ Node::createNode(Interval *itemInterval)
{
-- if (subnode[index]==NULL) {
-+ if (subnode[index]==std::NULL) {
- subnode[index]=createSubnode(index);
- }
- return subnode[index];
Index: geos/source/geomgraph/Node.cpp
===
geos.orig/source/geomgraph/Node.cpp2011-05-24 18:16:35.0
+0200
-+++ geos/source/geomgraph/Node.cpp 2011-05-25 12:17:04.0 +0200
+--- geos.orig/source/geomgraph/Node.cpp2011-05-25 12:45:36.0
+0200
geos/source/geomgraph/Node.cpp 2011-05-25 12:45:40.0 +0200
@@ -30,6 +30,7 @@
#include
#include
@@ -81,8 +51,8 @@ Index: geos/source/geomgraph/Node.cpp
int newLoc;
Index: geos/source/index/quadtree/Node.cpp
===
geos.orig/source/index/quadtree/Node.cpp 2011-05-24 18:16:35.0
+0200
-+++ geos/source/index/quadtree/Node.cpp2011-05-25 12:17:04.0
+0200
+--- geos.orig/source/index/quadtree/Node.cpp 2011-05-25 12:45:36.0
+0200
geos/source/index/quadtree/Node.cpp2011-05-25 12:45:40.0
+0200
@@ -25,6 +25,7 @@
#include
#include
@@ -111,8 +81,8 @@ Index: geos/source/index/quadtree/Node.cpp
}
Index: geos/source/index/bintree/Bintree.cpp
===
geos.orig/source/index/bintree/Bintree.cpp 2011-05-25 12:34:58.0
+0200
-+++ geos/source/index/bintree/Bintree.cpp 2011-05-25 12:35:09.0
+0200
+--- geos.orig/source/index/bintree/Bintree.cpp 2011-05-25 12:45:40.0
+0200
geos/source/index/bintree/Bintree.cpp 2011-05-25 12:45:40.0
+0200
@@ -67,14 +67,14 @@
int
Bintree::depth()
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 4af268b2f7d2822a7084a3608758a20458d5dd4a
Author: Francesco Paolo Lovergine
Date: Wed May 25 12:35:50 2011 +0200
Changed a bit Node.cpp patch.
diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp
index e858991..bec4a7d 100644
--- a/debian/patches/Node.cpp
+++ b/debian/patches/Node.cpp
@@ -1,7 +1,7 @@
Index: geos/source/index/bintree/Node.cpp
===
geos.orig/source/index/bintree/Node.cpp2011-05-24 17:31:02.0
+0200
-+++ geos/source/index/bintree/Node.cpp 2011-05-24 17:54:22.0 +0200
+--- geos.orig/source/index/bintree/Node.cpp2011-05-24 18:16:35.0
+0200
geos/source/index/bintree/Node.cpp 2011-05-25 12:17:04.0 +0200
@@ -15,6 +15,7 @@
**/
@@ -51,8 +51,8 @@ Index: geos/source/index/bintree/Node.cpp
return subnode[index];
Index: geos/source/geomgraph/Node.cpp
===
geos.orig/source/geomgraph/Node.cpp2011-05-24 17:31:02.0
+0200
-+++ geos/source/geomgraph/Node.cpp 2011-05-24 17:54:22.0 +0200
+--- geos.orig/source/geomgraph/Node.cpp2011-05-24 18:16:35.0
+0200
geos/source/geomgraph/Node.cpp 2011-05-25 12:17:04.0 +0200
@@ -30,6 +30,7 @@
#include
#include
@@ -81,8 +81,8 @@ Index: geos/source/geomgraph/Node.cpp
int newLoc;
Index: geos/source/index/quadtree/Node.cpp
===
geos.orig/source/index/quadtree/Node.cpp 2011-05-24 17:31:02.0
+0200
-+++ geos/source/index/quadtree/Node.cpp2011-05-24 17:54:22.0
+0200
+--- geos.orig/source/index/quadtree/Node.cpp 2011-05-24 18:16:35.0
+0200
geos/source/index/quadtree/Node.cpp2011-05-25 12:17:04.0
+0200
@@ -25,6 +25,7 @@
#include
#include
@@ -109,3 +109,33 @@ Index: geos/source/index/quadtree/Node.cpp
{
subnode[index] = createSubnode(index).release();
}
+Index: geos/source/index/bintree/Bintree.cpp
+===
+--- geos.orig/source/index/bintree/Bintree.cpp 2011-05-25 12:34:58.0
+0200
geos/source/index/bintree/Bintree.cpp 2011-05-25 12:35:09.0
+0200
+@@ -67,14 +67,14 @@
+ int
+ Bintree::depth()
+ {
+- if (root!=std::NULL) return root->depth();
++ if (root!=NULL) return root->depth();
+ return 0;
+ }
+
+ int
+ Bintree::size()
+ {
+- if (root!=std::NULL) return root->size();
++ if (root!=NULL) return root->size();
+ return 0;
+ }
+
+@@ -86,7 +86,7 @@
+ int
+ Bintree::nodeSize()
+ {
+- if (root!=std::NULL) return root->nodeSize();
++ if (root!=NULL) return root->nodeSize();
+ return 0;
+ }
+
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 474de6c070023129ad5e543649c2d07193e913a8
Author: Francesco Paolo Lovergine
Date: Tue May 24 18:16:40 2011 +0200
Changed a bit patch order
diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp
index 1f7876c..e858991 100644
--- a/debian/patches/Node.cpp
+++ b/debian/patches/Node.cpp
@@ -109,33 +109,3 @@ Index: geos/source/index/quadtree/Node.cpp
{
subnode[index] = createSubnode(index).release();
}
-Index: geos/source/index/bintree/Bintree.cpp
-===
geos.orig/source/index/bintree/Bintree.cpp 2011-05-24 17:54:40.0
+0200
-+++ geos/source/index/bintree/Bintree.cpp 2011-05-24 17:55:56.0
+0200
-@@ -67,14 +67,14 @@
- int
- Bintree::depth()
- {
-- if (root!=NULL) return root->depth();
-+ if (root!=std::NULL) return root->depth();
- return 0;
- }
-
- int
- Bintree::size()
- {
-- if (root!=NULL) return root->size();
-+ if (root!=std::NULL) return root->size();
- return 0;
- }
-
-@@ -86,7 +86,7 @@
- int
- Bintree::nodeSize()
- {
-- if (root!=NULL) return root->nodeSize();
-+ if (root!=std::NULL) return root->nodeSize();
- return 0;
- }
-
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 48d0aee749df35c60df0d355d6022512ce5344e0
Author: Francesco Paolo Lovergine
Date: Tue May 24 18:11:44 2011 +0200
Still a fix for qualifier.
diff --git a/debian/patches/Bintree.cpp b/debian/patches/Bintree.cpp
index dd93150..2dc9748 100644
--- a/debian/patches/Bintree.cpp
+++ b/debian/patches/Bintree.cpp
@@ -1,7 +1,7 @@
Index: geos/source/index/bintree/Bintree.cpp
===
geos.orig/source/index/bintree/Bintree.cpp 2011-05-24 17:06:29.0
+0200
-+++ geos/source/index/bintree/Bintree.cpp 2011-05-24 17:07:06.0
+0200
+--- geos.orig/source/index/bintree/Bintree.cpp 2011-05-24 18:10:41.0
+0200
geos/source/index/bintree/Bintree.cpp 2011-05-24 18:11:29.0
+0200
@@ -18,6 +18,7 @@
#include
#include
@@ -10,3 +10,29 @@ Index: geos/source/index/bintree/Bintree.cpp
namespace geos {
namespace index { // geos.index
+@@ -66,14 +67,14 @@
+ int
+ Bintree::depth()
+ {
+- if (root!=NULL) return root->depth();
++ if (root!=std::NULL) return root->depth();
+ return 0;
+ }
+
+ int
+ Bintree::size()
+ {
+- if (root!=NULL) return root->size();
++ if (root!=std::NULL) return root->size();
+ return 0;
+ }
+
+@@ -85,7 +86,7 @@
+ int
+ Bintree::nodeSize()
+ {
+- if (root!=NULL) return root->nodeSize();
++ if (root!=std::NULL) return root->nodeSize();
+ return 0;
+ }
+
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit b8b8fc51f0b4ddeeb0def9854229836cc2a6e1d0
Author: Francesco Paolo Lovergine
Date: Tue May 24 17:56:45 2011 +0200
Fixed patch for missing qualiefier.
diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp
index f514140..1f7876c 100644
--- a/debian/patches/Node.cpp
+++ b/debian/patches/Node.cpp
@@ -1,7 +1,7 @@
Index: geos/source/index/bintree/Node.cpp
===
geos.orig/source/index/bintree/Node.cpp2011-05-24 17:26:38.0
+0200
-+++ geos/source/index/bintree/Node.cpp 2011-05-24 17:27:28.0 +0200
+--- geos.orig/source/index/bintree/Node.cpp2011-05-24 17:31:02.0
+0200
geos/source/index/bintree/Node.cpp 2011-05-24 17:54:22.0 +0200
@@ -15,6 +15,7 @@
**/
@@ -51,8 +51,8 @@ Index: geos/source/index/bintree/Node.cpp
return subnode[index];
Index: geos/source/geomgraph/Node.cpp
===
geos.orig/source/geomgraph/Node.cpp2011-05-24 17:29:37.0
+0200
-+++ geos/source/geomgraph/Node.cpp 2011-05-24 17:30:35.0 +0200
+--- geos.orig/source/geomgraph/Node.cpp2011-05-24 17:31:02.0
+0200
geos/source/geomgraph/Node.cpp 2011-05-24 17:54:22.0 +0200
@@ -30,6 +30,7 @@
#include
#include
@@ -81,8 +81,8 @@ Index: geos/source/geomgraph/Node.cpp
int newLoc;
Index: geos/source/index/quadtree/Node.cpp
===
geos.orig/source/index/quadtree/Node.cpp 2011-05-24 17:28:56.0
+0200
-+++ geos/source/index/quadtree/Node.cpp2011-05-24 17:29:13.0
+0200
+--- geos.orig/source/index/quadtree/Node.cpp 2011-05-24 17:31:02.0
+0200
geos/source/index/quadtree/Node.cpp2011-05-24 17:54:22.0
+0200
@@ -25,6 +25,7 @@
#include
#include
@@ -109,3 +109,33 @@ Index: geos/source/index/quadtree/Node.cpp
{
subnode[index] = createSubnode(index).release();
}
+Index: geos/source/index/bintree/Bintree.cpp
+===
+--- geos.orig/source/index/bintree/Bintree.cpp 2011-05-24 17:54:40.0
+0200
geos/source/index/bintree/Bintree.cpp 2011-05-24 17:55:56.0
+0200
+@@ -67,14 +67,14 @@
+ int
+ Bintree::depth()
+ {
+- if (root!=NULL) return root->depth();
++ if (root!=std::NULL) return root->depth();
+ return 0;
+ }
+
+ int
+ Bintree::size()
+ {
+- if (root!=NULL) return root->size();
++ if (root!=std::NULL) return root->size();
+ return 0;
+ }
+
+@@ -86,7 +86,7 @@
+ int
+ Bintree::nodeSize()
+ {
+- if (root!=NULL) return root->nodeSize();
++ if (root!=std::NULL) return root->nodeSize();
+ return 0;
+ }
+
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit f2d1d8d2a7917c4108ee708e9ed4ba90ced86e3e
Author: Francesco Paolo Lovergine
Date: Tue May 24 17:31:54 2011 +0200
Fixed again FTBS for missing NULL decl.
diff --git a/debian/changelog b/debian/changelog
index 1b14516..5049b8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,10 @@ geos (3.2.2-2) unstable; urgency=low
* Fixed previous changelog entry.
* Added CoordinateSequenceFactory.h patch to fix a missing declaration.
(closes: #624949)
- * Added Bintree.cpp patch to fix a missing header file inclusion.
+ * Added Bintree.cppi and Node.cpp patch to fix a missing header
+file inclusion in some files.
- -- Francesco Paolo Lovergine Tue, 24 May 2011 17:07:20
+0200
+ -- Francesco Paolo Lovergine Tue, 24 May 2011 17:31:19
+0200
geos (3.2.2-1) unstable; urgency=low
diff --git a/debian/patches/Node.cpp b/debian/patches/Node.cpp
new file mode 100644
index 000..f514140
--- /dev/null
+++ b/debian/patches/Node.cpp
@@ -0,0 +1,111 @@
+Index: geos/source/index/bintree/Node.cpp
+===
+--- geos.orig/source/index/bintree/Node.cpp2011-05-24 17:26:38.0
+0200
geos/source/index/bintree/Node.cpp 2011-05-24 17:27:28.0 +0200
+@@ -15,6 +15,7 @@
+ **/
+
+ #include
++#include
+
+ #include
+ #include
+@@ -38,9 +39,9 @@
+ Node::createExpanded(Node *node,Interval *addInterval)
+ {
+ Interval *expandInt=new Interval(addInterval);
+- if (node!=NULL) expandInt->expandToInclude(node->interval);
++ if (node!=std::NULL) expandInt->expandToInclude(node->interval);
+ Node *largerNode=createNode(expandInt);
+- if (node!=NULL) largerNode->insert(node);
++ if (node!=std::NULL) largerNode->insert(node);
+ delete expandInt;
+ return largerNode;
+ }
+@@ -99,7 +100,7 @@
+ int subnodeIndex=getSubnodeIndex(searchInterval,centre);
+ if (subnodeIndex==-1)
+ return this;
+- if (subnode[subnodeIndex]!=NULL) {
++ if (subnode[subnodeIndex]!=std::NULL) {
+ // query lies in subnode, so search it
+ Node *node=subnode[subnodeIndex];
+ return node->find(searchInterval);
+@@ -111,7 +112,7 @@
+ void
+ Node::insert(Node *node)
+ {
+- assert(interval==NULL || interval->contains(node->interval));
++ assert(interval==std::NULL || interval->contains(node->interval));
+ int index=getSubnodeIndex(node->interval,centre);
+ if (node->level==level-1) {
+ subnode[index]=node;
+@@ -131,7 +132,7 @@
+ Node*
+ Node::getSubnode(int index)
+ {
+- if (subnode[index]==NULL) {
++ if (subnode[index]==std::NULL) {
+ subnode[index]=createSubnode(index);
+ }
+ return subnode[index];
+Index: geos/source/geomgraph/Node.cpp
+===
+--- geos.orig/source/geomgraph/Node.cpp2011-05-24 17:29:37.0
+0200
geos/source/geomgraph/Node.cpp 2011-05-24 17:30:35.0 +0200
+@@ -30,6 +30,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #ifndef GEOS_DEBUG
+ #define GEOS_DEBUG 0
+@@ -178,7 +179,7 @@
+ void
+ Node::setLabel(int argIndex, int onLocation)
+ {
+- if (label==NULL) {
++ if (label==std::NULL) {
+ label=new Label(argIndex, onLocation);
+ } else
+ label->setLocation(argIndex, onLocation);
+@@ -191,7 +192,7 @@
+ Node::setLabelBoundary(int argIndex)
+ {
+ int loc=Location::UNDEF;
+- if (label!=NULL)
++ if (label!=std::NULL)
+ loc=label->getLocation(argIndex);
+ // flip the loc
+ int newLoc;
+Index: geos/source/index/quadtree/Node.cpp
+===
+--- geos.orig/source/index/quadtree/Node.cpp 2011-05-24 17:28:56.0
+0200
geos/source/index/quadtree/Node.cpp2011-05-24 17:29:13.0
+0200
+@@ -25,6 +25,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #ifndef GEOS_DEBUG
+ #define GEOS_DEBUG 0
+@@ -103,7 +104,7 @@
+ int subnodeIndex=getSubnodeIndex(searchEnv, centre);
+ if (subnodeIndex==-1)
+ return this;
+- if (subnode[subnodeIndex]!=NULL) {
++ if (subnode[subnodeIndex]!=std::NULL) {
+ // query lies in subquad, so search it
+ Node *node=subnode[subnodeIndex];
+ return node->find(searchEnv);
+@@ -146,7 +147,7 @@
+ Node::getSubnode(int index)
+ {
+ assert(index >=0 && index < 4);
+- if (subnode[index] == NULL)
++ if (subnode[index] == std::NULL)
+ {
+ subnode[index] = createSubnode(index).release();
+ }
diff --git a/debian/patches/series b/debian/patches/series
index a935e1b..8
[SCM] geos branch, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 4e1cae72009062df24c01fe121e1fb65c0d881d0
Author: Francesco Paolo Lovergine
Date: Tue May 24 17:08:08 2011 +0200
Fixed another FTBS in current GCC.
diff --git a/debian/changelog b/debian/changelog
index 7806e54..1b14516 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ geos (3.2.2-2) unstable; urgency=low
* Fixed previous changelog entry.
* Added CoordinateSequenceFactory.h patch to fix a missing declaration.
(closes: #624949)
+ * Added Bintree.cpp patch to fix a missing header file inclusion.
- -- Francesco Paolo Lovergine Tue, 24 May 2011 15:52:18
+0200
+ -- Francesco Paolo Lovergine Tue, 24 May 2011 17:07:20
+0200
geos (3.2.2-1) unstable; urgency=low
diff --git a/debian/patches/Bintree.cpp b/debian/patches/Bintree.cpp
new file mode 100644
index 000..dd93150
--- /dev/null
+++ b/debian/patches/Bintree.cpp
@@ -0,0 +1,12 @@
+Index: geos/source/index/bintree/Bintree.cpp
+===
+--- geos.orig/source/index/bintree/Bintree.cpp 2011-05-24 17:06:29.0
+0200
geos/source/index/bintree/Bintree.cpp 2011-05-24 17:07:06.0
+0200
+@@ -18,6 +18,7 @@
+ #include
+ #include
+ #include
++#include
+
+ namespace geos {
+ namespace index { // geos.index
diff --git a/debian/patches/series b/debian/patches/series
index c0bb399..a935e1b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
CoordinateSequenceFactory.h
+Bintree.cpp
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 29536deca7b6b5a6257c544e7f5a6b7b87818d68
Author: Francesco Paolo Lovergine
Date: Tue May 24 15:53:42 2011 +0200
Fixating #624949
diff --git a/debian/changelog b/debian/changelog
index ccb43b1..7806e54 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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)
+
+ -- Francesco Paolo Lovergine Tue, 24 May 2011 15:52:18
+0200
+
geos (3.2.2-1) unstable; urgency=low
[ Alan Boudreault ]
@@ -8,7 +17,6 @@ geos (3.2.2-1) unstable; urgency=low
* 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.
- * Policy changed to 3.9.1, without changes.
* Added ${misc:Depends} to bin pkgs due to dh use.
* Added -dbg package for debugging symbols.
(closes: #582273)
diff --git a/debian/compat b/debian/compat
index 7f8f011..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+8
diff --git a/debian/control b/debian/control
index 82bd00f..c820c9d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project
Uploaders: Francesco Paolo Lovergine
-Build-Depends: debhelper (>= 7), doxygen, swig, ruby, ruby-dev,
+Build-Depends: debhelper (>= 8), doxygen, swig, ruby, ruby-dev,
python-all, python-all-dev, python-central (>= 0.5)
-Standards-Version: 3.9.1
+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
diff --git a/debian/control.in b/debian/control.in
index e328330..5784870 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,9 +3,9 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project
Uploaders: Francesco Paolo Lovergine
-Build-Depends: debhelper (>= 7), doxygen, swig, ruby, ruby-dev,
+Build-Depends: debhelper (>= 8), doxygen, swig, ruby, ruby-dev,
python-all, python-all-dev, python-central (>= 0.5)
-Standards-Version: 3.9.1
+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
diff --git a/debian/patches/CoordinateSequenceFactory.h
b/debian/patches/CoordinateSequenceFactory.h
new file mode 100644
index 000..90b8669
--- /dev/null
+++ b/debian/patches/CoordinateSequenceFactory.h
@@ -0,0 +1,13 @@
+Index: geos/source/headers/geos/geom/CoordinateSequenceFactory.h
+===
+--- geos.orig/source/headers/geos/geom/CoordinateSequenceFactory.h
2011-05-24 15:51:50.0 +0200
geos/source/headers/geos/geom/CoordinateSequenceFactory.h 2011-05-24
15:51:53.0 +0200
+@@ -24,7 +24,7 @@
+ #include
+ #include
+
+-//#include
++#include
+ #include
+
+ // Forward declarations
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..c0bb399 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+CoordinateSequenceFactory.h
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit ef0c1d5f0b1c085688f7e4f7533ce6ec65b8d7c0
Author: Francesco Paolo Lovergine
Date: Thu Mar 3 14:46:33 2011 +0100
Fixed for missing ${misc:Depends}
diff --git a/debian/control b/debian/control
index 5bcb34a..82bd00f 100644
--- a/debian/control
+++ b/debian/control
@@ -93,7 +93,7 @@ Package: libgeos-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: libgeos-3.2.2 (= ${binary:Version}), libgeos-c1 (= ${binary:Version})
+Depends: libgeos-3.2.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
diff --git a/debian/control.in b/debian/control.in
index 1eb3ac1..e328330 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -93,7 +93,7 @@ Package: libgeos-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: libgeos-@VERSION@ (= ${binary:Version}), libgeos-c1 (=
${binary:Version})
+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
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 454567cb3015df682da23a04f1b7f17acee7d2f2
Author: Francesco Paolo Lovergine
Date: Thu Mar 3 13:50:11 2011 +0100
Added debugging symbols.
diff --git a/debian/changelog b/debian/changelog
index d69c757..ccb43b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,10 @@ geos (3.2.2-1) unstable; urgency=low
* Source format moved to 3.0 with quilt support.
* Policy changed to 3.9.1, without changes.
* Added ${misc:Depends} to bin pkgs due to dh use.
+ * Added -dbg package for debugging symbols.
+(closes: #582273)
- -- Francesco Paolo Lovergine Wed, 02 Mar 2011 23:01:54
+0100
+ -- Francesco Paolo Lovergine Thu, 03 Mar 2011 13:40:04
+0100
geos (3.2.0-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 3e81ec5..5bcb34a 100644
--- a/debian/control
+++ b/debian/control
@@ -89,3 +89,14 @@ Description: GEOS bindings for Ruby
.
This package contains the Ruby bindings for GEOS.
+Package: libgeos-dbg
+Architecture: any
+Section: debug
+Priority: extra
+Depends: libgeos-3.2.2 (= ${binary:Version}), libgeos-c1 (= ${binary:Version})
+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
index f391f89..1eb3ac1 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -89,3 +89,14 @@ Description: GEOS bindings for Ruby
.
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})
+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/rules b/debian/rules
index 47c641e..c68aca0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -130,7 +130,7 @@ binary-common:
dh_installexamples
dh_installman
dh_link
- dh_strip
+ dh_strip --dbg-package=libgeos-dbg
dh_compress
dh_fixperms
dh_makeshlibs -V
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 33da6af5100bcc38cfbae1cc777582712e7ec2fd
Author: Francesco Paolo Lovergine
Date: Thu Mar 3 13:13:14 2011 +0100
Get rid of lintian warning.
diff --git a/debian/changelog b/debian/changelog
index e3d9e1e..d69c757 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ geos (3.2.2-1) unstable; urgency=low
* Repository moved to git and changed Vcs-* fields as required.
* Source format moved to 3.0 with quilt support.
* Policy changed to 3.9.1, without changes.
+ * Added ${misc:Depends} to bin pkgs due to dh use.
-- Francesco Paolo Lovergine Wed, 02 Mar 2011 23:01:54
+0100
diff --git a/debian/control b/debian/control
index 26775ef..3e81ec5 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Vcs-Git: git://git.debian.org/git/pkg-grass/geos
Package: libgeos-dev
Section: libdevel
Architecture: any
-Depends: libgeos-3.2.2 (= ${binary:Version}), libgeos-c1 (= ${binary:Version})
+Depends: libgeos-3.2.2 (= ${binary:Version}), 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
@@ -68,6 +68,7 @@ Description: Geometry engine for Geographic Information
Systems - C++ Library
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
diff --git a/debian/control.in b/debian/control.in
index d9e47e8..f391f89 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -13,7 +13,7 @@ Vcs-Git: git://git.debian.org/git/pkg-grass/geos
Package: libgeos-dev
Section: libdevel
Architecture: any
-Depends: libgeos-@VERSION@ (= ${binary:Version}), libgeos-c1 (=
${binary:Version})
+Depends: libgeos-@VERSION@ (= ${binary:Version}), 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
@@ -68,6 +68,7 @@ Description: Geometry engine for Geographic Information
Systems - C++ Library
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
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 628ff9e99babbf394e067c4d85ecd8ef0338d5b9 Author: Francesco Paolo Lovergine Date: Wed Mar 2 23:04:27 2011 +0100 Changes for quilt and Vcs fields. diff --git a/debian/changelog b/debian/changelog index bb30117..e3d9e1e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,9 +7,10 @@ geos (3.2.2-1) unstable; urgency=low * 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. + * Source format moved to 3.0 with quilt support. + * Policy changed to 3.9.1, without changes. - -- Francesco Paolo Lovergine Tue, 01 Mar 2011 21:26:23 +0100 + -- Francesco Paolo Lovergine Wed, 02 Mar 2011 23:01:54 +0100 geos (3.2.0-1) unstable; urgency=low diff --git a/debian/control b/debian/control index 79554f6..26775ef 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,12 @@ Section: science Priority: optional Maintainer: Debian GIS Project Uploaders: Francesco Paolo Lovergine -Build-Depends: debhelper (>= 7), dpatch, doxygen, swig, ruby, ruby-dev -Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 7), doxygen, swig, ruby, ruby-dev, + python-all, python-all-dev, python-central (>= 0.5) +Standards-Version: 3.9.1 Homepage: http://trac.osgeo.org/geos/ -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk -Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk +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 diff --git a/debian/control.in b/debian/control.in index 70ce9f3..d9e47e8 100644 --- a/debian/control.in +++ b/debian/control.in @@ -3,12 +3,12 @@ Section: science Priority: optional Maintainer: Debian GIS Project Uploaders: Francesco Paolo Lovergine -Build-Depends: debhelper (>= 7), dpatch, doxygen, swig, ruby, ruby-dev, - python-all, python-all-dev, python-central (>= 0.5) -Standards-Version: 3.8.4 +Build-Depends: debhelper (>= 7), doxygen, swig, ruby, ruby-dev, + python-all, python-all-dev, python-central (>= 0.5) +Standards-Version: 3.9.1 Homepage: http://trac.osgeo.org/geos/ -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk -Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk +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 -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 3405fd6b3d540f86621ae750eed124a553e55730 Author: Francesco Paolo Lovergine Date: Tue Mar 1 22:31:46 2011 +0100 Migrated to quilt and deb source 3.0 diff --git a/debian/changelog b/debian/changelog index dd74933..bb30117 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,20 +1,15 @@ geos (3.2.2-1) unstable; urgency=low + [ Alan Boudreault ] * New upstream release. - -- Alan Boudreault Tue, 11 May 2010 11:39:29 -0400 - -geos (3.2.1-1) unstable; urgency=low - - * New upstream release. - - -- Francesco Paolo Lovergine Sat, 03 Apr 2010 23:23:35 +0200 - -geos (3.2.0-2) unstable; urgency=low - - * Policy set to 3.8.4, without changes. + [ 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. - -- Francesco Paolo Lovergine Thu, 21 Jan 2010 17:55:27 +0100 + -- Francesco Paolo Lovergine Tue, 01 Mar 2011 21:26:23 +0100 geos (3.2.0-1) unstable; urgency=low diff --git a/debian/patches/00list b/debian/patches/00list deleted file mode 100644 index 021b0c3..000 --- a/debian/patches/00list +++ /dev/null @@ -1 +0,0 @@ -# no patches diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 000..e69de29 diff --git a/debian/rules b/debian/rules index 38604d4..47c641e 100755 --- a/debian/rules +++ b/debian/rules @@ -9,8 +9,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -include /usr/share/dpatch/dpatch.make - # 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) @@ -66,7 +64,7 @@ endif cp debian/libgeos-c++.dirs debian/libgeos-$(VER).dirs #Architecture -build: patch build-arch build-indep +build: build-arch build-indep build-arch: build-arch-stamp build-arch-stamp: config.status @@ -80,8 +78,7 @@ build-indep-stamp: config.status $(MAKE) -C doc doxygen-html touch $@ -clean: clean-patched unpatch -clean-patched: +clean: dh_testdir dh_testroot [ ! -f Makefile ] || $(MAKE) distclean diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit b86fb34225f2b8295947ae31e282cc5696fa539a Merge: 1d51f5864c453fa99a3f57ffdc116d6a8cf68c1f 33778def693c0b7bb8ef2c0ae46ae6dcd08bf088 Author: Francesco Paolo Lovergine Date: Tue Mar 1 21:12:11 2011 +0100 Merge commit 'upstream/3.2.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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 1d51f5864c453fa99a3f57ffdc116d6a8cf68c1f Merge: 17536c0cf97dde0283936db8bc8738aa99fe515f 259cb3305bdd6f415b12c998c1a4cc37f403969f Author: Francesco Paolo Lovergine Date: Tue Mar 1 20:33:22 2011 +0100 Merge commit 'upstream/3.2.0' -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 17536c0cf97dde0283936db8bc8738aa99fe515f Merge: 47199fe5b8fd1bf0004c268eb278423bf46c59a7 dff4d8b0b688280e32572ff0f689efda1115accb Author: Francesco Paolo Lovergine Date: Tue Mar 1 20:31:46 2011 +0100 Merge branch 'upstream' -- 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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit 578391970e6ea8a59917dc10c5993dad02d95968
Author: Francesco Paolo Lovergine
Date: Sat Apr 3 21:24:02 2010 +
Reverted change about python binding.
diff --git a/debian/changelog b/debian/changelog
index a145edd..f14db36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
geos (3.2.1-1) unstable; urgency=low
* New upstream release.
- * Added python bindings for all versions.
- -- Francesco Paolo Lovergine Fri, 02 Apr 2010 00:02:16
+0200
+ -- Francesco Paolo Lovergine Sat, 03 Apr 2010 23:23:35
+0200
geos (3.2.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 44c63ae..cd4ad76 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,8 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project
Uploaders: Francesco Paolo Lovergine
-Build-Depends: debhelper (>= 7), dpatch, doxygen, swig, ruby, ruby-dev,
- python-dev, python-all-dev (>= 2.3.5-11~), python-central (>= 0.5)
+Build-Depends: debhelper (>= 7), dpatch, doxygen, swig, ruby, ruby-dev
Standards-Version: 3.8.4
-XS-Python-Version: all
Homepage: http://trac.osgeo.org/geos/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk
@@ -89,15 +87,3 @@ Description: GEOS bindings for Ruby
.
This package contains the Ruby bindings for GEOS.
-Package: python-geos
-Section: python
-Architecture: any
-Depends: libgeos-3.2.1 (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}, ${python:Depends}
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Description: GEOS bindings for Python
- 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 Python bindings for GEOS.
diff --git a/debian/control.in b/debian/control.in
index 3a394c5..2de51db 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,10 +3,8 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project
Uploaders: Francesco Paolo Lovergine
-Build-Depends: debhelper (>= 7), dpatch, doxygen, swig, ruby, ruby-dev,
- python-dev, python-all-dev (>= 2.3.5-11~), python-central (>= 0.5)
+Build-Depends: debhelper (>= 7), dpatch, doxygen, swig, ruby, ruby-dev
Standards-Version: 3.8.4
-XS-Python-Version: all
Homepage: http://trac.osgeo.org/geos/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk
@@ -89,15 +87,3 @@ Description: GEOS bindings for Ruby
.
This package contains the Ruby bindings for GEOS.
-Package: python-geos
-Section: python
-Architecture: any
-Depends: libgeos-@VERSION@ (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}, ${python:Depends}
-Provides: ${python:Provides}
-XB-Python-Version: ${python:Versions}
-Description: GEOS bindings for Python
- 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 Python bindings for GEOS.
--
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, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch:
commit ba5ae59015a3798ef26c46acb4b2fcd5ba96dc20
Author: Francesco Paolo Lovergine
Date: Thu Apr 1 22:53:40 2010 +
Inital python binding support and new version.
diff --git a/debian/changelog b/debian/changelog
index deb55b1..a145edd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+geos (3.2.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * Added python bindings for all versions.
+
+ -- Francesco Paolo Lovergine Fri, 02 Apr 2010 00:02:16
+0200
+
geos (3.2.0-2) unstable; urgency=low
* Policy set to 3.8.4, without changes.
diff --git a/debian/control b/debian/control
index c7614e1..44c63ae 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,10 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project
Uploaders: Francesco Paolo Lovergine
-Build-Depends: debhelper (>= 7), dpatch, doxygen, swig, ruby, ruby-dev
+Build-Depends: debhelper (>= 7), dpatch, doxygen, swig, ruby, ruby-dev,
+ python-dev, python-all-dev (>= 2.3.5-11~), python-central (>= 0.5)
Standards-Version: 3.8.4
+XS-Python-Version: all
Homepage: http://trac.osgeo.org/geos/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk
@@ -12,7 +14,7 @@ Vcs-Svn:
svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk
Package: libgeos-dev
Section: libdevel
Architecture: any
-Depends: libgeos-3.2.0 (= ${binary:Version}), libgeos-c1 (= ${binary:Version})
+Depends: libgeos-3.2.1 (= ${binary:Version}), libgeos-c1 (= ${binary:Version})
Suggests: libgdal-doc
Description: Geometry engine for GIS - Development files
GEOS provides a spatial object model and fundamental geometric
@@ -43,7 +45,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.2.0
+Package: libgeos-3.2.1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -79,10 +81,23 @@ Description: Documentation for the GEOS GIS geometry engine
library
Package: libgeos-ruby1.8
Section: ruby
Architecture: any
-Depends: libgeos-3.2.0 (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
+Depends: libgeos-3.2.1 (= ${binary:Version}), ${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: python-geos
+Section: python
+Architecture: any
+Depends: libgeos-3.2.1 (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}, ${python:Depends}
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: GEOS bindings for Python
+ 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 Python bindings for GEOS.
diff --git a/debian/control.in b/debian/control.in
index 0158e61..3a394c5 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,8 +3,10 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project
Uploaders: Francesco Paolo Lovergine
-Build-Depends: debhelper (>= 7), dpatch, doxygen, swig, ruby, ruby-dev
+Build-Depends: debhelper (>= 7), dpatch, doxygen, swig, ruby, ruby-dev,
+ python-dev, python-all-dev (>= 2.3.5-11~), python-central (>= 0.5)
Standards-Version: 3.8.4
+XS-Python-Version: all
Homepage: http://trac.osgeo.org/geos/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk
Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk
@@ -86,3 +88,16 @@ Description: GEOS bindings for Ruby
OpenGIS Consortium Simple Features Specification for SQL.
.
This package contains the Ruby bindings for GEOS.
+
+Package: python-geos
+Section: python
+Architecture: any
+Depends: libgeos-@VERSION@ (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}, ${python:Depends}
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: GEOS bindings for Python
+ 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 Python bindings for GEOS.
diff --git a/debian/rules b/debian/rules
index 38604d4..4157b6d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,6 +11,9 @@
include /usr/share/dpatch/dpatch.make
+PYVERS=$(shell pyversions -v -r debian/control.in)
+PYDEF=$(shell pyversions -dv)
+
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (
[SCM] geos branch, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 5cfefd06fb51f90ed870f5af0f4b07ae7e70c77f Author: Francesco Paolo Lovergine Date: Wed Feb 17 16:54:53 2010 + Minor change. diff --git a/debian/changelog b/debian/changelog index 8328cd4..deb55b1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +geos (3.2.0-2) unstable; urgency=low + + * Policy set to 3.8.4, without changes. + + -- Francesco Paolo Lovergine Thu, 21 Jan 2010 17:55:27 +0100 + geos (3.2.0-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 2a8f3b3..c7614e1 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian GIS Project Uploaders: Francesco Paolo Lovergine Build-Depends: debhelper (>= 7), dpatch, doxygen, swig, ruby, ruby-dev -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: http://trac.osgeo.org/geos/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk diff --git a/debian/control.in b/debian/control.in index 5504410..0158e61 100644 --- a/debian/control.in +++ b/debian/control.in @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian GIS Project Uploaders: Francesco Paolo Lovergine Build-Depends: debhelper (>= 7), dpatch, doxygen, swig, ruby, ruby-dev -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Homepage: http://trac.osgeo.org/geos/ Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk -- 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] gdal tag, debian/1.9.0-1, created. upstream/1.8.1-104-g1efa5c5
The tag, debian/1.9.0-1 has been created at 1efa5c57db6dd74e3fec3ea4d4b7c3a366d95c2e (commit) - Shortlog commit 1efa5c57db6dd74e3fec3ea4d4b7c3a366d95c2e Author: Francesco Paolo Lovergine Date: Mon May 7 15:05:30 2012 +0200 FIxed numpy support. --- -- GDAL/OGR library and 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] gdal branch, master, updated. upstream/1.8.1-104-g1efa5c5
The following commit has been merged in the master branch: commit 1efa5c57db6dd74e3fec3ea4d4b7c3a366d95c2e Author: Francesco Paolo Lovergine Date: Mon May 7 15:05:30 2012 +0200 FIxed numpy support. diff --git a/debian/changelog b/debian/changelog index 4018791..09125e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ gdal (1.9.0-1) unstable; urgency=low * Ready for sid, starting transition. * All symfiles updated to latest builds. + * Added dh_numpy call in debian/rules to depend on numpy ABI. + * Policy bumped to 3.9.3, no changes required. - -- Francesco Paolo Lovergine Mon, 07 May 2012 11:25:50 +0200 + -- Francesco Paolo Lovergine Mon, 07 May 2012 15:04:42 +0200 gdal (1.9.0-1~exp5) experimental; urgency=low diff --git a/debian/control b/debian/control index 1ad1f51..94e861a 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 8), zlib1g-dev, libnetcdf-dev (>= 1:4.0.0), libpoppler-dev, liblzma-dev, libopenjpeg-dev, libarmadillo-dev, libfreexl-dev (>= 1.0.0), libkml-dev, liburiparser-dev Build-Conflicts: python-setuptools -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 XS-Python-Version: all Homepage: http://www.gdal.org/ Vcs-Browser: http://git.debian.org/?p=pkg-grass/gdal.git diff --git a/debian/rules b/debian/rules index c92b441..1e416cd 100755 --- a/debian/rules +++ b/debian/rules @@ -199,6 +199,7 @@ binary-common: dh_fixperms dh_lintian dh_python2 -X.info + dh_numpy dh_perl # Adds per arch symbols for compatible archs ln -f $(CURDIR)/debian/libgdal*.symbols.i386 $(CURDIR)/debian/libgdal1.symbols.kfreebsd-i386 -- GDAL/OGR library and 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] qgis tag, debian/1.7.4+1.7.5_20120320-1, updated. final-1_7_1-259-g62d1cde
The tag, debian/1.7.4+1.7.5_20120320-1 has been updated to 62d1cde262bd55d750497f9b720ed4d128ec1321 (commit) from d41bc60c0350e4534633918b022206c7222b2961 - Shortlog commit 62d1cde262bd55d750497f9b720ed4d128ec1321 Author: Francesco Paolo Lovergine Date: Tue Apr 24 15:34:35 2012 +0200 Changed (again) copyright notes. --- -- The Quantum GIS in Debian project ___ 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] qgis branch, debian, updated. final-1_7_1-259-g62d1cde
The following commit has been merged in the debian branch:
commit 62d1cde262bd55d750497f9b720ed4d128ec1321
Author: Francesco Paolo Lovergine
Date: Tue Apr 24 15:34:35 2012 +0200
Changed (again) copyright notes.
diff --git a/debian/changelog b/debian/changelog
index f58dae8..c4b2c95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,8 +16,9 @@ qgis (1.7.4+1.7.5~20120320-1) unstable; urgency=low
This is required for uploading currently.
* Added missing ${misc:Depends} to make lintian happy.
* Copyright notes updated and debian/copyright moved to format 1.0.
+ * More licenses notices now reported in debian/copyright. Thanks ftpmasters.
- -- Francesco Paolo Lovergine Tue, 27 Mar 2012 18:13:25
+0200
+ -- Francesco Paolo Lovergine Tue, 24 Apr 2012 15:12:20
+0200
qgis (1.7.4-1) UNRELEASED; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 3401e6f..926ef97 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -202,4 +202,112 @@ License: LGPL-2.1+
On Debian systems, the complete text of the GNU Lesser General Public
License can be found in the /usr/share/common-licenses/LGPL-2.1 file.
+Files: images/themes/gis/*
+Copyright: 2011, Robert Szczepanek
+ Anita Graser
+License: CC-BY-SA-3.0
+ GIS icons by Robert Szczepanek is licensed under a Creative Commons
+ Attribution-Share Alike 3.0 Unported License. Feel free to use it in any GIS
+ software or for other purposes. I only ask you to let me know about that and
+ to include licence.txt file in your work.
+Files: python/plugins/GdalTools
+Copyright: 2009 Faunalia
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to
do
+ so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
all
+ copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+Files: python/plugins/fTools
+Copyright: 2009 Carson J.Q. Farmer
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to
do
+ so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
all
+ copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+
+Files: python/plugins/plugin_installer
+Copyright: 2007 Matthew T. Perry
+ 2008-2009 Borys Jurgiel
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining a copy
of
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to
do
+ so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
all
+ copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ O
[SCM] qgis branch, debian, updated. final-1_7_1-259-g62d1cde
The following commit has been merged in the debian branch:
commit 16cc8bff69ff670eeae24ccf87616cea9c9cadd2
Author: Francesco Paolo Lovergine
Date: Wed Mar 28 10:37:10 2012 +0200
Typo fixed.
diff --git a/debian/changelog b/debian/changelog
index 8d98db0..f58dae8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,7 +15,7 @@ qgis (1.7.4+1.7.5~20120320-1) unstable; urgency=low
* Added an automagic creation of a lintian override for sqlite embedding.
This is required for uploading currently.
* Added missing ${misc:Depends} to make lintian happy.
- * Copyright notes updated and debian/copyroght moved to format 1.0.
+ * Copyright notes updated and debian/copyright moved to format 1.0.
-- Francesco Paolo Lovergine Tue, 27 Mar 2012 18:13:25
+0200
--
The Quantum GIS in Debian project
___
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] librasterlite tag, debian/1.1_svn11-2, deleted. debian/1.1_svn11-1-2-g8480649
The tag, debian/1.1_svn11-2 has been deleted was 8480649cabb26e26962f5c05fa031b72d4abd6d3 --- 8480649cabb26e26962f5c05fa031b72d4abd6d3 Fixed for multi-arch paths. --- -- library supporting raster data sources for spatialite ___ 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 annotated tag, upstream/3.1.0_rc2, created. upstream/3.1.0_rc2
The annotated tag, upstream/3.1.0_rc2 has been created at 793d6d82bc4c6b6e6dfc673a92cf69351d22858f (tag) tagging 1f15ac3f0dba5193324ab90f6c5fbeca9833844b (commit) replaces upstream/3.0.2_20120302 tagged by Francesco Paolo Lovergine on Tue Apr 3 14:22:32 2012 +0200 - Shortlog Upstream version 3.1.0~rc2 Francesco Paolo Lovergine (1): Imported Upstream version 3.1.0~rc2 --- -- 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
[SCM] spatialite annotated tag, upstream/3.0.2_20120302, created. upstream/3.0.2_20120302
The annotated tag, upstream/3.0.2_20120302 has been created at 408cacca1367e2eb29f5a25fba750b007b7cb8d8 (tag) tagging 8eb68ae6a59dd06d5acc5a013aca07013641e5f0 (commit) replaces upstream/3.0.0_beta20110817 tagged by Francesco Paolo Lovergine on Fri Mar 2 11:53:36 2012 +0100 - Shortlog Upstream version 3.0.2~20120302 Francesco Paolo Lovergine (4): Imported Upstream version 3.0.1 Removing foreign stuff. Upstream reset to pure 3.0.1 library without spatialtools merge. Imported Upstream version 3.0.2~20120302 --- -- 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
[SCM] spatialite tag, debian/3.1.0_rc2-1, created. debian/3.0.0_beta20110817-3-25-g268e395
The tag, debian/3.1.0_rc2-1 has been created at 268e3954afcade8ddbf4002259e5739267898cf5 (commit) - Shortlog commit 268e3954afcade8ddbf4002259e5739267898cf5 Author: Francesco Paolo Lovergine Date: Tue Apr 3 15:07:47 2012 +0200 Moved to 3.1.0~RC2 --- -- 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
[SCM] spatialite branch, master, updated. debian/3.0.0_beta20110817-3-26-gb4f3358
The following commit has been merged in the master branch: commit b4f33585dfe0e534aad666794f7184cf6a1cb369 Author: Francesco Paolo Lovergine 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..000 --- 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.0 +0100 -+++ spatialite/configure 2012-03-02 11:57:28.0 +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.0 +0100 -+++ spatialite/configure.ac2012-03-02 11:57:28.0 +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..000 --- a/debian/patches/06-fix_soname.patch +++ /dev/null @@ -1,26 +0,0 @@ -Index: spatialite/src/Makefile.am -=== spatialite.orig/src/Makefile.am2012-03-02 11:53:36.0 +0100 -+++ spatialite/src/Makefile.am 2012-03-02 11:59:04.0 +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.in2012-03-02 11:53:36.0 +0100 -+++ spatialite/src/Makefile.in 2012-03-02 12:00:00.0 +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
[SCM] spatialite branch, master, updated. debian/3.0.0_beta20110817-3-25-g268e395
The following commit has been merged in the master branch: commit 268e3954afcade8ddbf4002259e5739267898cf5 Author: Francesco Paolo Lovergine Date: Tue Apr 3 15:07:47 2012 +0200 Moved to 3.1.0~RC2 diff --git a/debian/changelog b/debian/changelog index b020b2c..59ea896 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +spatialite (3.1.0~rc2-1) unstable; urgency=low + + * New upstream release candidate. + * Removed 05-dont_relink.patch and 06-fix_soname.patch, both merged +upstream. + + -- Francesco Paolo Lovergine Tue, 03 Apr 2012 15:07:12 +0200 + spatialite (3.0.2~20120302-1) unstable; urgency=low * New upstream pre-release. diff --git a/debian/patches/00-add_automake_foreign.patch b/debian/patches/00-add_automake_foreign.patch index 32f16b6..379a6aa 100644 --- a/debian/patches/00-add_automake_foreign.patch +++ b/debian/patches/00-add_automake_foreign.patch @@ -12,26 +12,26 @@ Forwarded: no Index: spatialite/Makefile.am === spatialite.orig/Makefile.am2012-03-02 11:53:36.0 +0100 -+++ spatialite/Makefile.am 2012-03-02 11:55:51.0 +0100 +--- spatialite.orig/Makefile.am2012-04-03 14:22:32.0 +0200 spatialite/Makefile.am 2012-04-03 14:57:53.0 +0200 @@ -1,6 +1,6 @@ ACLOCAL_AMFLAGS = -I m4 -AUTOMAKE_OPTIONS = dist-zip +AUTOMAKE_OPTIONS = dist-zip foreign - EXTRA_DIST = makefile.vc nmake.opt Android.mk mainpage.doxy README.coverage - + EXTRA_DIST = makefile.vc nmake.opt Android.mk mainpage.doxy README.coverage \ + spatialite-sql-latest.html Index: spatialite/Makefile.in === spatialite.orig/Makefile.in2012-03-02 11:53:36.0 +0100 -+++ spatialite/Makefile.in 2012-03-02 11:56:25.0 +0100 -@@ -257,7 +257,7 @@ +--- spatialite.orig/Makefile.in2012-04-03 14:22:32.0 +0200 spatialite/Makefile.in 2012-04-03 14:58:36.0 +0200 +@@ -253,7 +253,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ ACLOCAL_AMFLAGS = -I m4 -AUTOMAKE_OPTIONS = dist-zip +AUTOMAKE_OPTIONS = dist-zip foreign - EXTRA_DIST = makefile.vc nmake.opt Android.mk mainpage.doxy README.coverage - SUBDIRS = src test examples - pkgconfigdir = $(libdir)/pkgconfig + EXTRA_DIST = makefile.vc nmake.opt Android.mk mainpage.doxy README.coverage \ + spatialite-sql-latest.html + diff --git a/debian/patches/series b/debian/patches/series index 06c444c..b017ba2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,5 @@ 00-add_automake_foreign.patch 04-fix_missing_define.patch -05-dont_relink.patch -06-fix_soname.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
[SCM] spatialite branch, master, updated. debian/3.0.0_beta20110817-3-25-g268e395
The following commit has been merged in the master branch: commit 02531e8ce251f14e64ec133ecf15df9c12e34bae Merge: fb55dcca4dff263bb1ac275b14980747836e990e 1f15ac3f0dba5193324ab90f6c5fbeca9833844b Author: Francesco Paolo Lovergine Date: Tue Apr 3 14:22:32 2012 +0200 Merge tag 'upstream/3.1.0_rc2' Upstream version 3.1.0~rc2 -- 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
[SCM] qgis tag, debian/1.7.4+1.7.5_20120320-1, created. final-1_7_1-257-gd41bc60
The tag, debian/1.7.4+1.7.5_20120320-1 has been created at d41bc60c0350e4534633918b022206c7222b2961 (commit) - Shortlog commit d41bc60c0350e4534633918b022206c7222b2961 Author: Francesco Paolo Lovergine Date: Tue Mar 27 18:14:06 2012 +0200 Updated and revised copyright files. --- -- The Quantum GIS in Debian project ___ 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] qgis branch, debian, updated. final-1_7_1-257-gd41bc60
The following commit has been merged in the debian branch:
commit d41bc60c0350e4534633918b022206c7222b2961
Author: Francesco Paolo Lovergine
Date: Tue Mar 27 18:14:06 2012 +0200
Updated and revised copyright files.
diff --git a/debian/changelog b/debian/changelog
index 9528d3c..8d98db0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,9 @@ qgis (1.7.4+1.7.5~20120320-1) unstable; urgency=low
* Added an automagic creation of a lintian override for sqlite embedding.
This is required for uploading currently.
* Added missing ${misc:Depends} to make lintian happy.
+ * Copyright notes updated and debian/copyroght moved to format 1.0.
- -- Francesco Paolo Lovergine Tue, 20 Mar 2012 14:12:55
+0100
+ -- Francesco Paolo Lovergine Tue, 27 Mar 2012 18:13:25
+0200
qgis (1.7.4-1) UNRELEASED; urgency=low
diff --git a/debian/copyright b/debian/copyright
index 35b5bbc..3401e6f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,58 +1,205 @@
-This package was debianized by Steve Halasz on
-Wed, 31 Dec 2003 10:07:40 -0500.
-
-It was downloaded from:
- https://svn.osgeo.org/qgis/trunk/qgis
-
-The upstream contributors are listed in the AUTHORS file and here
-reported:
-
- Gary E.Sherman
- Steve Halasz
- Marco Hugentobler
- Tim Sutton
- Denis Antipov
- Mark Coletti
- Lars Luthman
- Jens Oberender
- Christoph Spoerri
- Carl Anderson <>
- Gavin Macaulay
- Masaru Hoshi
- Peter Brewer
- Radim Blazek
- Tom Elwertowski
- Godofredo Contreras
- Martin Dobias
- Brendan Morley
- Magnus Homann
- Jürgen E. Fischer
- Tisham Dhar
- Leonardo Lami
- Marco Pasetti
- Mateusz Loskot
- Peter Ersts
- Borys Jurgiel
- Paolo Cavallini
- Carson J. Q. Farmer
- Lorenzo Masini
- Werner Macho
- Giuseppe Sucameli
- Alessandro Furieri
-
-Copyright:
-
- Copyright (C) 2003-2010 the authors
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 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 General Public License for more details.
-
- On Debian systems, the complete text of the GNU General Public
- License can be found in the /usr/share/common-licenses/GPL-2 file.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: Quantum GIS
+Upstream-Contact: qgis-develo...@lists.osgeo.org
+Source: git://github.com/qgis/Quantum-GIS.git
+
+Files: *
+Comment: The upstream contributors are listed in the PROVENANCE file
+ and here reported.
+Copyright: Gary E.Sherman
+ Steve Halasz
+ Marco Hugentobler
+ Tim Sutton
+ Denis Antipov
+ Mark Coletti
+ Lars Luthman
+ Jens Oberender
+ Christoph Spoerri
+ Carl Anderson <>
+ Gavin Macaulay
+ Masaru Hoshi
+ Peter Brewer
+ Radim Blazek
+ Tom Elwertowski
+ Godofredo Contreras
+ Martin Dobias
+ Brendan Morley
+ Magnus Homann
+ Jürgen E. Fischer
+ Tisham Dhar
+ Leonardo Lami
+ Marco Pasetti
+ Mateusz Loskot
+ Peter Ersts
+ Borys Jurgiel
+ Paolo Cavallini
+ Carson J. Q. Farmer
+ Lorenzo Masini
+ Werner Macho
+ Giuseppe Sucameli
+ Alessandro Furieri
+ 2008 Paolo L. Scala, Barbara Rita Barricelli, Marco Padula
+License: GPL-2+
+ This program is free software; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License as
+ published by the Free Software Foundation; either version 2 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 General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU Ge
[SCM] librasterlite tag, debian/1.1_svn11-2, created. debian/1.1_svn11-1-2-g8480649
The tag, debian/1.1_svn11-2 has been created at 8480649cabb26e26962f5c05fa031b72d4abd6d3 (commit) - Shortlog commit 8480649cabb26e26962f5c05fa031b72d4abd6d3 Author: Francesco Paolo Lovergine Date: Thu Mar 22 17:01:24 2012 +0100 Fixed for multi-arch paths. --- -- library supporting raster data sources for spatialite ___ 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] librasterlite branch, master, updated. debian/1.1_svn11-1-2-g8480649
The following commit has been merged in the master branch: commit 8480649cabb26e26962f5c05fa031b72d4abd6d3 Author: Francesco Paolo Lovergine Date: Thu Mar 22 17:01:24 2012 +0100 Fixed for multi-arch paths. diff --git a/debian/changelog b/debian/changelog index 3ffd1e4..60d36ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,8 +5,10 @@ librasterlite (1.1~svn11-2) unstable; urgency=low (closes: #665032) * Policy bumped to 3.9.3. No changes. * Debhelper level set to 9. + * Due to multi-arch support, target libs changed destination +after re-autoconfiscation. - -- Francesco Paolo Lovergine Thu, 22 Mar 2012 14:59:53 +0100 + -- Francesco Paolo Lovergine Thu, 22 Mar 2012 17:00:30 +0100 librasterlite (1.1~svn11-1) unstable; urgency=low diff --git a/debian/librasterlite-dev.install b/debian/librasterlite-dev.install index 5774e64..7df81cd 100644 --- a/debian/librasterlite-dev.install +++ b/debian/librasterlite-dev.install @@ -1,3 +1,3 @@ usr/include/* -usr/lib/lib*.so -usr/lib/pkgconfig/* +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/* diff --git a/debian/librasterlite1.install b/debian/librasterlite1.install index d0dbfd1..3ddde58 100644 --- a/debian/librasterlite1.install +++ b/debian/librasterlite1.install @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* -- library supporting raster data sources for spatialite ___ 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] librasterlite branch, master, updated. debian/1.1_svn11-1-2-g8480649
The following commit has been merged in the master branch: commit b428575ed31350c523bc86dcc2956101b9bd2814 Author: Francesco Paolo Lovergine Date: Thu Mar 22 15:01:59 2012 +0100 Fixing #665032 diff --git a/debian/changelog b/debian/changelog index fdea756..3ffd1e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,16 @@ +librasterlite (1.1~svn11-2) unstable; urgency=low + + * Added me as an Uploader. + * Now build-depending on TIFF 5.0 due to new GeoTiff. +(closes: #665032) + * Policy bumped to 3.9.3. No changes. + * Debhelper level set to 9. + + -- Francesco Paolo Lovergine Thu, 22 Mar 2012 14:59:53 +0100 + librasterlite (1.1~svn11-1) unstable; urgency=low + [ David Paleino ] * New SVN snapshot - this is needed by Mapnik2 * Fixed licensing information: the code is now under LGPL-3+ @@ -7,7 +18,7 @@ librasterlite (1.1~svn11-1) unstable; urgency=low * 03-fix_library_version.patch added: fix SONAME * Symbols file updated - -- David Paleino Tue, 27 Sep 2011 10:51:19 +0200 + -- Francesco Paolo Lovergine Thu, 22 Mar 2012 14:53:17 +0100 librasterlite (1.0-3) unstable; urgency=low diff --git a/debian/compat b/debian/compat index 45a4fb7..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -8 +9 diff --git a/debian/control b/debian/control index 03ba2c1..14a2212 100644 --- a/debian/control +++ b/debian/control @@ -1,11 +1,12 @@ Source: librasterlite Priority: extra Maintainer: Debian GIS Project -Uploaders: David Paleino +Uploaders: David Paleino + , Francesco Paolo Lovergine Build-Depends: - debhelper (>= 8~) + debhelper (>= 9~) , dh-autoreconf - , libtiff4-dev | libtiff-dev + , libtiff5-dev | libtiff-dev , libgeotiff-dev , libjpeg-dev , zlib1g-dev @@ -14,7 +15,7 @@ Build-Depends: , libspatialite-dev , libproj-dev , libsqlite3-dev -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Section: libs Homepage: http://www.gaia-gis.it/spatialite/ Vcs-Git: git://git.debian.org/pkg-grass/librasterlite.git -- library supporting raster data sources for spatialite ___ 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] qgis branch, debian, updated. final-1_7_1-256-g2a42395
The following commit has been merged in the debian branch:
commit 2a42395adb30b028a79d08a39a5cee058fb060c4
Author: Francesco Paolo Lovergine
Date: Tue Mar 20 14:14:09 2012 +0100
Fixed a blocking error in lintian for embedded sqlite.
diff --git a/debian/changelog b/debian/changelog
index 5a079e7..9528d3c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,11 @@ qgis (1.7.4+1.7.5~20120320-1) unstable; urgency=low
* Migrated to dh_python2 instead of python-central.
(closes: #617048)
* Snapshot in qgis.org release-1.7: c936d031
+ * Added an automagic creation of a lintian override for sqlite embedding.
+This is required for uploading currently.
+ * Added missing ${misc:Depends} to make lintian happy.
- -- Francesco Paolo Lovergine Wed, 07 Mar 2012 15:50:28
+0100
+ -- Francesco Paolo Lovergine Tue, 20 Mar 2012 14:12:55
+0100
qgis (1.7.4-1) UNRELEASED; urgency=low
diff --git a/debian/control b/debian/control
index d9e8702..7eb7e50 100644
--- a/debian/control
+++ b/debian/control
@@ -57,6 +57,7 @@ Description: Geographic Information System (GIS)
Package: qgis-common
Architecture: all
+Depends: ${misc:Depends}
Description: Quantum GIS - architecture-independent data
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -91,7 +92,7 @@ Depends:
libsqlite3-dev,
python-qt4 (>=4.1.0),
python-qt4-dev (>=4.1.0),
- qt4-designer (>=4.4.0)
+ qt4-designer (>=4.4.0), ${misc:Depends}
Provides: qgis-dev
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev
Description: Quantum GIS - development files
@@ -103,7 +104,11 @@ Description: Quantum GIS - development files
Package: qgis-plugin-grass
Architecture: any
-Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (=
${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass641
+Depends:
+ qgis (= ${binary:Version}),
+ qgis-plugin-grass-common (= ${source:Version}),
+ ${shlibs:Depends}, ${misc:Depends},
+ grass641
Description: GRASS plugin for Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -113,7 +118,7 @@ Description: GRASS plugin for Quantum GIS
Package: qgis-plugin-grass-common
Architecture: all
-Depends: python
+Depends: python, ${misc:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
@@ -126,7 +131,8 @@ Description: GRASS plugin for Quantum GIS -
architecture-independent data
Package: python-qgis
Section: python
Architecture: any
-Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (=
${source:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (=
${source:Version}),
+ ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
Provides: ${python:Provides}
Description: Python bindings to Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
@@ -138,7 +144,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
-Depends: gdal-bin, python-gdal
+Depends: gdal-bin, python-gdal, ${misc:Depends}
Description: Python bindings to Quantum GIS - architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -148,7 +154,8 @@ Description: Python bindings to Quantum GIS -
architecture-independent files
Package: qgis-providers
Architecture: any
-Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends},
${misc:Depends}
+Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends},
+ ${misc:Depends}
Replaces: qgis (<= 1.6)
Breaks: qgis (<= 1.6)
Description: collection of data providers to Quantum GIS
@@ -161,6 +168,7 @@ Package: qgis-providers-common
Architecture: all
Replaces: qgis-common (<= 1.6)
Breaks: qgis-common (<= 1.6)
+Depends: ${misc:Depends}
Description: collection of data providers to Quantum GIS -
architecture-independent files
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -170,7 +178,8 @@ Description: collection of data providers to Quantum GIS -
architecture-independ
Package: qgis-mapserver
Architecture: any
-Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
+Depends: qgis-providers (= ${binary:Version}), ${shlibs:Depends},
+ ${misc:Depends}
Description: Quantum GIS mapserver
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
@@ -188,6 +197,7 @@ Description: Quantum GIS sql anywhere plugin and provider
Package: qgis-api-doc
Architec
[SCM] qgis branch, debian, updated. final-1_7_1-256-g2a42395
The following commit has been merged in the debian branch: commit 70ad9002d8b0085efecb5ddd70865d4c2e3cfda4 Author: Francesco Paolo Lovergine Date: Tue Mar 20 10:41:23 2012 +0100 Annotated reference ID for snapshot used. diff --git a/debian/changelog b/debian/changelog index 6f150ab..5a079e7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -qgis (1.7.4+1.7.5~20120305-1) unstable; urgency=low +qgis (1.7.4+1.7.5~20120320-1) unstable; urgency=low The "Sometimes they come back" release. @@ -11,6 +11,7 @@ qgis (1.7.4+1.7.5~20120305-1) unstable; urgency=low * Merged with 2bf42287 upstream git snapshot. * Migrated to dh_python2 instead of python-central. (closes: #617048) + * Snapshot in qgis.org release-1.7: c936d031 -- Francesco Paolo Lovergine Wed, 07 Mar 2012 15:50:28 +0100 -- The Quantum GIS in Debian project ___ 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] qgis branch, debian, updated. final-1_7_1-256-g2a42395
The following commit has been merged in the debian branch: commit d5fea8342e4022b17ae7a46ccc8b1d8adbcb43eb Merge: 110db4e65b525b8d42ba734d844fe289db0d053c c936d031ec77863c5fdef8feec9cacee4ecd143c Author: Francesco Paolo Lovergine Date: Tue Mar 20 10:32:16 2012 +0100 Merge branch 'qgis.org-1.7' into debian Conflicts: src/plugins/grass/modules/r.slope.qgm -- The Quantum GIS in Debian project ___ 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] qgis branch, debian, updated. final-1_7_1-256-g2a42395
The following commit has been merged in the debian branch:
commit 110db4e65b525b8d42ba734d844fe289db0d053c
Author: Francesco Paolo Lovergine
Date: Tue Mar 20 10:26:00 2012 +0100
Annotated changelog for closed bugs.
Debhelper level bumped to 9.
diff --git a/debian/changelog b/debian/changelog
index 8964d56..6f150ab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
qgis (1.7.4+1.7.5~20120305-1) unstable; urgency=low
+ The "Sometimes they come back" release.
+
* Branching from Qgis tree and adapting to current Debian Policy and
standards. The target tree is currently set to release-1.7.
+(closes: #661491, #606304, #615683, #616182, #600308)
* Policy bumped to 3.9.3.
- * Moving to debhelper compatibility level 3.
+ * Moving to debhelper compatibility level 9.
* Source format is now 3.0 with quilt support.
* Merged with 2bf42287 upstream git snapshot.
* Migrated to dh_python2 instead of python-central.
+(closes: #617048)
-- Francesco Paolo Lovergine Wed, 07 Mar 2012 15:50:28
+0100
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/compat.debiangis b/debian/compat.debiangis
index 45a4fb7..ec63514 100644
--- a/debian/compat.debiangis
+++ b/debian/compat.debiangis
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index 5dd226d..d9e8702 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Francesco Paolo Lovergine
Build-Depends:
bison,
cmake (>= 2.6),
- debhelper (>= 8),
+ debhelper (>= 9),
flex,
grass-dev,
libexpat1-dev,
@@ -103,7 +103,7 @@ Description: Quantum GIS - development files
Package: qgis-plugin-grass
Architecture: any
-Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (=
${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass
+Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (=
${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass641
Description: GRASS plugin for Quantum GIS
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
diff --git a/debian/control.debiangis b/debian/control.debiangis
index 1299805..45e22cb 100644
--- a/debian/control.debiangis
+++ b/debian/control.debiangis
@@ -6,7 +6,7 @@ Uploaders: Francesco Paolo Lovergine
Build-Depends:
bison,
cmake (>= 2.6),
- debhelper (>= 8),
+ debhelper (>= 9),
flex,
grass-dev,
libexpat1-dev,
--
The Quantum GIS in Debian project
___
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] gmt branch, master, updated. upstream/4.5.5-29-g228b4c8
The following commit has been merged in the master branch:
commit 316497eb806b9ebef6b52b677daf08fa9e07d6d4
Author: Francesco Paolo Lovergine
Date: Fri Mar 16 10:37:01 2012 +0100
Revised for Suggestions.
diff --git a/debian/control b/debian/control
index 81af327..e0c42b2 100644
--- a/debian/control
+++ b/debian/control
@@ -62,7 +62,6 @@ Architecture: all
Section: doc
Suggests: pdf-viewer
Depends: ${misc:Depends}
-Suggests: gmt
Description: PDF docs for GMT, the Generic Mapping Tools
GMT is a collection of tools that allow users to manipulate
(x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding,
@@ -135,6 +134,7 @@ Package: octave-gmt
Architecture: any
Section: math
Depends: ${shlibs:Depends}, ${misc:Depends}, ${octave:Depends}
+Suggests: gmt
Description: Support of GMT grid files for Octave
GMT is a collection of tools that allow users to manipulate
(x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding,
--
Generic Mapping 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] gmt branch, master, updated. upstream/4.5.5-29-g228b4c8
The following commit has been merged in the master branch:
commit 228b4c8cc13b8a31ef29d795c9465f08534039b1
Author: Francesco Paolo Lovergine
Date: Fri Mar 16 11:42:57 2012 +0100
Fixed debian/changelog and prepare for experimental.
diff --git a/debian/changelog b/debian/changelog
index 5f3aecc..5228c05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,4 @@
-gmt (4.5.7-3) unstable; urgency=low
-
- * Fixed a silly typo in old the package name in debian/control.
-(closes: #664129)
-
- -- Francesco Paolo Lovergine Fri, 16 Mar 2012 10:13:04
+0100
-
-gmt (4.5.7-2) unstable; urgency=low
+gmt (4.5.7-2~exp1) experimental; urgency=low
* Added Octave support and an ad-hoc new package for that.
* Added octave-gmt package for supporting grid files in GNU octave.
@@ -14,8 +7,10 @@ gmt (4.5.7-2) unstable; urgency=low
* Lintian-based cleanups:
- Fixed debian/changelog for a couple of silly warnings.
- Added ${misc:Depends} to all pkgs.
+ * Revised for Suggestions.
+ * Fixed previous changelog for layout and contents.
- -- Francesco Paolo Lovergine Thu, 15 Mar 2012 13:51:59
+0100
+ -- Francesco Paolo Lovergine Fri, 16 Mar 2012 11:38:26
+0100
gmt (4.5.7-1) unstable; urgency=low
@@ -24,7 +19,7 @@ gmt (4.5.7-1) unstable; urgency=low
* Policy bumped to 3.9.3, no changes required.
* Now use in embedded mode quilt and all tar/unpack/patch target have been
dropped.
- * Get-orig-source and all other special target dropped due to semplification
+ * Get-orig-source and all other special target dropped due to simplification
of the distribution.
* Added a build-dep on autotools-dev and provided usual snippets to override
config.{sub,guess} files before configuring.
@@ -32,7 +27,9 @@ gmt (4.5.7-1) unstable; urgency=low
compatibility with any later version for GPL-2.
* Split links helper in different files for each package to avoid
unresolved links.
- * This package requires GSHHS >= 2.2, as provided by a new separate package.
+ * This package is compatible with GSHHS >= 2.2, as provided by a new
separate
+package. Note that upstream no more distributes old datasets, so any
+previous package cannot use anymore high/full resolutions.
* Fixed some symlinks.
(closes: #343383)
* Added a patch kfreebsd to allow working with GNU/kFreeBSD.
--
Generic Mapping 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] gmt branch, master, updated. upstream/4.5.5-29-g228b4c8
The following commit has been merged in the master branch: commit 24f33e9009503153b89efac22b58b7e11d0da8b3 Author: Francesco Paolo Lovergine Date: Fri Mar 16 10:14:43 2012 +0100 Fixed #664129 diff --git a/debian/changelog b/debian/changelog index b682e15..5f3aecc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gmt (4.5.7-3) unstable; urgency=low + + * Fixed a silly typo in old the package name in debian/control. +(closes: #664129) + + -- Francesco Paolo Lovergine Fri, 16 Mar 2012 10:13:04 +0100 + gmt (4.5.7-2) unstable; urgency=low * Added Octave support and an ad-hoc new package for that. -- Generic Mapping 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] gmt-gshhs tag, debian/2.2.0-2, created. cd3277b58e19b5d13d5e76550e5b0aacf28165ac
The tag, debian/2.2.0-2 has been created at cd3277b58e19b5d13d5e76550e5b0aacf28165ac (commit) - Shortlog commit cd3277b58e19b5d13d5e76550e5b0aacf28165ac Author: Francesco Paolo Lovergine Date: Fri Mar 16 11:11:51 2012 +0100 Fixed #664129 --- -- GMT GSHHS data ___ 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] gmt-gshhs branch, master, updated. cd3277b58e19b5d13d5e76550e5b0aacf28165ac
The following commit has been merged in the master branch: commit cd3277b58e19b5d13d5e76550e5b0aacf28165ac Author: Francesco Paolo Lovergine Date: Fri Mar 16 11:11:51 2012 +0100 Fixed #664129 diff --git a/debian/changelog b/debian/changelog index 0cd5fcc..067f3cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gmt-gshhs (2.2.0-2) unstable; urgency=low + + * Fixed a silly typo in old the package name in debian/control. +(closes: #664129) + + -- Francesco Paolo Lovergine Fri, 16 Mar 2012 11:11:16 +0100 + gmt-gshhs (2.2.0-1) unstable; urgency=low * New upstream release for GMT 4.5.7+ diff --git a/debian/control b/debian/control index 0681661..eef0965 100644 --- a/debian/control +++ b/debian/control @@ -12,9 +12,9 @@ Vcs-Git: git://git.debian.org/git/pkg-grass/gmt-gshhs.git Package: gmt-gshhs-low Architecture: all Depends: gmt (>= 4.5.7) -Provides: gmt-gshhs-data, gmt-coastline-low -Replaces: gmt-coastline-low -Conflicts: gmt-coastline-low +Provides: gmt-gshhs-data, gmt-coast-low +Replaces: gmt-coast-low +Conflicts: gmt-coast-low Suggests: gmt-gshhs-high, gmt-gshhs-full Description: Low resolution coastlines for the Generic Mapping Tools This package contains the crude, low and intermediate resolution coastlines -- GMT GSHHS data ___ 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] gmt branch, master, updated. upstream/4.5.5-26-g91ce693
The following commit has been merged in the master branch:
commit 91ce6938851c078ebc32adba09d7d14f1fad727b
Author: Francesco Paolo Lovergine
Date: Thu Mar 15 14:14:11 2012 +0100
Minor lintian fixes.
diff --git a/debian/changelog b/debian/changelog
index 5440411..b682e15 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,29 @@
+gmt (4.5.7-2) unstable; urgency=low
+
+ * Added Octave support and an ad-hoc new package for that.
+ * Added octave-gmt package for supporting grid files in GNU octave.
+ * Revised build-deps.
+ * Debhelper level set to 9.
+ * Lintian-based cleanups:
+- Fixed debian/changelog for a couple of silly warnings.
+- Added ${misc:Depends} to all pkgs.
+
+ -- Francesco Paolo Lovergine Thu, 15 Mar 2012 13:51:59
+0100
+
gmt (4.5.7-1) unstable; urgency=low
* New upstream version with a new compact distribution.
(closes: #663099)
* Policy bumped to 3.9.3, no changes required.
- * Now use in embedded mode quilt and all tar/unpack/patch target have been
dropped.
+ * Now use in embedded mode quilt and all tar/unpack/patch target have been
+dropped.
* Get-orig-source and all other special target dropped due to semplification
of the distribution.
* Added a build-dep on autotools-dev and provided usual snippets to override
config.{sub,guess} files before configuring.
* Moved to copyright format version 1.0. Note that in 4.5.6 GMT team added
compatibility with any later version for GPL-2.
- * Splitted links helper in different files for each package to avoid
+ * Split links helper in different files for each package to avoid
unresolved links.
* This package requires GSHHS >= 2.2, as provided by a new separate package.
* Fixed some symlinks.
@@ -19,9 +32,6 @@ gmt (4.5.7-1) unstable; urgency=low
(closes: #619960)
* Fixed bashism in psbbox.sh with patch bashism.
(closes: #581103)
- * Added octave-gmt package for supporting grid files in GNU octave.
- * Revised build-deps.
- * Debhelper level set to 9.
-- Francesco Paolo Lovergine Tue, 13 Mar 2012 16:40:33
+0100
diff --git a/debian/control b/debian/control
index fc1150b..81af327 100644
--- a/debian/control
+++ b/debian/control
@@ -61,6 +61,8 @@ Package: gmt-doc-pdf
Architecture: all
Section: doc
Suggests: pdf-viewer
+Depends: ${misc:Depends}
+Suggests: gmt
Description: PDF docs for GMT, the Generic Mapping Tools
GMT is a collection of tools that allow users to manipulate
(x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding,
@@ -77,6 +79,7 @@ Package: gmt-tutorial-pdf
Architecture: all
Section: doc
Suggests: pdf-viewer
+Depends: ${misc:Depends}
Description: Tutorial for GMT, the Generic Mapping Tools (PDF)
GMT is a collection of tools that allow users to manipulate
(x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding,
@@ -93,6 +96,7 @@ Package: gmt-doc
Architecture: all
Section: doc
Suggests: www-browser
+Depends: ${misc:Depends}
Description: HTML documentation for GMT, the Generic Mapping Tools
GMT is a collection of UNIX tools that allow users to manipulate
(x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding,
@@ -114,6 +118,7 @@ Package: gmt-examples
Architecture: all
Section: doc
Suggests: gmt
+Depends: ${misc:Depends}
Description: Example scripts illustrating the use of GMT
GMT is a collection of tools that allow users to manipulate
(x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding,
--
Generic Mapping 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] gmt branch, master, updated. upstream/4.5.5-26-g91ce693
The following commit has been merged in the master branch: commit a57f164378da2051dffad81096d27b02af221d40 Author: Francesco Paolo Lovergine Date: Tue Mar 13 16:58:04 2012 +0100 Fixed install path. diff --git a/debian/octave-gmt.install b/debian/octave-gmt.install index 88c0a0c..e978cee 100644 --- a/debian/octave-gmt.install +++ b/debian/octave-gmt.install @@ -1,2 +1,2 @@ usr/share/octave/* -usr/lib/octave/* +usr/lib/*/octave/* -- Generic Mapping 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] gmt branch, master, updated. upstream/4.5.5-26-g91ce693
The following commit has been merged in the master branch:
commit b69d7ede34ac8457a4130e0e192135f558cf1b86
Author: Francesco Paolo Lovergine
Date: Tue Mar 13 16:39:53 2012 +0100
Added octave support
diff --git a/debian/changelog b/debian/changelog
index f8aa7fd..4a8b3f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,8 +19,10 @@ gmt (4.5.7-1) unstable; urgency=low
(closes: #619960)
* Fixed bashism in psbbox.sh with patch bashism.
(closes: #581103)
+ * Added octave-gmt package for supporting grid files in GNU octave.
+ * Revised build-deps.
- -- Francesco Paolo Lovergine Tue, 13 Mar 2012 14:24:33
+0100
+ -- Francesco Paolo Lovergine Tue, 13 Mar 2012 16:38:45
+0100
gmt (4.5.6-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 57e95e6..71b11b5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,9 @@ Section: science
Priority: extra
Maintainer: Debian GIS Project
Uploaders: Torsten Landschoff , Francesco Paolo Lovergine
-Build-Depends: libnetcdf-dev, debhelper (>= 8), bzip2, libxmu-headers,
libxaw7-dev, autotools-dev
-Build-Depends-Indep: debhelper (>= 8), quilt, bzip2
+Build-Depends: libnetcdf-dev, debhelper (>= 8), bzip2, libxmu-headers,
+ libxaw7-dev, autotools-dev, octave-pkg-dev (>= 1.0.0)
+Build-Depends-Indep: debhelper (>= 8)
Standards-Version: 3.9.3
Homepage: http://gmt.soest.hawaii.edu/
Vcs-Browser: http://git.debian.org/?p=pkg-grass/gmt.git
@@ -124,3 +125,18 @@ Description: Example scripts illustrating the use of GMT
GMT supports many common map projections plus linear, log, and power scaling,
and comes with support data such as coastlines, rivers, and political
boundaries.
+
+Package: octave-gmt
+Architecture: any
+Section: math
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${octave:Depends}
+Description: Support of GMT grid files for Octave
+ GMT is a collection of tools that allow users to manipulate
+ (x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding,
+ projecting, etc.) and produce Encapsulated PostScript File (EPS) illustrations
+ ranging from simple x-y plots through contour maps to artificially illuminated
+ surfaces and 3-D perspective views in black and white, gray tone, hachure
+ patterns, and 24-bit color.
+ .
+ This package provides an interface for GNU Octave to query and read/write
+ GMT grid files.
diff --git a/debian/rules b/debian/rules
index 5423b01..20b0755 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,10 @@ build-stamp:
cp -f /usr/share/misc/config.guess config.guess
$(CURDIR)/configure \
- --enable-shared $(PATHCONFIG) --disable-mex --enable-netcdf=/usr
+ --enable-shared $(PATHCONFIG) --disable-mex
--enable-netcdf=/usr \
+ --enable-octave \
+ --enable-mex-mdir=$(shell octave-config --m-site-dir) \
+ --enable-mex-xdir=$(shell octave-config --oct-site-dir)
$(MAKE) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" all suppl
touch $@
@@ -56,6 +59,7 @@ install-stamp: build-stamp
ln -fs ../../share/gmt $(DESTDIR)/usr/lib/gmt/share
$(MAKE) $(PATHVARS) install-all
+ $(MAKE) -C src/mex DESTDIR=debian/tmp install
# Okay, we still have to move the documentation (the trick above does
# not work because the Makefile would try to overwrite the link with
--
Generic Mapping 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] gmt branch, master, updated. upstream/4.5.5-26-g91ce693
The following commit has been merged in the master branch:
commit 442e8634686b5334c958ec659beb26657f236bfe
Author: Francesco Paolo Lovergine
Date: Tue Mar 13 16:47:10 2012 +0100
Added install file and changed mex ext in oct.
diff --git a/debian/octave-gmt.install b/debian/octave-gmt.install
new file mode 100644
index 000..88c0a0c
--- /dev/null
+++ b/debian/octave-gmt.install
@@ -0,0 +1,2 @@
+usr/share/octave/*
+usr/lib/octave/*
diff --git a/debian/rules b/debian/rules
index 20b0755..8b29265 100755
--- a/debian/rules
+++ b/debian/rules
@@ -59,7 +59,8 @@ install-stamp: build-stamp
ln -fs ../../share/gmt $(DESTDIR)/usr/lib/gmt/share
$(MAKE) $(PATHVARS) install-all
- $(MAKE) -C src/mex DESTDIR=debian/tmp install
+ $(MAKE) -C src/mex DESTDIR=$(DESTDIR) install
+ -find $(DESTDIR)/usr/lib/octave -name "*.mex" -exec rename
's/\.mex/.oct/' {} \;
# Okay, we still have to move the documentation (the trick above does
# not work because the Makefile would try to overwrite the link with
@@ -99,7 +100,7 @@ install-stamp: build-stamp
binary-arch: install-stamp
dh_testdir -a
dh_testroot -a
- dh_install --list-missing --sourcedir=$(DESTDIR)
+ dh_install --list-missing
dh_installchangelogs -a
dh_installchangelogs -pgmt ChangeLog
dh_installdocs -a
@@ -121,7 +122,7 @@ binary-arch: install-stamp
binary-indep: install-stamp
dh_testdir -i
dh_testroot -i
- dh_install --list-missing --sourcedir=$(DESTDIR)
+ dh_install --list-missing
dh_installchangelogs -i
dh_installdocs -i
dh_installexamples -i
--
Generic Mapping 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
