[osmium-tool] 01/02: Merge tag 'debian/1.3.0-1' into jessie-backports

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch jessie-backports
in repository osmium-tool.

commit 3448fe3a86a3792cc686465e15afc992fc6a5ea8
Merge: 92f6d04 3862839
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Dec 11 12:09:02 2015 +0100

    Merge tag 'debian/1.3.0-1' into jessie-backports
    
    Conflicts:
    	debian/changelog

 .gitattributes                           |   5 +
 CHANGELOG.md                             |  18 ++-
 CMakeLists.txt                           |   5 +-
 README.md                                |   1 +
 cmake/FindOsmium.cmake                   |  13 +-
 debian/changelog                         |  13 ++
 debian/control                           |   2 +-
 man/osmium-apply-changes.md              |   6 +
 man/osmium-cat.md                        |   6 +
 man/osmium-changeset-filter.md           | 117 ++++++++++++++++
 man/osmium-check-refs.md                 |   2 +
 man/osmium-file-formats.md               |  17 +--
 man/osmium-fileinfo.md                   |   2 +
 man/osmium-getid.md                      |   6 +
 man/osmium-merge-changes.md              |   6 +
 man/osmium-renumber.md                   |   6 +
 man/{osmium-getid.md => osmium-sort.md}  |  27 ++--
 man/osmium-time-filter.md                |   6 +
 man/osmium.md                            |  14 ++
 src/cmd.hpp                              |  13 +-
 src/command_apply_changes.cpp            |  24 ++--
 src/command_cat.cpp                      |  25 ++--
 src/command_changeset_filter.cpp         | 232 +++++++++++++++++++++++++++++++
 src/command_changeset_filter.hpp         |  60 ++++++++
 src/command_check_refs.cpp               |  12 +-
 src/command_fileinfo.cpp                 |   9 +-
 src/command_getid.cpp                    |  45 +++---
 src/command_merge_changes.cpp            |  29 ++--
 src/command_renumber.cpp                 |  30 ++--
 src/command_sort.cpp                     | 122 ++++++++++++++++
 src/command_sort.hpp                     |  48 +++++++
 src/command_time_filter.cpp              |  59 +++++---
 src/io.cpp                               |  41 +++++-
 src/main.cpp                             |   2 +-
 test/changeset-filter/CMakeLists.txt     |  70 ++++++++++
 test/changeset-filter/input-open.osm     |   7 +
 test/changeset-filter/input1.osm         |  10 ++
 test/changeset-filter/output-empty.osm   |   3 +
 test/changeset-filter/output-open.osm    |   7 +
 test/changeset-filter/output1-all.osm    |  10 ++
 test/changeset-filter/output1-first.osm  |   6 +
 test/changeset-filter/output1-second.osm |   7 +
 test/sort/CMakeLists.txt                 |  26 ++++
 test/sort/input-bounds1.osm              |  16 +++
 test/sort/input-bounds2.osm              |  11 ++
 test/sort/input-change.osc               |  19 +++
 test/sort/input-history1.osm             |  12 ++
 test/sort/input-history2.osm             |   7 +
 test/sort/input-simple1.osm              |  15 ++
 test/sort/input-simple2.osm              |  10 ++
 test/sort/output-bounds.osm              |  23 +++
 test/sort/output-change.osc              |  19 +++
 test/sort/output-history.osm             |  16 +++
 test/sort/output-simple.osm              |  22 +++
 zsh_completion/_osmium                   |  38 ++++-
 55 files changed, 1215 insertions(+), 162 deletions(-)

diff --cc debian/changelog
index a15951c,9a6e924..741c122
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,16 +1,22 @@@
+ osmium-tool (1.3.0-1) unstable; urgency=medium
+ 
+   * Move from experimental to unstable.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 05 Dec 2015 14:21:36 +0100
+ 
+ osmium-tool (1.3.0-1~exp1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Bump minimum required libosmium2-dev to 2.5.3.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Wed, 18 Nov 2015 22:57:28 +0100
+ 
 +osmium-tool (1.2.1-2~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Tue, 08 Sep 2015 08:32:20 +0200
 +
  osmium-tool (1.2.1-2) unstable; urgency=medium
  
    * Don't ignore test failures any more, all fixed upstream.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmium-tool.git