Author: frankie
Date: 2008-04-10 12:32:51 +0000 (Thu, 10 Apr 2008)
New Revision: 1513
Added:
packages/geos/trunk/debian/patches/
packages/geos/trunk/debian/patches/00list
packages/geos/trunk/debian/patches/gcc43.dpatch
Modified:
packages/geos/trunk/debian/changelog
Log:
Incorporating NMU patch in the right way, i.e. via dpatch.
Modified: packages/geos/trunk/debian/changelog
===================================================================
--- packages/geos/trunk/debian/changelog 2008-04-09 13:11:31 UTC (rev
1512)
+++ packages/geos/trunk/debian/changelog 2008-04-10 12:32:51 UTC (rev
1513)
@@ -1,3 +1,10 @@
+geos (3.0.0-4) unstable; urgency=low
+
+ * [PATCH] gcc4.3.dpatch added to manage GCC 4.3 issue.
+ (closes: #456089)
+
+ -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Thu, 10 Apr 2008 14:27:56
+0200
+
geos (3.0.0-3) unstable; urgency=low
* debian/rules: the library itself (.so file) shouldn't be in the -dev
Added: packages/geos/trunk/debian/patches/00list
===================================================================
--- packages/geos/trunk/debian/patches/00list (rev 0)
+++ packages/geos/trunk/debian/patches/00list 2008-04-10 12:32:51 UTC (rev
1513)
@@ -0,0 +1 @@
+gcc43
Added: packages/geos/trunk/debian/patches/gcc43.dpatch
===================================================================
--- packages/geos/trunk/debian/patches/gcc43.dpatch
(rev 0)
+++ packages/geos/trunk/debian/patches/gcc43.dpatch 2008-04-10 12:32:51 UTC
(rev 1513)
@@ -0,0 +1,162 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## gcc43.dpatch by Francesco Paolo Lovergine <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+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)
Property changes on: packages/geos/trunk/debian/patches/gcc43.dpatch
___________________________________________________________________
Name: svn:executable
+ *
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
