This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository libcitygml.
commit 2c2af458f51b705b8cf892a31c0948a1edb51224 Author: Bas Couwenberg <[email protected]> Date: Fri Jan 20 16:35:16 2017 +0100 Drop occurred-typo.patch, applied upstream. --- debian/changelog | 1 + debian/patches/occurred-typo.patch | 35 ----------------------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 36 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6242883..02afceb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libcitygml (2.0.4-1) UNRELEASED; urgency=medium * Team upload. * New upstream release. + * Drop occurred-typo.patch, applied upstream. -- Bas Couwenberg <[email protected]> Fri, 20 Jan 2017 16:32:17 +0100 diff --git a/debian/patches/occurred-typo.patch b/debian/patches/occurred-typo.patch deleted file mode 100644 index 06920c0..0000000 --- a/debian/patches/occurred-typo.patch +++ /dev/null @@ -1,35 +0,0 @@ -Description: Fix 'occured' typo, replace with 'occurred'. -Author: Bas Couwenberg <[email protected]> -Forwarded: https://github.com/jklimke/libcitygml/pull/23 -Applied-Upstream: https://github.com/jklimke/libcitygml/commit/dce214154b6a9623df0e39d3650b2126532d246e - ---- a/sources/src/parser/parserxercesc.cpp -+++ b/sources/src/parser/parserxercesc.cpp -@@ -258,7 +258,7 @@ namespace citygml - xerces_init_mutex.unlock(); - } - catch (const xercesc::XMLException& e) { -- CITYGML_LOG_ERROR(logger, "Could not initialize xercesc XMLPlatformUtils, a XML Exception occured : " << toStdString(e.getMessage())); -+ CITYGML_LOG_ERROR(logger, "Could not initialize xercesc XMLPlatformUtils, a XML Exception occurred : " << toStdString(e.getMessage())); - return false; - } - -@@ -286,15 +286,15 @@ namespace citygml - } - catch ( const xercesc::XMLException& e ) - { -- CITYGML_LOG_ERROR(logger, "XML Exception occured: " << toStdString(e.getMessage())); -+ CITYGML_LOG_ERROR(logger, "XML Exception occurred: " << toStdString(e.getMessage())); - } - catch ( const xercesc::SAXParseException& e ) - { -- CITYGML_LOG_ERROR(logger, "SAXParser Exception occured: " << toStdString(e.getMessage())); -+ CITYGML_LOG_ERROR(logger, "SAXParser Exception occurred: " << toStdString(e.getMessage())); - } - catch ( const std::exception& e ) - { -- CITYGML_LOG_ERROR(logger, "Unexpected Exception occured: " << e.what()); -+ CITYGML_LOG_ERROR(logger, "Unexpected Exception occurred: " << e.what()); - } - #endif - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index ab8fb4c..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -occurred-typo.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/libcitygml.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

