[Pkg-mono-svn-commits] rev 3290 - in non-group/banshee/trunk/debian: . patches

[Sebastian Dröge]

Author: slomo
Date: 2007-08-18 07:26:37 +0000 (Sat, 18 Aug 2007)
New Revision: 3290

Added:
   non-group/banshee/trunk/debian/patches/05_home.patch
Modified:
   non-group/banshee/trunk/debian/changelog
Log:
* debian/patches/05_home.patch:
  + Support the changes to the xdg-user-dirs spec that allow $HOME
    to start the path; also allows for quotes surrounding the path.
    Patch from upstream SVN.

Modified: non-group/banshee/trunk/debian/changelog
===================================================================
--- non-group/banshee/trunk/debian/changelog	2007-08-16 18:22:38 UTC (rev 3289)
+++ non-group/banshee/trunk/debian/changelog	2007-08-18 07:26:37 UTC (rev 3290)
@@ -1,3 +1,12 @@
+banshee (0.13.0+dfsg-2) unstable; urgency=low
+
+  * debian/patches/05_home.patch:
+    + Support the changes to the xdg-user-dirs spec that allow $HOME
+      to start the path; also allows for quotes surrounding the path.
+      Patch from upstream SVN.
+
+ -- Sebastian Dröge <slomo at debian.org>  Sat, 18 Aug 2007 09:24:50 +0200
+
 banshee (0.13.0+dfsg-1) unstable; urgency=low
 
   * New upstream release

Added: non-group/banshee/trunk/debian/patches/05_home.patch
===================================================================
--- non-group/banshee/trunk/debian/patches/05_home.patch	                        (rev 0)
+++ non-group/banshee/trunk/debian/patches/05_home.patch	2007-08-18 07:26:37 UTC (rev 3290)
@@ -0,0 +1,24 @@
+Index: src/Core/Banshee.Base/Paths.cs
+===================================================================
+--- src/Core/Banshee.Base/Paths.cs	(revision 2419)
++++ src/Core/Banshee.Base/Paths.cs	(working copy)
+@@ -61,7 +61,17 @@
+                         line = line.Trim();
+                         int delim_index = line.IndexOf('=');
+                         if(delim_index > 8 && line.Substring (0, delim_index) == key) {
+-                            return Path.Combine(home_dir, line.Substring(delim_index + 1));
++                            string path = line.Substring(delim_index + 1).Trim('"');
++                            bool relative = false;
++
++                            if(path.StartsWith("$HOME/")) {
++                                relative = true;
++                                path = path.Substring(6);
++                            } else if(!path.StartsWith("/")) {
++                                relative = true;
++                            }
++
++                            return relative ? Path.Combine(home_dir, path) : path;
+                         }
+                     }
+                 }
+