6 files changed, 42 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog
index cdfc3d1..3747b20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,28 @@
-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.
@@ -21,7 +45,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 <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
 
@@ -276,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 f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 37f336c..8e7fda5 100644
--- a/debian/control
+++ b/debian/control
@@ -2,18 +2,20 @@ Source: xsd
 Section: devel
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
+Rules-Requires-Root: no
 Build-Depends:
- debhelper (>= 10),
+ 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: 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
+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/rules b/debian/rules
index a9f32a7..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
 #
@@ -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/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