[pyosmium] 05/06: Drop patches, applied upstream.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository pyosmium.

commit 460f9db822379fd2fdb1d6b96bb70b33472588b7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Aug 8 15:17:23 2016 +0200

    Drop patches, applied upstream.
---
 debian/changelog                                  |  1 +
 debian/patches/series                             |  2 --
 debian/patches/std_pair_to_python_converter.patch | 16 ----------------
 debian/patches/test_location_tuple.patch          | 17 -----------------
 4 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 249824f..82c7211 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pyosmium (2.8.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Bump minimum required libosmium2-dev to 2.8.0.
+  * Drop patches, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 08 Aug 2016 15:14:08 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d7ebf7a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-std_pair_to_python_converter.patch
-test_location_tuple.patch
diff --git a/debian/patches/std_pair_to_python_converter.patch b/debian/patches/std_pair_to_python_converter.patch
deleted file mode 100644
index 682b73c..0000000
--- a/debian/patches/std_pair_to_python_converter.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Add to_python converter for C++ type: std::pair<unsigned int, unsigned int>.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug: https://github.com/osmcode/pyosmium/issues/13
-Forwarded: https://github.com/osmcode/pyosmium/pull/14
-Applied-Upstream: https://github.com/osmcode/pyosmium/commit/3115629c6b811767b41f033a2463cd4acbdf40b7
-
---- a/lib/osm.cc
-+++ b/lib/osm.cc
-@@ -50,6 +50,7 @@ BOOST_PYTHON_MODULE(_osm)
- 
-     to_python_converter<osmium::Timestamp, Timestamp_to_python>();
-     std_pair_to_python_converter<int, int>();
-+    std_pair_to_python_converter<unsigned int, unsigned int>();
-     std_pair_to_python_converter<unsigned long, unsigned long>();
- 
-     enum_<osmium::osm_entity_bits::type>("osm_entity_bits")
diff --git a/debian/patches/test_location_tuple.patch b/debian/patches/test_location_tuple.patch
deleted file mode 100644
index 6b681d6..0000000
--- a/debian/patches/test_location_tuple.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix expected output for test_location_tuple.
-Author: Bas Couwenberg <sebastic at debian.org>
-Bug-Debian: https://bugs.debian.org/828979
-Bug: https://github.com/osmcode/pyosmium/issues/15
-Forwarded: https://github.com/osmcode/pyosmium/pull/16
-
---- a/test/test_writer.py
-+++ b/test/test_writer.py
-@@ -108,7 +108,7 @@ class TestWriteTags(unittest.TestCase):
- class TestWriteNode(unittest.TestCase):
- 
-     def test_location_tuple(self):
--        with WriteExpect('n0 v0 dV c0 t i0 u T x1.0000000 y2.0000000') as w:
-+        with WriteExpect('n0 v0 dV c0 t i0 u T x1 y2') as w:
-             w.add_node(O(location=(1, 2)))
- 
-     def test_location_none(self):

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