]> git.proxmox.com Git - ceph.git/blob - patches/0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch
avoid an empty override_dh_installdocs in d/rules
[ceph.git] / patches / 0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch
1 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
2 From: Alwin Antreich <a.antreich@proxmox.com>
3 Date: Wed, 6 Feb 2019 10:16:22 +0100
4 Subject: [PATCH] d/rules: fix instaldoc override and ship upstream changelog
5
6 since we replace it with our own.
7
8 The `override_dh_installdocs` target was left over as empty override
9 by MISTAKE in uptream commit c3a53010af432e77f74bcb46e7205c5500b6af77,
10 fix that by just dropping it completely.
11
12 ---
13 debian/rules | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16 diff --git a/debian/rules b/debian/rules
17 index 3ac923f71a..d9927b3e0d 100755
18 --- a/debian/rules
19 +++ b/debian/rules
20 @@ -65,9 +65,7 @@ override_dh_auto_install:
21
22 # doc/changelog is a directory, which confuses dh_installchangelogs
23 override_dh_installchangelogs:
24 - dh_installchangelogs --exclude doc/changelog
25 -
26 -override_dh_installdocs:
27 + dh_installchangelogs --exclude doc/changelog changelog.upstream
28
29 override_dh_installlogrotate:
30 cp src/logrotate.conf debian/ceph-common.logrotate