update logrotate fix to final version

diff --git a/patches/0007-debian-sync-logrotate-packaging-with-downstream.patch b/patches/0007-debian-sync-logrotate-packaging-with-downstream.patch
index cce56108fe63c2bca40862fa63b2a824bb4dac28..3b5df97c09a03736fc11b8989e2a7789675d7e07 100644 (file)
--- a/patches/0007-debian-sync-logrotate-packaging-with-downstream.patch
+++ b/patches/0007-debian-sync-logrotate-packaging-with-downstream.patch
@@ -1,4 +1,4 @@
-From 1e190c864e37ea2e76a0d41f10576186697d6521 Mon Sep 17 00:00:00 2001
+From 225fc4154e5da1b3ddc160c8e24bf485e91f9583 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
 Date: Tue, 6 Jun 2017 12:20:06 +0200
 Subject: [PATCH 7/7] debian: sync logrotate packaging with downstream
@@ -14,20 +14,23 @@ to prevent duplicate logrotate scripts handling the same log
 files, and to minimize the delta between upstream and
 downstream packaging, sync this change back upstream.
 
+Fixes: http://tracker.ceph.com/issues/19938
+
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 ---
- debian/ceph-base.maintscript | 1 +
+ debian/ceph-base.maintscript | 2 ++
  debian/rules                 | 4 ++--
- 2 files changed, 3 insertions(+), 2 deletions(-)
+ 2 files changed, 4 insertions(+), 2 deletions(-)
  create mode 100644 debian/ceph-base.maintscript
 
 diff --git a/debian/ceph-base.maintscript b/debian/ceph-base.maintscript
 new file mode 100644
-index 0000000000..13c9f25adb
+index 0000000000..38e36d454f
 --- /dev/null
 +++ b/debian/ceph-base.maintscript
-@@ -0,0 +1 @@
+@@ -0,0 +1,2 @@
 +rm_conffile /etc/logrotate.d/ceph.logrotate -- "$@"
++rm_conffile /etc/logrotate.d/ceph -- "$@"
 diff --git a/debian/rules b/debian/rules
 index e12913c6d7..aeb826b33e 100755
 --- a/debian/rules