xubuntu-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 198
fixes bug(s): https://launchpad.net/bugs/553925 https://launchpad.net/bugs/559758
committer: Lionel Le Folgoc <mrpouit@xxxxxxxxxx>
branch nick: xubuntu-default-settings
timestamp: Sat 2010-04-10 15:30:57 +0200
message:
  * etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml,
    etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-mixer-plugin-5.rc: revert changes
    from 10.04.4, gstreamer pulseaudio bindings aren't really usable.
    lp: #553925
  * etc/xdg/xdg-xubuntu/Thunar/volmanrc: use the correct command to play
    audio cds. lp: #559758
removed:
  etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml
modified:
  debian/changelog
  debian/preinst
  etc/xdg/xdg-xubuntu/Thunar/volmanrc
  etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-mixer-plugin-5.rc


--
lp:xubuntu-default-settings
https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk

Your team Xubuntu Team is subscribed to branch lp:xubuntu-default-settings.
To unsubscribe from this branch go to https://code.launchpad.net/~xubuntu-dev/xubuntu-default-settings/trunk/+edit-subscription

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-06 10:44:13 +0000
+++ debian/changelog	2010-04-10 13:30:57 +0000
@@ -1,3 +1,14 @@
+xubuntu-default-settings (10.04.6) UNRELEASED; urgency=low
+
+  * etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml,
+    etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-mixer-plugin-5.rc: revert changes
+    from 10.04.4, gstreamer pulseaudio bindings aren't really usable.
+    lp: #553925
+  * etc/xdg/xdg-xubuntu/Thunar/volmanrc: use the correct command to play
+    audio cds. lp: #559758
+
+ -- Lionel Le Folgoc <mrpouit@xxxxxxxxxx>  Sat, 10 Apr 2010 15:23:18 +0200
+
 xubuntu-default-settings (10.04.5) lucid; urgency=low
 
   * etc/xdg/xdg-xubuntu/*.rc => etc/xdg/xdg-xubuntu/xfce4/*.rc,

=== modified file 'debian/preinst'
--- debian/preinst	2010-03-06 10:39:10 +0000
+++ debian/preinst	2010-04-10 13:30:57 +0000
@@ -98,6 +98,9 @@
         prep_mv_conffile xubuntu-default-settings "/etc/xdg/xdg-xubuntu/helpers.rc"
         prep_mv_conffile xubuntu-default-settings "/etc/xdg/xdg-xubuntu/mount.rc"
     fi
+    if dpkg --compare-versions "$2" le-nl "10.04.6"; then
+        rm_conffile xubuntu-default-settings "/etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml"
+    fi
     ;;
 esac
 

=== modified file 'etc/xdg/xdg-xubuntu/Thunar/volmanrc'
--- etc/xdg/xdg-xubuntu/Thunar/volmanrc	2009-12-18 13:34:51 +0000
+++ etc/xdg/xdg-xubuntu/Thunar/volmanrc	2010-04-10 13:30:57 +0000
@@ -8,7 +8,7 @@
 AutoburnDataCommand=brasero
 AutoburnAudioCommand=brasero
 AutoplayAudioCd=TRUE
-AutoplayAudioCdCommand=listen
+AutoplayAudioCdCommand=exaile
 AutoplayVideoCd=TRUE
 AutoplayVideoCdCommand=totem %d
 Autoipod=FALSE

=== modified file 'etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-mixer-plugin-5.rc'
--- etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-mixer-plugin-5.rc	2010-03-04 20:22:58 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/panel/xfce4-mixer-plugin-5.rc	2010-04-10 13:30:57 +0000
@@ -1,4 +1,2 @@
-card=PlaybackAudiointerneAnalogStereoPulseAudioMixer
-track=Master
 command=xfce4-mixer
 

=== removed file 'etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml'
--- etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml	2010-03-04 20:22:58 +0000
+++ etc/xdg/xdg-xubuntu/xfce4/xfconf/xfce-perchannel-xml/xfce4-mixer.xml	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<channel name="xfce4-mixer" version="1.0">
-  <property name="active-card" type="string" value="PlaybackAudiointerneAnalogStereoPulseAudioMixer"/>
-  <property name="volume-step-size" type="uint" value="5"/>
-  <property name="sound-card" type="string" value="PlaybackAudiointerneAnalogStereoPulseAudioMixer"/>
-  <property name="sound-cards" type="empty">
-    <property name="PlaybackAudiointerneAnalogStereoPulseAudioMixer" type="array">
-      <value type="string" value="Master"/>
-    </property>
-  </property>
-</channel>