[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/natty, updated. debian/1.9.0+git20101121.r1.b13266e-0ubuntu5-18-g05f047b

[Iain Lane]

The following commit has been merged in the ubuntu/natty branch:
commit 7ff9143e213161a1ffcda45c88e00441f5e68d7b
Author: Iain Lane <laney at ubuntu.com>
Date:   Sun Dec 19 21:23:03 2010 +0000

    Enable U1MS and Sound Menu extensions

diff --git a/debian/banshee-extension-soundmenu.install b/debian/banshee-extension-soundmenu.install
new file mode 100644
index 0000000..39f5741
--- /dev/null
+++ b/debian/banshee-extension-soundmenu.install
@@ -0,0 +1 @@
+/usr/lib/banshee-1/Extensions/Banshee.SoundMenu.*
diff --git a/debian/banshee-extension-ubuntuonemusicstore.install b/debian/banshee-extension-ubuntuonemusicstore.install
new file mode 100644
index 0000000..912f007
--- /dev/null
+++ b/debian/banshee-extension-ubuntuonemusicstore.install
@@ -0,0 +1 @@
+/usr/lib/banshee-1/Extensions/Banshee.UbuntuOneMusicStore.*
diff --git a/debian/control b/debian/control
index 66f4781..02f97f8 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,8 @@ Build-Depends: debhelper (>= 7.0.50),
                libgtk-sharp-beans2.0-cil-dev (>= 2.8),
                libgpod-cil-dev (>= 0.7.95),
                libkarma-cil-dev (>= 0.0.5),
+               libindicate0.1-cil-dev (>= 0.4.1),
+               libubuntuone1.0-cil-dev,
                libwebkit-dev (>= 1.2.2),
                libsoup2.4-dev (>= 2.26),
                libsoup-gnome2.4-dev (>= 2.26),
@@ -59,8 +61,8 @@ Depends: ${shlibs:Depends},
 Recommends: brasero,
             avahi-daemon,
             media-player-info,
-            banshee-extension-soundmenu,
-            banshee-extension-ubuntuonemusicstore
+            banshee-extension-soundmenu (=${binary:Version}),
+            banshee-extension-ubuntuonemusicstore (=${binary:Version})
 Suggests: gstreamer0.10-plugins-bad,
           gstreamer0.10-plugins-ugly,
           gstreamer0.10-ffmpeg,
@@ -73,6 +75,38 @@ Description: Media Management and Playback application
  and other media devices, play and manage video files and burn selections
  to a CD.
 
+Package: banshee-extension-soundmenu
+Architecture: any
+Depends: banshee (>= ${source:Upstream-Version}),
+         ${cli:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+Enhances: banshee
+Description: Media Management and Playback application - sound menu 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 Sound Menu
+
+Package: banshee-extension-ubuntuonemusicstore
+Architecture: any
+Depends: banshee (>= ${source:Upstream-Version}),
+         ${cli:Depends},
+         ${shlibs:Depends},
+         ${misc:Depends}
+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 9738d0c..8f8b242 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,8 +28,8 @@ override_dh_auto_configure:
 	                     --enable-daap \
 	                     --disable-remote-audio \
 	                     --disable-torrent \
-			     --disable-soundmenu \
-			     --disable-ubuntuonemusicstore \
+			     --enable-soundmenu \
+			     --enable-ubuntuone \
 	                     --enable-meego \
 	                     --enable-gapless-playback \
 	                     --enable-podcast \
@@ -57,6 +57,9 @@ override_dh_install:
 	      debian/banshee/usr/lib/banshee-1/MeeGo.exe \
 	      debian/banshee/usr/lib/banshee-1/Extensions/Banshee.MeeGo.dll* \
 	      debian/banshee/usr/share/dbus-1/services/com.meego*
+	# Remove U1MS and Sound Menu stuff from banshee
+	rm -r debian/banshee/usr/lib/banshee-1/Extensions/Banshee.SoundMenu.* \
+              debian/banshee/usr/lib/banshee-1/Extensions/Banshee.UbuntuOneMusicStore.*
 ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
 	cd po; intltool-update --pot
 

-- 
banshee