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

13 files changed, 48 insertions, 9 deletions

diff --git a/debian/changelog b/debian/changelog
index 010bcf8..654ac41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 xsd (4.0.0-9) unstable; urgency=medium
 
+  * Migrate to debhelper 13:
+    - Bump minimum debhelper-compat version in debian/control to = 13.
   * Fix FTCBFS: Use dpkg's buildtools.mk to export tools for make
     install. (Closes: #955728). Thanks to Helmut Grohne <helmut@subdivi.de>.
-  * Declare compliance with Debian Policy 4.5.0 (No changes needed).
+  * Declare compliance with Debian Policy 4.6.0.0 (No changes needed).
   * Use jdupes to change duplicate files into symlinks:
     - debian/rules: Add override_dh_link.
     - debian/control: Add Build-Depend jdupes.
@@ -17,10 +19,20 @@ xsd (4.0.0-9) unstable; urgency=medium
     - Add year 2020 to debian/*.
     - Use secure URI.
     - Change Source to directory listing.
+    - Add paragraph for FLOSS.
+    - Fix lintian *-globbing-patterns errors.
   * debian/changelog:
     - Remove EOL before EOF.
+  * Add -std=gnu++11 to CXXFLAGS to fix FTBFS with GCC-11 (Closes: #984405).
 
- -- Jörg Frings-Fürst <debian@jff.email>  Sun, 12 Apr 2020 22:40:33 +0200
+ -- Jörg Frings-Fürst <debian@jff.email>  Sat, 21 Aug 2021 23:43:37 +0200
+
+xsd (4.0.0-8.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Apply patch from upstream to fix build with gcc 10. (Closes: #957999)
+
+ -- Michael Hudson-Doyle <mwhudson@debian.org>  Tue, 06 Oct 2020 14:03:20 +1300
 
 xsd (4.0.0-8) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index 8e7fda5..91e94ec 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Rules-Requires-Root: no
 Build-Depends:
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
  dpkg-dev (>= 1.15.4),
  jdupes,
  libboost-date-time-dev,
@@ -12,7 +12,7 @@ Build-Depends:
  libboost-regex-dev,
  libxerces-c-dev (>= 3),
  m4
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0.0
 Homepage: http://codesynthesis.com
 Vcs-Git: git://jff.email/opt/git/xsd.git
 Vcs-Browser: https://jff.email/cgit/xsd.git/
diff --git a/debian/copyright b/debian/copyright
index a5a8e4d..8af26f2 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,7 +8,6 @@ Copyright: Copyright (©) 2005-2014  CODE SYNTHESIS TOOLS CC
 License: GPL-2+ and FLOSS
 
 Files: xsd/doc/custom-literals.xsd
-       xsd/examples/cxx/*/driver.cxx
        xsd/examples/cxx/parser/generated/library.*
        xsd/examples/cxx/parser/hello/hello.*
        xsd/examples/cxx/parser/library/library*.*
@@ -124,7 +123,7 @@ License: GPL-1+
  License version 1 can be found in the file
  `/usr/share/common-licenses/GPL-1'.
 
-License: GPL-2+ and FLOSS
+License: GPL-2+
  This program is free software; you can redistribute it
  and/or modify it under the terms of the GNU General Public
  License as published by the Free Software Foundation; either
@@ -145,7 +144,8 @@ License: GPL-2+ and FLOSS
  On Debian systems, the full text of the GNU General Public
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
- .
+
+License: FLOSS
  Free/Libre and Open Source Software ("FLOSS")
  °°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°°
     1. Intent
diff --git a/debian/files b/debian/files
deleted file mode 100644
index 1555377..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-xsd_4.0.0-8_source.buildinfo devel optional
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
diff --git a/debian/rules b/debian/rules
index a3031ce..b44adc6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,9 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 export verbose=1
 
+export CXXFLAGS = $(shell dpkg-buildflags --get CXXFLAGS)
+export CXXFLAGS += -std=gnu++11
+
 %:
 	dh $@