[Pkg-cli-apps-commits] [SCM] banshee-community-extensions branch, ubuntu, updated. debian/1.9.0-1ubuntu2-16-gdddf53e

[Iain Lane]

The following commit has been merged in the ubuntu branch:
commit 83e881f86edb79ce3b48658ae430665844908704
Author: Iain Lane <laney at ubuntu.com>
Date:   Thu Dec 23 19:59:30 2010 +0000

    Remove U1MS extension, now included with Banshee mainline

diff --git a/debian/banshee-extension-ubuntuonemusicstore.install b/debian/banshee-extension-ubuntuonemusicstore.install
deleted file mode 100644
index 912f007..0000000
--- a/debian/banshee-extension-ubuntuonemusicstore.install
+++ /dev/null
@@ -1 +0,0 @@
-/usr/lib/banshee-1/Extensions/Banshee.UbuntuOneMusicStore.*
diff --git a/debian/control b/debian/control
index 38a1c47..b1d628b 100644
--- a/debian/control
+++ b/debian/control
@@ -28,7 +28,6 @@ Build-Depends: debhelper (>= 7.0.50),
                libmono-addins-cil-dev,
                libnotify-cil-dev,
                libappindicator0.1-cil-dev,
-               libubuntuone1.0-cil-dev,
                libtaoframework-opengl-cil-dev (>= 2.1),
                libtaoframework-freeglut-cil-dev,
                libtaoframework-sdl-cil-dev (>= 1.2.13),
@@ -60,8 +59,7 @@ Recommends: banshee-extension-alarm (>= ${source:Version}),
             banshee-extension-randombylastfm (>= ${source:Version}),
             banshee-extension-soundmenu (>= ${source:Version}),
             banshee-extension-streamrecorder (>= ${source:Version}),
-            banshee-extension-telepathy (>= ${source:Version}),
-            banshee-extension-ubuntuonemusicstore (>= ${source:Version})
+            banshee-extension-telepathy (>= ${source:Version})
 Depends: banshee-extensions-common (= ${source:Version}),
          ${misc:Depends}
 Description: set of community contributed extensions for Banshee
@@ -341,12 +339,3 @@ Description: Telepathy extension for Banshee
   * Stream your friends' music. This feature can be disabled.
  .
  Banshee is a media management and playback application for the GNOME desktop.
-
-Package: banshee-extension-ubuntuonemusicstore
-Architecture: all
-Depends: banshee-extensions-common (= ${source:Version}),
-         ${cli:Depends}, ${misc:Depends}
-Description: Ubuntu One Music Store extension for Banshee
- This extension makes the Ubuntu One Music Store available in Banshee.
- .
- Banshee is a media management and playback application for the GNOME desktop.
diff --git a/debian/patches/enable-u1ms.patch b/debian/patches/enable-u1ms.patch
deleted file mode 100644
index 2d2e2a1..0000000
--- a/debian/patches/enable-u1ms.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: banshee-community-extensions.git/src/UbuntuOneMusicStore/UbuntuOneMusicStore.addin.xml
-===================================================================
---- banshee-community-extensions.git.orig/src/UbuntuOneMusicStore/UbuntuOneMusicStore.addin.xml	2010-11-24 12:37:25.642689838 +0000
-+++ banshee-community-extensions.git/src/UbuntuOneMusicStore/UbuntuOneMusicStore.addin.xml	2010-11-24 12:37:35.913480654 +0000
-@@ -9,7 +9,7 @@
-     description="This extension grants access to the Ubuntu One Music Store, powered by 7digital."
-     author="Jo Shields"
-     url="http://one.ubuntu.com/"
--    defaultEnabled="false">
-+    defaultEnabled="true">
- 
-   <Localizer type="Gettext" catalog="banshee-community-extensions" location="../../../share/locale"/>
- 
diff --git a/debian/patches/series b/debian/patches/series
index 125144d..c78fc08 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 enable-soundmenu.patch
-enable-u1ms.patch
 fix-ampache-unicode.patch
 fsck-intltool.patch
 mirage-new-randomby-api.patch
diff --git a/debian/rules b/debian/rules
index 49e0490..7fcda3d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,7 +31,6 @@ override_dh_auto_configure:
 		--enable-soundmenu \
 		--enable-streamrecorder \
 		--enable-telepathy \
-		--enable-ubuntuonemusicstore \
 		--disable-zeitgeistdataprovider \
 		--disable-shave \
 		--enable-user-help \

-- 
banshee-community-extensions