[Pkg-cli-apps-commits] r4907 - in /packages/gnome-do-plugins/trunk/debian: changelog patches/00list patches/10_fix_rhythmbox_file.dpatch

[laney-guest at users.alioth.debian.org]

Author: laney-guest
Date: Thu May  7 20:24:26 2009
New Revision: 4907

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4907
Log:
debian/patches/10_fix_rhythmbox_file.dpatch: Add. Look in the correct place
for the rhythmbox database (Closes: #526337).

Added:
    packages/gnome-do-plugins/trunk/debian/patches/10_fix_rhythmbox_file.dpatch   (with props)
Modified:
    packages/gnome-do-plugins/trunk/debian/changelog
    packages/gnome-do-plugins/trunk/debian/patches/00list

Modified: packages/gnome-do-plugins/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/changelog?rev=4907&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/changelog (original)
+++ packages/gnome-do-plugins/trunk/debian/changelog Thu May  7 20:24:26 2009
@@ -1,11 +1,13 @@
-gnome-do-plugins (0.8.1.3+dfsg-2) UNRELEASED; urgency=low
+gnome-do-plugins (0.8.1.3+dfsg-2) karmic; urgency=low
 
   * debian/patches/00_use_system_gdata.dpatch: Patch build system to use
     system copy of gdata libs, allowing Google plugins to be enabled.
   * debian/patches/00_dfsg_autofoo.dpatch: Drop, now obsolete.
   * debian/control: Add libgdata1.4-cil build-dep for above.
+  * debian/patches/10_fix_rhythmbox_file.dpatch: Add. Look in the correct place
+    for the rhythmbox database (Closes: #526337).
 
- -- Iain Lane <laney at ubuntu.com>  Thu, 07 May 2009 19:27:22 +0100
+ -- Iain Lane <laney at ubuntu.com>  Thu, 07 May 2009 21:14:41 +0100
 
 gnome-do-plugins (0.8.1.3+dfsg-1) unstable; urgency=low
 

Modified: packages/gnome-do-plugins/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/patches/00list?rev=4907&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/00list (original)
+++ packages/gnome-do-plugins/trunk/debian/patches/00list Thu May  7 20:24:26 2009
@@ -1,4 +1,5 @@
 00_use_system_gdata
+01_firefox_iceweasel_rename
 04_fix_pidgin_dbus_ints
-01_firefox_iceweasel_rename
+10_fix_rhythmbox_file
 15_twitter_api

Added: packages/gnome-do-plugins/trunk/debian/patches/10_fix_rhythmbox_file.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/patches/10_fix_rhythmbox_file.dpatch?rev=4907&op=file
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/patches/10_fix_rhythmbox_file.dpatch (added)
+++ packages/gnome-do-plugins/trunk/debian/patches/10_fix_rhythmbox_file.dpatch Thu May  7 20:24:26 2009
@@ -1,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_fix_rhythmbox_file.dpatch by Iain Lane <laney at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Make Rhythmbox plugin functional by checking new (XDG) location for database
+
+ at DPATCH@
+diff -urNad gnome-do-plugins-0.8.1.3+dfsg~/Rhythmbox/src/Rhythmbox.cs gnome-do-plugins-0.8.1.3+dfsg/Rhythmbox/src/Rhythmbox.cs
+--- gnome-do-plugins-0.8.1.3+dfsg~/Rhythmbox/src/Rhythmbox.cs	2009-03-17 17:56:56.000000000 +0000
++++ gnome-do-plugins-0.8.1.3+dfsg/Rhythmbox/src/Rhythmbox.cs	2009-03-18 15:29:25.000000000 +0000
+@@ -43,8 +43,15 @@
+ 
+ 		static Rhythmbox ()
+ 		{
++			string xdgDbFile;
+ 			string home = Environment.GetFolderPath (Environment.SpecialFolder.Personal);
+-			MusicLibraryFile = Path.Combine (home, ".gnome2/rhythmbox/rhythmdb.xml");
++			
++			// this is for version compatibility, the new version of RB uses XDG dirs
++			xdgDbFile = Path.Combine (ReadXdgUserDir ("XDG_DATA_HOME", ".local/share"), "rhythmbox/rhythmdb.xml");
++			MusicLibraryFile = File.Exists (xdgDbFile) 
++				? xdgDbFile
++				: Path.Combine (home, ".gnome2/rhythmbox/rhythmdb.xml");
++
+ 			CoverArtDirectory = Path.Combine (ReadXdgUserDir ("XDG_CACHE_HOME", ".cache"), "rhythmbox/covers");
+ 
+ 			clear_songs_timer = new Timer (state =>

Propchange: packages/gnome-do-plugins/trunk/debian/patches/10_fix_rhythmbox_file.dpatch
------------------------------------------------------------------------------
    svn:executable = *