r24423 - in /desktop/unstable/gnome-panel/debian: changelog patches/02_mixer_applet.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sat May 29 09:01:08 2010
New Revision: 24423

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24423
Log:
02_mixer_applet.patch: put back the mixer applet in place. We don’t 
ship PhailAudio by default.

Added:
    desktop/unstable/gnome-panel/debian/patches/02_mixer_applet.patch
Modified:
    desktop/unstable/gnome-panel/debian/changelog
    desktop/unstable/gnome-panel/debian/patches/series

Modified: desktop/unstable/gnome-panel/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/changelog?rev=24423&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/changelog [utf-8] Sat May 29 09:01:08 2010
@@ -1,9 +1,14 @@
-gnome-panel (2.30.0-2) UNRELEASED; urgency=low
-
+gnome-panel (2.30.0-2) unstable; urgency=low
+
+  [ Emilio Pozuelo Monfort ]
   * debian/control.in:
     - Restore evolution data server support on Hurd.
 
- -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 16 May 2010 22:59:29 +0200
+  [ Josselin Mouette ]
+  * 02_mixer_applet.patch: put back the mixer applet in place. We don’t 
+    ship PhailAudio by default.
+
+ -- Josselin Mouette <joss at debian.org>  Sat, 29 May 2010 11:00:32 +0200
 
 gnome-panel (2.30.0-1) unstable; urgency=low
 

Added: desktop/unstable/gnome-panel/debian/patches/02_mixer_applet.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/02_mixer_applet.patch?rev=24423&op=file
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/02_mixer_applet.patch (added)
+++ desktop/unstable/gnome-panel/debian/patches/02_mixer_applet.patch [utf-8] Sat May 29 09:01:08 2010
@@ -1,0 +1,77 @@
+Revert upstream commit 305d061bee092b2dbad6a4a57fff9f6f50724b12
+
+Index: gnome-panel-2.30.0/gnome-panel/panel-default-setup.entries
+===================================================================
+--- gnome-panel-2.30.0.orig/gnome-panel/panel-default-setup.entries	2010-05-29 10:58:41.090430085 +0200
++++ gnome-panel-2.30.0/gnome-panel/panel-default-setup.entries	2010-05-29 10:58:43.734434423 +0200
+@@ -50,6 +50,9 @@
+             <string>window_menu</string>
+           </value>
+           <value>
++            <string>mixer</string>
++          </value>
++          <value>
+             <string>clock</string>
+           </value>
+           <value>
+@@ -382,6 +385,60 @@
+     <entry><key>applets/window_menu/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
+     <entry><key>applets/window_menu/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
+ 
++  <!-- Mixer Applet -->
++
++    <entry>
++      <key>applets/mixer/object_type</key>
++      <schema_key>/schemas/apps/panel/objects/object_type</schema_key>
++      <value>
++        <string>bonobo-applet</string>
++      </value>
++    </entry>
++    <entry>
++      <key>applets/mixer/toplevel_id</key>
++      <schema_key>/schemas/apps/panel/objects/toplevel_id</schema_key>
++      <value>
++        <string>top_panel</string>
++      </value>
++    </entry>
++    <entry>
++      <key>applets/mixer/position</key>
++      <schema_key>/schemas/apps/panel/objects/position</schema_key>
++      <value>
++        <int>1</int>
++      </value>
++    </entry>
++    <entry>
++      <key>applets/mixer/panel_right_stick</key>
++      <schema_key>/schemas/apps/panel/objects/panel_right_stick</schema_key>
++      <value>
++        <bool>true</bool>
++      </value>
++    </entry>
++    <entry>
++      <key>applets/mixer/locked</key>
++      <schema_key>/schemas/apps/panel/objects/locked</schema_key>
++      <value>
++        <bool>true</bool>
++      </value>
++    </entry>
++    <entry>
++      <key>applets/mixer/bonobo_iid</key>
++      <schema_key>/schemas/apps/panel/objects/bonobo_iid</schema_key>
++      <value>
++        <string>OAFIID:GNOME_MixerApplet</string>
++      </value>
++    </entry>
++
++    <entry><key>applets/mixer/attached_toplevel_id</key><schema_key>/schemas/apps/panel/objects/attached_toplevel_id</schema_key> </entry>
++    <entry><key>applets/mixer/tooltip</key><schema_key>/schemas/apps/panel/objects/tooltip</schema_key></entry>
++    <entry><key>applets/mixer/use_custom_icon</key><schema_key>/schemas/apps/panel/objects/use_custom_icon</schema_key></entry>
++    <entry><key>applets/mixer/custom_icon</key><schema_key>/schemas/apps/panel/objects/custom_icon</schema_key></entry>
++    <entry><key>applets/mixer/use_menu_path</key><schema_key>/schemas/apps/panel/objects/use_menu_path</schema_key></entry>
++    <entry><key>applets/mixer/menu_path</key><schema_key>/schemas/apps/panel/objects/menu_path</schema_key></entry>
++    <entry><key>applets/mixer/launcher_location</key><schema_key>/schemas/apps/panel/objects/launcher_location</schema_key></entry>
++    <entry><key>applets/mixer/action_type</key><schema_key>/schemas/apps/panel/objects/action_type</schema_key></entry>
++
+   <!-- Clock Applet -->
+ 
+     <entry>

Modified: desktop/unstable/gnome-panel/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-panel/debian/patches/series?rev=24423&op=diff
==============================================================================
--- desktop/unstable/gnome-panel/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-panel/debian/patches/series [utf-8] Sat May 29 09:01:08 2010
@@ -1,4 +1,5 @@
 01_panel_submenus.patch
+02_mixer_applet.patch
 06_clock_permissions.patch
 09_default_icons.patch
 70_relibtoolize.patch