[Pkg-ceph-commits] [ceph] 71/85: Install bash-completions to /usr

[Gaudenz Steinlin]

This is an automated email from the git hooks/post-receive script.

gaudenz pushed a commit to branch jewel
in repository ceph.

commit aa1393ffa395cf77fe42f9a1f84b8923876b8f67
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date:   Sat Dec 17 11:15:16 2016 +0100

    Install bash-completions to /usr
    
    Also add the maintainer script snippets to remove the configuration
    files present in previous versions of the package.
    
    The bash completion configuration file for ceph was in package ceph
    at the time the last upload to Debian was made. So the conffile removal
    needs to be in this package.
---
 debian/ceph-base.install       | 2 +-
 debian/ceph-common.install     | 4 ++--
 debian/ceph-common.maintscript | 2 ++
 debian/ceph.maintscript        | 1 +
 debian/radosgw.install         | 2 +-
 debian/radosgw.maintscript     | 1 +
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/debian/ceph-base.install b/debian/ceph-base.install
index c3d9406..93436f0 100644
--- a/debian/ceph-base.install
+++ b/debian/ceph-base.install
@@ -1,6 +1,6 @@
 ## install from source tree
 debian/etc/pm/sleep.d/*    /etc/pm/sleep.d/
-etc/bash_completion.d/ceph
+etc/bash_completion.d/ceph /usr/share/bash-completion/completions/
 usr/bin/ceph-debugpack
 usr/bin/ceph-run
 usr/bin/crushtool
diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index 49fdbb1..3296aa2 100644
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -1,5 +1,5 @@
-etc/bash_completion.d/rados
-etc/bash_completion.d/rbd
+etc/bash_completion.d/rados /usr/share/bash-completion/completions/
+etc/bash_completion.d/rbd   /usr/share/bash-completion/completions/
 etc/ceph/rbdmap
 etc/default/ceph
 udev/50-rbd.rules /lib/udev/rules.d
diff --git a/debian/ceph-common.maintscript b/debian/ceph-common.maintscript
new file mode 100644
index 0000000..dc7cf62
--- /dev/null
+++ b/debian/ceph-common.maintscript
@@ -0,0 +1,2 @@
+rm_conffile /etc/bash_completion.d/rados 10.2.5-1~
+rm_conffile /etc/bash_completion.d/rbd 10.2.5-1~
diff --git a/debian/ceph.maintscript b/debian/ceph.maintscript
index 238a3f2..ec2c87d 100644
--- a/debian/ceph.maintscript
+++ b/debian/ceph.maintscript
@@ -8,3 +8,4 @@ rm_conffile /etc/init/ceph-mon-all-starter.conf 10.2.5-1~
 rm_conffile /etc/init/ceph-all.conf 10.2.5-1~
 rm_conffile /etc/init/ceph-mon.conf 10.2.5-1~
 rm_conffile /etc/init/ceph-mon-all.conf 10.2.5-1~
+rm_conffile /etc/bash_completion.d/ceph 10.2.5-1~
diff --git a/debian/radosgw.install b/debian/radosgw.install
index e9f3e18..5179cef 100644
--- a/debian/radosgw.install
+++ b/debian/radosgw.install
@@ -1,4 +1,4 @@
-etc/bash_completion.d/radosgw-admin
+etc/bash_completion.d/radosgw-admin /usr/share/bash-completion/completions/
 usr/bin/radosgw
 usr/bin/radosgw-admin
 usr/bin/radosgw-object-expirer
diff --git a/debian/radosgw.maintscript b/debian/radosgw.maintscript
index 2219c10..fd1bbd2 100644
--- a/debian/radosgw.maintscript
+++ b/debian/radosgw.maintscript
@@ -1,3 +1,4 @@
 rm_conffile /etc/init/radosgw-all-starter.conf 10.2.5-1~
 rm_conffile /etc/init/radosgw-instance.conf 10.2.5-1~
 rm_conffile /etc/init/radosgw-all.conf 10.2.5-1~
+rm_conffile /etc/bash_completion.d/radosgw-admin 10.2.5-1~

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git