[pulseaudio] 01/06: Bash completion script has moved, add mv_conffile snippet

[Luke Yelavich]

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

themuso-guest pushed a commit to branch ubuntu
in repository pulseaudio.

commit 9221ca1b7054be1ebd73dc4d4f8a6b6d0ac86f91
Author: Felipe Sateler <fsateler at debian.org>
Date:   Thu Dec 4 00:52:08 2014 -0300

    Bash completion script has moved, add mv_conffile snippet
    
    Conflicts:
    	debian/changelog
---
 debian/changelog                    | 4 ++++
 debian/pulseaudio.lintian-overrides | 2 +-
 debian/pulseaudio.maintscript       | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e26bd27..6ea84a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 pulseaudio (1:5.99.1-0ubuntu1~vivid2) UNRELEASED; urgency=medium
 
+  [ Luke Yelavich ]
   * Merge from Debian unstable, remaining changes:
     - epoch (my stupid fault :S)
     - Remove libwebrtc-audio-processing-dev build dep, its in universe
@@ -55,6 +56,9 @@ pulseaudio (1:5.99.1-0ubuntu1~vivid2) UNRELEASED; urgency=medium
     or are obsolete
   * Disable systemd socket activation for now
 
+  [ Felipe Sateler ]
+  * Bash completion script has moved, add mv_conffile snippet
+
  -- Luke Yelavich <themuso at ubuntu.com>  Wed, 19 Nov 2014 11:21:32 +1100
 
 pulseaudio (5.0-13) unstable; urgency=medium
diff --git a/debian/pulseaudio.lintian-overrides b/debian/pulseaudio.lintian-overrides
index 33103a1..fb16b79 100644
--- a/debian/pulseaudio.lintian-overrides
+++ b/debian/pulseaudio.lintian-overrides
@@ -1,6 +1,6 @@
 # These are not meant to be executed
 pulseaudio: script-not-executable etc/pulse/*.pa
-pulseaudio: script-not-executable etc/bash_completion.d/pulseaudio-bash-completion.sh
+pulseaudio: script-not-executable etc/bash_completion.d/pulseaudio
 pulseaudio: script-not-executable ./etc/pulse/default.pa
 pulseaudio: description-starts-with-package-name
 pulseaudio: shlib-in-multi-arch-foreign-package usr/lib/libpulsecore-*.so
diff --git a/debian/pulseaudio.maintscript b/debian/pulseaudio.maintscript
index ba25fc9..3ee1471 100644
--- a/debian/pulseaudio.maintscript
+++ b/debian/pulseaudio.maintscript
@@ -1,2 +1,3 @@
 rm_conffile /etc/default/pulseaudio 5.0-3~
 rm_conffile /etc/init.d/pulseaudio 5.0-3~
+mv_conffile /etc/bash_completion.d/pulseaudio-bash-completion.sh /etc/bash_completion.d/pulseaudio 5.99.1-2~

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