r29289 - in /packages/unstable/rhythmbox/debian: changelog control control.in patches/05_port_to_libnotify0.7.patch patches/06_fix_pause_shadowing.patch patches/series

sjoerd at users.alioth.debian.org sjoerd at users.alioth.debian.org
Sun Jul 31 20:15:29 UTC 2011 

Author: sjoerd
Date: Sun Jul 31 20:15:28 2011
New Revision: 29289

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29289
Log:
* debian/patches/05_port_to_libnotify0.7.patch
  * Added, port to libnotify0.7 (Closes: #630298)
* debian/patches/06_fix_pause_shadowing.patch
  * Added, fix shadowing pause from unistd.h (Closes: #614464)

Added:
    packages/unstable/rhythmbox/debian/patches/05_port_to_libnotify0.7.patch
    packages/unstable/rhythmbox/debian/patches/06_fix_pause_shadowing.patch
Modified:
    packages/unstable/rhythmbox/debian/changelog
    packages/unstable/rhythmbox/debian/control
    packages/unstable/rhythmbox/debian/control.in
    packages/unstable/rhythmbox/debian/patches/series

Modified: packages/unstable/rhythmbox/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/changelog?rev=29289&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/changelog [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/changelog [utf-8] Sun Jul 31 20:15:28 2011
@@ -1,3 +1,12 @@
+rhythmbox (0.12.8-4) unstable; urgency=low
+
+  * debian/patches/05_port_to_libnotify0.7.patch
+    * Added, port to libnotify0.7 (Closes: #630298)
+  * debian/patches/06_fix_pause_shadowing.patch
+    * Added, fix shadowing pause from unistd.h (Closes: #614464)
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 31 Jul 2011 20:58:04 +0100
+
 rhythmbox (0.12.8-3) unstable; urgency=low
 
   * Drop type-handling usage. Closes: #587870.

Modified: packages/unstable/rhythmbox/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/control?rev=29289&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/control [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/control [utf-8] Sun Jul 31 20:15:28 2011
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Loic Minier <lool at dooz.org>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Luca Falavigna <dktrkranz at debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Luca Falavigna <dktrkranz at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: cdbs (>= 0.4.37),
                debhelper (>= 5.0.37.2),
                gnome-pkg-tools (>= 0.6),
@@ -18,7 +18,7 @@
                libgtk2.0-dev (>= 2.16.0),
                libglib2.0-dev (>= 2.18.0),
                libgnome-media-dev (>= 2.8),
-               libnotify-dev (>= 0.4.1),
+               libnotify-dev (>= 0.7.0),
                libgpod-dev (>= 0.6),
                libmusicbrainz4-dev (>= 2.1.0),
                libbrasero-media-dev (>= 0.9.1),

Modified: packages/unstable/rhythmbox/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/control.in?rev=29289&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/control.in [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/control.in [utf-8] Sun Jul 31 20:15:28 2011
@@ -13,7 +13,7 @@
                libgtk2.0-dev (>= 2.16.0),
                libglib2.0-dev (>= 2.18.0),
                libgnome-media-dev (>= 2.8),
-               libnotify-dev (>= 0.4.1),
+               libnotify-dev (>= 0.7.0),
                libgpod-dev (>= 0.6),
                libmusicbrainz4-dev (>= 2.1.0),
                libbrasero-media-dev (>= 0.9.1),

Added: packages/unstable/rhythmbox/debian/patches/05_port_to_libnotify0.7.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/patches/05_port_to_libnotify0.7.patch?rev=29289&op=file
==============================================================================
--- packages/unstable/rhythmbox/debian/patches/05_port_to_libnotify0.7.patch (added)
+++ packages/unstable/rhythmbox/debian/patches/05_port_to_libnotify0.7.patch [utf-8] Sun Jul 31 20:15:28 2011
@@ -1,0 +1,25 @@
+From 91eaba4f29739dfaf3c5567b9cdc9dd86fd2e54c Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd at luon.net>
+Date: Sun, 31 Jul 2011 20:11:52 +0100
+Subject: [PATCH] Port to libnotify 0.7
+
+---
+ plugins/status-icon/rb-status-icon-plugin.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/plugins/status-icon/rb-status-icon-plugin.c b/plugins/status-icon/rb-status-icon-plugin.c
+index bc6f59f..46003ca 100644
+--- a/plugins/status-icon/rb-status-icon-plugin.c
++++ b/plugins/status-icon/rb-status-icon-plugin.c
+@@ -394,7 +394,7 @@ do_notify (RBStatusIconPlugin *plugin,
+ 		icon_name = NULL;
+ 
+ 	if (plugin->priv->notification == NULL) {
+-		plugin->priv->notification = notify_notification_new (primary, secondary, icon_name, NULL);
++		plugin->priv->notification = notify_notification_new (primary, secondary, icon_name);
+ 
+ 		g_signal_connect_object (plugin->priv->notification,
+ 					 "closed",
+-- 
+1.7.5.4
+

Added: packages/unstable/rhythmbox/debian/patches/06_fix_pause_shadowing.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/patches/06_fix_pause_shadowing.patch?rev=29289&op=file
==============================================================================
--- packages/unstable/rhythmbox/debian/patches/06_fix_pause_shadowing.patch (added)
+++ packages/unstable/rhythmbox/debian/patches/06_fix_pause_shadowing.patch [utf-8] Sun Jul 31 20:15:28 2011
@@ -1,0 +1,52 @@
+From 7b64a038e8e0ce8c1e0e9c5d0d4223e9416e4793 Mon Sep 17 00:00:00 2001
+From: Sjoerd Simons <sjoerd.simons at collabora.co.uk>
+Date: Sun, 31 Jul 2011 20:57:01 +0100
+Subject: [PATCH] rename pause to rb_pause to prevent shadowing
+
+---
+ remote/dbus/rb-client.c |    8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/remote/dbus/rb-client.c b/remote/dbus/rb-client.c
+index 648dd2f..3865495 100644
+--- a/remote/dbus/rb-client.c
++++ b/remote/dbus/rb-client.c
+@@ -54,7 +54,7 @@ static gboolean previous = FALSE;
+ static gboolean notify = FALSE;
+ 
+ static gboolean play = FALSE;
+-static gboolean pause = FALSE;
++static gboolean rb_pause = FALSE;
+ static gboolean play_pause = FALSE;
+ static gboolean stop = FALSE;
+ 
+@@ -91,7 +91,7 @@ static GOptionEntry args[] = {
+ 	{ "notify", 0, 0, G_OPTION_ARG_NONE, &notify, N_("Show notification of the playing song"), NULL },
+ 
+ 	{ "play", 0, 0, G_OPTION_ARG_NONE, &play, N_("Resume playback if currently paused"), NULL },
+-	{ "pause", 0, 0, G_OPTION_ARG_NONE, &pause, N_("Pause playback if currently playing"), NULL },
++	{ "pause", 0, 0, G_OPTION_ARG_NONE, &rb_pause, N_("Pause playback if currently playing"), NULL },
+ 	{ "play-pause", 0, 0, G_OPTION_ARG_NONE, &play_pause, N_("Toggle play/pause mode"), NULL },
+ /*	{ "stop", 0, 0, G_OPTION_ARG_NONE, &stop, N_("Stop playback"), NULL }, */
+ 
+@@ -608,7 +608,7 @@ main (int argc, char **argv)
+ 	if (next || previous ||
+ 	    clear_queue ||
+ 	    play_uri || other_stuff ||
+-	    play || pause || play_pause || stop ||
++	    play || rb_pause || play_pause || stop ||
+ 	    print_playing || print_playing_format || notify ||
+ 	    (set_volume > -0.01) || volume_up || volume_down || print_volume || mute || unmute || (set_rating > -0.01))
+ 		no_present = TRUE;
+@@ -696,7 +696,7 @@ main (int argc, char **argv)
+ 	org_gnome_Rhythmbox_Player_get_playing (player_proxy, &is_playing, &error);
+ 	if (!annoy (&error)) {
+ 		rb_debug ("playback state: %d", is_playing);
+-		if (play || pause || play_pause) {
++		if (play || rb_pause || play_pause) {
+ 			if (is_playing != play || play_pause) {
+ 				rb_debug ("calling playPause to change playback state");
+ 				org_gnome_Rhythmbox_Player_play_pause (player_proxy, FALSE, &error);
+-- 
+1.7.5.4
+

Modified: packages/unstable/rhythmbox/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/rhythmbox/debian/patches/series?rev=29289&op=diff
==============================================================================
--- packages/unstable/rhythmbox/debian/patches/series [utf-8] (original)
+++ packages/unstable/rhythmbox/debian/patches/series [utf-8] Sun Jul 31 20:15:28 2011
@@ -1,4 +1,5 @@
 01_dlna_vorbis.patch
 02_python_fixes.patch
 04_mtp_crash.patch
-
+05_port_to_libnotify0.7.patch
+06_fix_pause_shadowing.patch

More information about the pkg-gnome-commits mailing list