[Pkg-nagios-changes] [pkg-icinga2] 01/08: Move bash-completion to /usr/share

[Markus Frosch]

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

lazyfrosch pushed a commit to branch master
in repository pkg-icinga2.

commit 89b3a4a65f76b7f43ee8ddc4ce40f7f8944dc54e
Author: Markus Frosch <lazyfrosch at debian.org>
Date:   Thu Feb 4 15:22:52 2016 +0100

    Move bash-completion to /usr/share
---
 debian/control                        |  3 ++-
 debian/icinga2-common.bash-completion |  1 +
 debian/icinga2-common.install         |  1 -
 debian/icinga2-common.postinst        |  3 +++
 debian/icinga2-common.preinst         | 10 ++++++++++
 debian/icinga2-common.prerm           | 10 ++++++++++
 debian/rules                          |  2 +-
 7 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 7b65078..4168eb8 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,8 @@ Maintainer: Debian Nagios Maintainer Group <pkg-nagios-devel at lists.alioth.debian
 Uploaders: Markus Frosch <lazyfrosch at debian.org>,
            Jan Wagner <waja at cyconet.org>,
            Alexander Wirt <formorer at debian.org>
-Build-Depends: bison,
+Build-Depends: bash-completion,
+               bison,
                cmake (>= 2.8.7),
                debhelper (>= 9),
                dh-systemd (>= 1.5),
diff --git a/debian/icinga2-common.bash-completion b/debian/icinga2-common.bash-completion
new file mode 100644
index 0000000..b3e3ebd
--- /dev/null
+++ b/debian/icinga2-common.bash-completion
@@ -0,0 +1 @@
+etc/bash_completion.d/icinga2
diff --git a/debian/icinga2-common.install b/debian/icinga2-common.install
index 580898c..bb10bd3 100644
--- a/debian/icinga2-common.install
+++ b/debian/icinga2-common.install
@@ -3,7 +3,6 @@ debian/tmp/etc/icinga2
 debian/tmp/etc/logrotate.d
 tools/syntax/nano/icinga2.nanorc usr/share/nano
 usr/share/icinga2
-debian/tmp/etc/bash_completion.d
 etc/sysconfig/icinga2 usr/lib/icinga2
 usr/lib/icinga2/prepare-dirs
 usr/lib/icinga2/safe-reload
diff --git a/debian/icinga2-common.postinst b/debian/icinga2-common.postinst
index dbe0f47..134474c 100644
--- a/debian/icinga2-common.postinst
+++ b/debian/icinga2-common.postinst
@@ -24,6 +24,9 @@ is_fresh_install()
     return 1
 }
 
+dpkg-maintscript-helper rm_conffile \
+   "/etc/bash_completion.d/icinga2" "2.4.1-2~" -- "$@"
+
 case "$1" in
     configure)
         if ! getent passwd nagios > /dev/null ; then
diff --git a/debian/icinga2-common.preinst b/debian/icinga2-common.preinst
new file mode 100644
index 0000000..d14d422
--- /dev/null
+++ b/debian/icinga2-common.preinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper rm_conffile \
+   "/etc/bash_completion.d/icinga2" "2.4.1-2~" -- "$@"
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/icinga2-common.prerm b/debian/icinga2-common.prerm
new file mode 100644
index 0000000..d14d422
--- /dev/null
+++ b/debian/icinga2-common.prerm
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+dpkg-maintscript-helper rm_conffile \
+   "/etc/bash_completion.d/icinga2" "2.4.1-2~" -- "$@"
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/rules b/debian/rules
index 3a6427d..31c0312 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
 #export DH_VERBOSE=1
 
 %:
-	dh $@ --with systemd
+	dh $@ --with systemd --with bash_completion
 
 override_dh_systemd_enable:
 	dh_systemd_enable --name=icinga2

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