[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, master, updated. debian/2.2.0-3-10-g3d02ca2

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 45db91bc3c02a6e810266e462763363a7244e022
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Sat Apr 7 22:16:21 2012 +0800

    Drop patches
    
     - 0001-LiveRadio….patch: Applied upstream
     - fsck-intltool.patch: No longer needed

diff --git a/debian/patches/0001-LiveRadio-prevent-crash-when-updating-GUI-by-using-H.patch b/debian/patches/0001-LiveRadio-prevent-crash-when-updating-GUI-by-using-H.patch
deleted file mode 100644
index 9bc8d0f..0000000
--- a/debian/patches/0001-LiveRadio-prevent-crash-when-updating-GUI-by-using-H.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9a12ca50a75ff39c06f029a747b677d361a72d86 Mon Sep 17 00:00:00 2001
-From: Frank Ziegler <funtastix at googlemail.com>
-Date: Sun, 16 Oct 2011 16:10:28 +0700
-Subject: [PATCH] [LiveRadio] prevent crash when updating GUI by using
- Hyena.ThreadAssist methods
-
----
- .../LiveRadioPluginSourceContents.cs               |   20 +++++++++++---------
- 1 files changed, 11 insertions(+), 9 deletions(-)
-
-diff --git a/src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs b/src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs
-index 05ad12d..6714441 100644
---- a/src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs
-+++ b/src/LiveRadio/Banshee.LiveRadio/LiveRadioPluginSourceContents.cs
-@@ -243,15 +243,17 @@ namespace Banshee.LiveRadio
-         /// </param>
-         void OnPluginGenreListLoaded (object sender, List<Genre> genres)
-         {
--            if (genres.Count > 0) {
--                filter_box.UpdateGenres (genres);
--                filter_box.Sensitive = true;
--            } else {
--                List<Genre> fakeresult = new List<Genre> ();
--                fakeresult.Add (new Genre(AddinManager.CurrentLocalizer.GetString("Error... Please Reload")));
--                filter_box.UpdateGenres (fakeresult);
--                filter_box.Sensitive = false;
--            }
-+            Hyena.ThreadAssist.ProxyToMain (delegate {
-+                if (genres.Count > 0) {
-+                    filter_box.UpdateGenres (genres);
-+                    filter_box.Sensitive = true;
-+                } else {
-+                    List<Genre> fakeresult = new List<Genre> ();
-+                    fakeresult.Add (new Genre(AddinManager.CurrentLocalizer.GetString("Error... Please Reload")));
-+                    filter_box.UpdateGenres (fakeresult);
-+                    filter_box.Sensitive = false;
-+                }
-+            });
-         }
- 
-         /// <summary>
--- 
-1.7.5.4
-
diff --git a/debian/patches/fsck-intltool.patch b/debian/patches/fsck-intltool.patch
deleted file mode 100644
index 75a5f52..0000000
--- a/debian/patches/fsck-intltool.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: Workaround intltool screwing around with quilt's .pc files
-Author: Chow Loong Jin <hyperair at ubuntu.com>
-Forwarded: not-needed
-Index: banshee-community-extensions/po/POTFILES.skip
-===================================================================
---- banshee-community-extensions.orig/po/POTFILES.skip	2010-11-12 11:09:45.789453462 +0800
-+++ banshee-community-extensions/po/POTFILES.skip	2010-11-12 11:09:52.259461089 +0800
-@@ -1,3 +1,4 @@
- build/extension-template/Banshee.Template/TemplateSource.cs
- src/Lirc/GUITestHarness/gtk-gui/MainWindow.cs
- src/Telepathy/Banshee.Telepathy/Banshee.Telepathy.Gui/IncomingTubeDialog.cs
-+.pc
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6297710..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-LiveRadio-prevent-crash-when-updating-GUI-by-using-H.patch
-fsck-intltool.patch

-- 
banshee-community-extensions