[libcitygml] 04/06: Drop patches applied/included upstream.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository libcitygml.

commit 11eb19a42b772ce64a0ba5384e3b4b1a0ce6b8ee
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Nov 16 19:28:35 2017 +0100

    Drop patches applied/included upstream.
---
 debian/changelog                                   |  1 +
 ...nctional-header-in-address-parser-which-p.patch | 36 ----------------------
 debian/patches/series                              |  2 --
 debian/patches/xerces-3.2.patch                    | 25 ---------------
 4 files changed, 1 insertion(+), 63 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c83537..c7d0b33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libcitygml (2.0.7-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release.
+  * Drop patches applied/included upstream.
 
  -- Bas Couwenberg <sebastic at debian.org>  Thu, 16 Nov 2017 19:25:18 +0100
 
diff --git a/debian/patches/0001-Included-functional-header-in-address-parser-which-p.patch b/debian/patches/0001-Included-functional-header-in-address-parser-which-p.patch
deleted file mode 100644
index f784f8b..0000000
--- a/debian/patches/0001-Included-functional-header-in-address-parser-which-p.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Included functional header in address parser which possibly caused a build error on some compilers.
-Author: Jan Klimke <jan.klimke at hpi.de>
-Origin: https://github.com/jklimke/libcitygml/commit/c644e9e462fca870fdc7d8f0d2cb3bc122233acc
-Bug: https://github.com/jklimke/libcitygml/issues/31
-Bug-Debian: https://bugs.debian.org/853487
-
---- a/sources/include/parser/addressparser.h
-+++ b/sources/include/parser/addressparser.h
-@@ -1,7 +1,10 @@
- #pragma once
- 
-+#include <functional>
-+
- #include <parser/citygmlelementparser.h>
- 
-+
- namespace citygml {
- 
-     class Address;
---- a/test/citygmltest.cpp
-+++ b/test/citygmltest.cpp
-@@ -76,7 +76,13 @@ int main( int argc, char **argv )
-     file.open( argv[fargc], std::ifstream::in );
-      std::shared_ptr<const citygml::CityModel> city = citygml::load( file, params );
- #else
--    std::shared_ptr<const citygml::CityModel> city = citygml::load( argv[fargc], params );
-+
-+    std::shared_ptr<const citygml::CityModel> city;
-+    try{
-+        city = citygml::load( argv[fargc], params );
-+    }catch(const std::runtime_error& e){
-+        
-+    }
- #endif
- 
-     time_t end;
diff --git a/debian/patches/series b/debian/patches/series
index eaac07d..38edaa7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-0001-Included-functional-header-in-address-parser-which-p.patch
 spelling-errors.patch
-xerces-3.2.patch
diff --git a/debian/patches/xerces-3.2.patch b/debian/patches/xerces-3.2.patch
deleted file mode 100644
index 15cf4df..0000000
--- a/debian/patches/xerces-3.2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Fix build with xerces3.2.
-Author: Matthias Klose <doko at ubuntu.com>
-Bug-Debian: https://bugs.debian.org/881924
-Forwarded: https://github.com/jklimke/libcitygml/pull/41
-Applied-Upstream: https://github.com/jklimke/libcitygml/commit/db4c831bd37306ed08a2897e9ce500a0a6f58983
-
---- a/CMakeModules/FindXerces.cmake
-+++ b/CMakeModules/FindXerces.cmake
-@@ -29,14 +29,14 @@ ${XERCESC_INCLUDE_DIR}
- )
- 
- IF (XERCESC_STATIC)
--FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_static_3 xerces-c-3.1 xerces-c
-+FIND_LIBRARY(XERCESC_LIBRARY NAMES xerces-c_static_3 xerces-c-3.2 xerces-c-3.1 xerces-c
-  PATHS
-  $ENV{XERCESC_LIBRARY_DIR}
-  ${XERCESC_LIBRARY_DIR}
-  /usr/lib
-  /usr/local/lib
- )
--FIND_LIBRARY(XERCESC_LIBRARY_DEBUG NAMES xerces-c_static_3D xerces-c-3.1D
-+FIND_LIBRARY(XERCESC_LIBRARY_DEBUG NAMES xerces-c_static_3D xerces-c-3.2D xerces-c-3.1D
-  PATHS
-  $ENV{XERCESC_LIBRARY_DIR}
-  ${XERCESC_LIBRARY_DIR}

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