[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/1.9.6-1-17-g5adb0dd

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 9f9519dd46ba0a24890b26a9ac5974118da5f7d5
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Tue Apr 12 21:14:11 2011 +0800

    Strip extra diff file header
    
    11_reduce_cpu_usage.patch contains two commits, both of which patch the same
    file. This commit drops the ---/+++ header from the second commit, so that patch
    doesn't complain that the same file is patched twice
    
    Git-Dch: Ignore

diff --git a/debian/patches/11_reduce_cpu_usage.patch b/debian/patches/11_reduce_cpu_usage.patch
index 310dc76..eaa39fa 100644
--- a/debian/patches/11_reduce_cpu_usage.patch
+++ b/debian/patches/11_reduce_cpu_usage.patch
@@ -37,10 +37,6 @@ Date:   Fri Apr 8 16:34:37 2011 +1000
     
     Signed-off-by: Gabriel Burt <gabriel.burt at gmail.com>
 
-diff --git a/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs b/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs
-index e8e3748..fdb1293 100644
---- a/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs
-+++ b/src/Core/Banshee.Widgets/Banshee.Widgets/StreamPositionLabel.cs
 @@ -202,7 +202,6 @@ namespace Banshee.Widgets
              set {
                  buffering_progress = Math.Max (0.0, Math.Min (1.0, value));

-- 
banshee