| Message ID | 20210205003125.24463-4-bastiangermann@fishpost.de (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | debian: minor fixes | expand |
On Fri, Feb 05, 2021 at 01:31:25AM +0100, Bastian Germann wrote: > 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> /me wonders if a wider cleanup (isn't debhelper up to v12 now?) is in order but for now, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > 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 >
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
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(-)