[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/2.0.0-2-5-g3815bd1

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 5bd47d1ddd660addf3474ddd1b8b3ca79201c206
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Tue May 3 21:03:17 2011 +0800

    Drop upstreamed 10_bind-to-loopback-for-daap

diff --git a/debian/patches/10_bind-to-loopback-for-daap b/debian/patches/10_bind-to-loopback-for-daap
deleted file mode 100644
index 45517d7..0000000
--- a/debian/patches/10_bind-to-loopback-for-daap
+++ /dev/null
@@ -1,34 +0,0 @@
-Index: banshee.git/src/Core/Banshee.Services/Banshee.Web/BaseHttpServer.cs
-===================================================================
---- banshee.git.orig/src/Core/Banshee.Services/Banshee.Web/BaseHttpServer.cs	2011-04-07 21:04:44.637545514 +0100
-+++ banshee.git/src/Core/Banshee.Services/Banshee.Web/BaseHttpServer.cs	2011-04-07 21:04:31.858043358 +0100
-@@ -76,7 +76,7 @@
-             get { return running; }
-         }
- 
--        private EndPoint end_point = new IPEndPoint (IPAddress.Any, 80);
-+        private EndPoint end_point = new IPEndPoint (IPAddress.Loopback, 80);
-         protected EndPoint EndPoint {
-             get { return end_point; }
-             set {
-Index: banshee.git/src/Extensions/Banshee.Daap/Banshee.Daap/DaapProxyWebServer.cs
-===================================================================
---- banshee.git.orig/src/Extensions/Banshee.Daap/Banshee.Daap/DaapProxyWebServer.cs	2011-04-07 21:04:43.217600828 +0100
-+++ banshee.git/src/Extensions/Banshee.Daap/Banshee.Daap/DaapProxyWebServer.cs	2011-04-07 21:04:31.858043358 +0100
-@@ -49,14 +49,14 @@
-     {
-         private ArrayList databases = new ArrayList();
- 
--        public DaapProxyWebServer() : base (new IPEndPoint(IPAddress.Any, 8089), "DAAP Proxy")
-+        public DaapProxyWebServer() : base (new IPEndPoint(IPAddress.Loopback, 8089), "DAAP Proxy")
-         {
-         }
- 
-         protected override bool BindServerSocket ()
-         {
-             if (!base.BindServerSocket ()) {
--                EndPoint = new IPEndPoint(IPAddress.Any, 0);
-+                EndPoint = new IPEndPoint(IPAddress.Loopback, 0);
-                 try {
-                     server.Bind (EndPoint);
-                 } catch (System.Net.Sockets.SocketException e) {
diff --git a/debian/patches/series b/debian/patches/series
index 0fc870c..9ce1eb5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,4 @@
 07_enable-mpris-by-default.patch
 08_remove_unrelevant_media.patch
 0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
-10_bind-to-loopback-for-daap
-11_reduce_cpu_usage.patch
 99_ltmain_as-needed.patch

-- 
banshee