[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/natty, updated. debian/2.0.0-1ubuntu1-1-g42402c3

[Chow Loong Jin]

The following commit has been merged in the ubuntu/natty branch:
commit 42402c3c104bd3d2703a39c21cdbe88c0e348666
Author: Rodney Dawes <rodney.dawes at canonical.com>
Date:   Fri Apr 8 23:37:37 2011 -0400

    Imported Debian patch 2.0.0-1ubuntu2

diff --git a/debian/changelog b/debian/changelog
index 7423362..ad6c081 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+banshee (2.0.0-1ubuntu2) natty; urgency=low
+
+  * 90_amazon_url.patch:
+    - Change the url for the Amazon store redirector (LP: #745194)
+  * 91_u1ms-initialize-earlier.patch:
+    - Create the U1MusicStore widget earlier (LP: #604699)
+    - Require libubuntuone >= 0.9.2
+
+ -- Rodney Dawes <rodney.dawes at canonical.com>  Fri, 08 Apr 2011 23:37:37 -0400
+
 banshee (2.0.0-1ubuntu1) natty; urgency=low
 
   * Merge from Debian Unstable, remaining changes:
diff --git a/debian/control b/debian/control
index 39a1c02..7359d75 100644
--- a/debian/control
+++ b/debian/control
@@ -24,7 +24,7 @@ Build-Depends: debhelper (>= 7.0.50),
                libgio2.0-cil-dev (>= 2.22),
                libgtk-sharp-beans2.0-cil-dev (>= 2.8),
                libgpod-cil-dev (>= 0.7.95),
-               libubuntuone1.0-cil-dev (>= 0.3.2),
+               libubuntuone1.0-cil-dev (>= 0.9.2),
                libwebkitgtk-dev (>= 1.2.2),
                libsoup2.4-dev (>= 2.26),
                libsoup-gnome2.4-dev (>= 2.26),
@@ -96,7 +96,8 @@ Architecture: any
 Depends: banshee (>= ${source:Upstream-Version}),
          ${cli:Depends},
          ${shlibs:Depends},
-         ${misc:Depends}
+         ${misc:Depends},
+         libubuntuone1.0-cil (>= 0.9.2)
 Enhances: banshee
 Description: Media Management and Playback application - U1MS extension
  Banshee is a media management and playback application for the GNOME
diff --git a/debian/patches/90_amazon_url.patch b/debian/patches/90_amazon_url.patch
new file mode 100644
index 0000000..58cc823
--- /dev/null
+++ b/debian/patches/90_amazon_url.patch
@@ -0,0 +1,13 @@
+=== modified file 'banshee/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreView.cs'
+--- banshee/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreView.cs	2011-03-29 08:16:04 +0000
++++ banshee/src/Extensions/Banshee.AmazonMp3.Store/Banshee.AmazonMp3.Store/StoreView.cs	2011-04-04 18:27:58 +0000
+@@ -188,7 +188,7 @@ namespace Banshee.AmazonMp3.Store
+ 
+         public string GetActionUrl (string action)
+         {
+-            return "http://integrated-services.banshee.fm/amz/redirect.do/" + Country + "/" + action;
++            return "https://one.ubuntu.com/music/store/amz/" + Country + "/" + action;
+         }
+     }
+ }
+
diff --git a/debian/patches/91_u1ms-initialize-earlier.patch b/debian/patches/91_u1ms-initialize-earlier.patch
new file mode 100644
index 0000000..ff38942
--- /dev/null
+++ b/debian/patches/91_u1ms-initialize-earlier.patch
@@ -0,0 +1,46 @@
+=== 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 8f39334..17b98aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,6 @@
 08_remove_unrelevant_media.patch
 0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
 10_bind-to-loopback-for-daap
+90_amazon_url.patch
+91_u1ms-initialize-earlier.patch
 99_ltmain_as-needed.patch

-- 
banshee