diff mbox series

[v2,3/3] debian: Prevent installing duplicate changelog

Message ID 20210205203405.1955-4-bastiangermann@fishpost.de (mailing list archive)
State Accepted
Headers show
Series debian: minor fixes | expand

Commit Message

Bastian Germann Feb. 5, 2021, 8:34 p.m. UTC 
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>
---
 debian/changelog | 1 +
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/debian/changelog b/debian/changelog
index 2da58f30..5421aed6 100644
--- 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 7304222c..c6ca5491 100755
--- 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