debian: Prevent installing duplicate changelog

The doc/CHANGES file is both processed by dh_installdocs and
dh_installchangelogs. So it ends up as changelog.gz and CHANGES.gz.
Prevent that by excluding it from dh_installdocs.

Signed-off-by: Bastian Germann <bastiangermann@fishpost.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/debian/changelog b/debian/changelog
index 2da58f307311236daadfb4970432f58b1be8e376..5421aed6ce51b4c8ea7c9ccc1821fc0ca8765fa1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xfsprogs (5.10.0-3) unstable; urgency=medium
 
   * Drop unused dh-python from Build-Depends (Closes: #981361)
   * Only build for Linux
+  * Prevent installing duplicate changelog (Closes: #570704)
 
  -- Bastian Germann <bastiangermann@fishpost.de>  Fri, 05 Feb 2021 00:18:31 +0100
 

diff --git a/debian/rules b/debian/rules
index 7304222cefde9b73d0e93f1c5fcb155d40a8d2d7..c6ca54917cd4447f4b4761dd7c1c0aadc6110dde 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -87,7 +87,7 @@ binary-arch: checkroot built
        rm -f debian/xfslibs-dev/lib/libhandle.la
        rm -f debian/xfslibs-dev/lib/libhandle.a
        rm -fr debian/xfslibs-dev/usr/lib
-       dh_installdocs
+       dh_installdocs -XCHANGES
        dh_installchangelogs
        dh_strip
        dh_compress