[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/oneiric, updated. debian/2.0.1-1ubuntu1-15-g254021c

[Chow Loong Jin]

The following commit has been merged in the ubuntu/oneiric branch:
commit 9d7c600be202a6908aa765a677ab320791ab153d
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sat May 14 22:25:14 2011 +0800

    Drop upstreamed u1ms-initialize-earlier patch

diff --git a/debian/patches/91_u1ms-initialize-earlier.patch b/debian/patches/91_u1ms-initialize-earlier.patch
deleted file mode 100644
index ff38942..0000000
--- a/debian/patches/91_u1ms-initialize-earlier.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-=== modified file 'banshee/build/m4/banshee/ubuntuonemusicstore.m4'
---- banshee/build/m4/banshee/ubuntuonemusicstore.m4	2011-03-29 08:16:04 +0000
-+++ banshee/build/m4/banshee/ubuntuonemusicstore.m4	2011-04-07 20:59:22 +0000
-@@ -8,7 +8,7 @@ AC_DEFUN([BANSHEE_CHECK_UBUNTUONE],
- 	if test "x$enable_ubuntuone" = "xyes"; then
- 		has_ubuntuonesharp=no
- 		PKG_CHECK_MODULES(UBUNTUONESHARP,
--			[ubuntuone-sharp-1.0 >= 0.3.2],
-+			[ubuntuone-sharp-1.0 >= 0.9.2],
- 			has_ubuntuonesharp=yes, has_ubuntuonesharp=no)
- 		if test "x$has_ubuntuonesharp" = "xno"; then
- 			AC_MSG_ERROR([ubuntuone-sharp was not found. Please install ubuntuone-sharp, or disable Ubuntu One support by passing --disable-ubuntuone])
-
-=== modified file 'banshee/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs'
---- banshee/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs	2011-04-06 20:19:13 +0000
-+++ banshee/src/Extensions/Banshee.UbuntuOneMusicStore/Banshee.UbuntuOneMusicStore/UbuntuOneMusicStoreSource.cs	2011-04-07 20:58:44 +0000
-@@ -55,6 +55,10 @@ namespace Banshee.UbuntuOneMusicStore
-         {
-             Properties.SetString ("Icon.Name", "ubuntuone");
- 
-+            if (custom_view == null) {
-+                Properties.Set<ISourceContents> ("Nereid.SourceContents", custom_view = new CustomView ());
-+            }
-+
-             // So we can handle u1ms:// URIs
-             ServiceManager.Get<DBusCommandService> ().ArgumentPushed += OnCommandLineArgument;
-         }
-@@ -84,17 +88,6 @@ namespace Banshee.UbuntuOneMusicStore
-             get { return 0; }
-         }
- 
--        // Defer any UI creation until it's actually needed.
--        public override void Activate ()
--        {
--            if (custom_view == null) {
--                Properties.Set<ISourceContents> ("Nereid.SourceContents", custom_view = new CustomView ());
--            }
--
--            base.Activate ();
--            Log.Debug ("U1MS: Initialized");
--        }
--
-         public class StoreWrapper: UbuntuOne.U1MusicStore, IDisableKeybindings
-         {
-             string U1LibraryLocation = System.IO.Path.Combine (System.IO.Path.Combine (System.Environment.GetFolderPath (System.Environment.SpecialFolder.Personal), ".ubuntuone"), "Purchased from Ubuntu One");
-
diff --git a/debian/patches/series b/debian/patches/series
index 438f871..eb496fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,6 @@
 08_remove_unrelevant_media.patch
 0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
 90_amazon_url.patch
-91_u1ms-initialize-earlier.patch
 workaround-clideps-winmm.patch
 workaround-clideps-meego.patch
 99_ltmain_as-needed.patch

-- 
banshee