[mapnik] 05/06: Drop dependencies-typo.patch, 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 mapnik.

commit 5de1349c0414583b15f25895c6b221f51954b489
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Jan 19 00:10:57 2017 +0100

    Drop dependencies-typo.patch, applied upstream.
---
 debian/changelog                       |  1 +
 debian/patches/dependencies-typo.patch | 27 ---------------------------
 debian/patches/series                  |  1 -
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e0f45d..83f1c5b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ mapnik (3.0.13~rc1+ds-1) UNRELEASED; urgency=medium
 
   * New upstream release candidate.
   * Re-instate lintian override for hardening-no-pie.
+  * Drop dependencies-typo.patch, applied upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 19 Jan 2017 00:10:27 +0100
 
diff --git a/debian/patches/dependencies-typo.patch b/debian/patches/dependencies-typo.patch
deleted file mode 100644
index e5f1ae0..0000000
--- a/debian/patches/dependencies-typo.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Fix 'depedencies' typo, replace with 'dependencies'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/mapnik/mapnik/pull/3535
-Applied-Upstream: https://github.com/mapnik/mapnik/commit/e3041f07c71ac46f5b57fa646537a29233a3c488
-
---- a/CHANGELOG.md
-+++ b/CHANGELOG.md
-@@ -459,7 +459,7 @@ Released June 3rd, 2013
- 
- Summary: The 2.2.0 release is primarily a performance and stability release. The code line represents development in the master branch since the release of 2.1.0 in Aug 2012 and therefore includes nearly a year of bug-fixes and optimizations. Nearly 500 new tests have been added bring the total coverage to 925. Shapefile and PostGIS datasources have benefited from numerous stability fixes, 64 bit integer support has been added to support OSM data in the grid renderer and in attribute fi [...]
- 
--- Removed 3 depedencies without loosing any functionality: `ltdl`, `cairomm` and `libsigc++` (#1804,#806,#1681)
-+- Removed 3 dependencies without loosing any functionality: `ltdl`, `cairomm` and `libsigc++` (#1804,#806,#1681)
- 
- - Added 64 bit integer support in expressions, feature ids, and the grid_renderer (#1661,#1662,#1662)
- 
---- a/utils/mapnik-config/build.py
-+++ b/utils/mapnik-config/build.py
-@@ -159,7 +159,7 @@ configuration = {
-     "mapnik_bundled_icu_data":mapnik_bundled_icu_data,
- }
- 
--## if we are statically linking depedencies
-+## if we are statically linking dependencies
- ## then they do not need to be reported in ldflags
- #if env['RUNTIME_LINK'] == 'static':
- #    configuration['ldflags'] = ''
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 99a9462..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-dependencies-typo.patch

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