[osmcoastline] 06/06: 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 osmcoastline.

commit 3c6ffeef6a81619c67902f08e2cbcedad5915c4f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Aug 18 16:19:43 2015 +0200

    Drop patches, applied upstream.
---
 debian/changelog                        |  1 +
 debian/patches/curently-typo.patch      | 26 --------------------------
 debian/patches/reproducible-build.patch | 19 -------------------
 debian/patches/series                   |  2 --
 4 files changed, 1 insertion(+), 47 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9e29a45..367bf2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ osmcoastline (2.1.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Drop build dependency on osmpbf.
   * Bump minimum required libosmium2-dev to 2.3.0.
+  * Drop patches, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 18 Aug 2015 16:13:32 +0200
 
diff --git a/debian/patches/curently-typo.patch b/debian/patches/curently-typo.patch
deleted file mode 100644
index 24301af..0000000
--- a/debian/patches/curently-typo.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix 'curently' typo, replace with 'currently'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/osmcode/osmcoastline/pull/13
-
---- a/README.md
-+++ b/README.md
-@@ -207,7 +207,7 @@ case. Default is 1000.
- Set spatial reference system/projection. Use 4326 for WGS84 or 3857 for "Google
- Mercator". If you want to use the data for the usual tiled web maps, 3857 is
- probably right. For other uses, especially if you want to re-project to some
--other projection, 4326 is probably right. Other projections are curently not
-+other projection, 4326 is probably right. Other projections are currently not
- supported. Default is 4326.
- 
-     -v, --verbose
---- a/man/osmcoastline.md
-+++ b/man/osmcoastline.md
-@@ -77,7 +77,7 @@ description of the options below and the
-     "Google Mercator". If you want to use the data for the usual tiled web
-     maps, 3857 is probably right. For other uses, especially if you want to
-     re-project to some other projection, 4326 is probably right. Other
--    projections are curently not supported. Default is 4326.
-+    projections are currently not supported. Default is 4326.
- 
- -v, --verbose
- :   Gives you detailed information on what **osmcoastline** is doing,
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
deleted file mode 100644
index c280752..0000000
--- a/debian/patches/reproducible-build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Make build reproducible by setting the date embedded in man pages.
- This patch was initially developed for osmium-tools,
- but osmcoastline has the same issue.
-Author: Chris Lamb <lamby at debian.org>
-Bug-Debian: https://bugs.debian.org/790087
-Forwarded: not-needed
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -189,7 +189,8 @@ endfunction()
- if(PANDOC)
-     message(STATUS "Looking for pandoc - found")
-     message(STATUS "  Manual pages will be built")
--    execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE PUBDATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-+    execute_process(COMMAND dpkg-parsechangelog -SDate OUTPUT_VARIABLE DEBDATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-+    execute_process(COMMAND env LC_ALL=C date --utc --date ${DEBDATE} "+%Y-%m-%d" OUTPUT_VARIABLE PUBDATE OUTPUT_STRIP_TRAILING_WHITESPACE)
-     set(PANDOC_MAN_OPTIONS
-         -s
-         -t man
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 30a23e3..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-curently-typo.patch
-reproducible-build.patch

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