[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/precise, updated. debian/2.3.4.ds-1ubuntu2

[Chow Loong Jin]

The following commit has been merged in the ubuntu/precise branch:
commit 84062006bee1d118e40322a1561b88130f67618d
Author: Rodney Dawes <rodney.dawes at ubuntu.com>
Date:   Wed Feb 8 03:10:47 2012 +0800

    Disable Ubuntu One extension
    
    It requires gtk3 and the mono bindings have been removed.

diff --git a/debian/banshee-extension-ubuntuonemusicstore.install b/debian/banshee-extension-ubuntuonemusicstore.install
deleted file mode 100644
index c28cb13..0000000
--- a/debian/banshee-extension-ubuntuonemusicstore.install
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/banshee/Extensions/Banshee.UbuntuOneMusicStore.*
diff --git a/debian/control b/debian/control
index cc0745a..ff11b44 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,6 @@ Build-Depends: debhelper (>= 7.0.50),
                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 @@ Recommends: brasero,
 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 @@ Description: Media Management and Playback application - sound menu extension
  .
  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}),
diff --git a/debian/rules b/debian/rules
index e1c793b..feefe09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,7 @@ CONFFLAGS += \
 	--disable-boo \
 	--disable-karma \
 	--enable-soundmenu \
-	--enable-ubuntuone
+	--disable-ubuntuone
 else
 CONFFLAGS += \
 	--enable-boo \
@@ -82,8 +82,7 @@ override_dh_install:
 	      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 \

-- 
banshee