[pyosmium] 05/07: Drop applying-typo.patch, applied upstream.

Bas Couwenberg sebastic at debian.org
Wed Nov 16 19:14:31 UTC 2016


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

sebastic pushed a commit to branch master
in repository pyosmium.

commit b32ed102d5189b39551ff647cd8d716133ffcfa0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Nov 16 19:00:03 2016 +0100

    Drop applying-typo.patch, applied upstream.
---
 debian/changelog                   |  1 +
 debian/patches/applying-typo.patch | 16 ----------------
 debian/patches/series              |  1 -
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed4bf0f..8081e1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pyosmium (2.10.2-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Bump minimum required libosmium2-dev to 2.10.2.
+  * Drop applying-typo.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Wed, 16 Nov 2016 18:46:52 +0100
 
diff --git a/debian/patches/applying-typo.patch b/debian/patches/applying-typo.patch
deleted file mode 100644
index c050ad5..0000000
--- a/debian/patches/applying-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'apllying' typo, replace with 'applying'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/osmcode/pyosmium/pull/22
-Applied-Upstream: https://github.com/osmcode/pyosmium/commit/f5376d5999da2af6500b2d74e137cf275d9aa427
-
---- a/lib/osmium.cc
-+++ b/lib/osmium.cc
-@@ -145,7 +145,7 @@ BOOST_PYTHON_MODULE(_osmium)
- 
-     class_<pyosmium::MergeInputReader, boost::noncopyable>("MergeInputReader",
-         "Collects data from multiple input files and sorts and optionally "
--        "deduplicates the data before apllying it to a handler.")
-+        "deduplicates the data before applying it to a handler.")
-         .def("apply", &pyosmium::MergeInputReader::apply,
-             (arg("self"), arg("handler"), arg("simplify")=true),
-             "Apply collected data to a handler. The data will be sorted first. "
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f171391..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-applying-typo.patch

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



More information about the Pkg-grass-devel mailing list