public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Bastian Germann <bastiangermann@fishpost.de>
To: linux-xfs@vger.kernel.org
Cc: Bastian Germann <bastiangermann@fishpost.de>
Subject: [PATCH 3/3] debian: Prevent installing duplicate changelog
Date: Fri,  5 Feb 2021 01:31:25 +0100	[thread overview]
Message-ID: <20210205003125.24463-4-bastiangermann@fishpost.de> (raw)
In-Reply-To: <20210205003125.24463-1-bastiangermann@fishpost.de>

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>
---
 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


  parent reply	other threads:[~2021-02-05  0:32 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-05  0:31 [PATCH 0/3] debian: minor fixes Bastian Germann
2021-02-05  0:31 ` [PATCH 1/3] debian: Drop unused dh-python from Build-Depends Bastian Germann
2021-02-05  0:51   ` Darrick J. Wong
2021-02-05  4:49     ` Eric Sandeen
2021-02-05 18:05     ` Bastian Germann
2021-02-05 18:18       ` Darrick J. Wong
2021-02-05  0:31 ` [PATCH 2/3] debian: Only build for Linux Bastian Germann
2021-02-05  0:48   ` Darrick J. Wong
2021-02-05  0:31 ` Bastian Germann [this message]
2021-02-05  0:49   ` [PATCH 3/3] debian: Prevent installing duplicate changelog Darrick J. Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210205003125.24463-4-bastiangermann@fishpost.de \
    --to=bastiangermann@fishpost.de \
    --cc=linux-xfs@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox