Author: frankie
Date: 2008-12-24 17:11:09 +0000 (Wed, 24 Dec 2008)
New Revision: 1828

Removed:
   packages/geos/trunk/debian/patches/gcc43.dpatch
Modified:
   packages/geos/trunk/debian/changelog
   packages/geos/trunk/debian/patches/00list
Log:
Patch removed


Modified: packages/geos/trunk/debian/changelog
===================================================================
--- packages/geos/trunk/debian/changelog        2008-12-24 16:49:48 UTC (rev 
1827)
+++ packages/geos/trunk/debian/changelog        2008-12-24 17:11:09 UTC (rev 
1828)
@@ -7,8 +7,9 @@
   * Updated homepage fields in debian/control to reflect moving into OSGeo 
infrastracture.
   * Watch file updated.
     (closes: #504470)
+  * Patch gcc43.dpatch removed, merged upstream.
 
- -- Francesco Paolo Lovergine <fran...@debian.org>  Wed, 24 Dec 2008 17:48:39 
+0100
+ -- Francesco Paolo Lovergine <fran...@debian.org>  Wed, 24 Dec 2008 18:10:18 
+0100
 
 geos (3.0.0-5) unstable; urgency=low
 

Modified: packages/geos/trunk/debian/patches/00list
===================================================================
--- packages/geos/trunk/debian/patches/00list   2008-12-24 16:49:48 UTC (rev 
1827)
+++ packages/geos/trunk/debian/patches/00list   2008-12-24 17:11:09 UTC (rev 
1828)
@@ -1 +0,0 @@
-gcc43

Deleted: packages/geos/trunk/debian/patches/gcc43.dpatch
===================================================================
--- packages/geos/trunk/debian/patches/gcc43.dpatch     2008-12-24 16:49:48 UTC 
(rev 1827)
+++ packages/geos/trunk/debian/patches/gcc43.dpatch     2008-12-24 17:11:09 UTC 
(rev 1828)
@@ -1,162 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## gcc43.dpatch by Francesco Paolo Lovergine <fran...@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-...@dpatch@
-diff -urNad geos-3.0.0~/doc/example.cpp geos-3.0.0/doc/example.cpp
---- geos-3.0.0~/doc/example.cpp        2007-12-12 22:59:31.000000000 +0100
-+++ geos-3.0.0/doc/example.cpp 2008-04-10 14:27:18.000000000 +0200
-@@ -31,6 +31,7 @@
- #include <vector>
- #include <sstream>
- #include <iomanip>
-+#include <cstdlib>
- #include <geos/geom/PrecisionModel.h>
- #include <geos/geom/GeometryFactory.h>
- #include <geos/geom/Geometry.h>
-diff -urNad geos-3.0.0~/source/geomgraph/GeometryGraph.cpp 
geos-3.0.0/source/geomgraph/GeometryGraph.cpp
---- geos-3.0.0~/source/geomgraph/GeometryGraph.cpp     2007-12-12 
22:59:26.000000000 +0100
-+++ geos-3.0.0/source/geomgraph/GeometryGraph.cpp      2008-04-10 
14:27:18.000000000 +0200
-@@ -45,6 +45,7 @@
- #include <vector>
- #include <memory> // auto_ptr
- #include <cassert>
-+#include <typeinfo>
- 
- #ifndef GEOS_DEBUG
- #define GEOS_DEBUG 0
-diff -urNad geos-3.0.0~/source/headers/geos/noding/FastNodingValidator.h 
geos-3.0.0/source/headers/geos/noding/FastNodingValidator.h
---- geos-3.0.0~/source/headers/geos/noding/FastNodingValidator.h       
2007-12-12 22:59:29.000000000 +0100
-+++ geos-3.0.0/source/headers/geos/noding/FastNodingValidator.h        
2008-04-10 14:27:18.000000000 +0200
-@@ -25,6 +25,7 @@
- 
- #include <cassert>
- #include <string>
-+#include <memory>
- 
- // Forward declarations
- namespace geos {
-diff -urNad geos-3.0.0~/source/headers/geos/noding/IntersectionAdder.h 
geos-3.0.0/source/headers/geos/noding/IntersectionAdder.h
---- geos-3.0.0~/source/headers/geos/noding/IntersectionAdder.h 2007-12-12 
22:59:29.000000000 +0100
-+++ geos-3.0.0/source/headers/geos/noding/IntersectionAdder.h  2008-04-10 
14:27:18.000000000 +0200
-@@ -19,6 +19,7 @@
- #include <vector>
- #include <iostream>
- #include <cmath> // for abs()
-+#include <cstdlib> // for abs()
- 
- #include <geos/inline.h>
- 
-diff -urNad geos-3.0.0~/source/index/quadtree/DoubleBits.cpp 
geos-3.0.0/source/index/quadtree/DoubleBits.cpp
---- geos-3.0.0~/source/index/quadtree/DoubleBits.cpp   2007-12-12 
22:59:26.000000000 +0100
-+++ geos-3.0.0/source/index/quadtree/DoubleBits.cpp    2008-04-10 
14:27:18.000000000 +0200
-@@ -22,6 +22,7 @@
- #include <geos/util/IllegalArgumentException.h>
- 
- #include <string>
-+#include <cstring>
- 
- #if __STDC_IEC_559__
- #define ASSUME_IEEE_DOUBLE 1
-diff -urNad geos-3.0.0~/source/io/ByteOrderValues.cpp 
geos-3.0.0/source/io/ByteOrderValues.cpp
---- geos-3.0.0~/source/io/ByteOrderValues.cpp  2007-12-12 22:59:26.000000000 
+0100
-+++ geos-3.0.0/source/io/ByteOrderValues.cpp   2008-04-10 14:27:18.000000000 
+0200
-@@ -22,6 +22,7 @@
- #include <geos/util.h>
- 
- #include <cassert>
-+#include <cstring>
- 
- namespace geos {
- namespace io { // geos.io
-diff -urNad geos-3.0.0~/source/io/StringTokenizer.cpp 
geos-3.0.0/source/io/StringTokenizer.cpp
---- geos-3.0.0~/source/io/StringTokenizer.cpp  2007-12-12 22:59:26.000000000 
+0100
-+++ geos-3.0.0/source/io/StringTokenizer.cpp   2008-04-10 14:27:18.000000000 
+0200
-@@ -17,6 +17,7 @@
- #include <geos/io/StringTokenizer.h>
- 
- #include <string>
-+#include <cstdlib>
- 
- using namespace std;
- 
-diff -urNad geos-3.0.0~/source/operation/buffer/OffsetCurveSetBuilder.cpp 
geos-3.0.0/source/operation/buffer/OffsetCurveSetBuilder.cpp
---- geos-3.0.0~/source/operation/buffer/OffsetCurveSetBuilder.cpp      
2007-12-12 22:59:25.000000000 +0100
-+++ geos-3.0.0/source/operation/buffer/OffsetCurveSetBuilder.cpp       
2008-04-10 14:27:18.000000000 +0200
-@@ -41,6 +41,7 @@
- #include <vector>
- #include <memory>
- #include <cassert>
-+#include <typeinfo>
- 
- #ifndef GEOS_DEBUG
- #define GEOS_DEBUG 0
-diff -urNad 
geos-3.0.0~/source/operation/distance/ConnectedElementPointFilter.cpp 
geos-3.0.0/source/operation/distance/ConnectedElementPointFilter.cpp
---- geos-3.0.0~/source/operation/distance/ConnectedElementPointFilter.cpp      
2007-12-12 22:59:25.000000000 +0100
-+++ geos-3.0.0/source/operation/distance/ConnectedElementPointFilter.cpp       
2008-04-10 14:27:18.000000000 +0200
-@@ -20,6 +20,7 @@
- #include <geos/geom/Polygon.h>
- 
- #include <vector>
-+#include <typeinfo>
- 
- using namespace std;
- using namespace geos::geom;
-diff -urNad geos-3.0.0~/source/planargraph/DirectedEdge.cpp 
geos-3.0.0/source/planargraph/DirectedEdge.cpp
---- geos-3.0.0~/source/planargraph/DirectedEdge.cpp    2007-12-12 
22:59:25.000000000 +0100
-+++ geos-3.0.0/source/planargraph/DirectedEdge.cpp     2008-04-10 
14:27:18.000000000 +0200
-@@ -21,6 +21,7 @@
- #include <cmath>
- #include <sstream>
- #include <vector>
-+#include <typeinfo>
- 
- using namespace std;
- using namespace geos::geom;
-diff -urNad geos-3.0.0~/source/precision/SimpleGeometryPrecisionReducer.cpp 
geos-3.0.0/source/precision/SimpleGeometryPrecisionReducer.cpp
---- geos-3.0.0~/source/precision/SimpleGeometryPrecisionReducer.cpp    
2007-12-12 22:59:24.000000000 +0100
-+++ geos-3.0.0/source/precision/SimpleGeometryPrecisionReducer.cpp     
2008-04-10 14:27:18.000000000 +0200
-@@ -30,6 +30,7 @@
- #include <geos/geom/LinearRing.h>
- 
- #include <vector>
-+#include <typeinfo>
- 
- using namespace std;
- using namespace geos::geom;
-diff -urNad geos-3.0.0~/tests/bigtest/TestSweepLineSpeed.cpp 
geos-3.0.0/tests/bigtest/TestSweepLineSpeed.cpp
---- geos-3.0.0~/tests/bigtest/TestSweepLineSpeed.cpp   2007-12-12 
22:59:30.000000000 +0100
-+++ geos-3.0.0/tests/bigtest/TestSweepLineSpeed.cpp    2008-04-10 
14:27:18.000000000 +0200
-@@ -88,7 +88,7 @@
- //    cout << "n Pts: " << nPts << "   Executed in " << totalTime << endl;
- }
- 
--int main(int /* argC */, char* /* argV[] */) {
-+int main(int /* argC */, char** /* argV */) {
- 
-       GeometryFactory *fact=new GeometryFactory();
- 
-diff -urNad geos-3.0.0~/tests/xmltester/XMLTester.cpp 
geos-3.0.0/tests/xmltester/XMLTester.cpp
---- geos-3.0.0~/tests/xmltester/XMLTester.cpp  2007-12-21 19:14:09.000000000 
+0100
-+++ geos-3.0.0/tests/xmltester/XMLTester.cpp   2008-04-10 14:27:18.000000000 
+0200
-@@ -57,6 +57,7 @@
- #include <functional>
- #include <stdexcept>
- #include <cmath>
-+#include <cstring>
- 
- #ifdef _MSC_VER
- #include <windows.h>
-diff -urNad geos-3.0.0~/tests/xmltester/markup/MarkupSTL.h 
geos-3.0.0/tests/xmltester/markup/MarkupSTL.h
---- geos-3.0.0~/tests/xmltester/markup/MarkupSTL.h     2007-12-12 
22:59:30.000000000 +0100
-+++ geos-3.0.0/tests/xmltester/markup/MarkupSTL.h      2008-04-10 
14:27:18.000000000 +0200
-@@ -65,6 +65,7 @@
- #include <string>
- #include <map>
- #include <vector>
-+#include <cstring>
- 
- #ifdef _DEBUG
- #define _DS(i) (i?&(m_strDoc.c_str())[m_aPos[i].nStartL]:0)


_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to