import 15.2.9

[ceph.git] / patches / 0007-debian-rules-ship-Ceph-changelog-as-upstream-changel.patch

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Alwin Antreich <a.antreich@proxmox.com>
Date: Wed, 6 Feb 2019 10:16:22 +0100
Subject: [PATCH] debian/rules: ship Ceph changelog as upstream changelog

since we replace it with our own.
---
 debian/rules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/rules b/debian/rules
index 3ac923f71a..d9927b3e0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -55,7 +55,7 @@ override_dh_auto_install:
 
 # doc/changelog is a directory, which confuses dh_installchangelogs
 override_dh_installchangelogs:
-	dh_installchangelogs --exclude doc/changelog
+	dh_installchangelogs --exclude doc/changelog changelog.upstream
 
 override_dh_installdocs:
 	dh_installdocs -a --all ChangeLog