[osmctools] 06/12: Drop patches, applied upstream.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository osmctools.

commit 0134cc0633db29a5c14552bcbdf4b7222aaab9cc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Feb 15 07:07:46 2016 +0100

    Drop patches, applied upstream.
---
 debian/changelog                   |  1 +
 debian/patches/allow-to-typo.patch | 16 ----------------
 debian/patches/ld-as-needed.patch  | 18 ------------------
 debian/patches/series              |  2 --
 4 files changed, 1 insertion(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 02f3bdd..fc55832 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ osmctools (0.6-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Update copyright years for Markus Weber.
   * Update man pages for upstream changes.
+  * Drop patches, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Mon, 15 Feb 2016 06:58:02 +0100
 
diff --git a/debian/patches/allow-to-typo.patch b/debian/patches/allow-to-typo.patch
deleted file mode 100644
index b21ae3c..0000000
--- a/debian/patches/allow-to-typo.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix 'allows to process' typo, replace with 'allows processing'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: yes
-Applied-Upstream: https://gitlab.com/osm-c-tools/osmctools/commit/e68b473c0b35c5672c56a55a30b84fb56a4f8373
-
---- a/src/osmupdate.c
-+++ b/src/osmupdate.c
-@@ -102,7 +102,7 @@ const char* helptext=
- "        and daily changefiles. If you want to limit these changefile\n"
- "        categories, use one or two of these options and choose that\n"
- "        category/ies you want to be used.\n"
--"        The option --sporadic allows to process changefile sources\n"
-+"        The option --sporadic allows processing changefile sources\n"
- "        which do not have the usual \"minute\", \"hour\" and \"day\"\n"
- "        subdirectories.\n"
- "\n"
diff --git a/debian/patches/ld-as-needed.patch b/debian/patches/ld-as-needed.patch
deleted file mode 100644
index fb30b6b..0000000
--- a/debian/patches/ld-as-needed.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Michael Bienia 
-Date: Thu, 21 Jan 2014 21:00:08 +0200
-Subject: Don't use osmconvert_LDFLAGS to specify libraries to
-link with, use osmconvert_LDADD instead (fixes FTBFS).
-Forwarded: yes
-Applied-Upstream: https://gitlab.com/osm-c-tools/osmctools/commit/bbcfebff2ea069da1853cdb069900543696d521f
-
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -6,7 +6,7 @@ endif
- 
- if ENABLE_OSMCONVERT
- osmconvert_SOURCES = osmconvert.c
--osmconvert_LDFLAGS = -lz
-+osmconvert_LDADD = -lz
- endif
- 
- osmfilter_SOURCES = osmfilter.c
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3ca1cb7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-ld-as-needed.patch
-allow-to-typo.patch

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