From 5bb815188761ef6da556393113b5722f1a731fc7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 15 Apr 2020 08:25:07 +0200 Subject: d/changelog: Change date and time --- debian/changelog | 2 +- debian/files | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 debian/files diff --git a/debian/changelog b/debian/changelog index 010bcf8..10b49d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,7 @@ xsd (4.0.0-9) unstable; urgency=medium * debian/changelog: - Remove EOL before EOF. - -- Jörg Frings-Fürst Sun, 12 Apr 2020 22:40:33 +0200 + -- Jörg Frings-Fürst Wed, 15 Apr 2020 08:23:24 +0200 xsd (4.0.0-8) unstable; urgency=medium 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 -- cgit v1.2.3 From 0369eabb06d4b4ea2d8d2acf69dd4b3fb38f25b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 10 Sep 2020 20:04:39 +0200 Subject: Fix FTBFS with gcc-10 --- debian/changelog | 7 +++++++ debian/patches/0120-g++10.patch | 12 ++++++++++++ debian/patches/series | 1 + 3 files changed, 20 insertions(+) create mode 100644 debian/patches/0120-g++10.patch diff --git a/debian/changelog b/debian/changelog index 10b49d5..6fdd98b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xsd (4.0.0-10) UNRELEASED; urgency=medium + + * Fix FTBFS with gcc-10 (Closes: #957999): + - New debian/patches/0120-g++10.patch. + + -- Jörg Frings-Fürst Sun, 31 May 2020 17:16:10 +0200 + xsd (4.0.0-9) unstable; urgency=medium * Fix FTCBFS: Use dpkg's buildtools.mk to export tools for make diff --git a/debian/patches/0120-g++10.patch b/debian/patches/0120-g++10.patch new file mode 100644 index 0000000..5828dcf --- /dev/null +++ b/debian/patches/0120-g++10.patch @@ -0,0 +1,12 @@ +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 ++#include + + #include + 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 -- cgit v1.2.3 From eff767d9db9bb7ecd0d1938d7389e97ebc8d908c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 10 Sep 2020 20:22:40 +0200 Subject: d/copyright: Add paragraph for FLOSS --- debian/changelog | 2 ++ debian/copyright | 5 +++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6fdd98b..5f8e697 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ xsd (4.0.0-10) UNRELEASED; urgency=medium * Fix FTBFS with gcc-10 (Closes: #957999): - New debian/patches/0120-g++10.patch. + * debian/copyright: + - Add paragraph for FLOSS. -- Jörg Frings-Fürst Sun, 31 May 2020 17:16:10 +0200 diff --git a/debian/copyright b/debian/copyright index a5a8e4d..e9a3063 100644 --- a/debian/copyright +++ b/debian/copyright @@ -124,7 +124,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 +145,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 -- cgit v1.2.3 From aa391883188db9290d2c378b72edb9b6dbb7c9fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 10 Sep 2020 20:38:03 +0200 Subject: d/copyright: Fix lintian *-globbing-patterns errors --- debian/changelog | 1 + debian/copyright | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5f8e697..77f3a88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ xsd (4.0.0-10) UNRELEASED; urgency=medium - New debian/patches/0120-g++10.patch. * debian/copyright: - Add paragraph for FLOSS. + - Fix lintian *-globbing-patterns errors. -- Jörg Frings-Fürst Sun, 31 May 2020 17:16:10 +0200 diff --git a/debian/copyright b/debian/copyright index e9a3063..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*.* -- cgit v1.2.3 From d16d109af2d26d31379ea4354c1d56f1a9a1d76f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 10 Sep 2020 20:41:12 +0200 Subject: Migrate to debhelper 13 --- debian/changelog | 2 ++ debian/control | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 77f3a88..cb4066a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ xsd (4.0.0-10) UNRELEASED; urgency=medium * debian/copyright: - Add paragraph for FLOSS. - Fix lintian *-globbing-patterns errors. + * Migrate to debhelper 13: + - Bump minimum debhelper-compat version in debian/control to = 13. -- Jörg Frings-Fürst Sun, 31 May 2020 17:16:10 +0200 diff --git a/debian/control b/debian/control index 8e7fda5..af2f164 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Jörg Frings-Fürst Rules-Requires-Root: no Build-Depends: - debhelper-compat (= 12), + debhelper-compat (= 13), dpkg-dev (>= 1.15.4), jdupes, libboost-date-time-dev, -- cgit v1.2.3 From 41e2a240dfde9db8d0804514f0e9207716aa7628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 10 Sep 2020 20:49:30 +0200 Subject: some work with patches --- debian/patches/0001-xsd_xsdcxx-rename.patch | 2 +- debian/patches/0100-C++Parser_Expat_support.patch | 1 + debian/patches/0105-Fix_path_handling_bug.patch | 1 + debian/patches/0110-xerces-c3.2.patch | 1 + debian/patches/0115-lintian-typos.patch | 1 + debian/patches/0120-g++10.patch | 7 +++++++ debian/patches/0700_hurd_PATH_MAX.patch | 1 + 7 files changed, 13 insertions(+), 1 deletion(-) 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 -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 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 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 Origin: https://git.codesynthesis.com/cgit/xsd/xsd/patch/?id=400651ba7fd2f80155348ed39fc02e2aa9892fb9 Bug: 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 +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 index 5828dcf..441b278 100644 --- a/debian/patches/0120-g++10.patch +++ b/debian/patches/0120-g++10.patch @@ -1,3 +1,10 @@ +Description: Fix FTBFS with gcc-10 +Author: Boris Kolpackov +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 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 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/ -- cgit v1.2.3 From 5902d15e5336bc5ca4a1e80c299f6c4358e7cd7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 10 Sep 2020 22:17:44 +0200 Subject: Rewrite d/changelog --- debian/changelog | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index cb4066a..a364af9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,9 @@ -xsd (4.0.0-10) UNRELEASED; urgency=medium +xsd (4.0.0-9) UNRELEASED; urgency=medium * Fix FTBFS with gcc-10 (Closes: #957999): - New debian/patches/0120-g++10.patch. - * debian/copyright: - - Add paragraph for FLOSS. - - Fix lintian *-globbing-patterns errors. * Migrate to debhelper 13: - Bump minimum debhelper-compat version in debian/control to = 13. - - -- Jörg Frings-Fürst Sun, 31 May 2020 17:16:10 +0200 - -xsd (4.0.0-9) unstable; urgency=medium - * Fix FTCBFS: Use dpkg's buildtools.mk to export tools for make install. (Closes: #955728). Thanks to Helmut Grohne . * Declare compliance with Debian Policy 4.5.0 (No changes needed). @@ -29,6 +21,8 @@ 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. -- cgit v1.2.3 From 0ba548f893da4b9d63686bd02aeabc12597b7f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 10 Sep 2020 22:19:55 +0200 Subject: d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a364af9..59b017f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xsd (4.0.0-9) UNRELEASED; urgency=medium +xsd (4.0.0-9) unstable; urgency=medium * Fix FTBFS with gcc-10 (Closes: #957999): - New debian/patches/0120-g++10.patch. @@ -26,7 +26,7 @@ xsd (4.0.0-9) UNRELEASED; urgency=medium * debian/changelog: - Remove EOL before EOF. - -- Jörg Frings-Fürst Wed, 15 Apr 2020 08:23:24 +0200 + -- Jörg Frings-Fürst Thu, 10 Sep 2020 22:18:44 +0200 xsd (4.0.0-8) unstable; urgency=medium -- cgit v1.2.3 From de3c40ccd7ebc7fee58d4f765fd988459a079cce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 21 Aug 2021 21:57:42 +0200 Subject: Add -std=gnu++11 to CXXFLAGS fix fix FTBFS with GCC-11 --- debian/changelog | 6 ++++++ debian/rules | 3 +++ 2 files changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 59b017f..d4d5d33 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xsd (4.0.0-10) UNRELEASED; urgency=medium + + * Add -std=gnu++11 to CXXFLAGS fix fix FTBFS with GCC-11 (Closes: #984405). + + -- Jörg Frings-Fürst Sat, 21 Aug 2021 20:19:15 +0200 + xsd (4.0.0-9) unstable; urgency=medium * Fix FTBFS with gcc-10 (Closes: #957999): 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 $@ -- cgit v1.2.3 From 589b32f96aa481d4744ea06719f1321afff10778 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 21 Aug 2021 23:21:13 +0200 Subject: Bug #955728 --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index d4d5d33..af063fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ xsd (4.0.0-10) UNRELEASED; urgency=medium * Add -std=gnu++11 to CXXFLAGS fix fix FTBFS with GCC-11 (Closes: #984405). + * Fix FTCBFS: Use dpkg's buildtools.mk to export tools for make + install. (Closes: #955728). Thanks to Helmut Grohne . -- Jörg Frings-Fürst Sat, 21 Aug 2021 20:19:15 +0200 -- cgit v1.2.3 From 2aa4b691113d495820ecacea79902c8571c6f013 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 22 Aug 2021 13:25:21 +0200 Subject: fix d/changelog --- debian/changelog | 22 ++++++++++------------ debian/control | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index af063fe..654ac41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,20 +1,10 @@ -xsd (4.0.0-10) UNRELEASED; urgency=medium - - * Add -std=gnu++11 to CXXFLAGS fix fix FTBFS with GCC-11 (Closes: #984405). - * Fix FTCBFS: Use dpkg's buildtools.mk to export tools for make - install. (Closes: #955728). Thanks to Helmut Grohne . - - -- Jörg Frings-Fürst Sat, 21 Aug 2021 20:19:15 +0200 - xsd (4.0.0-9) unstable; urgency=medium - * Fix FTBFS with gcc-10 (Closes: #957999): - - New debian/patches/0120-g++10.patch. * 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 . - * 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. @@ -33,8 +23,16 @@ xsd (4.0.0-9) unstable; urgency=medium - 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 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) - -- Jörg Frings-Fürst Thu, 10 Sep 2020 22:18:44 +0200 + -- Michael Hudson-Doyle 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 af2f164..91e94ec 100644 --- a/debian/control +++ b/debian/control @@ -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/ -- cgit v1.2.3