[devscripts] 05/06: Move bash completion scripts into appropriate directory

[James McCoy]

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

jamessan pushed a commit to branch master
in repository devscripts.

commit 17eb5834b6eee0751c98b8a1af1bb7425175932a
Author: James McCoy <jamessan at debian.org>
Date:   Sun May 10 00:08:39 2015 -0400

    Move bash completion scripts into appropriate directory
    
    Signed-off-by: James McCoy <jamessan at debian.org>
---
 debian/changelog | 2 ++
 debian/control   | 4 +++-
 debian/postinst  | 4 ++++
 debian/postrm    | 4 ++++
 debian/preinst   | 8 ++++++++
 scripts/Makefile | 4 +++-
 6 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c223c6..dfeb2e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ devscripts (2.15.5) UNRELEASED; urgency=medium
     mk-origtargz.  (Closes: #784394)
   * Stop building and shipping libvfork.so since strace has handled vforks for
     at least a decade.
+  * Move bash-completion scripts from /etc/bash_completion.d (compat
+    directory) to /usr/share/bash-completion/completions.
 
  -- Cyril Brulebois <kibi at debian.org>  Tue, 28 Apr 2015 16:58:36 +0200
 
diff --git a/debian/control b/debian/control
index b940892..2a6b0df 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,8 @@ Uploaders: James McCoy <jamessan at debian.org>,
            Ryan Niebur <ryanryan52 at gmail.com>,
            Benjamin Drung <bdrung at debian.org>
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 9),
+Build-Depends: bash-completion,
+               debhelper (>= 9),
                docbook-xsl,
                file,
                libdistro-info-perl,
@@ -18,6 +19,7 @@ Build-Depends: debhelper (>= 9),
                libwww-perl,
                lsb-release,
                perl,
+               pkg-config,
                po4a (>= 0.40),
                pylint,
                python3-all,
diff --git a/debian/postinst b/debian/postinst
index 6a9cd6c..74d0a04 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -744,4 +744,8 @@ EOF
     fi
 fi
 
+for cf in chdist debchange debsign pkgnames uupdate; do
+    dpkg-maintscript-helper rm_conffile /etc/bash_completion.d/devscripts."$cf" 2.15.5~ devscripts -- "$@"
+done
+
 #DEBHELPER#
diff --git a/debian/postrm b/debian/postrm
index cc5e5bc..fdb96db 100644
--- a/debian/postrm
+++ b/debian/postrm
@@ -6,4 +6,8 @@ then
     rm -f /etc/devscripts.conf*
 fi
 
+for cf in chdist debchange debsign pkgnames uupdate; do
+    dpkg-maintscript-helper rm_conffile /etc/bash_completion.d/devscripts."$cf" 2.15.5~ devscripts -- "$@"
+done
+
 #DEBHELPER#
diff --git a/debian/preinst b/debian/preinst
new file mode 100644
index 0000000..8ad0590
--- /dev/null
+++ b/debian/preinst
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -e
+
+for cf in chdist debchange debsign pkgnames uupdate; do
+    dpkg-maintscript-helper rm_conffile /etc/bash_completion.d/devscripts."$cf" 2.15.5~ devscripts -- "$@"
+done
+
+#DEBHELPER#
diff --git a/scripts/Makefile b/scripts/Makefile
index 3c2f4f5..b4d43bf 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -20,6 +20,7 @@ CWRAPPERS = debpkg-wrapper
 SCRIPTS = $(patsubst %.pl,%,$(PL_FILES)) $(patsubst %.sh,%,$(SH_FILES))
 COMPL_FILES := $(wildcard *.bash_completion)
 COMPLETION = $(patsubst %.bash_completion,devscripts.%,$(COMPL_FILES))
+COMPL_DIR := $(shell pkg-config --variable=completionsdir bash-completion)
 
 GEN_MAN1S += devscripts.1 mk-origtargz.1
 
@@ -89,7 +90,8 @@ install: all
 	cp $(SCRIPTS) $(DESTDIR)$(BINDIR)
 	ln -sf edit-patch $(DESTDIR)$(BINDIR)/add-patch
 	install -dD $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
-	cp $(COMPLETION) $(DESTDIR)$(SYSCONFDIR)/bash_completion.d
+	install -d $(DESTDIR)$(COMPL_DIR)
+	cp $(COMPLETION) $(DESTDIR)$(COMPL_DIR)
 	# Special treatment for debpkg
 	install -d $(DESTDIR)$(DATA_DIR)
 	mv $(DESTDIR)$(BINDIR)/debpkg $(DESTDIR)$(DATA_DIR)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git