Merge lp:~dobey/ubuntu/precise/banshee/drop-u1ms into lp:ubuntu/precise/banshee

[dobey]

[Iain Lane (laney)]

Are you going to get it removed upstream?

[dobey (dobey)]

Yes, I've already started some work to pull the code out into a separate project; though got sidetracked needint to finish other work first. I'll get that done soon though.

=== removed file 'debian/banshee-extension-ubuntuonemusicstore.install'
--- debian/banshee-extension-ubuntuonemusicstore.install	2011-03-29 08:16:04 +0000
+++ debian/banshee-extension-ubuntuonemusicstore.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-/usr/lib/banshee/Extensions/Banshee.UbuntuOneMusicStore.*

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-23 23:16:49 +0000
+++ debian/changelog	2012-02-06 20:15:30 +0000
@@ -1,3 +1,10 @@
+banshee (2.3.4.ds-1ubuntu2) precise; urgency=low
+
+  * Disable Ubuntu One extension, as it requires gtk3 now and the mono
+    bindings have been removed.
+
+ -- Rodney Dawes <[e-mail]>  Mon, 06 Feb 2012 13:48:57 -0500
+
 banshee (2.3.4.ds-1ubuntu1) precise; urgency=low
 
   * Merge from Debian Experimental, remaining changes:

=== modified file 'debian/control'
--- debian/control	2012-01-23 23:16:49 +0000
+++ debian/control	2012-02-06 20:15:30 +0000
@@ -25,7 +25,6 @@
                libgio2.0-cil-dev (>= 2.22.3-1~),
                libgtk-sharp-beans2.0-cil-dev (>= 2.8),
                libgpod-cil-dev (>= 0.8.2),
-               libubuntuone1.0-cil-dev (>= 0.9.2),
                libwebkitgtk-dev (>= 1.2.2) | libwebkit-dev (>= 1.2.2),
                libsoup2.4-dev (>= 2.26),
                libsoup-gnome2.4-dev (>= 2.26),
@@ -67,7 +66,6 @@
 Suggests: gstreamer0.10-plugins-bad,
           gstreamer0.10-plugins-ugly,
           gstreamer0.10-ffmpeg,
-          banshee-extension-ubuntuonemusicstore (=${binary:Version}),
           banshee-dbg (=${binary:Version})
 Provides: banshee-api-${banshee:API},
           banshee-asm-${banshee:ASM}
@@ -95,23 +93,6 @@
  .
  This package contains Banshee's support for the Sound Menu
 
-Package: banshee-extension-ubuntuonemusicstore
-Architecture: any
-Depends: banshee (>= ${source:Upstream-Version}),
-         ${cli:Depends},
-         ${shlibs: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
- desktop, allowing users to import audio from CDs, search their library,
- create playlists of selections of their library, sync music to/from iPods
- and other media devices, play and manage video files and burn selections
- to a CD.
- .
- This package contains Banshee's support for the Ubuntu One Music Store
-
 Package: banshee-meego
 Architecture: any
 Depends: banshee (= ${binary:Version}),

=== modified file 'debian/rules'
--- debian/rules	2011-09-21 13:54:50 +0000
+++ debian/rules	2012-02-06 20:15:30 +0000
@@ -37,7 +37,7 @@
 	--disable-boo \
 	--disable-karma \
 	--enable-soundmenu \
-	--enable-ubuntuone
+	--disable-ubuntuone
 else
 CONFFLAGS += \
 	--enable-boo \
@@ -82,8 +82,7 @@
 	      debian/banshee/usr/share/dbus-1/services/com.meego*
 ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
 	# Remove U1MS and Sound Menu stuff from banshee
-	rm -r debian/banshee/usr/lib/banshee/Extensions/Banshee.SoundMenu.* \
-	      debian/banshee/usr/lib/banshee/Extensions/Banshee.UbuntuOneMusicStore.*
+	rm -r debian/banshee/usr/lib/banshee/Extensions/Banshee.SoundMenu.* 
 	cd po; intltool-update --pot
 
 	for d in $$(find debian/ -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \