[pyosmium] 04/07: Drop patches, included 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 74c2c034ff777ee0c67428e8b16c1dfd471c6a74
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jan 15 21:45:43 2017 +0100

    Drop patches, included upstream.
---
 debian/changelog                                      |  1 +
 ...solve-ambiguous-call-to-WayNodeList-operator.patch | 19 -------------------
 debian/patches/series                                 |  1 -
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a375256..1efe364 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 pyosmium (2.11.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+  * Drop patches, included upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 15 Jan 2017 21:44:55 +0100
 
diff --git a/debian/patches/0001-resolve-ambiguous-call-to-WayNodeList-operator.patch b/debian/patches/0001-resolve-ambiguous-call-to-WayNodeList-operator.patch
deleted file mode 100644
index 2404bd3..0000000
--- a/debian/patches/0001-resolve-ambiguous-call-to-WayNodeList-operator.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: resolve ambiguous call to WayNodeList::operator[]
- Newer libosmium overloads the [] operator, so we need to
- specifiy which one to use.
-Author: Sarah Hoffmann <lonvia at denofr.de>
-Origin: https://github.com/osmcode/pyosmium/commit/a556231cac90f88046113aa28569f8dccfea066f
-Bug: https://github.com/osmcode/pyosmium/issues/24
-
---- a/lib/osm.cc
-+++ b/lib/osm.cc
-@@ -170,7 +170,8 @@ BOOST_PYTHON_MODULE(_osm)
-         "is normally not used directly, use one of its subclasses instead.",
-         no_init)
-         .def("__len__", &osmium::NodeRefList::size)
--        .def("__getitem__", &osmium::NodeRefList::operator[], return_value_policy<reference_existing_object>())
-+        .def("__getitem__",
-+             make_function(static_cast<const osmium::NodeRef& (osmium::NodeRefList::*)(osmium::NodeRefList::size_type) const>(&osmium::NodeRefList::operator[]), return_value_policy<reference_existing_object>()))
-         .def("__iter__", iterator<osmium::NodeRefList,return_internal_reference<>>())
-         .def("is_closed", &osmium::NodeRefList::is_closed, args("self"),
-              "True if the start and end node are the same (synonym for "
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3dec584..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-resolve-ambiguous-call-to-WayNodeList-operator.patch

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