This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository osmium.
commit 790946b4808060e62690345d7409460afdbd46df
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Mon Jun 9 00:40:32 2014 +0200
Drop obsolete patches.
---
debian/changelog | 2 +-
debian/patches/01-fix_ld--as-needed.patch | 73 ---------------------------
debian/patches/02-support_new_libgeos++.patch | 47 -----------------
debian/patches/04-hardening.patch | 15 ------
debian/patches/series | 3 --
5 files changed, 1 insertion(+), 139 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f97dd47..fa31990 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,6 @@ osmium (0.0~20140410-d1d56bedb3-1) UNRELEASED; urgency=medium
- Make Debian GIS maintainer of the package
- Build-Depends: s/libgdal1-dev/libgdal-dev (>= 1.10.0-0~)/
Closes: #732389
- * debian/patches/04-hardening.patch: Propagate hardening options
[ Bas Couwenberg ]
* Add myself to Uploaders.
@@ -18,6 +17,7 @@ osmium (0.0~20140410-d1d56bedb3-1) UNRELEASED; urgency=medium
* New git snapshot.
(closes: #700614)
* Add build dependencies on boost libraries.
+ * Drop obsolete patches, refresh remaining patches.
-- Bas Couwenberg <sebas...@xs4all.nl> Sun, 08 Jun 2014 19:07:28 +0200
diff --git a/debian/patches/01-fix_ld--as-needed.patch
b/debian/patches/01-fix_ld--as-needed.patch
deleted file mode 100644
index 1bde3ba..0000000
--- a/debian/patches/01-fix_ld--as-needed.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From: Julian Taylor <jtay...@ubuntu.com>
-Subject: fix build with ld --as-needed
- libraries must be placed after objects needing their symbols
-Origin: vendor
-Bug-Debian: http://bugs.debian.org/656751
-Forwarded: no
-
----
- test/run_tests.sh | 15 ++++++++-------
- test/testgroup_geos/setup.sh | 3 ++-
- test/testgroup_ogr/setup.sh | 3 ++-
- test/testgroup_plain/setup.sh | 2 +-
- 4 files changed, 13 insertions(+), 10 deletions(-)
-
---- osmium.orig/test/run_tests.sh
-+++ osmium/test/run_tests.sh
-@@ -13,7 +13,8 @@ set -e
-
- CXX="g++"
- CXXFLAGS="-g -Wall -Wextra -Wredundant-decls -Wdisabled-optimization
-pedantic -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual
-Wsign-promo"
--COMPILE="$CXX -I../include -I. $CXXFLAGS -lboost_unit_test_framework -o tests
test_utils.cpp"
-+LIBADD="-lboost_unit_test_framework"
-+COMPILE="$CXX -I../include -I. $CXXFLAGS -o tests test_utils.cpp"
-
- if [ "x$1" = "x-v" ]; then
- VALGRIND="valgrind --leak-check=full --show-reachable=yes"
-@@ -30,8 +31,8 @@ if [ "x$1" = "x" ]; then
- echo "\nTesting group $GROUP...\n"
- . $DIR/setup.sh
- FILES="test_main.cpp $DIR/*/test_*.cpp"
-- echo $COMPILE $FLAGS $FILES
-- $COMPILE $FLAGS $FILES
-+ echo $COMPILE $FLAGS $FILES $LIBS $LIBADD
-+ $COMPILE $FLAGS $FILES $LIBS $LIBADD
- $VALGRIND ./tests
- done
- else
-@@ -41,14 +42,14 @@ else
- if [ "x$2" = "x" ]; then
- echo "\nTesting group $GROUP...\n"
- FILES="test_main.cpp $DIR/*/test_*.cpp"
-- echo $COMPILE $FLAGS $FILES
-- $COMPILE $FLAGS $FILES
-+ echo $COMPILE $FLAGS $FILES $LIBS $LIBADD
-+ $COMPILE $FLAGS $FILES $LIBS $LIBADD
- $VALGRIND ./tests
- else
- echo "\nTesting file $2 in group $GROUP...\n"
- FILES="-DSTAND_ALONE $DIR/$2"
-- echo $COMPILE $FLAGS $FILES
-- $COMPILE $FLAGS $FILES
-+ echo $COMPILE $FLAGS $FILES $LIBS $LIBADD
-+ $COMPILE $FLAGS $FILES $LIBS $LIBADD
- $VALGRIND ./tests
- fi
- fi
---- osmium.orig/test/testgroup_geos/setup.sh
-+++ osmium/test/testgroup_geos/setup.sh
-@@ -1 +1,2 @@
--FLAGS="-DOSMIUM_WITH_GEOS `geos-config --cflags` `geos-config --libs`"
-+FLAGS="-DOSMIUM_WITH_GEOS `geos-config --cflags`"
-+LIBS="-DOSMIUM_WITH_GEOS `geos-config --libs`"
---- osmium.orig/test/testgroup_ogr/setup.sh
-+++ osmium/test/testgroup_ogr/setup.sh
-@@ -1 +1,2 @@
--FLAGS="-DOSMIUM_WITH_OGR `gdal-config --cflags` `gdal-config --libs`"
-+FLAGS="-DOSMIUM_WITH_OGR `gdal-config --cflags`"
-+LIBS="-DOSMIUM_WITH_OGR `gdal-config --libs`"
---- osmium.orig/test/testgroup_plain/setup.sh
-+++ osmium/test/testgroup_plain/setup.sh
-@@ -1 +1 @@
--FLAGS=""
-+FLAGS="`gdal-config --cflags`"
diff --git a/debian/patches/02-support_new_libgeos++.patch
b/debian/patches/02-support_new_libgeos++.patch
deleted file mode 100644
index e5c9926..0000000
--- a/debian/patches/02-support_new_libgeos++.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From: David Paleino <da...@debian.org>
-Subject: patch code to work with geos++ 3.3.1
-Origin: vendor
-Forwarded: no
-
----
- include/osmium/geometry/multipolygon.hpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
---- osmium.orig/include/osmium/geometry/multipolygon.hpp
-+++ osmium/include/osmium/geometry/multipolygon.hpp
-@@ -54,14 +54,14 @@ namespace Osmium {
- switch (g->getGeometryTypeId()) {
- case geos::geom::GEOS_MULTIPOLYGON:
- case geos::geom::GEOS_MULTILINESTRING: {
-- for (geos::geom::GeometryCollection::const_iterator
it = static_cast<const geos::geom::GeometryCollection*>(g)->begin();
-- it != static_cast<const
geos::geom::GeometryCollection*>(g)->end(); ++it) {
-+ for (geos::geom::GeometryCollection::const_iterator
it = dynamic_cast<const geos::geom::GeometryCollection*>(g)->begin();
-+ it != dynamic_cast<const
geos::geom::GeometryCollection*>(g)->end(); ++it) {
- dump_geometry(*it, part_start_list, x_list,
y_list);
- }
- break;
- }
- case geos::geom::GEOS_POLYGON: {
-- const geos::geom::Polygon* polygon =
static_cast<const geos::geom::Polygon*>(g);
-+ const geos::geom::Polygon* polygon =
dynamic_cast<const geos::geom::Polygon*>(g);
- dump_geometry(polygon->getExteriorRing(),
part_start_list, x_list, y_list);
- for (size_t i=0; i < polygon->getNumInteriorRing();
++i) {
- dump_geometry(polygon->getInteriorRingN(i),
part_start_list, x_list, y_list);
-@@ -71,7 +71,7 @@ namespace Osmium {
- case geos::geom::GEOS_LINESTRING:
- case geos::geom::GEOS_LINEARRING: {
- part_start_list.push_back(x_list.size());
-- const geos::geom::CoordinateSequence* cs =
static_cast<const geos::geom::LineString*>(g)->getCoordinatesRO();
-+ const geos::geom::CoordinateSequence* cs =
dynamic_cast<const geos::geom::LineString*>(g)->getCoordinatesRO();
- for (size_t i = 0; i < cs->getSize(); ++i) {
- x_list.push_back(cs->getX(i));
- y_list.push_back(cs->getY(i));
-@@ -165,7 +165,7 @@ namespace Osmium {
- v8::Local<v8::Array> multipolygon_array =
v8::Array::New(geometry->getNumGeometries());
-
- for (size_t i=0; i < geometry->getNumGeometries(); ++i) {
-- geos::geom::Polygon* polygon = (geos::geom::Polygon*)
geometry->getGeometryN(i);
-+ const geos::geom::Polygon* polygon =
dynamic_cast<const geos::geom::Polygon*>(geometry->getGeometryN(i));
- v8::Local<v8::Array> polygon_array =
v8::Array::New(polygon->getNumInteriorRing());
- multipolygon_array->Set(i, polygon_array);
- polygon_array->Set(0,
js_ring_as_array(polygon->getExteriorRing()));
diff --git a/debian/patches/04-hardening.patch
b/debian/patches/04-hardening.patch
deleted file mode 100644
index e5ec8d2..0000000
--- a/debian/patches/04-hardening.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: Andreas Tille <ti...@debian.org>
-Last-Update: Tue, 17 Dec 2013 17:27:00 +0100
-Description: Propagate hardening options
-
---- osmium.orig/osmjs/Makefile
-+++ osmium/osmjs/Makefile
-@@ -26,7 +26,7 @@
-
- CXXFLAGS += -I../include
-
--LDFLAGS = -L/usr/local/lib -lexpat -lpthread
-+LDFLAGS += -L/usr/local/lib -lexpat -lpthread
- LDFLAGS += $(shell geos-config --libs)
-
- LIB_V8 = -lv8 -licuuc
diff --git a/debian/patches/series b/debian/patches/series
index 9fd5ef0..c81dd38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
00-fix_typos.patch
-01-fix_ld--as-needed.patch
-02-support_new_libgeos++.patch
03-disable_building_docs.patch
04-big-endian.patch
-04-hardening.patch
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/osmium.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
