Thread (10 messages) 10 messages, 3 authors, 2021-02-05
STALE1969d
Revisions (2)
  1. v1 current
  2. v2 [diff vs current]

[PATCH 3/3] debian: Prevent installing duplicate changelog

From: Bastian Germann <hidden>
Date: 2021-02-05 00:32:20
Subsystem: the rest · Maintainer: Linus Torvalds

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 <redacted>
---
 debian/changelog | 1 +
 debian/rules     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
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
-- 
2.30.0
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help