diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2020-04-12 19:53:29 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2020-04-12 19:53:29 +0200 |
commit | 0802e2b0c8dbd72f34f8e988daccf379c571c826 (patch) | |
tree | fbcdb54d8d262db1d84a734b8a36a57020f1491e /debian | |
parent | 442e98604d4158dae11056c4f94aaa655cb480fa (diff) | |
parent | 1b39342d55dfcb40a9aaf8635458cf542b63fc6a (diff) |
Merge branch 'release/4.0.0-7'
Diffstat (limited to 'debian')
-rw-r--r-- | debian/README.source | 18 | ||||
-rw-r--r-- | debian/changelog | 57 | ||||
-rw-r--r-- | debian/compat | 1 | ||||
-rw-r--r-- | debian/control | 13 | ||||
-rw-r--r-- | debian/copyright | 6 | ||||
-rw-r--r-- | debian/patches/0115-lintian-typos.patch | 31 | ||||
-rw-r--r-- | debian/patches/series | 1 | ||||
-rwxr-xr-x | debian/rules | 9 | ||||
-rw-r--r-- | debian/watch | 2 | ||||
-rw-r--r-- | debian/xsdcxx.lintian-overrides | 1 |
10 files changed, 116 insertions, 23 deletions
diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..e4f2b3d --- /dev/null +++ b/debian/README.source @@ -0,0 +1,18 @@ +Hello, + +now I use the branching model from Vincent Driessen[1]. + +I use the gitflow-avh[2]. with the Documentation[3]. +The Debian package can be found here[4]. + +Please upload unattended uploads use a branch feature/<your title>. + + +Many thanks. + + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Fri, 02 Jun 2017 19:00:40 +0200 + +[1] http://nvie.com/posts/a-successful-git-branching-model/ +[2] https://github.com/petervanderdoes/gitflow-avh +[3] https://github.com/petervanderdoes/gitflow-avh/wiki +[4] https://tracker.debian.org/pkg/git-flow diff --git a/debian/changelog b/debian/changelog index dd685b6..3747b20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,51 @@ -xsd (4.0.0-7) UNRELEASED; urgency=medium +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 <helmut@subdivi.de>. + * 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. + - Change Source to directory listing. + * debian/changelog: + - Remove EOL before EOF. + + -- Jörg Frings-Fürst <debian@jff.email> 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): - Remove tests for character reference values unsupported by Xerces-C++ 3.2. Thanks to Boris Kolpackov <boris@codesynthesis.com>. * Change to my new email-address: - - debian/control, - - debian/copyright. + - debian/control, + - debian/copyright. + * New README.source to explain the branching model used. + * debian/changelog: + - Remove trailing white spaces. + * debian/control: + - Replace Priority extra with optional. + * debian/watch: + - Switch to secure URI. + * Declare compliance with Debian Policy 4.1.1. (No changes needed). + * Migrate to debhelper 10: + - Change debian/compat to 10. + - Bump minimum debhelper version in debian/control to >= 10. + - Drop autotools-dev from Build-Depends. + - 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 <debian@jff.email> Wed, 08 Nov 2017 19:25:38 +0100 + -- Jörg Frings-Fürst <debian@jff.email> Sun, 12 Nov 2017 14:36:31 +0100 xsd (4.0.0-6) unstable; urgency=medium @@ -102,11 +140,11 @@ xsd (4.0.0-1) unstable; urgency=medium xsd (3.3.0.2-3) unstable; urgency=medium * debian/rules - - add --with autotools-dev - to prevent build errors on ppc64el & arm64 + - add --with autotools-dev + to prevent build errors on ppc64el & arm64 thanks to Dimitri John Ledkov - add ubuntu apport hook - - change hardening to debhelper >= 9 + - change hardening to debhelper >= 9 * debian/source - add options compression xz @@ -132,12 +170,12 @@ xsd (3.3.0.2-1) unstable; urgency=low * rewrite debian/copyright * replace old tarball-in-tarball to the Upstream-tarball - * remove + * remove - patches included in tarball - debian/README.source * add hardenning-wrapper to Build-Depends * rewrite debian/rules - * rename debian/patches/xsd_xsdcxx-rename.patch to + * rename debian/patches/xsd_xsdcxx-rename.patch to 0001-xsd_xsdcxx-rename.patch * add file xsdcxx.lintian-overrides - duplicate-files @@ -262,4 +300,3 @@ xsd (3.1.0-1) unstable; urgency=low * Initial release (Closes: #479523) -- Raphael Bossek <bossekr@debian.org> Sat, 16 Feb 2008 19:26:38 +0100 - diff --git a/debian/compat b/debian/compat deleted file mode 100644 index ec63514..0000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -9 diff --git a/debian/control b/debian/control index aef53a8..8e7fda5 100644 --- a/debian/control +++ b/debian/control @@ -1,20 +1,21 @@ Source: xsd Section: devel -Priority: extra +Priority: optional Maintainer: Jörg Frings-Fürst <debian@jff.email> +Rules-Requires-Root: no Build-Depends: - autotools-dev, - debhelper (>= 9), + debhelper-compat (= 12), dpkg-dev (>= 1.15.4), + jdupes, libboost-date-time-dev, libboost-filesystem-dev, libboost-regex-dev, libxerces-c-dev (>= 3), m4 -Standards-Version: 3.9.8 +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 diff --git a/debian/copyright b/debian/copyright index 55f0fd5..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 <xsd-users@codesynthesis.com> -Source: <http://www.codesynthesis.com/download/xsd/3.2/xsd-3.2.0.2+dep.tar.bz2> +Source: https://www.codesynthesis.com/download/xsd/ Files: * Copyright: Copyright (©) 2005-2014 CODE SYNTHESIS TOOLS CC @@ -89,7 +89,7 @@ License: GFDL-1.2 Files: debian/* Copyright: 2008 Raphael Bossek <bossekr@debian.org> - 2014-2016 Jörg Frings-Fürst <debian@jff.email> + 2014-2020 Jörg Frings-Fürst <debian@jff.email> License: GPL-1+ diff --git a/debian/patches/0115-lintian-typos.patch b/debian/patches/0115-lintian-typos.patch new file mode 100644 index 0000000..d40e529 --- /dev/null +++ b/debian/patches/0115-lintian-typos.patch @@ -0,0 +1,31 @@ +Description: Correct some typos +Author: Jörg Frings-Fürst <debian@jff.email> +Last-Update: 2017-11-09 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: trunk/xsd/xsd/cxx/tree/tree-header.cxx +=================================================================== +--- trunk.orig/xsd/xsd/cxx/tree/tree-header.cxx ++++ trunk/xsd/xsd/cxx/tree/tree-header.cxx +@@ -972,7 +972,7 @@ namespace CXX + << " * @brief Assign the underlying enum value." << endl + << " *" << endl + << " * @param v A enum value." << endl +- << " * @return A refernce to the instance." << endl ++ << " * @return A reference to the instance." << endl + << " */" << endl; + } + +Index: trunk/xsd/xsd/processing/inheritance/processor.cxx +=================================================================== +--- trunk.orig/xsd/xsd/processing/inheritance/processor.cxx ++++ trunk/xsd/xsd/processing/inheritance/processor.cxx +@@ -290,7 +290,7 @@ namespace Processing + wcerr << t.file () << ":" << t.line () << ":" << t.column () + << " error: nested anonymous type in '" << t.name () + << "' or '" << type.name () << "' inherits from one of " +- << "these types and makes them mutually dependant" ++ << "these types and makes them mutually dependent" + << endl; + + wcerr << t.file () << ":" << t.line () << ":" << t.column () diff --git a/debian/patches/series b/debian/patches/series index 28fbf6b..9836207 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 0700_hurd_PATH_MAX.patch 0105-Fix_path_handling_bug.patch 0110-xerces-c3.2.patch +0115-lintian-typos.patch diff --git a/debian/rules b/debian/rules index 1649d46..a3031ce 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 # @@ -18,7 +21,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export verbose=1 %: - dh $@ --with autotools-dev --parallel + dh $@ override_dh_clean: rm -f $(CURDIR)/libcult/build/system/configuration-dynamic.make @@ -36,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/watch b/debian/watch index 9aafe48..2501db5 100644 --- a/debian/watch +++ b/debian/watch @@ -1,6 +1,6 @@ # Compulsory line, this is a version 4 file version=4 opts=dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$// \ -http://codesynthesis.com/download/xsd/(\d+)\.(\d+)/xsd-(\d+)\.(\d+)\.(\d+)[-(\d+)]?\+dep\.tar\.bz2 +https://codesynthesis.com/download/xsd/(\d+)\.(\d+)/xsd-(\d+)\.(\d+)\.(\d+)[-(\d+)]?\+dep\.tar\.bz2 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 |