[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/1.5.1-1-6-g60db8de

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 431686024233a6ce3a3dbc8bc4c808a6ec515a3d
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Wed Dec 2 05:14:13 2009 +0800

    Revert "Apply patch from BGO 601612 to re-enable last.fm streaming radio

debian/patches/banshee-lastfm-api.patch: Apply patch from upstream bug tracker (BGO #601612) to re-enable Last.fm streaming. Last had bumped a version number requirement for their 1.0 API which needed to be updated in Banshee. It is highly likely that the 1.0 API will stop working completely at some point in the not-too-distant future, but the next upstream release will support the new Last.fm 2.0 API (with the caveat that this is only available to paid subscribers). (Closes: #548029)"
    
    This reverts commit b1347aa798aa2a4665d24256615500ec1583ebaa.

diff --git a/debian/changelog b/debian/changelog
index 67feb80..9e44d7a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,3 @@
-banshee (1.5.1-2) UNRELEASED; urgency=low
-
-  * debian/patches/banshee-lastfm-api.patch: Apply patch from upstream bug
-    tracker (BGO #601612) to re-enable Last.fm streaming. Last had bumped a
-    version number requirement for their 1.0 API which needed to be updated in
-    Banshee. It is highly likely that the 1.0 API will stop working completely
-    at some point in the not-too-distant future, but the next upstream release
-    will support the new Last.fm 2.0 API (with the caveat that this is only
-    available to paid subscribers). (Closes: #548029)
-
- -- Iain Lane <laney at ubuntu.com>  Mon, 16 Nov 2009 11:28:25 +0000
-
 banshee (1.5.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/banshee-lastfm-api.patch b/debian/patches/banshee-lastfm-api.patch
deleted file mode 100644
index cdca269..0000000
--- a/debian/patches/banshee-lastfm-api.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Update version number passed to Last.fm to allow radio streams to function once more
-Origin: https://bugzilla.gnome.org/attachment.cgi?id=147800
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=601612
-Forwarded: not-needed
-Author: Bertrand Lorentz <bertrand.lorentz at gmail.com>
-Last-Update: 2009-11-16
-
-diff --git a/src/Libraries/Lastfm/Lastfm/RadioConnection.cs b/src/Libraries/Lastfm/Lastfm/RadioConnection.cs
-index 7206305..e3a28b9 100644
---- a/src/Libraries/Lastfm/Lastfm/RadioConnection.cs
-+++ b/src/Libraries/Lastfm/Lastfm/RadioConnection.cs
-@@ -426,7 +426,7 @@ namespace Lastfm
-         private string StationRefreshUrl {
-             get {
-                 return String.Format (
--                    "http://{0}{1}/xspf.php?sk={2}&discovery=0&desktop=1.3.1.1",
-+                    "http://{0}{1}/xspf.php?sk={2}&discovery=0&desktop=1.5",
-                     base_url, base_path, session
-                 );
-             }
diff --git a/debian/patches/series b/debian/patches/series
index 6e8a68a..1e76233 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-banshee-lastfm-api.patch
 01_fix-ipod-sharp-ftbfs
 99_ltmain_as-needed.patch

-- 
banshee