This is an automated email from the git hooks/post-receive script.
gaudenz pushed a commit to branch master
in repository ceph.
commit 186e1e9f744abec2e7be53e5807c20af69daeb27
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date: Tue Oct 6 18:01:32 2015 +0200
Use dh_bash-completion to install bash completions
---
debian/ceph-common.bash-completion | 2 ++
debian/ceph-common.install | 2 --
debian/ceph-common.maintscript | 2 ++
debian/ceph.bash-completion | 1 +
debian/ceph.install | 1 -
debian/ceph.maintscript | 1 +
debian/control | 3 ++-
debian/radosgw.bash-completion | 1 +
debian/radosgw.install | 1 -
debian/radosgw.maintscript | 1 +
debian/rules | 2 +-
11 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/debian/ceph-common.bash-completion b/debian/ceph-common.bash-completion
new file mode 100644
index 0000000..b493a9b
--- /dev/null
+++ b/debian/ceph-common.bash-completion
@@ -0,0 +1,2 @@
+etc/bash_completion.d/rados
+etc/bash_completion.d/rbd
diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index e341a06..755b575 100644
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -1,5 +1,3 @@
-etc/bash_completion.d/rados
-etc/bash_completion.d/rbd
usr/bin/ceph
usr/bin/ceph-authtool
usr/bin/ceph-conf
diff --git a/debian/ceph-common.maintscript b/debian/ceph-common.maintscript
new file mode 100644
index 0000000..a9bedda
--- /dev/null
+++ b/debian/ceph-common.maintscript
@@ -0,0 +1,2 @@
+rm_conffile /etc/bash_completion.d/rados 0.80.10-1~
+rm_conffile /etc/bash_completion.d/rbd 0.80.10-1~
diff --git a/debian/ceph.bash-completion b/debian/ceph.bash-completion
new file mode 100644
index 0000000..1f91519
--- /dev/null
+++ b/debian/ceph.bash-completion
@@ -0,0 +1 @@
+etc/bash_completion.d/ceph
diff --git a/debian/ceph.install b/debian/ceph.install
index 87c5865..d8fb0e1 100644
--- a/debian/ceph.install
+++ b/debian/ceph.install
@@ -1,5 +1,4 @@
debian/etc/pm/sleep.d/* /etc/pm/sleep.d/
-etc/bash_completion.d/ceph
sbin/mkcephfs
usr/bin/ceph-clsinfo
usr/bin/ceph-debugpack
diff --git a/debian/ceph.maintscript b/debian/ceph.maintscript
new file mode 100644
index 0000000..6f1a11e
--- /dev/null
+++ b/debian/ceph.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/bash_completion.d/ceph 0.80.10-1~
\ No newline at end of file
diff --git a/debian/control b/debian/control
index 5a5578b..97abb1b 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Uploaders: Laszlo Boszormenyi (GCS) <gcs at debian.org>,
Homepage: http://ceph.com/
Vcs-Git: git://anonscm.debian.org/pkg-ceph/ceph.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ceph/ceph.git
-Build-Depends: debhelper (>= 9~),
+Build-Depends: bash-completion,
+ debhelper (>= 9~),
default-jdk,
dh-autoreconf,
dpkg-dev (>= 1.16.1~),
diff --git a/debian/radosgw.bash-completion b/debian/radosgw.bash-completion
new file mode 100644
index 0000000..4314868
--- /dev/null
+++ b/debian/radosgw.bash-completion
@@ -0,0 +1 @@
+etc/bash_completion.d/radosgw-admin
diff --git a/debian/radosgw.install b/debian/radosgw.install
index 1ed620e..f4c4abf 100644
--- a/debian/radosgw.install
+++ b/debian/radosgw.install
@@ -1,4 +1,3 @@
-etc/bash_completion.d/radosgw-admin
usr/bin/radosgw
usr/bin/radosgw-admin
usr/share/man/man8/radosgw-admin.8
diff --git a/debian/radosgw.maintscript b/debian/radosgw.maintscript
new file mode 100644
index 0000000..ec51ed1
--- /dev/null
+++ b/debian/radosgw.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/bash_completion.d/radosgw-admin 0.80.10-1~
diff --git a/debian/rules b/debian/rules
index b3b0ccb..06c0190 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ endif
extraopts += --with-system-libs3
%:
- dh $@ --with javahelper,python2,autoreconf --parallel
+ dh $@ --with javahelper,python2,autoreconf,bash-completion --parallel
# use --as-needed only if supported by dh-autoreconf (to simplify backporting)
DH_AS_NEEDED=$(shell dpkg --compare-versions $$(dpkg --status dh-autoreconf | grep Version | cut -d' ' -f2) ge 6 && echo --as-needed)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git