[SCM] pulseaudio packaging branch, master, updated. debian/4.0-6-15-g3023d37

[sjoerd at users.alioth.debian.org]

The branch, master has been updated
       via  3023d37b9a65996af5d3ab4b34ca5777d41df7a4 (commit)
       via  3503d3d6f596aa45f257e87ef6dff57a357598da (commit)
      from  44ecc32a30edef921b87842a8697ba45bc68af4d (commit)


- Shortlog ------------------------------------------------------------
3023d37 Revert "Fix upgrade not creating the symlink to /etc/pulse/alsa-mixer"
3503d3d Revert "Move ALSA mixer configuration files under /etc/pulse (Closes: #736708)"

Summary of changes:
 debian/pulseaudio.install  | 1 -
 debian/pulseaudio.links    | 1 -
 debian/pulseaudio.postinst | 5 -----
 debian/rules               | 1 -
 4 files changed, 8 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit 3023d37b9a65996af5d3ab4b34ca5777d41df7a4
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Fri Mar 28 20:46:31 2014 +0100

    Revert "Fix upgrade not creating the symlink to /etc/pulse/alsa-mixer"
    
    This reverts commit b6cab0d66205f5ef4c72d81b3be8c3b94974fb62.

diff --git a/debian/pulseaudio.postinst b/debian/pulseaudio.postinst
index ccb9459..a0f4b9d 100644
--- a/debian/pulseaudio.postinst
+++ b/debian/pulseaudio.postinst
@@ -27,11 +27,6 @@ case "$1" in
     if ! getent group pulse-access >/dev/null; then
       addgroup --quiet --system pulse-access
     fi
-    # fix upgrade not creating the symlink due to existing dir
-    if test -d /usr/share/pulseaudio/alsa-mixer; then
-	rm -r /usr/share/pulseaudio/alsa-mixer
-	ln -s /etc/pulse/alsa-mixer /usr/share/pulseaudio/alsa-mixer
-    fi
   ;;
   abort-upgrade|abort-remove|abort-deconfigure)
   ;;

commit 3503d3d6f596aa45f257e87ef6dff57a357598da
Author: Sjoerd Simons <sjoerd at debian.org>
Date:   Fri Mar 28 20:46:19 2014 +0100

    Revert "Move ALSA mixer configuration files under /etc/pulse (Closes: #736708)"
    
    This reverts commit ff1c626b6c468e0c5d5cbf3d66258914258bb180.

diff --git a/debian/pulseaudio.install b/debian/pulseaudio.install
index 2fcbbbb..dac03c3 100644
--- a/debian/pulseaudio.install
+++ b/debian/pulseaudio.install
@@ -1,4 +1,3 @@
-etc/pulse/alsa-mixer
 etc/pulse/default.pa
 etc/pulse/system.pa
 etc/pulse/daemon.conf
diff --git a/debian/pulseaudio.links b/debian/pulseaudio.links
deleted file mode 100644
index f6424c6..0000000
--- a/debian/pulseaudio.links
+++ /dev/null
@@ -1 +0,0 @@
-etc/pulse/alsa-mixer usr/share/pulseaudio/alsa-mixer
diff --git a/debian/rules b/debian/rules
index 97a3456..db00a31 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,6 @@ common-build-arch::
 
 common-install-arch::
 	find $(DEB_DESTDIR) -name "*.la" -delete
-	mv $(CURDIR)/debian/tmp/usr/share/pulseaudio/alsa-mixer $(CURDIR)/debian/tmp/etc/pulse/
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/lintian
 	cp -a $(CURDIR)/debian/overrides $(CURDIR)/debian/tmp/usr/share/lintian
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/alsa/alsa.conf.d

-- 
pulseaudio packaging