Merge branch 'release/debian/4.0.0-9'debian/4.0.0-9

8 files changed, 26 insertions, 1 deletions

diff --git a/debian/patches/0001-xsd_xsdcxx-rename.patch b/debian/patches/0001-xsd_xsdcxx-rename.patch
index c810ec9..a2984c0 100644
--- a/debian/patches/0001-xsd_xsdcxx-rename.patch
+++ b/debian/patches/0001-xsd_xsdcxx-rename.patch
@@ -1,6 +1,6 @@
 Description: change docu from xsd to xsdcxx
 Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
-Reviewed-by: 
+Forwarded: not-needed
 Last-Update: 2014-07-22
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/patches/0100-C++Parser_Expat_support.patch b/debian/patches/0100-C++Parser_Expat_support.patch
index 4f98d00..f37ea02 100644
--- a/debian/patches/0100-C++Parser_Expat_support.patch
+++ b/debian/patches/0100-C++Parser_Expat_support.patch
@@ -2,6 +2,7 @@ Description: Fix bug in C++/Parser Expat support.
 Author: Jörg Frings-Fürst <debian@jff-webhosting.net>
 Origin: http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commit;h=94cba986108a0e0f42295572ca42c356d59328d7
         http://scm.codesynthesis.com/?p=xsd/xsd.git;a=commit;h=0e5fab0664fb36c6253dfd7bb86d8985d1b349ef
+Forwarded: not-needed
 Last-Update: 2016-04-10
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/patches/0105-Fix_path_handling_bug.patch b/debian/patches/0105-Fix_path_handling_bug.patch
index de893b1..7275283 100644
--- a/debian/patches/0105-Fix_path_handling_bug.patch
+++ b/debian/patches/0105-Fix_path_handling_bug.patch
@@ -1,6 +1,7 @@
 Description: Fix path handling bug
 Author: Boris Kolpackov <boris@codesynthesis.com>
 Origin: git commit b4c3242a763e0461f454cc29be28c2ab26e4a495
+Forwarded: not-needed
 Last-Update: 2016-09-10
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/patches/0110-xerces-c3.2.patch b/debian/patches/0110-xerces-c3.2.patch
index 319936b..b15960b 100644
--- a/debian/patches/0110-xerces-c3.2.patch
+++ b/debian/patches/0110-xerces-c3.2.patch
@@ -3,6 +3,7 @@ Author: Boris Kolpackov <boris@codesynthesis.com>
 Origin: https://git.codesynthesis.com/cgit/xsd/xsd/patch/?id=400651ba7fd2f80155348ed39fc02e2aa9892fb9
 Bug: <URL to the upstream bug report if any, implies patch has been forwarded, optional>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=881108
+Forwarded: not-needed
 Last-Update: 2017-11-08
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/patches/0115-lintian-typos.patch b/debian/patches/0115-lintian-typos.patch
index d40e529..f2b96b5 100644
--- a/debian/patches/0115-lintian-typos.patch
+++ b/debian/patches/0115-lintian-typos.patch
@@ -1,5 +1,6 @@
 Description: Correct some typos
 Author: Jörg Frings-Fürst <debian@jff.email>
+Forwarded: not-needed
 Last-Update: 2017-11-09
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/patches/0120-g++10.patch b/debian/patches/0120-g++10.patch
new file mode 100644
index 0000000..441b278
--- /dev/null
+++ b/debian/patches/0120-g++10.patch
@@ -0,0 +1,19 @@
+Description: Fix FTBFS with gcc-10
+Author: Boris Kolpackov <boris@codesynthesis.com>
+Origin: upstream, https://git.codesynthesis.com/cgit/libxsd-frontend/libxsd-frontend/commit/?id=5029f8665190879285787a9dcdaf5f997cadd2e2
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=957999
+Last-Update: 2020-09-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx
+===================================================================
+--- trunk.orig/libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx
++++ trunk/libxsd-frontend/xsd-frontend/semantic-graph/elements.cxx
+@@ -3,6 +3,7 @@
+ // license   : GNU GPL v2 + exceptions; see accompanying LICENSE file
+ 
+ #include <algorithm>
++#include <iostream>
+ 
+ #include <cutl/compiler/type-info.hxx>
+ 
diff --git a/debian/patches/0700_hurd_PATH_MAX.patch b/debian/patches/0700_hurd_PATH_MAX.patch
index 3babcdd..b825e23 100644
--- a/debian/patches/0700_hurd_PATH_MAX.patch
+++ b/debian/patches/0700_hurd_PATH_MAX.patch
@@ -1,6 +1,7 @@
 Description: Add PATH_MAX for hurd
 Author: Jörg Frings-Fürst <debain@jff-webhosting.net>
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=784425
+Forwarded: not-needed
 Last-Update: 2016-01-17
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
diff --git a/debian/patches/series b/debian/patches/series
index 9836207..e82ca95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 0105-Fix_path_handling_bug.patch
 0110-xerces-c3.2.patch
 0115-lintian-typos.patch
+0120-g++10.patch