r32343 - in /packages/unstable/gnome-media/debian: changelog control.in patches/04_grecord_uses_gcc.patch patches/series

[seb128 at users.alioth.debian.org]

Author: seb128
Date: Fri Jan  6 12:08:17 2012
New Revision: 32343

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=32343
Log:
  * debian/control.in:
    - recommends gnome-control-center since grecords calls it
    - updated description, there is no mixer there
  * debian/patches/04_grecord_uses_gcc.patch: 
    - grecord should call gnome-control-center not the deprecated g-v-c

Added:
    packages/unstable/gnome-media/debian/patches/04_grecord_uses_gcc.patch
Modified:
    packages/unstable/gnome-media/debian/changelog
    packages/unstable/gnome-media/debian/control.in
    packages/unstable/gnome-media/debian/patches/series

Modified: packages/unstable/gnome-media/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-media/debian/changelog?rev=32343&op=diff
==============================================================================
--- packages/unstable/gnome-media/debian/changelog [utf-8] (original)
+++ packages/unstable/gnome-media/debian/changelog [utf-8] Fri Jan  6 12:08:17 2012
@@ -1,8 +1,16 @@
 gnome-media (2.91.2-4) UNRELEASED; urgency=low
 
+  [ Josselin Mouette ]
   * Update repository URL.
 
- -- Josselin Mouette <joss at debian.org>  Sat, 31 Dec 2011 14:55:05 +0100
+  [ Sebastien Bacher ]
+  * debian/control.in:
+    - recommends gnome-control-center since grecords calls it
+    - updated description, there is no mixer there
+  * debian/patches/04_grecord_uses_gcc.patch: 
+    - grecord should call gnome-control-center not the deprecated g-v-c
+
+ -- Sebastien Bacher <seb128 at debian.org>  Fri, 06 Jan 2012 13:04:02 +0100
 
 gnome-media (2.91.2-3) unstable; urgency=low
 

Modified: packages/unstable/gnome-media/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-media/debian/control.in?rev=32343&op=diff
==============================================================================
--- packages/unstable/gnome-media/debian/control.in [utf-8] (original)
+++ packages/unstable/gnome-media/debian/control.in [utf-8] Fri Jan  6 12:08:17 2012
@@ -38,11 +38,11 @@
          gstreamer0.10-plugins-good,
          x11-utils
 Recommends: pulseaudio,
-            gstreamer0.10-pulseaudio
+            gstreamer0.10-pulseaudio,
+            gnome-control-center
 Replaces: gnome-media-common (<< 2.91.0), libgnome-media0 (<< 2.91.0), libgnome-media-dev (<< 2.91.0)
 Breaks: gnome-control-center (<< 1:3.0)
 Description: GNOME media utilities
  This package contains a few media utilities for the GNOME desktop:
-  * the GNOME audio mixer;
   * the GNOME Sound Recorder;
   * the GStreamer properties capplet.

Added: packages/unstable/gnome-media/debian/patches/04_grecord_uses_gcc.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-media/debian/patches/04_grecord_uses_gcc.patch?rev=32343&op=file
==============================================================================
--- packages/unstable/gnome-media/debian/patches/04_grecord_uses_gcc.patch (added)
+++ packages/unstable/gnome-media/debian/patches/04_grecord_uses_gcc.patch [utf-8] Fri Jan  6 12:08:17 2012
@@ -1,0 +1,27 @@
+# Description: call the correct command under GNOME3
+# Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=667402
+# Ubuntu: https://launchpad.net/bugs/883791
+Index: gnome-media-2.91.2/grecord/src/gsr-window.c
+===================================================================
+--- gnome-media-2.91.2.orig/grecord/src/gsr-window.c	2012-01-06 12:28:40.665067361 +0100
++++ gnome-media-2.91.2/grecord/src/gsr-window.c	2012-01-06 12:28:42.461067448 +0100
+@@ -806,16 +806,16 @@
+ 	       GSRWindow *window)
+ {
+ 	char *mixer_path;
+-	char *argv[4] = {NULL, "--page", "recording",  NULL};
++	char *argv[4] = {NULL, "sound", "input",  NULL};
+ 	GError *error = NULL;
+ 	gboolean ret;
+ 
+ 	/* Open the mixer */
+-	mixer_path = g_find_program_in_path ("gnome-volume-control");
++	mixer_path = g_find_program_in_path ("gnome-control-center");
+ 	if (mixer_path == NULL) {
+ 		show_error_dialog (GTK_WINDOW (window), NULL,
+ 		                   _("%s is not installed in the path."),
+-		                   "gnome-volume-control");
++		                   "gnome-control-center");
+ 		return;
+ 	}
+ 

Modified: packages/unstable/gnome-media/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gnome-media/debian/patches/series?rev=32343&op=diff
==============================================================================
--- packages/unstable/gnome-media/debian/patches/series [utf-8] (original)
+++ packages/unstable/gnome-media/debian/patches/series [utf-8] Fri Jan  6 12:08:17 2012
@@ -1,3 +1,4 @@
+04_grecord_uses_gcc.patch
 06_track_capture_toggle.patch
 10_missing_includes.patch
 99_ltmain_as-needed.patch