build/ops: deb: fix logrotate packaging

This minimal jewel-only fix is not cherry-picked from master because
the Debian packaging was refactored between jewel and master and the
master fix is totally different.

Fixes: http://tracker.ceph.com/issues/20316
Signed-off-by: Nathan Cutler <ncutler@suse.com>

diff --git a/debian/rules b/debian/rules
index cd73c878968846b30b7f5d94e9a3431089a85330..6d6ffc99ecebc9cda0db857b7df36e518aec0e94 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -53,7 +53,7 @@ build-stamp: configure-stamp
 
        cp src/init-ceph debian/ceph-base.ceph.init
        cp src/init-radosgw debian/radosgw.init
-       cp src/logrotate.conf debian/ceph.logrotate
+       cp src/logrotate.conf debian/ceph-common.logrotate
 
        touch $@
 
@@ -67,7 +67,7 @@ clean:
          ltmain.sh missing
        rm -f configure Makefile.in man/Makefile.in src/Makefile.in
        rm -f src/acconfig.h.in
-       rm -f debian/ceph-base.ceph.init debian/radosgw.init debian/ceph.logrotate debian/radosgw.logrotate
+       rm -f debian/ceph-base.ceph.init debian/radosgw.init debian/ceph-common.logrotate
 
        dh_clean
 
@@ -116,7 +116,7 @@ binary-arch: build install
        dh_installexamples -a
        dh_install -a --sourcedir=$(DESTDIR) --list-missing
        install -d -m0755 debian/ceph-base/etc/logrotate.d
-       install -m0644 debian/ceph.logrotate debian/ceph-base/etc/logrotate.d
+       install -m0644 debian/ceph-common.logrotate debian/ceph-base/etc/logrotate.d
 
        # dh_installinit is only set up to handle one upstart script
        # per package, so do this ourselves