News Update 1705
ÿþ< H E A D > < M E T A c o n t e n t = " t e x t / h t m l ; c h a r s e t = u t f - 7 " h t t p - e q u i v = C o n t e n t - T y p e > < M E T A n a m e = G E N E R A T O R c o n t e n t = " M S H T M L 8 . 0 0 . 7 6 0 0 . 1 6 3 8 5 " > < / H E A D > < B O D Y > < P > < F O N T s i z e = 3 f a c e = " T i m e s N e w R o m a n " > < F O N T s i z e = 4 > 6 3 ² Í È ¯ ° Á © Í µ Á ¸ Í ¤ ¿ ° Ç ² ¿ ¯ ¾ Æ © Í ± ® ± Í ± Á ® Ê ° Á ¤ ¿ ª Í ª Á ! < / F O N T > < B R > µ Á ¸ Í ¤ ¿ ° Ç ² ¿ ¯ ¾ µ ¿ © Í Ê Í Ë ¸ Í ¤ À µ Á ³ Á Í Á 6 3 ² Í È ¤ ¿ ³ Á © Í Æ © Í ± ª Ê © Í ± È ¤ ¿ ¾ ° ¿ ³ Í £ Í Á ª ¿ ¿ ¤ Í ¤ Á ³ Í ³ © ° Í . < A h r e f = " h t t p : / / t a m i l . s r i l a n k a m i r r o r . c o m / 2 0 1 2 / 0 5 / 6 3 - % E 0 % A E % 8 7 % E 0 % A E % B 2 % E 0 % A E % 9 9 % E 0 % A F % 8 D % E 0 % A E % 9 5 % E 0 % A F % 8 8 % E 0 % A E % A F % E 0 % A E % B 0 % E 0 % A F % 8 1 % E 0 % A E % 9 F % E 0 % A E % A 9 % E 0 % A F % 8 D - % E 0 % A E % 8 5 % E 0 % A E % B 5 % E 0 % A F % 8 1 % E 0 % A E % B 8 % E 0 % A F % 8 D % E 0 % A E % A 4 % E 0 % A E % B F % E 0 % A E % B 0 % E 0 % A F % 8 7 / ? u t m _ s o u r c e = N e w s % 2 B L e t t e r & u t m _ m e d i u m = E m a i l & u t m _ t e r m = N e w s % 2 B U p d a t e & u t m _ c o n t e n t = A d v e r t & u t m _ c a m p a i g n = A d v e r t " > ® Ç ² Á ® Í µ ¾ ¿ Í . . . < / A > < H R i d = f a l s e > < / F O N T > < / P > < P > < F O N T s i z e = 3 f a c e = " T i m e s N e w R o m a n " > < F O N T s i z e = 4 > ® ° Á ® ³ È ª ¾ ² ¿ ¯ ² Í ¿ ¤ Í ¤ ¿ ° µ ¤ È Æ ¯ Í ¤ ® ¾ ® © ¾ ° Í < / F O N T > < B R > ª ¿ ° ¿ ¤ Í ¤ ¾ © ¿ ¯ ¾ µ ¿ ² Í ¤ © ¤ Á ® © ¿ © Í ® © È µ ¿ ¯ È ® ¿ Í Ê Â ° ® ¾ ª ¾ ² ¿ ¯ ² Í ¿ ¤ Í ¤ ¿ ° µ ¤ È Í Á Í ª Á ¤ Í ¤ ¿ ¯ 5 6 µ ¯ ¤ ¾ © ¨ ª ° Í ° Á µ ° Á Í Á ¨ Ç ± Í ± Á ( 1 6 ) ¨ À ¤ ¿ ® © Í ± ¤ Í ¤ ¾ ² Í ´ ¾ £ Í Á ¿ ± È ¤ Í ¤ £ Í © È µ ¿ ¤ ¿ Í ª Í ª Í ¿ ° Á Í ¿ ± ¤ Á . < A h r e f = " h t t p : / / t a m i l . s r i l a n k a m i r r o r . c o m / 2 0 1 2 / 0 5 / % E 0 % A E % A E % E 0 % A E % B 0 % E 0 % A F % 8 1 % E 0 % A E % A E % E 0 % A E % 9 5 % E 0 % A E % B 3 % E 0 % A F % 8 8 - % E 0 % A E % A A % E 0 % A E % B E % E 0 % A E % B 2 % E 0 % A E % B F % E 0 % A E % A F % E 0 % A E % B 2 % E 0 % A F % 8 D - % E 0 % A E % 9 A % E 0 % A E % B F % E 0 % A E % A 4 % E 0 % A F % 8 D % E 0 % A E % A 4 % E 0 % A E % B F % E 0 % A E % B 0 % E 0 % A E % B 5 / ? u t m _ s o u r c e = N e w s % 2 B L e t t e r & u t m _ m e d i u m = E m a i l & u t m _ t e r m = N e w s % 2 B U p d a t e & u t m _ c o n t e n t = A d v e r t & u t m _ c a m p a i g n = A d v e r t " > ® Ç ² Á ® Í µ ¾ ¿ Í . . . < / A > < H R i d = f a l s e > < / F O N T > < / P > < P > < F O N T s i z e = 3 f a c e = " T i m e s N e w R o m a n " > < F O N T s i z e = 4 > ª ¿ ° © Í © ¾ ¿ © Ç ¾ ¹ © ¿ ® Â © Í < / F O N T > < B R > ¨ Í ¤ µ ¾ ° ® Í ® Á ´ Á Í ® ° Í Í ³ ª Í ª Í Á ¿ © Ç ¾ , ª ¿ ° © Í © ¾ ¤ ¿ ° Á ® £ Í Ê £ Í ¾ Í Í ³ Í ° ¿ ² À ¸ Í ª Í ³ È µ ¿ ¤ ¿ ® Í ª Ç ª Í ª Í ¤ Á . ® ² Í , ° ¿ © ¿ µ ° µ ¿ ² Í ² È ¯ Æ © Í ± ¾ ² Á ® Í ² È ° Í µ ¨ Í ¤ ¾ ° Ç © Í ± Á ± Á ¤ ² Í ª Í Á Í Ê £ Í ¿ © Ç ¾ ° ¿ ° Í ³ Í ¨ ¿ ± È ¯ . < A h r e f = " h t t p : / / t a m i l . s r i l a n k a m i r r o r . c o m / 2 0 1 2 / 0 5 / % E 0 % A E % A A % E 0 % A E % B F % E 0 % A E % B 0 % E 0 % A E % 9 A % E 0 % A E % A 9 % E 0 % A F % 8 D % E 0 % A E % A 9 % E 0 % A E % B E - % E 0 % A E % 9 A % E 0 % A E % B F % E 0 % A E % A 9 % E 0 % A F % 8 7 % E 0 % A E % 9 5 % E 0 % A E % B E - % E 0 % A E % B 9 % E 0 % A E % A 9 % E 0 % A E % B F % E 0 % A E % A E % E 0 % A F % 8 2 % E 0 % A E % A 9 % E 0 % A F % 8 D / ? u t m _ s o u r c e = N e w s % 2 B L e t t e r & u t m _ m e d i u m = E m a i l & u t m _ t e r m = N e w s % 2 B U p d a t e & u t m _ c o n t e n t = A d v e r t & u t m _ c a m p a i g n = A d v e r t " > ® Ç ² Á ® Í µ ¾ ¿ Í . . < / A > < / F O N T > < / P > < P > < / P > < P > < I M G b o r d e r = 0 s r c = " h t t p : / / f r e e a d s . e - m a r k k . o r g / m t . p h p ? h o p = Z R G 0 I K 3 9 J N / r / [ e m a i l e n c o d e d ] " > < / P > < / B O D Y > ___ 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] grass branch, master, updated. upstream/6.4.1-96-gb0d7a25
The following commit has been merged in the master branch:
commit ae5c9deff2c6a4a61020d32749c15164ce9bf5bc
Author: M. Hamish Bowman hamis...@yahoo.com
Date: Thu May 17 20:08:36 2012 +1200
Add patch to fix C++ FTBFS for gcc 4.7.0; fix -dev pkg warning message
patch, was giving false negatives for previously-installed but now removed pkgs
diff --git a/debian/patches/check4dev b/debian/patches/check4dev
index 2c87afb..0c905e5 100644
--- a/debian/patches/check4dev
+++ b/debian/patches/check4dev
@@ -8,7 +8,7 @@ Index: grass/scripts/g.extension/g.extension
+
+# check if we have the grass include and Make files
-+dpkg-query -W grass-dev /dev/null 2 /dev/null
++dpkg-query -l grass-dev | grep '^ii' /dev/null 2 /dev/null
+if [ $? -ne 0 ] ; then
+ g.message -w This module requires the \grass-dev\ package
+fi
diff --git a/debian/patches/iostream_cpp470 b/debian/patches/iostream_cpp470
new file mode 100644
index 000..d1e7a4a
--- /dev/null
+++ b/debian/patches/iostream_cpp470
@@ -0,0 +1,116 @@
+Index: /grass/branches/releasebranch_6_4/lib/iostream/mm.cc
+===
+--- /grass/branches/releasebranch_6_4/lib/iostream/mm.cc (revision 48704)
/grass/branches/releasebranch_6_4/lib/iostream/mm.cc (revision 51638)
+@@ -254,11 +254,11 @@
+ }
+
+
+
+ /* */
+-void* operator new[] (size_t sz) {
++void* operator new[] (size_t sz) throw(std::bad_alloc) {
+ void *p;
+
+ MM_DEBUG cout new: sz= sz , register
+sz+SIZE_SPACE B ,;
+
+@@ -305,11 +305,11 @@
+ }
+
+
+
+ /* */
+-void* operator new (size_t sz) {
++void* operator new (size_t sz) throw(std::bad_alloc) {
+ void *p;
+
+ MM_DEBUG cout new: sz= sz , register
+sz+SIZE_SPACE B ,;
+
+@@ -357,11 +357,11 @@
+
+
+
+
+ /* -- */
+-void operator delete (void *ptr) {
++void operator delete (void *ptr) throw() {
+ size_t sz;
+ void *p;
+
+ MM_DEBUG cout delete: ptr= ptr ,;
+
+@@ -397,11 +397,11 @@
+
+
+
+
+ /* -- */
+-void operator delete[] (void *ptr) {
++void operator delete[] (void *ptr) throw() {
+ size_t sz;
+ void *p;
+
+ MM_DEBUG cout delete[]: ptr= ptr ,;
+
+Index: /grass/branches/releasebranch_6_4/include/iostream/mm.h
+===
+--- /grass/branches/releasebranch_6_4/include/iostream/mm.h(revision 32629)
/grass/branches/releasebranch_6_4/include/iostream/mm.h(revision 51638)
+@@ -108,14 +108,14 @@
+ intspace_overhead ();
+
+ void print();
+
+ friend class mm_register_init;
+- friend void * operator new(size_t);
+- friend void * operator new[](size_t);
+- friend void operator delete(void *);
+- friend void operator delete[](void *);
++ friend void * operator new(size_t) throw(std::bad_alloc);
++ friend void * operator new[](size_t) throw(std::bad_alloc);
++ friend void operator delete(void *) throw();
++ friend void operator delete[](void *) throw();
+ };
+
+
+
+
+Index: /grass/branches/releasebranch_6_4/include/iostream/minmaxheap.h
+===
+--- /grass/branches/releasebranch_6_4/include/iostream/minmaxheap.h
(revision 41531)
/grass/branches/releasebranch_6_4/include/iostream/minmaxheap.h
(revision 51638)
+@@ -742,11 +742,11 @@
+ HeapIndex MinMaxHeapT::fill(T* arr, HeapIndex n) {
+ HeapIndex i;
+ //heap must be empty
+ assert(this-size()==0);
+ for (i = 0; !full() in; i++) {
+-insert(arr[i]);
++this-insert(arr[i]);
+ }
+ if (i n) {
+ assert(i == this-maxsize);
+ return n - i;
+ } else {
+@@ -775,17 +775,17 @@
+
+ assert(this-maxsize 0);
+
+ if(old) {
+ HeapIndex n = this-size();
+- this-A = allocateHeap(this-maxsize); /* allocate a new array */
++ this-A = this-allocateHeap(this-maxsize); /* allocate a new array */
+ /* copy over the old values */
+ assert(this-maxsize n);
+ for(HeapIndex i=0; i=n; i++) { /* why extra value? -RW */
+ this-A[i] = old[i];
+ }
+- freeHeap(old); /* free up old storage */
++ this-freeHeap(old);/* free up old storage */
+ }
+
+ }
+
+
diff --git a/debian/patches/series b/debian/patches/series
index e7797bd..2272ff9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ pager
xterm
instdir
check4dev
+iostream_cpp470
--
Geographic Resources Analysis Support System
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
[SCM] grass branch, master, updated. upstream/6.4.1-96-gb0d7a25
The following commit has been merged in the master branch: commit b0d7a25b984b061642c182500eca3145d4e0fc4a Author: M. Hamish Bowman hamis...@yahoo.com Date: Thu May 17 20:12:45 2012 +1200 bump changelog diff --git a/debian/changelog b/debian/changelog index 9f09794..6bdc572 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,11 +12,13 @@ grass (6.4.2-1) unstable; urgency=low * Use xdg-open for GRASS_HTML_BROWSER when available. (closes: #615667) * Policy bumped to 3.9.3, using metapackages archive section for 'grass'. + * Fix g.extension.sh test for the grass-dev package. + * Add patch to fix C++ FTBFS for gcc 4.7.0. [ Francesco Paolo Lovergine ] * Moved to use TIFF 4.0.1 instead of the legacy flavor. - -- Francesco Paolo Lovergine fran...@debian.org Sat, 25 Feb 2012 19:21:24 +0100 + -- M. Hamish Bowman hamis...@yahoo.com Thu, 17 May 2012 20:09:15 +1200 grass (6.4.1-2) unstable; urgency=low -- Geographic Resources Analysis Support System ___ 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] grass branch, master, updated. upstream/6.4.1-97-g195b177
The following commit has been merged in the master branch: commit 195b177ffe096bac731ef6dc23532100493f2003 Author: M. Hamish Bowman hamis...@yahoo.com Date: Thu May 17 20:33:10 2012 +1200 changelog diff --git a/debian/changelog b/debian/changelog index 6bdc572..854ff34 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ grass (6.4.2-1) unstable; urgency=low * Policy bumped to 3.9.3, using metapackages archive section for 'grass'. * Fix g.extension.sh test for the grass-dev package. * Add patch to fix C++ FTBFS for gcc 4.7.0. +(closes: #671991) [ Francesco Paolo Lovergine ] * Moved to use TIFF 4.0.1 instead of the legacy flavor. -- Geographic Resources Analysis Support System ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#672719: grass: FTBFS on s390x
Perhaps the build failed due to an out-of-memory, or other system error? The build failed because a 'make test' style check was Killed by the OS.(?) here is the relevant section of the build log: [...] gcc -shared -o /build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/dist.s390x-ibm-linux-gnu/lib/libgrass_dig2.6.4.1.so -L/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/g rass-6.4.1/dist.s390x-ibm-linux-gnu/lib -Wl,--export-dynamic -Wl,-rpath-link,/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/dist.s390x-ibm-linux-gnu/lib OBJ. s390x-ibm-linux-gnu/allocation.o OBJ.s390x-ibm-linux-gnu/angle.o OBJ.s390x-ibm-linux-gnu/box.o OBJ.s390x-ibm-linux-gnu/cindex.o OBJ.s390x-ibm-linux-gnu/cindex_rw.o OBJ. s390x-ibm-linux-gnu/file.o OBJ.s390x-ibm-linux-gnu/frmt.o OBJ.s390x-ibm-linux-gnu/head.o OBJ.s390x-ibm-linux-gnu/inside.o OBJ.s390x-ibm-linux-gnu/linecros.o OBJ.s390x-i bm-linux-gnu/line_dist.o OBJ.s390x-ibm-linux-gnu/list.o OBJ.s390x-ibm-linux-gnu/plus.o OBJ.s390x-ibm-linux-gnu/plus_area.o OBJ.s390x-ibm-linux-gnu/plus_line.o OBJ.s390x -ibm-linux-gnu/plus_node.o OBJ.s390x-ibm-linux-gnu/plus_struct.o OBJ.s390x-ibm-linux-gnu/poly.o OBJ.s390x-ibm-linux-gnu/port_init.o OBJ.s390x-ibm-linux-gnu/portable.o O BJ.s390x-ibm-linux-gnu/prune.o OBJ.s390x-ibm-linux-gnu/spindex.o OBJ.s390x-ibm-linux-gnu/spindex_rw.o OBJ.s390x-ibm-linux-gnu/struct_alloc.o OBJ.s390x-ibm-linux-gnu/typ e.o OBJ.s390x-ibm-linux-gnu/update.o -lgrass_gis -lgrass_datetime -lz -lgrass_rtree -lm amp;amp; \ (cd /build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/dist.s390x-ibm-linux-gnu/lib; ln -f -s libgrass_dig2.6.4.1.so /build/buildd-grass_6.4.1-2.1-s390x-GTA LEw/grass-6.4.1/dist.s390x-ibm-linux-gnu/lib/libgrass_dig2.so) /usr/bin/make OBJ.s390x-ibm-linux-gnu/test make[6]: Entering directory `/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/lib/vector/diglib' echo quot;==TEST=quot; ==TEST= gcc -L/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/dist.s390x-ibm-linux-gnu/lib -Wl,--export-dynamic -Wl,-rpath-link,/build/buildd-grass_6.4.1-2.1-s390x-GTALE w/grass-6.4.1/dist.s390x-ibm-linux-gnu/lib -Wall -g -O -I/usr/include/gdal -I/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/dist.s390x-ibm-linux-gnu/incl ude -o OBJ.s390x-ibm-linux-gnu/test test.c -lgrass_dig2 -lgrass_gis -lgrass_datetime -lz -lgrass_rtree -lgrass_rtree \ -lgrass_gis -lgrass_datetime -lz -lgrass_datetime -lm -lz cd OBJ.s390x-ibm-linux-gnu; LD_LIBRARY_PATH=quot;:/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/dist.s390x-ibm-linux-gnu/libquot; ./test; diff ./test.tmp ../ test.ok Killed make[6]: *** [OBJ.s390x-ibm-linux-gnu/test] Error 2 make[5]: *** [default] Error 2 Binary files ./test.tmp and ../test.ok differ make[6]: Leaving directory `/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/lib/vector/diglib' make[5]: Leaving directory `/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/lib/vector/diglib' /usr/bin/make -C Vlib || echo /build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/lib/vector/Vlib gt;gt; /build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/err or.log make[5]: Entering directory `/build/buildd-grass_6.4.1-2.1-s390x-GTALEw/grass-6.4.1/lib/vector/Vlib' [...] try, try again? Hamish ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] geos branch, master, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the master branch: commit 31cadcc4cd9bf9c09d49961e829b7484eab1db43 Merge: 2df4f41a90109c1d687942ba5e1ec5250bc6e3b1 94c87538b77a44944053c68325c65090c0c463a4 Author: Jerome Villeneuve Larouche jlarou...@mapgears.com Date: Thu May 17 15:39:00 2012 + Merge commit 'upstream/3.3.3' -- Geometry engine for Geographic Information Systems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] geos branch, master, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the master branch:
commit 722309c27556c36862610937210aeca5516de9de
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date: Thu May 17 17:40:12 2012 +
New debian/control generated
diff --git a/debian/changelog b/debian/changelog
index 9da4cb3..f38f0a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+geos (3.3.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Jerome Villeneuve Larouche jlarou...@mapgears.com Thu, 17 May 2012
17:36:39 +
+
geos (3.3.2-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index eb6f2c1..033bf81 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.2 (= ${binary:Version}), libgeos-dev, ${misc:Depends}
+Depends: libgeos-3.3.3 (= ${binary:Version}), libgeos-dev, ${misc:Depends}
Suggests: libgdal-doc
Breaks: libgeos-dev ( 3.3.1-1~)
Description: Geometry engine for GIS - C++ development files
@@ -59,7 +59,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.2
+Package: libgeos-3.3.3
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -109,7 +109,7 @@ Package: libgeos-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: libgeos-3.3.2 (= ${binary:Version}), libgeos-c1 (=
${binary:Version}), ${misc:Depends}
+Depends: libgeos-3.3.3 (= ${binary:Version}), libgeos-c1 (=
${binary:Version}), ${misc:Depends}
Description: Debugging symbols for the GEOS library
GEOS provides a spatial object model and fundamental geometric
functions. It implements the geometry model defined in the
--
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 5cfefd06fb51f90ed870f5af0f4b07ae7e70c77f Author: Francesco Paolo Lovergine fran...@debian.org 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 fran...@debian.org 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 pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org 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 pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org 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] 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 fran...@debian.org
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 fran...@debian.org 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 pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org
-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 pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org
-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
[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 fran...@debian.org
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 fran...@debian.org Fri, 02 Apr 2010 00:02:16
+0200
+ -- Francesco Paolo Lovergine fran...@debian.org 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 pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org
-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 pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org
-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 2e633c626d114e0509f4f9a67527550e94b983fe
Author: Alan Boudreault aboudrea...@mapgears.com
Date: Tue May 11 19:29:41 2010 +
New upstream release of geos: 3.2.2
diff --git a/debian/changelog b/debian/changelog
index f14db36..0f34764 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+geos (3.2.2-1) unstable; urgency=low
+
+ * NOT RELEASE YET.
+ * New upstream release.
+ * Added python-all, python-all-dev and python-central as build depends.
+
+ -- Alan Boudreault aboudrea...@mapgears.com Tue, 11 May 2010 11:39:29 -0400
+
geos (3.2.1-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index cd4ad76..688d540 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org
-Build-Depends: debhelper (= 7), dpatch, doxygen, swig, ruby, ruby-dev
+Build-Depends: debhelper (= 7), dpatch, doxygen, swig, ruby, ruby-dev,
+ python-all, python-all-dev, python-central (= 0.5)
Standards-Version: 3.8.4
Homepage: http://trac.osgeo.org/geos/
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/geos/trunk
@@ -12,7 +13,7 @@ Vcs-Svn:
svn://svn.debian.org/svn/pkg-grass/packages/geos/trunk
Package: libgeos-dev
Section: libdevel
Architecture: any
-Depends: libgeos-3.2.1 (= ${binary:Version}), libgeos-c1 (= ${binary:Version})
+Depends: libgeos-3.2.2 (= ${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 +44,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.1
+Package: libgeos-3.2.2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -79,7 +80,7 @@ Description: Documentation for the GEOS GIS geometry engine
library
Package: libgeos-ruby1.8
Section: ruby
Architecture: any
-Depends: libgeos-3.2.1 (= ${binary:Version}), ${shlibs:Depends},
${misc:Depends}
+Depends: libgeos-3.2.2 (= ${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
diff --git a/debian/control.in b/debian/control.in
index 2de51db..70ce9f3 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,8 @@ Section: science
Priority: optional
Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org
-Build-Depends: debhelper (= 7), dpatch, doxygen, swig, ruby, ruby-dev
+Build-Depends: debhelper (= 7), dpatch, doxygen, swig, ruby, ruby-dev,
+ python-all, python-all-dev, python-central (= 0.5)
Standards-Version: 3.8.4
Homepage: http://trac.osgeo.org/geos/
Vcs-Browser: http://svn.debian.org/viewsvn/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] geos branch, upstream, updated. upstream/3.3.2-56-g722309c
The following commit has been merged in the upstream branch: commit 1033a89a0024420cc521ca44aac9cedef8dd256d Author: Alan Boudreault aboudrea...@mapgears.com Date: Wed May 12 12:20:54 2010 + Reverted rules file about python binding diff --git a/debian/changelog b/debian/changelog index 0f34764..dd74933 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,6 @@ geos (3.2.2-1) unstable; urgency=low - * NOT RELEASE YET. * New upstream release. - * Added python-all, python-all-dev and python-central as build depends. -- Alan Boudreault aboudrea...@mapgears.com Tue, 11 May 2010 11:39:29 -0400 -- 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 ace0602f2304ea7942742b9f9655e905bc6bee0f
Author: Alan Boudreault aboudrea...@mapgears.com
Date: Wed May 12 12:21:54 2010 +
Reverted rules file about python binding, missing rules file in last commit
diff --git a/debian/rules b/debian/rules
index 4157b6d..38604d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,9 +11,6 @@
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 (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -58,17 +55,13 @@ ifneq $(wildcard /usr/share/misc/config.guess)
mv config.guess config.guess.bak
cp -f /usr/share/misc/config.guess config.guess
endif
- for V in $(PYVERS); do \
- CFLAGS=$(CFLAGS) PYTHON=/usr/bin/python$$V ./configure \
- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --enable-ruby \
- --enable-python \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info $(CONFFLAGS); \
- cp swig/python/Makefile swig/python/Makefile-$$V; \
- done
+ CFLAGS=$(CFLAGS) ./configure \
+--host=$(DEB_HOST_GNU_TYPE) \
+--build=$(DEB_BUILD_GNU_TYPE) \
+--enable-ruby \
+ --prefix=/usr \
+--mandir=\$${prefix}/share/man \
+--infodir=\$${prefix}/share/info $(CONFFLAGS)
cp debian/libgeos-c++.install debian/libgeos-$(VER).install
cp debian/libgeos-c++.dirs debian/libgeos-$(VER).dirs
@@ -79,10 +72,6 @@ build-arch: build-arch-stamp
build-arch-stamp: config.status
# Add here commands to compile the arch part of the package.
$(MAKE)
- for V in $(PYVERS); do \
- $(MAKE) -C swig/python clean; \
- PYTHON=/usr/bin/python$$V $(MAKE) -C swig/python -f
Makefile-$$V; \
- done
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 47199fe5b8fd1bf0004c268eb278423bf46c59a7 Author: Alan Boudreault aboudrea...@mapgears.com Date: Wed May 12 12:24:11 2010 + Removed python build dependencies diff --git a/debian/control b/debian/control index 688d540..79554f6 100644 --- a/debian/control +++ b/debian/control @@ -3,8 +3,7 @@ Section: science Priority: optional Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org -Build-Depends: debhelper (= 7), dpatch, doxygen, swig, ruby, ruby-dev, - python-all, python-all-dev, python-central (= 0.5) +Build-Depends: debhelper (= 7), dpatch, doxygen, swig, ruby, ruby-dev Standards-Version: 3.8.4 Homepage: http://trac.osgeo.org/geos/ Vcs-Browser: http://svn.debian.org/viewsvn/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] 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 fran...@debian.org 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 1d51f5864c453fa99a3f57ffdc116d6a8cf68c1f Merge: 17536c0cf97dde0283936db8bc8738aa99fe515f 259cb3305bdd6f415b12c998c1a4cc37f403969f Author: Francesco Paolo Lovergine fran...@debian.org 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 b86fb34225f2b8295947ae31e282cc5696fa539a Merge: 1d51f5864c453fa99a3f57ffdc116d6a8cf68c1f 33778def693c0b7bb8ef2c0ae46ae6dcd08bf088 Author: Francesco Paolo Lovergine fran...@debian.org 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 3405fd6b3d540f86621ae750eed124a553e55730 Author: Francesco Paolo Lovergine fran...@debian.org 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 aboudrea...@mapgears.com Tue, 11 May 2010 11:39:29 -0400 - -geos (3.2.1-1) unstable; urgency=low - - * New upstream release. - - -- Francesco Paolo Lovergine fran...@debian.org 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 fran...@debian.org Thu, 21 Jan 2010 17:55:27 +0100 + -- Francesco Paolo Lovergine fran...@debian.org 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 628ff9e99babbf394e067c4d85ecd8ef0338d5b9 Author: Francesco Paolo Lovergine fran...@debian.org 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 fran...@debian.org Tue, 01 Mar 2011 21:26:23 +0100 + -- Francesco Paolo Lovergine fran...@debian.org 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 pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org -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 pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org -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 33da6af5100bcc38cfbae1cc777582712e7ec2fd
Author: Francesco Paolo Lovergine fran...@debian.org
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 fran...@debian.org 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 454567cb3015df682da23a04f1b7f17acee7d2f2
Author: Francesco Paolo Lovergine fran...@debian.org
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 fran...@debian.org Wed, 02 Mar 2011 23:01:54
+0100
+ -- Francesco Paolo Lovergine fran...@debian.org 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 ef0c1d5f0b1c085688f7e4f7533ce6ec65b8d7c0
Author: Francesco Paolo Lovergine fran...@debian.org
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 29536deca7b6b5a6257c544e7f5a6b7b87818d68
Author: Francesco Paolo Lovergine fran...@debian.org
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 fran...@debian.org 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 pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org
-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 pkg-grass-devel@lists.alioth.debian.org
Uploaders: Francesco Paolo Lovergine fran...@debian.org
-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 geos/export.h
+ #include vector
+
+-//#include geos/geom/Coordinate.h
++#include geos/geom/Coordinate.h
+ #include geos/inline.h
+
+ // Forward declarations
diff --git a/debian/patches/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 4e1cae72009062df24c01fe121e1fb65c0d881d0
Author: Francesco Paolo Lovergine fran...@debian.org
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 fran...@debian.org Tue, 24 May 2011 15:52:18
+0200
+ -- Francesco Paolo Lovergine fran...@debian.org 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 geos/index/bintree/Root.h
+ #include geos/index/bintree/Interval.h
+ #include vector
++#include cstddef
+
+ 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 f2d1d8d2a7917c4108ee708e9ed4ba90ced86e3e
Author: Francesco Paolo Lovergine fran...@debian.org
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 fran...@debian.org Tue, 24 May 2011 17:07:20
+0200
+ -- Francesco Paolo Lovergine fran...@debian.org 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 cassert
++#include cstddef
+
+ #include geos/index/bintree/Node.h
+ #include geos/index/bintree/Key.h
+@@ -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 sstream
+ #include vector
+ #include algorithm
++#include cstddef
+
+ #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 string
+ #include sstream
+ #include cassert
++#include cstddef
+
+ #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] =
[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 fran...@debian.org
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 sstream
#include vector
@@ -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 string
#include sstream
@@ -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 48d0aee749df35c60df0d355d6022512ce5344e0
Author: Francesco Paolo Lovergine fran...@debian.org
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 geos/index/bintree/Root.h
#include geos/index/bintree/Interval.h
@@ -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 474de6c070023129ad5e543649c2d07193e913a8
Author: Francesco Paolo Lovergine fran...@debian.org
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 4af268b2f7d2822a7084a3608758a20458d5dd4a
Author: Francesco Paolo Lovergine fran...@debian.org
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 sstream
#include vector
@@ -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 string
#include sstream
@@ -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 804ceb67d6a5cf9b9fbc9a4ac813d5fdffe0
Author: Francesco Paolo Lovergine fran...@debian.org
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 geos/index/bintree/Node.h
#include geos/index/bintree/Key.h
-@@ -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 sstream
#include vector
@@ -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 string
#include sstream
@@ -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 d5bd9aa0d7ec5f1c4935e5f28666ce431fab2775
Author: Francesco Paolo Lovergine fran...@debian.org
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 geos/index/bintree/Root.h
#include geos/index/bintree/Interval.h
@@ -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 sstream
#include vector
@@ -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 string
#include sstream
@@ -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();
- }
-Index:
[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 fran...@debian.org
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 fran...@debian.org Tue, 24 May 2011 17:31:19
+0200
+ -- Francesco Paolo Lovergine fran...@debian.org 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 geos/export.h
+ #include vector
++#include cstddef
+
+ // 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 34826d7c7415b4ae52dd0cb209dcff64c9e70711 Author: Francesco Paolo Lovergine fran...@debian.org 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 fran...@debian.org Wed, 25 May 2011 13:13:03 +0200 + -- Francesco Paolo Lovergine fran...@debian.org 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 vector + #include cassert ++#include cstddef + + 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 786f97f2021b181ff36310fcd8a6d00c7af7e85f Author: Francesco Paolo Lovergine fran...@debian.org 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 fran...@debian.org Wed, 25 May 2011 13:23:46 +0200 + -- Francesco Paolo Lovergine fran...@debian.org 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 2e16daafe23bf02110d5f8fb32c4cd66a66aed28 Author: Francesco Paolo Lovergine fran...@debian.org 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 b15b2e44645edac018cf7de08fea5e69a3ab5fa9 Author: Francesco Paolo Lovergine fran...@debian.org 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 4460d055f078fb73ee4246789c93573dedfc54c2 Author: Francesco Paolo Lovergine fran...@debian.org 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 4495372d93e1cd2d56a5db5bbad0ec66f65d02e7
Author: Francesco Paolo Lovergine fran...@debian.org
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 geos/export.h
+
+ #include vector
++#include cstddef
+
+ // 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 ef014a0a4cc50e3758f340092f8aca04cb313917
Author: Francesco Paolo Lovergine fran...@debian.org
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 fran...@debian.org Wed, 25 May 2011 14:21:49
+0200
+ -- Francesco Paolo Lovergine fran...@debian.org 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 geos/export.h
+
+ #include vector
++#include cstddef
+
+ // 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 2511bc7a2bfce86715d99fcdd8fe279f07443fc8
Author: Francesco Paolo Lovergine fran...@debian.org
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 geos/export.h
+ #include vector
+ #include memory // for auto_ptr
++#include cstddef
+
+ // 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 aa7b80f0f88e118c526432d9a07c4c00dc52bf8c
Author: Francesco Paolo Lovergine fran...@debian.org
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 cassert
+ #include memory
++#include cstddef
+
+ #ifndef GEOS_DEBUG
+ #define GEOS_DEBUG 0
+@@ -42,6 +43,8 @@
+ namespace geos {
+ namespace simplify { // geos::simplify
+
++using namespace std;
++
+ /*public*/
+ TaggedLineString::TaggedLineString(const geom::LineString* nParentLine,
+ 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 67f5cf6787e0a67cdee92ac3fb33616de8e9e267
Author: Francesco Paolo Lovergine fran...@debian.org
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 geos/export.h
+ #include vector
+ #include memory
++#include cstddef
+
+ // 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 04972d8aedaf23df082f31d152f1ea4778dbdde6
Author: Francesco Paolo Lovergine fran...@debian.org
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 geos/export.h
+ #include vector
+ #include memory
++#include cstddef
+
+ // 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 2b9bb4dc711177bfe957f63481bcf4070c52ebd0 Author: Francesco Paolo Lovergine fran...@debian.org 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 fran...@debian.org Mon, 18 Jul 2011 12:23:11 +0200 + geos (3.2.2-2) unstable; urgency=low * Policy bumped to 3.9.2, no changes. 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 pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org -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 pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org -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 20856e6ef8e3b5ae2ee1faebcb6b3d1b78a1f136
Author: Francesco Paolo Lovergine fran...@debian.org
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 abcoll...@yahoo.com
+ 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 4d70d7426fefbd099ebe4e25420a7af31c8ded37
Author: Francesco Paolo Lovergine fran...@debian.org
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 abcoll...@yahoo.com
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 ea73a63690bdababd3f0c73a7bb4a2fc3566625d
Author: Francesco Paolo Lovergine fran...@debian.org
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 fran...@debian.org 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
[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 fran...@debian.org 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 bb987fa3bbc246f6fcd3eee2b3dac27d4b75a792 Author: Francesco Paolo Lovergine fran...@debian.org 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 fran...@debian.org 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 e9f5163f564dfa4b458a4089abb59f1f84266e98 Author: Francesco Paolo Lovergine fran...@debian.org 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 5b65c8370b89b9989d16702092ea543143bc333d Author: Francesco Paolo Lovergine fran...@debian.org 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 fran...@debian.org 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 fran...@debian.org 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 86ad87871942fc7ad8d91fc73e049e19316f2418 Author: Francesco Paolo Lovergine fran...@debian.org 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 abb70c74b157b68108e5cf85e4adef70a06f254a
Author: Francesco Paolo Lovergine fran...@debian.org
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 fran...@debian.org Wed, 30 Nov 2011 17:01:19
+0100
+ -- Francesco Paolo Lovergine fran...@debian.org 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 vector
+ #include cstddef
#include cassert
+#include cstddef
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 geos/index/bintree/Root.h
#include geos/index/bintree/Interval.h
#include vector
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 geos/export.h
#include vector
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 geos/export.h
#include vector
+#include cstddef
- // 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
-+++
[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 fran...@debian.org
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 fran...@debian.org Fri, 02 Dec 2011 14:41:49
+0100
+ -- Francesco Paolo Lovergine fran...@debian.org 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 vector
- #include cstddef
- #include cassert
-+#include cstddef
-
- 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 geos/index/bintree/Root.h
- #include geos/index/bintree/Interval.h
- #include vector
-+#include cstddef
-
- 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 geos/export.h
- #include vector
-+#include cstddef
-
- // 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 abcoll...@yahoo.com
- 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=''
[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 fran...@debian.org
Date: Tue Feb 21 23:38:22 2012 +0100
Fixed for C++/C separation.
diff --git a/debian/NEWS b/debian/NEWS
index 2fdb5f6..3d400e1 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -4,7 +4,7 @@ geos (3.3.1-4) unstable; urgency=low
the stable interface. See http://trac.osgeo.org/geos/wiki/Applications for
details. Starting from this version we are trying to short the list of
reverse build-deps that require erroneously linking both C/C++ and binary
- NMUs.
+ NMUs frequency.
A program which depends on the C++ API has to b-depend on the libgeos++-dev
which in turn depends on the right libgeos-VERSION lib. All
@@ -12,7 +12,7 @@ geos (3.3.1-4) unstable; urgency=low
depends strictly on the C stable interface (currently libgeos1).
Note that geos-config has some problems on those regards, so current
- version also provides the C lib only for --libs.
- See http://trac.osgeo.org/geos/ticket/497 about that.
+ version also provides the C lib only for --clibs, with the same approach
+ adopted by upstream. See http://trac.osgeo.org/geos/ticket/497 about that.
-- Francesco Paolo Lovergine fran...@debian.org Wed, 30 Nov 2011 17:27:23
+0100
diff --git a/debian/changelog b/debian/changelog
index 9219115..a27372c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,10 @@ geos (3.3.1-4) unstable; urgency=low
* Changed the C/C++ chain for development. See NEWS file for an explanation.
(closes: #643658)
* Patches refreshed and merged with upstream changes.
+ * Added patch geos-config to fix library paths. This is coherent with
+upstream approach too.
- -- Francesco Paolo Lovergine fran...@debian.org Fri, 02 Dec 2011 15:43:28
+0100
+ -- Francesco Paolo Lovergine fran...@debian.org Tue, 21 Feb 2012 23:33:45
+0100
geos (3.2.2-3) unstable; urgency=low
diff --git a/debian/control b/debian/control
index c4c9a4f..ea61bab 100644
--- a/debian/control
+++ b/debian/control
@@ -27,13 +27,15 @@ Section: libdevel
Architecture: any
Depends: libgeos-3.3.1 (= ${binary:Version}), ${misc:Depends}
Suggests: libgdal-doc
-Description: Geometry engine for GIS - Development files
+Description: Geometry engine for GIS - C++ development files
GEOS provides a spatial object model and fundamental geometric
functions. It implements the geometry model defined in the
OpenGIS Consortium Simple Features Specification for SQL.
.
This package contains the headers and libraries needed to
- develop programs using GEOS.
+ develop programs using GEOS in C++. Note that third-parties
+ programs should use the stable C API instead of the
+ unstable C++ one.
Package: libgeos-c1
Section: libs
@@ -54,7 +56,7 @@ Description: Geometry engine for Geographic Information
Systems - C Library
* topological validity checking
.
This package contains the C library. A C++ library is provided
- by the libgeos* package.
+ by the libgeos-* package.
Package: libgeos-3.3.1
Section: libs
@@ -74,7 +76,7 @@ Description: Geometry engine for Geographic Information
Systems - C++ Library
* area and distance functions, and
* topological validity checking
.
- This package contains the C++ library. A C library is provided
+ This package contains the C++ library. A stable C library is provided
by the libgeos-c* package.
Package: libgeos-doc
diff --git a/debian/control.in b/debian/control.in
index 92579b0..180cf88 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -27,13 +27,15 @@ Section: libdevel
Architecture: any
Depends: libgeos-@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*
[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 fran...@debian.org
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 fran...@debian.org Tue, 21 Feb 2012 23:33:45
+0100
+ -- Francesco Paolo Lovergine fran...@debian.org 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 bc114b1f344da57d33f4deaf4b3cb12fbd0838df Author: Francesco Paolo Lovergine fran...@debian.org 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 c39c3c1b4821e31e249db11102e8bc9f1682cb7c
Author: Francesco Paolo Lovergine fran...@debian.org
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 fran...@debian.org 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 fran...@debian.org 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 44d40768750e758e028bfd1e828a646a3a2666db Author: Francesco Paolo Lovergine fran...@debian.org 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 67042c37fcb85230a559c0712cdd8c5288a2176f Author: Francesco Paolo Lovergine fran...@debian.org 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 4100f1c946a4f0a8451b666254ef8c907bef8e40 Author: Francesco Paolo Lovergine fran...@debian.org 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 581129610f9de609c31e013d8a5c670522d97a0f Author: Francesco Paolo Lovergine fran...@debian.org 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 e6d5a322b03c82337786890c2724ad077a540693 Author: Francesco Paolo Lovergine fran...@debian.org 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 300420500fddaab9639c5d10c20f1e1d99bcf868 Merge: 216878271f27a5662920f7f23e710da46957f4a3 09fc4e9cdd600fde1e24b40f2e16250ff721fc1f Author: Francesco Paolo Lovergine fran...@debian.org 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 aa07aef7ac0799ec784d493f6254319980ac122e
Author: Francesco Paolo Lovergine fran...@debian.org
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 fran...@debian.org 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 248b798c0bb497c450e6bd081fa826be4862644e
Author: Francesco Paolo Lovergine fran...@debian.org
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 2df4f41a90109c1d687942ba5e1ec5250bc6e3b1
Merge: 248b798c0bb497c450e6bd081fa826be4862644e
e6d5a322b03c82337786890c2724ad077a540693
Author: Francesco Paolo Lovergine fran...@debian.org
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 fran...@debian.org 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 fran...@debian.org 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 fran...@debian.org 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 31cadcc4cd9bf9c09d49961e829b7484eab1db43 Merge: 2df4f41a90109c1d687942ba5e1ec5250bc6e3b1 94c87538b77a44944053c68325c65090c0c463a4 Author: Jerome Villeneuve Larouche jlarou...@mapgears.com Date: Thu May 17 15:39:00 2012 + Merge commit 'upstream/3.3.3' -- 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 722309c27556c36862610937210aeca5516de9de
Author: Jerome Villeneuve Larouche jlarou...@mapgears.com
Date: Thu May 17 17:40:12 2012 +
New debian/control generated
diff --git a/debian/changelog b/debian/changelog
index 9da4cb3..f38f0a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+geos (3.3.3-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Jerome Villeneuve Larouche jlarou...@mapgears.com Thu, 17 May 2012
17:36:39 +
+
geos (3.3.2-1) unstable; urgency=low
* New upstream release.
diff --git a/debian/control b/debian/control
index eb6f2c1..033bf81 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.2 (= ${binary:Version}), libgeos-dev, ${misc:Depends}
+Depends: libgeos-3.3.3 (= ${binary:Version}), libgeos-dev, ${misc:Depends}
Suggests: libgdal-doc
Breaks: libgeos-dev ( 3.3.1-1~)
Description: Geometry engine for GIS - C++ development files
@@ -59,7 +59,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.2
+Package: libgeos-3.3.3
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -109,7 +109,7 @@ Package: libgeos-dbg
Architecture: any
Section: debug
Priority: extra
-Depends: libgeos-3.3.2 (= ${binary:Version}), libgeos-c1 (=
${binary:Version}), ${misc:Depends}
+Depends: libgeos-3.3.3 (= ${binary:Version}), libgeos-c1 (=
${binary:Version}), ${misc:Depends}
Description: Debugging symbols for the GEOS library
GEOS provides a spatial object model and fundamental geometric
functions. It implements the geometry model defined in the
--
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-57-g7702355
The following commit has been merged in the upstream branch:
commit 77023550ec26b38e27369647dd1f281e133e65f2
Author: Alan Boudreault aboudrea...@mapgears.com
Date: Thu May 17 18:48:32 2012 +
Removing debian dir in upstream
diff --git a/debian/Makefile.example b/debian/Makefile.example
deleted file mode 100644
index 8186037..000
--- a/debian/Makefile.example
+++ /dev/null
@@ -1,8 +0,0 @@
-example:
- g++ -g -O -lgeos -o example example.cpp
-
-clean:
- rm example
-
-.PHONY:
- clean
diff --git a/debian/NEWS b/debian/NEWS
deleted file mode 100644
index 804741e..000
--- a/debian/NEWS
+++ /dev/null
@@ -1,18 +0,0 @@
-geos (3.3.1-1) unstable; urgency=low
-
- GEOS provides a (stable) C API and an unstable C++ one. Most programs use
- the stable interface. See http://trac.osgeo.org/geos/wiki/Applications for
- details. Starting from this version we are trying to short the list of
- reverse build-deps that require erroneously linking both C/C++ and binary
- NMUs frequency.
-
- A program which depends on the C++ API has to b-depend on the libgeos++-dev
- which in turn depends on the right libgeos-VERSION lib. All
- other programs have to b-depend on the C libgeos-dev package, which
- depends strictly on the C stable interface (currently libgeos1).
-
- Note that geos-config has some problems on those regards, so current
- version also provides the C lib only for --clibs, with the same approach
- adopted by upstream. See http://trac.osgeo.org/geos/ticket/497 about that.
-
- -- Francesco Paolo Lovergine fran...@debian.org Wed, 30 Nov 2011 17:27:23
+0100
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index f38f0a4..000
--- a/debian/changelog
+++ /dev/null
@@ -1,282 +0,0 @@
-geos (3.3.3-1) unstable; urgency=low
-
- * New upstream release
-
- -- Jerome Villeneuve Larouche jlarou...@mapgears.com Thu, 17 May 2012
17:36:39 +
-
-geos (3.3.2-1) unstable; urgency=low
-
- * New upstream release.
- * Dropped geos-config patch, merged upstream.
-
- -- Francesco Paolo Lovergine fran...@debian.org Sun, 26 Feb 2012 23:29:37
+0100
-
-geos (3.3.1-1) unstable; urgency=low
-
- * New upstream major release.
-(closes: #648611)
- * Changed the C/C++ chain for development. See NEWS file for an explanation.
-Thanks strk for a useful discussion about that.
-(closes: #643658)
- * Patches refreshed and merged with upstream changes.
- * Added patch geos-config to fix library paths. This is coherent with
-upstream approach too.
- * Moved the C++ headers under libgeos++-dev automagically and added a break
-against the old libgeos-dev all-in-one package.
- * The libgeos++-dev package depends on libgeos-dev for a couple of reasons:
- - a common header (geos/extern.h)
- - a program using C++ API could mixup C and C++ APIs so better being
-safe about that.
- * Merged NMU change in debian/rules to fix armhf FTBS.
-(closes: #641387)
-
- -- Francesco Paolo Lovergine fran...@debian.org Wed, 22 Feb 2012 14:20:57
+0100
-
-geos (3.2.2-3) unstable; urgency=low
-
- * New patch: swig. Fixed for strong version detection in ac_pkg_swig.m4.
-Merged from 3.3 series. Thanks strk. (closes: #631819)
- * Removed obsolete python build-deps, because now the suggested binding
-is via shapely. (closes: #616823)
-
- -- Francesco Paolo Lovergine fran...@debian.org Mon, 18 Jul 2011 12:23:11
+0200
-
-geos (3.2.2-2) unstable; urgency=low
-
- * Policy bumped to 3.9.2, no changes.
- * Fixed previous changelog entry.
- * Added CoordinateSequenceFactory.h patch to fix a missing declaration.
-(closes: #624949)
- * Added Bintree.cpp, Node.cpp, MonotoneChainBuilder.h, AbstractNode.cpp,
-and other patches to fix a missing cstddef header file inclusion in
-some files and use of std namespace. This is required in current
-default gcc flavor.
- * Use -fpermessive at building time to work around some minor compatibility
-problems which prevent a successuful building.
-
- -- Francesco Paolo Lovergine fran...@debian.org Wed, 25 May 2011 15:33:37
+0200
-
-geos (3.2.2-1) unstable; urgency=low
-
- [ Alan Boudreault ]
- * New upstream release.
-
- [ Francesco Paolo Lovergine ]
- * Policy set to 3.9.1, without changes.
- * Merged log for post squeeze release.
- * Repository moved to git and changed Vcs-* fields as required.
- * Source format moved to 3.0 with quilt support.
- * Added ${misc:Depends} to bin pkgs due to dh use.
- * Added -dbg package for debugging symbols.
-(closes: #582273)
-
- -- Francesco Paolo Lovergine fran...@debian.org Thu, 03 Mar 2011 13:40:04
+0100
-
-geos (3.2.0-1) unstable; urgency=low
-
- * New upstream release.
- * Removed kobold among uploaders because no more active on DebianGIS
packages.
- * Policy bumped to 3.8.3, without changes.
- * Changed a bit debian/rules to manage RC patch version.
- * Now, it does not install libtool helper file .la, as
Bug#673165: mapserver: FTBFS with multiarch-ready libgd2
retitle 673165 mapserver: FTBFS with multiarch-ready libgd2 block 645105 by 673165 thanks Hi, This FTBFS (actually on all arches now?) because libgd2 since 2.0.36~rc1~dfsg-6.1 uses a multiarch path, where it is not seen by these checks in configure.in: for GD_DIR in /usr /usr/local do test -f $GD_DIR/include/gd.h GD_INCLUDE=$GD_DIR/include test -f $GD_DIR/lib/libgd.a GD_LIBDIR=$GD_DIR/lib test -f $GD_DIR/lib64/libgd.a GD_LIBDIR=$GD_DIR/lib64 test -f $GD_DIR/lib/libgd.so -o -f $GD_DIR/lib/libgd.sl -o -f $GD_DIR/lib/libgd.dylib GD_LIBDIR=$GD_DIR/lib test -f $GD_DIR/lib64/libgd.so -o -f $GD_DIR/lib/libgd.sl GD_LIBDIR=$GD_DIR/lib64 The path can't be specified from debian/rules via --with-gd because the includes and libraries must all be there. So the configure.in must be modified in some way to look for the static+shared libs in the appropriate (multiarch) path... Regards, -- Steven Chamberlain ste...@pyro.eu.org ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Processed: Re: Bug#673165: mapserver: FTBFS with multiarch-ready libgd2
Processing commands for cont...@bugs.debian.org: retitle 673165 mapserver: FTBFS with multiarch-ready libgd2 Bug #673165 [src:mapserver] mapserver: FTBFS[armel,kfreebsd-i386,mips]: configure: error: Could not find gd.h or libgd.a/libgd.so in /usr. Changed Bug title to 'mapserver: FTBFS with multiarch-ready libgd2' from 'mapserver: FTBFS[armel,kfreebsd-i386,mips]: configure: error: Could not find gd.h or libgd.a/libgd.so in /usr. ' block 645105 by 673165 Bug #645105 [release.debian.org] transition: gdal 645105 was blocked by: 648628 631019 645105 was not blocking any bugs. Added blocking bug(s) of 645105: 673165 thanks Stopping processing here. Please contact me if you need assistance. -- 645105: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=645105 673165: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673165 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
