debian/changelog

-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@debian.org>  Tue, 28 Aug 2018 14:48:34 +0200
+ -- Bas Couwenberg <sebastic@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-Do-not-forward-declare-classes-we-don-t-own.patch

+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@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

+0001-Do-not-forward-declare-classes-we-don-t-own.patch
+0001-Add-upload-false-to-all-test-output-files.patch