[Git][debian-gis-team/osmium-tool][master] 3 commits: Add upstream patches to fix FTBFS with libosmium 2.15.0. (closes: #916109)
Bas Couwenberg
gitlab at salsa.debian.org
Mon Dec 10 11:37:12 GMT 2018
Bas Couwenberg pushed to branch master at Debian GIS Project / osmium-tool
Commits:
10cab85d by Bas Couwenberg at 2018-12-10T11:09:10Z
Add upstream patches to fix FTBFS with libosmium 2.15.0. (closes: #916109)
- - - - -
c52c6145 by Bas Couwenberg at 2018-12-10T11:20:35Z
Bump minimum required libosmium2-dev to 2.15.0.
- - - - -
3106f99a by Bas Couwenberg at 2018-12-10T11:20:49Z
Set distribution to unstable.
- - - - -
5 changed files:
- debian/changelog
- debian/control
- + debian/patches/0001-Add-upload-false-to-all-test-output-files.patch
- + debian/patches/0001-Do-not-forward-declare-classes-we-don-t-own.patch
- + debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,8 +1,11 @@
-osmium-tool (1.9.1-2) UNRELEASED; urgency=medium
+osmium-tool (1.9.1-2) unstable; urgency=medium
* Bump Standards-Version to 4.2.1, no changes.
+ * Add upstream patches to fix FTBFS with libosmium 2.15.0.
+ (closes: #916109)
+ * Bump minimum required libosmium2-dev to 2.15.0.
- -- Bas Couwenberg <sebastic at debian.org> Tue, 28 Aug 2018 14:48:34 +0200
+ -- Bas Couwenberg <sebastic at debian.org> Mon, 10 Dec 2018 12:20:36 +0100
osmium-tool (1.9.1-1) unstable; urgency=medium
=====================================
debian/control
=====================================
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9),
libboost-program-options-dev,
libbz2-dev,
libexpat1-dev,
- libosmium2-dev (>= 2.14.2),
+ libosmium2-dev (>= 2.15.0),
pandoc,
zlib1g-dev
Standards-Version: 4.2.1
=====================================
debian/patches/0001-Add-upload-false-to-all-test-output-files.patch
=====================================
@@ -0,0 +1,368 @@
+Description: Add upload="false" to all test output files.
+ Recent libosmium will create it this way.
+Author: Jochen Topf <jochen at topf.org>
+Origin: https://github.com/osmcode/osmium-tool/commit/2f34ae5386b0589af925f0e05e0b5b27d5919564
+
+--- a/test/add-locations-to-ways/CMakeLists.txt
++++ b/test/add-locations-to-ways/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ #-----------------------------------------------------------------------------
+
+ function(check_add_locations_to_ways _name _options _input _output)
+- check_output(add-locations-to-ways ${_name} "add-locations-to-ways ${_options} --generator=test --output-format=xml add-locations-to-ways/${_input}" "add-locations-to-ways/${_output}")
++ check_output(add-locations-to-ways ${_name} "add-locations-to-ways ${_options} --generator=test --output-header=xml_josm_upload=false --output-format=xml add-locations-to-ways/${_input}" "add-locations-to-ways/${_output}")
+ endfunction()
+
+ check_add_locations_to_ways(taggednodes "" input.osm output.osm)
+--- a/test/add-locations-to-ways/output-n.osm
++++ b/test/add-locations-to-ways/output-n.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="10" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="1" lon="1"/>
+ <node id="11" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="2" lon="1"/>
+ <node id="12" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="3" lon="1"/>
+--- a/test/add-locations-to-ways/output.osm
++++ b/test/add-locations-to-ways/output.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="13" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="4" lon="1">
+ <tag k="some" v="tag"/>
+ </node>
+--- a/test/fileinfo/fi1-result.txt
++++ b/test/fileinfo/fi1-result.txt
+@@ -9,6 +9,7 @@ Header:
+ Options:
+ generator=testdata
+ version=0.6
++ xml_josm_upload=false
+ Data:
+ Bounding box: (1,1,1,3)
+ Timestamps:
+--- a/test/getid/CMakeLists.txt
++++ b/test/getid/CMakeLists.txt
+@@ -7,11 +7,11 @@
+ #-----------------------------------------------------------------------------
+
+ function(check_getid _name _input _output)
+- check_output(getid ${_name} "getid --generator=test -f osm getid/${_input} n11,n12 w21" "getid/${_output}")
++ check_output(getid ${_name} "getid --generator=test --output-header=xml_josm_upload=false -f osm getid/${_input} n11,n12 w21" "getid/${_output}")
+ endfunction()
+
+ function(check_getid_file _name _file _input _output)
+- check_output(getid ${_name} "getid --generator=test -i getid/${_file} -f osm getid/${_input}" "getid/${_output}")
++ check_output(getid ${_name} "getid --generator=test --output-header=xml_josm_upload=false -i getid/${_file} -f osm getid/${_input}" "getid/${_output}")
+ endfunction()
+
+ check_getid(n input.osm output.osm)
+--- a/test/getid/out10.osm
++++ b/test/getid/out10.osm
+@@ -1,4 +1,4 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="10" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="1" lon="1"/>
+ </osm>
+--- a/test/getid/out21.osm
++++ b/test/getid/out21.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="11" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="2" lon="1"/>
+ <node id="12" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="3" lon="1"/>
+ <way id="21" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
+--- a/test/getid/out30.osm
++++ b/test/getid/out30.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="10" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="1" lon="1"/>
+ <node id="11" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="2" lon="1"/>
+ <node id="12" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="3" lon="1"/>
+--- a/test/getid/out31.osm
++++ b/test/getid/out31.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="10" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="1" lon="1"/>
+ <node id="11" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="2" lon="1"/>
+ <node id="12" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="3" lon="1"/>
+--- a/test/getid/out32.osm
++++ b/test/getid/out32.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="13" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="4" lon="1"/>
+ <relation id="32" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
+ <member type="node" ref="13" role=""/>
+--- a/test/getid/output-file.osm
++++ b/test/getid/output-file.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="10" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="1" lon="1"/>
+ <node id="11" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="2" lon="1"/>
+ <node id="12" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="3" lon="1"/>
+--- a/test/getid/output.osm
++++ b/test/getid/output.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="11" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="2" lon="1"/>
+ <node id="12" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="3" lon="1"/>
+ <way id="21" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
+--- a/test/getid/relloop-out.osm
++++ b/test/getid/relloop-out.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <relation id="30" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
+ <member type="relation" ref="31" role=""/>
+ </relation>
+--- a/test/getparents/CMakeLists.txt
++++ b/test/getparents/CMakeLists.txt
+@@ -7,11 +7,11 @@
+ #-----------------------------------------------------------------------------
+
+ function(check_getparents _name _input _ids _output)
+- check_output(getparents ${_name} "getparents --generator=test -f osm getparents/${_input} ${_ids}" "getparents/${_output}")
++ check_output(getparents ${_name} "getparents --generator=test --output-header=xml_josm_upload=false -f osm getparents/${_input} ${_ids}" "getparents/${_output}")
+ endfunction()
+
+ function(check_getparents_r _name _input _ids _output)
+- check_output(getparents ${_name}-s "getparents --generator=test -f osm --add-self getparents/${_input} ${_ids}" "getparents/${_output}")
++ check_output(getparents ${_name}-s "getparents --generator=test --output-header=xml_josm_upload=false -f osm --add-self getparents/${_input} ${_ids}" "getparents/${_output}")
+ endfunction()
+
+ #-----------------------------------------------------------------------------
+--- a/test/getparents/out-n10-s.osm
++++ b/test/getparents/out-n10-s.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="10" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="1" lon="1"/>
+ <way id="20" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
+ <nd ref="10"/>
+--- a/test/getparents/out-n10.osm
++++ b/test/getparents/out-n10.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <way id="20" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
+ <nd ref="10"/>
+ <nd ref="11"/>
+--- a/test/getparents/out-n12-s.osm
++++ b/test/getparents/out-n12-s.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="12" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="3" lon="1"/>
+ <way id="20" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
+ <nd ref="10"/>
+--- a/test/getparents/out-n12.osm
++++ b/test/getparents/out-n12.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <way id="20" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
+ <nd ref="10"/>
+ <nd ref="11"/>
+--- a/test/getparents/out-w20-s.osm
++++ b/test/getparents/out-w20-s.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <way id="20" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
+ <nd ref="10"/>
+ <nd ref="11"/>
+--- a/test/getparents/out-w20.osm
++++ b/test/getparents/out-w20.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <relation id="30" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
+ <member type="node" ref="12" role="m1"/>
+ <member type="way" ref="20" role="m2"/>
+--- a/test/tags-filter/CMakeLists.txt
++++ b/test/tags-filter/CMakeLists.txt
+@@ -7,15 +7,15 @@
+ #-----------------------------------------------------------------------------
+
+ function(check_tags_filter_R _name _input _expressions _output)
+- check_output(tags-filter ${_name} "tags-filter --generator=test -f osm -R tags-filter/${_input} ${_expressions}" "tags-filter/${_output}")
++ check_output(tags-filter ${_name} "tags-filter --generator=test --output-header=xml_josm_upload=false -f osm -R tags-filter/${_input} ${_expressions}" "tags-filter/${_output}")
+ endfunction()
+
+ function(check_tags_filter_i _name _input _expressions _output)
+- check_output(tags-filter ${_name} "tags-filter --generator=test -f osm -i -R tags-filter/${_input} ${_expressions}" "tags-filter/${_output}")
++ check_output(tags-filter ${_name} "tags-filter --generator=test --output-header=xml_josm_upload=false -f osm -i -R tags-filter/${_input} ${_expressions}" "tags-filter/${_output}")
+ endfunction()
+
+ function(check_tags_filter _name _input _expressions _output)
+- check_output(tags-filter ${_name} "tags-filter --generator=test -f osm tags-filter/${_input} ${_expressions}" "tags-filter/${_output}")
++ check_output(tags-filter ${_name} "tags-filter --generator=test --output-header=xml_josm_upload=false -f osm tags-filter/${_input} ${_expressions}" "tags-filter/${_output}")
+ endfunction()
+
+ check_tags_filter_R(node input.osm n/amenity output-amenity.osm)
+--- a/test/tags-filter/output-amenity.osm
++++ b/test/tags-filter/output-amenity.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="14" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="5" lon="1">
+ <tag k="amenity" v="post_box"/>
+ </node>
+--- a/test/tags-filter/output-highway-r.osm
++++ b/test/tags-filter/output-highway-r.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="10" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="1" lon="1"/>
+ <node id="11" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="2" lon="1"/>
+ <node id="12" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="3" lon="1"/>
+--- a/test/tags-filter/output-highway.osm
++++ b/test/tags-filter/output-highway.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <way id="20" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
+ <nd ref="10"/>
+ <nd ref="11"/>
+--- a/test/tags-filter/output-no-note.osm
++++ b/test/tags-filter/output-no-note.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="10" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="1" lon="1"/>
+ <node id="11" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="2" lon="1"/>
+ <node id="12" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="3" lon="1"/>
+--- a/test/tags-filter/output-note.osm
++++ b/test/tags-filter/output-note.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <way id="21" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1">
+ <nd ref="12"/>
+ <nd ref="13"/>
+--- a/test/time-filter/CMakeLists.txt
++++ b/test/time-filter/CMakeLists.txt
+@@ -7,7 +7,7 @@
+ #-----------------------------------------------------------------------------
+
+ function(check_time_filter _name _type _from _to _output)
+- check_output(time-filter ${_name} "time-filter --generator=test -f ${_type} time-filter/input.osh ${_from} ${_to}" "time-filter/output-${_output}.${_type}")
++ check_output(time-filter ${_name} "time-filter --generator=test --output-header=xml_josm_upload=false -f ${_type} time-filter/input.osh ${_from} ${_to}" "time-filter/output-${_output}.${_type}")
+ endfunction()
+
+ #-----------------------------------------------------------------------------
+--- a/test/time-filter/output-last.osm
++++ b/test/time-filter/output-last.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="2" version="3" timestamp="2015-01-01T02:00:00Z" uid="1" user="test" changeset="3" lat="2" lon="3"/>
+ <node id="3" version="4" timestamp="2015-01-01T03:00:00Z" uid="1" user="test" changeset="3" lat="3" lon="3"/>
+ </osm>
+--- a/test/time-filter/output-range-0-5.osh
++++ b/test/time-filter/output-range-0-5.osh
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="1" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" visible="true" lat="1" lon="1"/>
+ <node id="1" version="2" timestamp="2015-01-01T02:00:00Z" uid="1" user="test" changeset="2" visible="true" lat="1" lon="2"/>
+ <node id="1" version="3" timestamp="2015-01-01T03:00:00Z" uid="1" user="test" changeset="3" visible="true" lat="1" lon="3"/>
+--- a/test/time-filter/output-range-1-2.osh
++++ b/test/time-filter/output-range-1-2.osh
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="1" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" visible="true" lat="1" lon="1"/>
+ <node id="2" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" visible="true" lat="2" lon="1"/>
+ <node id="3" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" visible="true" lat="3" lon="1"/>
+--- a/test/time-filter/output-range-1a-2a.osh
++++ b/test/time-filter/output-range-1a-2a.osh
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="1" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" visible="true" lat="1" lon="1"/>
+ <node id="1" version="2" timestamp="2015-01-01T02:00:00Z" uid="1" user="test" changeset="2" visible="true" lat="1" lon="2"/>
+ <node id="2" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" visible="true" lat="2" lon="1"/>
+--- a/test/time-filter/output-range-2-3.osh
++++ b/test/time-filter/output-range-2-3.osh
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="1" version="2" timestamp="2015-01-01T02:00:00Z" uid="1" user="test" changeset="2" visible="true" lat="1" lon="2"/>
+ <node id="2" version="2" timestamp="2015-01-01T02:00:00Z" uid="1" user="test" changeset="2" visible="true" lat="2" lon="2"/>
+ <node id="2" version="3" timestamp="2015-01-01T02:00:00Z" uid="1" user="test" changeset="3" visible="true" lat="2" lon="3"/>
+--- a/test/time-filter/output-range-2-3a.osh
++++ b/test/time-filter/output-range-2-3a.osh
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="1" version="2" timestamp="2015-01-01T02:00:00Z" uid="1" user="test" changeset="2" visible="true" lat="1" lon="2"/>
+ <node id="1" version="3" timestamp="2015-01-01T03:00:00Z" uid="1" user="test" changeset="3" visible="true" lat="1" lon="3"/>
+ <node id="2" version="2" timestamp="2015-01-01T02:00:00Z" uid="1" user="test" changeset="2" visible="true" lat="2" lon="2"/>
+--- a/test/time-filter/output-range-2-4.osh
++++ b/test/time-filter/output-range-2-4.osh
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="1" version="2" timestamp="2015-01-01T02:00:00Z" uid="1" user="test" changeset="2" visible="true" lat="1" lon="2"/>
+ <node id="1" version="3" timestamp="2015-01-01T03:00:00Z" uid="1" user="test" changeset="3" visible="true" lat="1" lon="3"/>
+ <node id="2" version="2" timestamp="2015-01-01T02:00:00Z" uid="1" user="test" changeset="2" visible="true" lat="2" lon="2"/>
+--- a/test/time-filter/output-ts1.osm
++++ b/test/time-filter/output-ts1.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="1" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="1" lon="1"/>
+ <node id="2" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="2" lon="1"/>
+ <node id="3" version="1" timestamp="2015-01-01T01:00:00Z" uid="1" user="test" changeset="1" lat="3" lon="1"/>
+--- a/test/time-filter/output-ts2.osm
++++ b/test/time-filter/output-ts2.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="1" version="2" timestamp="2015-01-01T02:00:00Z" uid="1" user="test" changeset="2" lat="1" lon="2"/>
+ <node id="2" version="3" timestamp="2015-01-01T02:00:00Z" uid="1" user="test" changeset="3" lat="2" lon="3"/>
+ <node id="3" version="3" timestamp="2015-01-01T02:00:00Z" uid="1" user="test" changeset="2" lat="3" lon="2"/>
+--- a/test/time-filter/output-ts3.osm
++++ b/test/time-filter/output-ts3.osm
+@@ -1,5 +1,5 @@
+ <?xml version='1.0' encoding='UTF-8'?>
+-<osm version="0.6" generator="test">
++<osm version="0.6" upload="false" generator="test">
+ <node id="1" version="3" timestamp="2015-01-01T03:00:00Z" uid="1" user="test" changeset="3" lat="1" lon="3"/>
+ <node id="2" version="3" timestamp="2015-01-01T02:00:00Z" uid="1" user="test" changeset="3" lat="2" lon="3"/>
+ <node id="3" version="4" timestamp="2015-01-01T03:00:00Z" uid="1" user="test" changeset="3" lat="3" lon="3"/>
=====================================
debian/patches/0001-Do-not-forward-declare-classes-we-don-t-own.patch
=====================================
@@ -0,0 +1,256 @@
+Description: Do not forward-declare classes we don't own.
+ Because it makes the code brittle, depending of internals of libosmium.
+Author: Jochen Topf <jochen at topf.org>
+Origin: https://github.com/osmcode/osmium-tool/commit/ca9f83a00787eb6c0679735fae115acacc44a3d6
+Bug-Debian: https://bugs.debian.org/916109
+
+--- a/src/cmd.hpp
++++ b/src/cmd.hpp
+@@ -24,6 +24,7 @@ along with this program. If not, see <h
+ */
+
+ #include <osmium/io/file.hpp>
++#include <osmium/io/header.hpp>
+ #include <osmium/io/writer_options.hpp>
+ #include <osmium/osm/entity_bits.hpp>
+ #include <osmium/util/file.hpp>
+@@ -42,14 +43,6 @@ const char* get_osmium_version() noexcep
+ const char* get_osmium_long_version() noexcept;
+ const char* get_libosmium_version() noexcept;
+
+-namespace osmium {
+-
+- namespace io {
+- class Header;
+- } // namespace io
+-
+-} // namespace osmium
+-
+ class CommandFactory;
+
+ namespace po = boost::program_options;
+--- a/src/command_add_locations_to_ways.hpp
++++ b/src/command_add_locations_to_ways.hpp
+@@ -27,17 +27,9 @@ along with this program. If not, see <h
+
+ #include <osmium/handler/node_locations_for_ways.hpp>
+ #include <osmium/index/map/all.hpp>
+-
+-namespace osmium {
+-
+- namespace io {
+- class Reader;
+- class Writer;
+- } // namespace io
+-
+- class ProgressBar;
+-
+-} // namespace osmium
++#include <osmium/io/reader.hpp>
++#include <osmium/io/writer.hpp>
++#include <osmium/util/progress_bar.hpp>
+
+ #include <string>
+ #include <vector>
+--- a/src/command_derive_changes.hpp
++++ b/src/command_derive_changes.hpp
+@@ -25,17 +25,9 @@ along with this program. If not, see <h
+
+ #include "cmd.hpp" // IWYU pragma: export
+
++#include <osmium/io/writer.hpp>
+ #include <osmium/memory/buffer.hpp>
+-
+-namespace osmium {
+-
+- namespace io {
+- class Writer;
+- } // namespace io
+-
+- class OSMObject;
+-
+-} // namespace osmium
++#include <osmium/osm/object.hpp>
+
+ #include <string>
+ #include <vector>
+--- a/src/command_getid.hpp
++++ b/src/command_getid.hpp
+@@ -28,6 +28,7 @@ along with this program. If not, see <h
+ #include <osmium/fwd.hpp>
+ #include <osmium/index/id_set.hpp>
+ #include <osmium/index/nwr_array.hpp>
++#include <osmium/index/relations_map.hpp>
+ #include <osmium/osm/entity_bits.hpp>
+ #include <osmium/osm/item_type.hpp>
+ #include <osmium/osm/types.hpp>
+@@ -37,14 +38,6 @@ along with this program. If not, see <h
+ #include <string>
+ #include <vector>
+
+-namespace osmium {
+-
+- namespace index {
+- class RelationsMapIndex;
+- } // namespace index
+-
+-} // namespace osmium
+-
+ class CommandGetId : public Command, public with_single_osm_input, public with_osm_output {
+
+ osmium::item_type m_default_item_type = osmium::item_type::node;
+--- a/src/command_getparents.hpp
++++ b/src/command_getparents.hpp
+@@ -28,6 +28,7 @@ along with this program. If not, see <h
+ #include <osmium/fwd.hpp>
+ #include <osmium/index/id_set.hpp>
+ #include <osmium/index/nwr_array.hpp>
++#include <osmium/index/relations_map.hpp>
+ #include <osmium/osm/entity_bits.hpp>
+ #include <osmium/osm/item_type.hpp>
+ #include <osmium/osm/types.hpp>
+@@ -37,14 +38,6 @@ along with this program. If not, see <h
+ #include <string>
+ #include <vector>
+
+-namespace osmium {
+-
+- namespace index {
+- class RelationsMapIndex;
+- } // namespace index
+-
+-} // namespace osmium
+-
+ class CommandGetParents : public Command, public with_single_osm_input, public with_osm_output {
+
+ osmium::item_type m_default_item_type = osmium::item_type::node;
+--- a/src/command_merge.cpp
++++ b/src/command_merge.cpp
+@@ -23,6 +23,7 @@ along with this program. If not, see <h
+ #include "command_merge.hpp"
+ #include "util.hpp"
+
++#include <osmium/io/file.hpp>
+ #include <osmium/io/header.hpp>
+ #include <osmium/io/input_iterator.hpp>
+ #include <osmium/io/output_iterator.hpp>
+@@ -44,14 +45,6 @@ along with this program. If not, see <h
+ #include <utility>
+ #include <vector>
+
+-namespace osmium {
+-
+- namespace io {
+- class File;
+- } // namespace io
+-
+-} // namespace osmium
+-
+ bool CommandMerge::setup(const std::vector<std::string>& arguments) {
+ po::options_description opts_cmd{"COMMAND OPTIONS"};
+
+--- a/src/command_merge_changes.cpp
++++ b/src/command_merge_changes.cpp
+@@ -23,6 +23,7 @@ along with this program. If not, see <h
+ #include "command_merge_changes.hpp"
+ #include "util.hpp"
+
++#include <osmium/io/file.hpp>
+ #include <osmium/io/header.hpp>
+ #include <osmium/io/output_iterator.hpp>
+ #include <osmium/io/reader.hpp>
+@@ -42,14 +43,6 @@ along with this program. If not, see <h
+ #include <utility>
+ #include <vector>
+
+-namespace osmium {
+-
+- namespace io {
+- class File;
+- } // namespace io
+-
+-} // namespace osmium
+-
+ bool CommandMergeChanges::setup(const std::vector<std::string>& arguments) {
+ po::options_description opts_cmd{"COMMAND OPTIONS"};
+ opts_cmd.add_options()
+--- a/src/command_renumber.cpp
++++ b/src/command_renumber.cpp
+@@ -23,6 +23,7 @@ along with this program. If not, see <h
+ #include "exception.hpp"
+
+ #include <osmium/io/detail/read_write.hpp>
++#include <osmium/io/file.hpp>
+ #include <osmium/io/header.hpp>
+ #include <osmium/io/input_iterator.hpp>
+ #include <osmium/io/reader.hpp>
+@@ -55,14 +56,6 @@ along with this program. If not, see <h
+ # include <io.h>
+ #endif
+
+-namespace osmium {
+-
+- namespace io {
+- class File;
+- } // namespace io
+-
+-} // namespace osmium
+-
+ osmium::object_id_type id_map::add_offset_to_id(osmium::object_id_type id) const noexcept {
+ if (m_start_id < 0) {
+ return -id + m_start_id + 1;
+--- a/src/command_tags_filter.hpp
++++ b/src/command_tags_filter.hpp
+@@ -28,6 +28,7 @@ along with this program. If not, see <h
+ #include <osmium/fwd.hpp>
+ #include <osmium/index/id_set.hpp>
+ #include <osmium/index/nwr_array.hpp>
++#include <osmium/index/relations_map.hpp>
+ #include <osmium/osm/entity_bits.hpp>
+ #include <osmium/osm/item_type.hpp>
+ #include <osmium/osm/types.hpp>
+@@ -36,14 +37,6 @@ along with this program. If not, see <h
+ #include <string>
+ #include <vector>
+
+-namespace osmium {
+-
+- namespace index {
+- class RelationsMapIndex;
+- } // namespace index
+-
+-} // namespace osmium
+-
+ class CommandTagsFilter : public Command, public with_single_osm_input, public with_osm_output {
+
+ bool m_add_referenced_objects = true;
+--- a/src/util.hpp
++++ b/src/util.hpp
+@@ -23,25 +23,17 @@ along with this program. If not, see <h
+
+ */
+
++#include <osmium/io/file.hpp>
+ #include <osmium/osm/box.hpp>
+ #include <osmium/osm/entity_bits.hpp>
+ #include <osmium/tags/matcher.hpp>
++#include <osmium/tags/tags_filter.hpp>
+ #include <osmium/util/string_matcher.hpp>
+
+ #include <string>
+ #include <utility>
+ #include <vector>
+
+-namespace osmium {
+-
+- class TagsFilter;
+-
+- namespace io {
+- class File;
+- } // namespace io
+-
+-} // namespace osmium
+-
+ std::string get_filename_suffix(const std::string& file_name);
+ const char* yes_no(bool choice) noexcept;
+ void warning(const char* text);
=====================================
debian/patches/series
=====================================
@@ -0,0 +1,2 @@
+0001-Do-not-forward-declare-classes-we-don-t-own.patch
+0001-Add-upload-false-to-all-test-output-files.patch
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmium-tool/compare/db0fa28cb2052a0d7b2c05d91e36a7e02278bf73...3106f99ac1e6f13454de8f93fdc58cdec554b1d4
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/osmium-tool/compare/db0fa28cb2052a0d7b2c05d91e36a7e02278bf73...3106f99ac1e6f13454de8f93fdc58cdec554b1d4
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20181210/8f321709/attachment-0001.html>
More information about the Pkg-grass-devel
mailing list