diff -Nru banshee-community-extensions-2.2.0/debian/banshee-extension-clutterflow.install banshee-community-extensions-2.2.0/debian/banshee-extension-clutterflow.install --- banshee-community-extensions-2.2.0/debian/banshee-extension-clutterflow.install 2011-09-22 17:40:58.000000000 +0000 +++ banshee-community-extensions-2.2.0/debian/banshee-extension-clutterflow.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -/usr/lib/banshee/Extensions/*ClutterFlow.dll* -/usr/lib/banshee/Extensions/clutter-*.dll* -/usr/lib/banshee/Extensions/glib-sharp.dll* diff -Nru banshee-community-extensions-2.2.0/debian/changelog banshee-community-extensions-2.2.0/debian/changelog --- banshee-community-extensions-2.2.0/debian/changelog 2011-09-22 17:40:58.000000000 +0000 +++ banshee-community-extensions-2.2.0/debian/changelog 2012-02-11 18:31:47.000000000 +0000 @@ -1,3 +1,30 @@ +banshee-community-extensions (2.2.0-3ubuntu1) precise; urgency=low + + * Merge from debian/unstable to drop clutterflow extension, + remaining change: + - Enable Appindicator extension + + -- Andreas Moog Sat, 11 Feb 2012 19:30:25 +0100 + +banshee-community-extensions (2.2.0-3) unstable; urgency=low + + * [fb763e7] Cherry-pick LiveRadio crash-fix (LP: #881902) + * [004bc6f] Update email address + * [4a7215b] Drop clutterflow extension + clutter-gtk-sharp has been disabled due to the removal of + clutter-gtk-0.10/libchamplain-0.8. Clutterflow also does not work, causing a + huge memory leak that causes the system to thrash in about a minute or so. + Thanks to Michael Biebl (Closes: #648429) (LP: #738486) + + -- Chow Loong Jin Fri, 27 Jan 2012 13:04:54 +0800 + +banshee-community-extensions (2.2.0-2) unstable; urgency=low + + * Upload rebuild for CLR 4.0 transition + * [a57bfe0] Don't use deprecated cli.make, instead use the cli sequence + + -- Iain Lane Tue, 24 Jan 2012 11:15:01 +0000 + banshee-community-extensions (2.2.0-1ubuntu1) oneiric; urgency=low * [c0b3875] Merge from Debian Unstable (LP: #856579), remaining changes: diff -Nru banshee-community-extensions-2.2.0/debian/control banshee-community-extensions-2.2.0/debian/control --- banshee-community-extensions-2.2.0/debian/control 2011-09-22 17:40:58.000000000 +0000 +++ banshee-community-extensions-2.2.0/debian/control 2012-02-11 18:32:05.000000000 +0000 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian CLI Applications Team -Uploaders: Chow Loong Jin +Uploaders: Chow Loong Jin Build-Depends: debhelper (>= 7.0.50), dh-autoreconf, libgconf2-dev, @@ -35,8 +35,6 @@ libtaoframework-sdl-cil-dev (>= 1.2.13), mono-jay, gnome-doc-utils (>= 0.17.3), - libclutter-cil-dev, - libclutter-gtk-cil-dev, libzeitgeist-cil-dev Standards-Version: 3.9.2 Vcs-Git: git://git.debian.org/git/pkg-cli-apps/packages/banshee-community-extensions.git @@ -49,10 +47,8 @@ Recommends: banshee-extension-alarm (>= ${source:Version}), banshee-extension-albumartwriter (>= ${source:Version}), banshee-extension-ampache (>= ${source:Version}), - banshee-extension-appindicator (>= ${source:Version}), banshee-extension-awn (>= ${source:Version}), banshee-extension-coverwallpaper (>= ${source:Version}), - banshee-extension-clutterflow (>= ${source:Version}), banshee-extension-duplicatesongdetector (>= ${source:Version}), banshee-extension-jamendo (>= ${source:Version}), banshee-extension-lastfmfingerprint (>= ${source:Version}), @@ -121,17 +117,6 @@ . Banshee is a media management and playback application for the GNOME desktop -Package: banshee-extension-appindicator -Architecture: all -Depends: banshee-extensions-common (= ${source:Version}), - ${cli:Depends}, ${misc:Depends} -Description: Application Indicator extension for Banshee - This package provides integration for Banshee with Application Indicators, - which is a replacement for the notification area in Ubuntu, as a way to add - menus in the panel. - . - Banshee is a media management and playback application for the GNOME desktop. - Package: banshee-extension-awn Enhances: banshee Architecture: all @@ -144,16 +129,6 @@ . Banshee is a media management and playback application for the GNOME desktop. -Package: banshee-extension-clutterflow -Architecture: all -Depends: banshee-extensions-common (= ${source:Version}), - ${cli:Depends}, ${misc:Depends} -Description: CoverFlow functionality for Banshee - This package provides a clone of the CoverFlow functionality for - Banshee using the Clutter toolkit. - . - Banshee is a media management and playback application for the GNOME desktop. - Package: banshee-extension-coverwallpaper Enhances: banshee Architecture: all diff -Nru banshee-community-extensions-2.2.0/debian/copyright banshee-community-extensions-2.2.0/debian/copyright --- banshee-community-extensions-2.2.0/debian/copyright 2011-09-22 17:40:58.000000000 +0000 +++ banshee-community-extensions-2.2.0/debian/copyright 2012-01-27 05:25:10.000000000 +0000 @@ -139,7 +139,7 @@ 2010, Randal Barlow Files: debian/* -Copyright: 2010, Chow Loong Jin +Copyright: 2010, Chow Loong Jin License: GPL-2+ License: GPL-2+ diff -Nru banshee-community-extensions-2.2.0/debian/gbp.conf banshee-community-extensions-2.2.0/debian/gbp.conf --- banshee-community-extensions-2.2.0/debian/gbp.conf 2011-09-22 17:40:58.000000000 +0000 +++ banshee-community-extensions-2.2.0/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -[DEFAULT] -debian-branch = ubuntu -upstream-branch = upstream-experimental diff -Nru banshee-community-extensions-2.2.0/debian/patches/0001-LiveRadio-prevent-crash-when-updating-GUI-by-using-H.patch banshee-community-extensions-2.2.0/debian/patches/0001-LiveRadio-prevent-crash-when-updating-GUI-by-using-H.patch --- banshee-community-extensions-2.2.0/debian/patches/0001-LiveRadio-prevent-crash-when-updating-GUI-by-using-H.patch 1970-01-01 00:00:00.000000000 +0000 +++ banshee-community-extensions-2.2.0/debian/patches/0001-LiveRadio-prevent-crash-when-updating-GUI-by-using-H.patch 2012-01-27 05:25:10.000000000 +0000 @@ -0,0 +1,44 @@ +From 9a12ca50a75ff39c06f029a747b677d361a72d86 Mon Sep 17 00:00:00 2001 +From: Frank Ziegler +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 + /// + void OnPluginGenreListLoaded (object sender, List genres) + { +- if (genres.Count > 0) { +- filter_box.UpdateGenres (genres); +- filter_box.Sensitive = true; +- } else { +- List fakeresult = new List (); +- 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 fakeresult = new List (); ++ fakeresult.Add (new Genre(AddinManager.CurrentLocalizer.GetString("Error... Please Reload"))); ++ filter_box.UpdateGenres (fakeresult); ++ filter_box.Sensitive = false; ++ } ++ }); + } + + /// +-- +1.7.5.4 + diff -Nru banshee-community-extensions-2.2.0/debian/patches/series banshee-community-extensions-2.2.0/debian/patches/series --- banshee-community-extensions-2.2.0/debian/patches/series 2011-09-22 17:40:58.000000000 +0000 +++ banshee-community-extensions-2.2.0/debian/patches/series 2012-01-27 05:25:10.000000000 +0000 @@ -1 +1,2 @@ +0001-LiveRadio-prevent-crash-when-updating-GUI-by-using-H.patch fsck-intltool.patch diff -Nru banshee-community-extensions-2.2.0/debian/rules banshee-community-extensions-2.2.0/debian/rules --- banshee-community-extensions-2.2.0/debian/rules 2011-09-22 17:40:58.000000000 +0000 +++ banshee-community-extensions-2.2.0/debian/rules 2012-02-11 18:29:03.000000000 +0000 @@ -1,11 +1,8 @@ #!/usr/bin/make -f # -*- makefile -*- -include /usr/share/cli-common/cli.make - BANSHEE_VERSION = $(shell pkg-config --modversion banshee-thickclient) -# disable zeitgeistdataprovider and lirc due to dependencies missing override_dh_auto_configure: dh_auto_configure -- \ --with-vendor-build-id="`lsb_release -ds`" \ @@ -16,7 +13,7 @@ --enable-ampache \ --enable-appindicator \ --enable-awn \ - --enable-clutterflow \ + --disable-clutterflow \ --enable-coverwallpaper \ --enable-duplicatesongdetector \ --enable-jamendo \ @@ -63,4 +60,4 @@ --exclude-moduleref=glibsharpglue-2 %: - dh $@ --with=autoreconf + dh $@ --with cli,autoreconf