[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/1.9.4-1-8-g7b83dc5

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit ac457460992b460d7fcdec227c26ce0837a8884f
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Fri Mar 11 01:01:51 2011 +0800

    Squash Ubuntu delta in debian/rules
    
    Add everything in using ifeq conditionals

diff --git a/debian/rules b/debian/rules
index acb8760..16b045d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,6 @@ CONFFLAGS = \
 	--disable-builtin-equalizer \
 	--disable-gst-sharp \
 	--enable-user-help \
-	--enable-boo \
 	--enable-docs \
 	--enable-youtube \
 	--disable-hal \
@@ -23,19 +22,30 @@ CONFFLAGS = \
 	--enable-mtp \
 	--enable-appledevice \
 	--disable-ipod \
-	--enable-karma \
 	--enable-daap \
 	--disable-remote-audio \
 	--disable-torrent \
 	--enable-meego \
-	--disable-soundmenu \
-	--disable-ubuntuone \
 	--enable-gapless-playback \
 	--enable-podcast \
 	--enable-release \
 	--disable-shave \
 	MCS=/usr/bin/mono-csc LDFLAGS="$(LDFLAGS)"
 
+ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
+CONFFLAGS += \
+	--disable-boo \
+	--disable-karma \
+	--enable-soundmenu \
+	--enable-ubuntuone
+else
+CONFFLAGS += \
+	--enable-boo \
+	--enable-karma \
+	--disable-soundmenu \
+	--disable-ubuntuone
+endif
+
 ifeq ($(shell dpkg-architecture -ilinux-any && echo yes), y)
 CONFFLAGS += --enable-gio-hardware
 else
@@ -66,6 +76,9 @@ override_dh_install:
 	      debian/banshee/usr/lib/banshee-1/Extensions/Banshee.MeeGo.dll* \
 	      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-1/Extensions/Banshee.SoundMenu.* \
+	      debian/banshee/usr/lib/banshee-1/Extensions/Banshee.UbuntuOneMusicStore.*
 	cd po; intltool-update --pot
 
 	for d in $$(find debian/ -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \

-- 
banshee