This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapnik.
commit c8cb9de537eb433b93dd9dac82a69ad66dc01266 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Wed Aug 10 12:42:00 2016 +0200 Drop patches, applied upstream. --- debian/changelog | 1 + debian/patches/initialize-typo.patch | 26 -------------------------- debian/patches/occurred-typo.patch | 15 --------------- debian/patches/series | 2 -- 4 files changed, 1 insertion(+), 43 deletions(-) diff --git a/debian/changelog b/debian/changelog index d022cc7..1bea1c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ mapnik (3.0.12~rc2+ds-1) UNRELEASED; urgency=medium * New upstream release candidate. + * Drop patches, applied upstream. -- Bas Couwenberg <sebas...@debian.org> Wed, 10 Aug 2016 12:34:28 +0200 diff --git a/debian/patches/initialize-typo.patch b/debian/patches/initialize-typo.patch deleted file mode 100644 index d93587f..0000000 --- a/debian/patches/initialize-typo.patch +++ /dev/null @@ -1,26 +0,0 @@ -Description: Fix 'intialize' typo, replace with 'initialize'. -Author: Bas Couwenberg <sebas...@debian.org> -Forwarded: https://github.com/mapnik/mapnik/pull/3480 - ---- a/src/map.cpp -+++ b/src/map.cpp -@@ -695,7 +695,7 @@ featureset_ptr Map::query_point(unsigned - { - if (!current_extent_.valid()) - { -- throw std::runtime_error("query_point: map extent is not intialized, you need to set a valid extent before querying"); -+ throw std::runtime_error("query_point: map extent is not initialized, you need to set a valid extent before querying"); - } - if (!current_extent_.intersects(x,y)) - { ---- a/src/marker_cache.cpp -+++ b/src/marker_cache.cpp -@@ -267,7 +267,7 @@ std::shared_ptr<mapnik::marker const> ma - } - else - { -- MAPNIK_LOG_ERROR(marker_cache) << "could not intialize reader for: '" << uri << "'"; -+ MAPNIK_LOG_ERROR(marker_cache) << "could not initialize reader for: '" << uri << "'"; - return std::make_shared<mapnik::marker const>(mapnik::marker_null()); - } - } diff --git a/debian/patches/occurred-typo.patch b/debian/patches/occurred-typo.patch deleted file mode 100644 index 7b07fa8..0000000 --- a/debian/patches/occurred-typo.patch +++ /dev/null @@ -1,15 +0,0 @@ -Description: Fix 'occured' typo, replace with 'occurred'. -Author: Bas Couwenberg <sebas...@debian.org> -Forwarded: https://github.com/mapnik/mapnik/pull/3480 - ---- a/src/load_map.cpp -+++ b/src/load_map.cpp -@@ -755,7 +755,7 @@ void map_parser::parse_layer(Map & map, - } - catch (...) - { -- throw config_error("Unknown exception occured attempting to create datasoure for layer '" + lyr.name() + "'"); -+ throw config_error("Unknown exception occurred attempting to create datasoure for layer '" + lyr.name() + "'"); - } - } - } diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 5d213c7..0000000 --- a/debian/patches/series +++ /dev/null @@ -1,2 +0,0 @@ -initialize-typo.patch -occurred-typo.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel