[apache2] 01/02: Moved bash_completion from /etc to /usr/share

[Jean-Michel Vourgère]

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

nirgal pushed a commit to branch master
in repository apache2.

commit 44adfca2f44884e35ebb8a98000261bcb66c2ebf
Author: Jean-Michel Vourgère <nirgal at debian.org>
Date:   Sat May 30 12:37:30 2015 +0200

    Moved bash_completion from /etc to /usr/share
    
    Renamed the script to match a command name and added links within
    /usr/share/bash_completion/completions because the snippets are now loaded on
    the fly based on the filename, and no longer pre-loaded.
    
    This clears package-install-into-obsolete-dir lintian warnings.
---
 debian/apache2.install                      |  2 +-
 debian/apache2.links                        | 21 +++++++++++++--------
 debian/apache2.maintscript                  |  1 +
 debian/bash_completion/{apache2 => a2enmod} |  0
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/debian/apache2.install b/debian/apache2.install
index 52bbac7..46ee11d 100644
--- a/debian/apache2.install
+++ b/debian/apache2.install
@@ -1,4 +1,4 @@
-debian/bash_completion/apache2			/etc/bash_completion.d/
+debian/bash_completion/a2enmod			/usr/share/bash-completion/completions/
 debian/config-dir/*				/etc/apache2
 debian/a2enmod					/usr/sbin
 debian/apache2ctl				/usr/sbin
diff --git a/debian/apache2.links b/debian/apache2.links
index 6f23c01..3e38af8 100644
--- a/debian/apache2.links
+++ b/debian/apache2.links
@@ -1,8 +1,13 @@
-usr/share/bug/apache2-bin/script	usr/share/bug/apache2/script
-usr/share/bug/apache2-bin/control	usr/share/bug/apache2/control
-usr/sbin/a2enmod 			usr/sbin/a2dismod
-usr/sbin/a2enmod 			usr/sbin/a2ensite
-usr/sbin/a2enmod 			usr/sbin/a2dissite
-usr/sbin/a2enmod 			usr/sbin/a2enconf
-usr/sbin/a2enmod 			usr/sbin/a2disconf
-usr/sbin/apache2ctl 			usr/sbin/apachectl
+usr/share/bash-completion/completions/a2enmod	usr/share/bash-completion/completions/a2dismod
+usr/share/bash-completion/completions/a2enmod	usr/share/bash-completion/completions/a2ensite
+usr/share/bash-completion/completions/a2enmod	usr/share/bash-completion/completions/a2dissite
+usr/share/bash-completion/completions/a2enmod	usr/share/bash-completion/completions/a2enconf
+usr/share/bash-completion/completions/a2enmod	usr/share/bash-completion/completions/a2disconf
+usr/share/bug/apache2-bin/script		usr/share/bug/apache2/script
+usr/share/bug/apache2-bin/control		usr/share/bug/apache2/control
+usr/sbin/a2enmod 				usr/sbin/a2dismod
+usr/sbin/a2enmod 				usr/sbin/a2ensite
+usr/sbin/a2enmod 				usr/sbin/a2dissite
+usr/sbin/a2enmod 				usr/sbin/a2enconf
+usr/sbin/a2enmod 				usr/sbin/a2disconf
+usr/sbin/apache2ctl 				usr/sbin/apachectl
diff --git a/debian/apache2.maintscript b/debian/apache2.maintscript
index c69c1f3..f3761b9 100644
--- a/debian/apache2.maintscript
+++ b/debian/apache2.maintscript
@@ -1 +1,2 @@
 symlink_to_dir /usr/share/doc/apache2 apache2.2-common 2.4.1-1~
+rm_conffile /etc/bash_completion.d/apache2 2.4.12-3~
diff --git a/debian/bash_completion/apache2 b/debian/bash_completion/a2enmod
similarity index 100%
rename from debian/bash_completion/apache2
rename to debian/bash_completion/a2enmod

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