[Pkg-ganeti-devel] [SCM] Ganeti packaging branch, master, updated. debian/2.7.0-2-12-g7959fb0

[Apollon Oikonomopoulos]

The following commit has been merged in the master branch:
commit eb3fa5f5916d1d13d2cf684ea97f65360eecb7f7
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Mon Jul 29 01:11:59 2013 +0300

    Build-Depend on bash-completion and use dh_bash-completion
    
    Do not manually copy the bash completion snippet to /etc/bash_completion.d,
    have dh_bash-completion do it instead.

diff --git a/debian/control b/debian/control
index 3a6a166..acf7070 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 9),
  python-simplejson, python-pyparsing, python-openssl, python-bitarray,
  python-support (>= 0.6), python-pyinotify, python-pycurl,
  python-paramiko, python-ipaddr, python-sphinx (>= 1.0.7+dfsg), graphviz,
- qemu-utils, socat, iproute, procps, shelltestrunner
+ qemu-utils, socat, iproute, procps, shelltestrunner, bash-completion
 Standards-Version: 3.9.4
 X-Python-Version: >= 2.5
 Homepage: http://code.google.com/p/ganeti/
diff --git a/debian/ganeti.bash-completion b/debian/ganeti.bash-completion
new file mode 100644
index 0000000..65e7f19
--- /dev/null
+++ b/debian/ganeti.bash-completion
@@ -0,0 +1 @@
+doc/examples/bash_completion	ganeti
diff --git a/debian/ganeti.dirs b/debian/ganeti.dirs
index b7381c3..f1d84d9 100644
--- a/debian/ganeti.dirs
+++ b/debian/ganeti.dirs
@@ -1,5 +1,4 @@
 etc/ganeti
-etc/bash_completion.d
 usr/lib/ganeti
 usr/lib/ganeti/iallocators
 usr/share/lintian/overrides
diff --git a/debian/rules b/debian/rules
index 47c35c7..2122e92 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with python2,sphinxdoc
+	dh $@ --with python2,sphinxdoc,bash_completion
 
 override_dh_auto_configure:
 	./configure \
@@ -46,8 +46,6 @@ override_dh_auto_install:
 	cp $(CURDIR)/doc/examples/ganeti.cron $(CURDIR)/debian/ganeti.cron.d
 	cp $(CURDIR)/doc/examples/ganeti.default $(CURDIR)/debian/ganeti.default
 	cp $(CURDIR)/doc/examples/ganeti.logrotate $(CURDIR)/debian/ganeti.logrotate
-	install -m 0644 $(CURDIR)/doc/examples/bash_completion \
-	   $(CURDIR)/debian/ganeti/etc/bash_completion.d/ganeti
 	
 	# Hack to make our life a bit easier and be able to use wildcards in .install files
 	mv $(CURDIR)/debian/tmp/usr/lib/ganeti/mon-collector $(CURDIR)/debian/ganeti-haskell/usr/lib/ganeti

-- 
Ganeti packaging