From 5b883a9c5aa69dbe19263634a9a8574867d10519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Nov 2017 15:08:38 +0100 Subject: d/changelog: change date/time, distribution for release --- debian/changelog | 4 ++-- debian/files | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 debian/files diff --git a/debian/changelog b/debian/changelog index cdfc3d1..c3a9fbe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xsd (4.0.0-7) UNRELEASED; urgency=medium +xsd (4.0.0-7) unstable; urgency=medium * New debian/patches/0110-xerces-c3.2.patch (Closes: #881108): - Remove tests for character reference values unsupported by Xerces-C++ 3.2. @@ -21,7 +21,7 @@ xsd (4.0.0-7) UNRELEASED; urgency=medium - Remove autotools-dev and parallel from dh command line as both are enabled by default for dh compat level 10. - -- Jörg Frings-Fürst Wed, 08 Nov 2017 19:25:38 +0100 + -- Jörg Frings-Fürst Sun, 12 Nov 2017 14:36:31 +0100 xsd (4.0.0-6) unstable; urgency=medium diff --git a/debian/files b/debian/files new file mode 100644 index 0000000..f497884 --- /dev/null +++ b/debian/files @@ -0,0 +1 @@ +xsd_4.0.0-7_source.buildinfo devel optional -- cgit v1.2.3 From 810991d4b5b5570445bbeaeb5d505e732ebcf273 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Apr 2020 17:17:43 +0200 Subject: Fix FTCBFS: Use dpkg's buildtools.mk to export tools for make install --- debian/changelog | 7 +++++++ debian/files | 1 - debian/rules | 3 +++ 3 files changed, 10 insertions(+), 1 deletion(-) delete mode 100644 debian/files diff --git a/debian/changelog b/debian/changelog index c3a9fbe..7ee59b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xsd (4.0.0-8) UNRELEASED; urgency=medium + + * Fix FTCBFS: Use dpkg's buildtools.mk to export tools for make + install. (Closes: #955728). Thanks to Helmut Grohne . + + -- Jörg Frings-Fürst Sun, 12 Apr 2020 16:19:33 +0200 + xsd (4.0.0-7) unstable; urgency=medium * New debian/patches/0110-xerces-c3.2.patch (Closes: #881108): diff --git a/debian/files b/debian/files deleted file mode 100644 index f497884..0000000 --- a/debian/files +++ /dev/null @@ -1 +0,0 @@ -xsd_4.0.0-7_source.buildinfo devel optional diff --git a/debian/rules b/debian/rules index a9f32a7..204d43f 100755 --- a/debian/rules +++ b/debian/rules @@ -10,6 +10,9 @@ #export DH_VERBOSE=1 export DH_OPTIONS +DPKG_EXPORT_BUILDTOOLS=1 +include /usr/share/dpkg/buildtools.mk + # # Hardening # -- cgit v1.2.3 From f9f6c17e519f7a37bd865f082cbfa5df40cb07b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Apr 2020 17:19:13 +0200 Subject: Declare compliance with Debian Policy 4.5.0 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7ee59b4..39408ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ xsd (4.0.0-8) UNRELEASED; 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). -- Jörg Frings-Fürst Sun, 12 Apr 2020 16:19:33 +0200 diff --git a/debian/control b/debian/control index 37f336c..f27e848 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,7 @@ Build-Depends: libboost-regex-dev, libxerces-c-dev (>= 3), m4 -Standards-Version: 4.1.1 +Standards-Version: 4.5.0 Homepage: http://codesynthesis.com Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/xsd.git Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/xsd.git -- cgit v1.2.3 From dd7606a48ac04db0361c224e2378a659db0c239b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Apr 2020 17:23:15 +0200 Subject: d/control: Switch Vcs-* to new location --- debian/changelog | 2 ++ debian/control | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 39408ba..2833678 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ xsd (4.0.0-8) UNRELEASED; 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). + * debian/control: + - Switch Vcs-* to new location. -- Jörg Frings-Fürst Sun, 12 Apr 2020 16:19:33 +0200 diff --git a/debian/control b/debian/control index f27e848..3949aa2 100644 --- a/debian/control +++ b/debian/control @@ -12,8 +12,8 @@ Build-Depends: m4 Standards-Version: 4.5.0 Homepage: http://codesynthesis.com -Vcs-Git: https://anonscm.debian.org/cgit/collab-maint/xsd.git -Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/xsd.git +Vcs-Git: git://jff.email/opt/git/xsd.git +Vcs-Browser: https://jff.email/cgit/xsd.git/ Package: xsdcxx Architecture: any -- cgit v1.2.3 From f71c5976606d1caf856c64cdfe0b59628c02ecaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Apr 2020 17:26:52 +0200 Subject: Switch to debhelper-compat --- debian/changelog | 3 +++ debian/compat | 1 - debian/control | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 debian/compat diff --git a/debian/changelog b/debian/changelog index 2833678..96ae56b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ xsd (4.0.0-8) UNRELEASED; 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). + * Switch to debhelper-compat: + - debian/control: Replace debhelper with debhelper-compat. + - Remove debian/compat. * debian/control: - Switch Vcs-* to new location. diff --git a/debian/compat b/debian/compat deleted file mode 100644 index f599e28..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/debian/control b/debian/control index 3949aa2..ca5e2ca 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: Jörg Frings-Fürst Build-Depends: - debhelper (>= 10), + debhelper-compat (= 12), dpkg-dev (>= 1.15.4), libboost-date-time-dev, libboost-filesystem-dev, -- cgit v1.2.3 From 606bb558ea047a585d9dbb4ccfb3c567a02ba8d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Apr 2020 17:30:07 +0200 Subject: d/copyright: Add year 2020 to debian/* --- debian/changelog | 2 ++ debian/copyright | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 96ae56b..20d9d41 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,8 @@ xsd (4.0.0-8) UNRELEASED; urgency=medium - Remove debian/compat. * debian/control: - Switch Vcs-* to new location. + * debian/copyright: + - Add year 2020 to debian/*. -- Jörg Frings-Fürst Sun, 12 Apr 2020 16:19:33 +0200 diff --git a/debian/copyright b/debian/copyright index 55f0fd5..f6b8225 100644 --- a/debian/copyright +++ b/debian/copyright @@ -89,7 +89,7 @@ License: GFDL-1.2 Files: debian/* Copyright: 2008 Raphael Bossek - 2014-2016 Jörg Frings-Fürst + 2014-2020 Jörg Frings-Fürst License: GPL-1+ -- cgit v1.2.3 From 63bf94533fd4972ed714b2037f6aafd7991a0159 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Apr 2020 17:37:44 +0200 Subject: d/copyright: Use secure URI; Change Source to directory listing --- debian/changelog | 2 ++ debian/copyright | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 20d9d41..05dfd79 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ xsd (4.0.0-8) UNRELEASED; urgency=medium - Switch Vcs-* to new location. * debian/copyright: - Add year 2020 to debian/*. + - Use secure URI. + - Change Source to directory listing. -- Jörg Frings-Fürst Sun, 12 Apr 2020 16:19:33 +0200 diff --git a/debian/copyright b/debian/copyright index f6b8225..a5a8e4d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: xsd Upstream-Contact: xsd-user Maillist -Source: +Source: https://www.codesynthesis.com/download/xsd/ Files: * Copyright: Copyright (©) 2005-2014 CODE SYNTHESIS TOOLS CC -- cgit v1.2.3 From b98ca73b433ba3ded5bd2d9ed33a37d4547490c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Apr 2020 17:39:49 +0200 Subject: d/changelog: Remove EOL before EOF --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 05dfd79..c7b5994 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ xsd (4.0.0-8) UNRELEASED; urgency=medium - Add year 2020 to debian/*. - Use secure URI. - Change Source to directory listing. + * debian/changelog: + - Remove EOL before EOF. -- Jörg Frings-Fürst Sun, 12 Apr 2020 16:19:33 +0200 @@ -293,4 +295,3 @@ xsd (3.1.0-1) unstable; urgency=low * Initial release (Closes: #479523) -- Raphael Bossek Sat, 16 Feb 2008 19:26:38 +0100 - -- cgit v1.2.3 From ed38d5aab18608d078457384af0f1d037a0b442c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 12 Apr 2020 19:34:37 +0200 Subject: Use jdupes to change duplicate files into symlinks; Add Rules-Requires-Root: no --- debian/changelog | 5 +++++ debian/control | 2 ++ debian/rules | 4 ++++ debian/xsdcxx.lintian-overrides | 1 - 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c7b5994..3747b20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,11 +3,16 @@ xsd (4.0.0-8) UNRELEASED; 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). + * Use jdupes to change duplicate files into symlinks: + - debian/rules: Add override_dh_link. + - debian/control: Add Build-Depend jdupes. + - debian/xsdcxx.lintian-overrides: Remove duplicate-files. * Switch to debhelper-compat: - debian/control: Replace debhelper with debhelper-compat. - Remove debian/compat. * debian/control: - Switch Vcs-* to new location. + - Add Rules-Requires-Root: no. * debian/copyright: - Add year 2020 to debian/*. - Use secure URI. diff --git a/debian/control b/debian/control index ca5e2ca..8e7fda5 100644 --- a/debian/control +++ b/debian/control @@ -2,9 +2,11 @@ Source: xsd Section: devel Priority: optional Maintainer: Jörg Frings-Fürst +Rules-Requires-Root: no Build-Depends: debhelper-compat (= 12), dpkg-dev (>= 1.15.4), + jdupes, libboost-date-time-dev, libboost-filesystem-dev, libboost-regex-dev, diff --git a/debian/rules b/debian/rules index 204d43f..a3031ce 100755 --- a/debian/rules +++ b/debian/rules @@ -39,3 +39,7 @@ override_dh_auto_install: override_dh_install: dh_install install -D -m 644 debian/ubuntu/apport-hook.py $(CURDIR)/debian/xsdcxx/usr/share/apport/package-hooks/source_xsdcxx.py + +override_dh_link: + jdupes -rl debian/xsdcxx/usr + dh_link diff --git a/debian/xsdcxx.lintian-overrides b/debian/xsdcxx.lintian-overrides index 6b2ce65..3de886d 100644 --- a/debian/xsdcxx.lintian-overrides +++ b/debian/xsdcxx.lintian-overrides @@ -1,2 +1 @@ -duplicate-files hardening-no-fortify-functions -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3 -- cgit v1.2.3