r11631 - in /packages/experimental/rhythmbox/debian: TODO changelog control control.in patches/80_from_bugzilla_fix_crash_on_eject.patch patches/81_from_bugzilla_fix_unknown_tags.patch patches/81_from_bugzilla_process_pending_events.patch rules
lool at users.alioth.debian.org
lool at users.alioth.debian.org
Tue Jun 19 13:24:26 UTC 2007
Author: lool
Date: Tue Jun 19 13:24:25 2007
New Revision: 11631
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11631
Log:
* New upstream development series; use at your own risk.
- Target at experimental; include check-dist.
- Bump up build-deps to libgtk2.0-dev >= 2.8.0, libgnomevfs2-dev >= 2.8.0,
libgstreamer0.10-dev >= 0.10.11, libgstreamer-plugins-base0.10-dev
>= 0.10.4, libglib2.0-dev >= 2.13.0.
- Add vala support to TODO.
- Search now ignores diacritics; closes: #425806.
* Build-depend on python-gtk2-dev >= 2.10 and python-gtk2 >= 2.10;
closes: #427056.
* New patch, 80_from_bugzilla_fix_crash_on_eject, fixes crash on iPod eject;
Ubuntu #117724; found in the Ubuntu package.
* New patch, 81_from_bugzilla_fix_unknown_tags, fixes songs having "Unknown"
tags when both ID3v1 and ID3v2 tags exist with possible trailing
whitespace; GNOME #442792; found in the Ubuntu package.
* New patch, 81_from_bugzilla_process_pending_events, process pending events
so that tags aren't randomly ignored, complements
81_from_bugzilla_fix_unknown_tags; found in the Ubuntu package.
Added:
packages/experimental/rhythmbox/debian/patches/80_from_bugzilla_fix_crash_on_eject.patch
packages/experimental/rhythmbox/debian/patches/81_from_bugzilla_fix_unknown_tags.patch
packages/experimental/rhythmbox/debian/patches/81_from_bugzilla_process_pending_events.patch
Modified:
packages/experimental/rhythmbox/debian/TODO
packages/experimental/rhythmbox/debian/changelog
packages/experimental/rhythmbox/debian/control
packages/experimental/rhythmbox/debian/control.in
packages/experimental/rhythmbox/debian/rules
Modified: packages/experimental/rhythmbox/debian/TODO
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/TODO?rev=11631&op=diff
==============================================================================
--- packages/experimental/rhythmbox/debian/TODO (original)
+++ packages/experimental/rhythmbox/debian/TODO Tue Jun 19 13:24:25 2007
@@ -10,3 +10,5 @@
gstreamer or from rhythmbox itself, it would be nice to extend reportbug to
do some basic tests or to print a message
+- vala support
+
Modified: packages/experimental/rhythmbox/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/changelog?rev=11631&op=diff
==============================================================================
--- packages/experimental/rhythmbox/debian/changelog (original)
+++ packages/experimental/rhythmbox/debian/changelog Tue Jun 19 13:24:25 2007
@@ -1,3 +1,25 @@
+rhythmbox (0.11.0-1) experimental; urgency=low
+
+ * New upstream development series; use at your own risk.
+ - Target at experimental; include check-dist.
+ - Bump up build-deps to libgtk2.0-dev >= 2.8.0, libgnomevfs2-dev >= 2.8.0,
+ libgstreamer0.10-dev >= 0.10.11, libgstreamer-plugins-base0.10-dev
+ >= 0.10.4, libglib2.0-dev >= 2.13.0.
+ - Add vala support to TODO.
+ - Search now ignores diacritics; closes: #425806.
+ * Build-depend on python-gtk2-dev >= 2.10 and python-gtk2 >= 2.10;
+ closes: #427056.
+ * New patch, 80_from_bugzilla_fix_crash_on_eject, fixes crash on iPod eject;
+ Ubuntu #117724; found in the Ubuntu package.
+ * New patch, 81_from_bugzilla_fix_unknown_tags, fixes songs having "Unknown"
+ tags when both ID3v1 and ID3v2 tags exist with possible trailing
+ whitespace; GNOME #442792; found in the Ubuntu package.
+ * New patch, 81_from_bugzilla_process_pending_events, process pending events
+ so that tags aren't randomly ignored, complements
+ 81_from_bugzilla_fix_unknown_tags; found in the Ubuntu package.
+
+ -- Loic Minier <lool at dooz.org> Tue, 19 Jun 2007 15:04:22 +0200
+
rhythmbox (0.10.1-1) unstable; urgency=low
* Recommend libgnomevfs2-extra to fetch album art; thanks Tom Parker;
Modified: packages/experimental/rhythmbox/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/control?rev=11631&op=diff
==============================================================================
--- packages/experimental/rhythmbox/debian/control (original)
+++ packages/experimental/rhythmbox/debian/control Tue Jun 19 13:24:25 2007
@@ -6,10 +6,10 @@
Build-Depends: cdbs (>= 0.4.37),
debhelper (>= 5.0.37.2),
libgnome2-dev (>= 2.0.5-1),
- libgtk2.0-dev (>= 2.6.0),
+ libgtk2.0-dev (>= 2.8.0),
scrollkeeper,
libgnomeui-dev (>= 2.8.1-3),
- libgnomevfs2-dev (>= 2.7.4),
+ libgnomevfs2-dev (>= 2.8.0),
docbook-xsl (>= 1.54.1),
docbook-utils (>= 0.6.11),
gnome-pkg-tools,
@@ -29,15 +29,15 @@
libgpod-dev (>= 0.4),
libnotify-dev (>= 0.2.2),
libglade2-dev,
- libgstreamer0.10-dev,
- libgstreamer-plugins-base0.10-dev,
+ libgstreamer0.10-dev (>= 0.10.11),
+ libgstreamer-plugins-base0.10-dev (>= 0.10.4),
zlib1g-dev,
libx11-dev,
- libglib2.0-dev,
+ libglib2.0-dev (>= 2.13.0),
gtk-doc-tools (>= 1.4),
libsexy-dev (>= 0.1.5),
python,
- python-gtk2-dev (>= 2.8.0),
+ python-gtk2-dev (>= 2.10),
python-dev,
gnome-doc-utils,
libgnome-media-dev (>= 2.8),
@@ -59,7 +59,7 @@
libgstreamer0.10-0,
gstreamer0.10-alsa | gstreamer0.10-audiosink,
python-gnome2,
- python-gtk2,
+ python-gtk2 (>= 2.10),
gnome-icon-theme,
gstreamer0.10-x
Conflicts: gnome-control-center (<< 2.15.90)
Modified: packages/experimental/rhythmbox/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/control.in?rev=11631&op=diff
==============================================================================
--- packages/experimental/rhythmbox/debian/control.in (original)
+++ packages/experimental/rhythmbox/debian/control.in Tue Jun 19 13:24:25 2007
@@ -6,10 +6,10 @@
Build-Depends: cdbs (>= 0.4.37),
debhelper (>= 5.0.37.2),
libgnome2-dev (>= 2.0.5-1),
- libgtk2.0-dev (>= 2.6.0),
+ libgtk2.0-dev (>= 2.8.0),
scrollkeeper,
libgnomeui-dev (>= 2.8.1-3),
- libgnomevfs2-dev (>= 2.7.4),
+ libgnomevfs2-dev (>= 2.8.0),
docbook-xsl (>= 1.54.1),
docbook-utils (>= 0.6.11),
gnome-pkg-tools,
@@ -29,15 +29,15 @@
libgpod-dev (>= 0.4),
libnotify-dev (>= 0.2.2),
libglade2-dev,
- libgstreamer0.10-dev,
- libgstreamer-plugins-base0.10-dev,
+ libgstreamer0.10-dev (>= 0.10.11),
+ libgstreamer-plugins-base0.10-dev (>= 0.10.4),
zlib1g-dev,
libx11-dev,
- libglib2.0-dev,
+ libglib2.0-dev (>= 2.13.0),
gtk-doc-tools (>= 1.4),
libsexy-dev (>= 0.1.5),
python,
- python-gtk2-dev (>= 2.8.0),
+ python-gtk2-dev (>= 2.10),
python-dev,
gnome-doc-utils,
libgnome-media-dev (>= 2.8),
@@ -59,7 +59,7 @@
libgstreamer0.10-0,
gstreamer0.10-alsa | gstreamer0.10-audiosink,
python-gnome2,
- python-gtk2,
+ python-gtk2 (>= 2.10),
gnome-icon-theme,
gstreamer0.10-x
Conflicts: gnome-control-center (<< 2.15.90)
Added: packages/experimental/rhythmbox/debian/patches/80_from_bugzilla_fix_crash_on_eject.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/patches/80_from_bugzilla_fix_crash_on_eject.patch?rev=11631&op=file
==============================================================================
--- packages/experimental/rhythmbox/debian/patches/80_from_bugzilla_fix_crash_on_eject.patch (added)
+++ packages/experimental/rhythmbox/debian/patches/80_from_bugzilla_fix_crash_on_eject.patch Tue Jun 19 13:24:25 2007
@@ -1,0 +1,31 @@
+Ubuntu #117724; fixes crash on iPod eject
+
+Index: sources/rb-source.c
+===================================================================
+--- sources/rb-source.c (révision 5132)
++++ sources/rb-source.c (copie de travail)
+@@ -1025,8 +1025,10 @@
+ void
+ rb_source_delete_thyself (RBSource *source)
+ {
+- RBSourceClass *klass = RB_SOURCE_GET_CLASS (source);
++ RBSourceClass *klass;
+
++ g_return_if_fail (source != NULL);
++ klass = RB_SOURCE_GET_CLASS (source);
+ klass->impl_delete_thyself (source);
+ g_signal_emit (G_OBJECT (source), rb_source_signals[DELETED], 0);
+ }
+Index: plugins/ipod/rb-ipod-source.c
+===================================================================
+--- plugins/ipod/rb-ipod-source.c (révision 5132)
++++ plugins/ipod/rb-ipod-source.c (copie de travail)
+@@ -1330,7 +1330,7 @@
+
+ for (p = priv->ipod_db->playlists; p != NULL; p = p->next) {
+ Itdb_Playlist *playlist = (Itdb_Playlist *)p->data;
+- if (!itdb_playlist_is_mpl (playlist)) {
++ if (!itdb_playlist_is_mpl (playlist) && !playlist->is_spl) {
+ RBSource *rb_playlist = RB_SOURCE (playlist->userdata);
+ rb_source_delete_thyself (rb_playlist);
+ }
Added: packages/experimental/rhythmbox/debian/patches/81_from_bugzilla_fix_unknown_tags.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/patches/81_from_bugzilla_fix_unknown_tags.patch?rev=11631&op=file
==============================================================================
--- packages/experimental/rhythmbox/debian/patches/81_from_bugzilla_fix_unknown_tags.patch (added)
+++ packages/experimental/rhythmbox/debian/patches/81_from_bugzilla_fix_unknown_tags.patch Tue Jun 19 13:24:25 2007
@@ -1,0 +1,44 @@
+GNOME #442792; fixes songs having "Unknown" tags when both ID3v1 and ID3v2 tags
+exist with possible trailing whitespace
+
+diff -Nur rhythmbox-0.11.0/metadata/rb-metadata-gst.c rhythmbox-0.11.0.new/metadata/rb-metadata-gst.c
+--- rhythmbox-0.11.0/metadata/rb-metadata-gst.c 2007-05-28 08:48:11.000000000 -0400
++++ rhythmbox-0.11.0.new/metadata/rb-metadata-gst.c 2007-06-04 03:24:59.000000000 -0400
+@@ -623,7 +623,6 @@
+ * and then remove leading and trailing whitespace.
+ */
+ char *str;
+- const char *old_str;
+
+ str = g_value_dup_string (newval);
+
+@@ -638,15 +637,20 @@
+
+ /* Check whether we have a shorter duplicate tag,
+ * Doesn't work with non-normalised UTF-8 strings */
+- old_str = g_value_get_string (val);
+- if (old_str != NULL
+- && g_utf8_strlen (old_str, -1) > g_utf8_strlen (str, -1)) {
+- if (g_str_has_prefix (old_str, str) != FALSE) {
+- rb_debug ("Got shorter duplicate tag");
+- g_free (str);
+- g_value_unset (newval);
+- g_free (newval);
+- return;
++ val = g_hash_table_lookup (md->priv->metadata,
++ GINT_TO_POINTER (field));
++ if (val != NULL) {
++ const char *old_str;
++ old_str = g_value_get_string (val);
++ if (old_str != NULL
++ && g_utf8_strlen (old_str, -1) > g_utf8_strlen (str, -1)) {
++ if (g_str_has_prefix (old_str, str) != FALSE) {
++ rb_debug ("Got shorter duplicate tag");
++ g_free (str);
++ g_value_unset (newval);
++ g_free (newval);
++ return;
++ }
+ }
+ }
+ g_value_take_string (newval, str);
Added: packages/experimental/rhythmbox/debian/patches/81_from_bugzilla_process_pending_events.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/patches/81_from_bugzilla_process_pending_events.patch?rev=11631&op=file
==============================================================================
--- packages/experimental/rhythmbox/debian/patches/81_from_bugzilla_process_pending_events.patch (added)
+++ packages/experimental/rhythmbox/debian/patches/81_from_bugzilla_process_pending_events.patch Tue Jun 19 13:24:25 2007
@@ -1,0 +1,15 @@
+diff -Nur rhythmbox-0.11.0/metadata/rb-metadata-gst.c rhythmbox-0.11.0.new/metadata/rb-metadata-gst.c
+--- rhythmbox-0.11.0/metadata/rb-metadata-gst.c 2007-06-06 19:31:49.000000000 -0400
++++ rhythmbox-0.11.0.new/metadata/rb-metadata-gst.c 2007-06-06 19:32:28.000000000 -0400
+@@ -1002,10 +1002,10 @@
+ }
+ gst_object_unref (GST_OBJECT (bus));
+
++ rb_metadata_event_loop (md, GST_ELEMENT (pipeline), FALSE);
+
+ if (state_ret != GST_STATE_CHANGE_SUCCESS) {
+ rb_debug ("failed to go to PAUSED for %s", uri);
+- rb_metadata_event_loop (md, GST_ELEMENT (pipeline), FALSE);
+ if (!md->priv->non_audio && md->priv->error == NULL)
+ g_set_error (error,
+ RB_METADATA_ERROR,
Modified: packages/experimental/rhythmbox/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/experimental/rhythmbox/debian/rules?rev=11631&op=diff
==============================================================================
--- packages/experimental/rhythmbox/debian/rules (original)
+++ packages/experimental/rhythmbox/debian/rules Tue Jun 19 13:24:25 2007
@@ -4,6 +4,7 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/gnome.mk
+include /usr/share/gnome-pkg-tools/1/rules/check-dist.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
-include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
More information about the pkg-gnome-commits
mailing list