[Pkg-cli-apps-commits] [banshee] 01/01: Resync ubuntu-specific parts of rules

[Chow Loong Jin]

This is an automated email from the git hooks/post-receive script.

hyperair pushed a commit to branch master
in repository banshee.

commit ede80cfe77c10e1728d278bc0432b503b7c6f369
Author: Chow Loong Jin <hyperair at debian.org>
Date:   Mon May 25 12:14:12 2015 +0800

    Resync ubuntu-specific parts of rules
    
    Changes have been made in snippets that are only run in Ubuntu, but only on the
    Ubuntu branches. This commit syncs up these snippets.
---
 debian/rules | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/debian/rules b/debian/rules
index 34b2684..6f34bae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ CONFFLAGS += \
 	--disable-boo \
 	--disable-karma \
 	--enable-soundmenu \
-	--enable-ubuntuone
+	--disable-ubuntuone
 else
 CONFFLAGS += \
 	--enable-boo \
@@ -90,14 +90,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.*
-	cd po; intltool-update --pot
-
-	for d in $$(find debian/ -type f \( -name "*.desktop" -o -name "*.directory" \) ); do \
-	    sed -ri '/^(Name|GenericName|Comment|X-GNOME-FullName)\[/d' $$d; \
-	    echo "X-Ubuntu-Gettext-Domain=banshee" >> $$d; \
-	done
+	rm -r debian/banshee/usr/lib/banshee/Extensions/Banshee.SoundMenu.*
 endif
 
 override_dh_gencontrol:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/banshee.git