[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/maverick, updated. ppa/1.7.4-1ubuntu1-15-gd54fedc

[Iain Lane]

The following commit has been merged in the ubuntu/maverick branch:
commit fb3f452781517bb049fc20bbd86789e9ea8f9655
Merge: df01b1e6d1a74258494c101ff8809fad41d3d40b 9c3402b07cec63d7cf9a7e403b8365dd2753c684
Author: Iain Lane <laney at ubuntu.com>
Date:   Mon Sep 6 19:48:41 2010 +0100

    Merge branch 'experimental' into ubuntu/maverick

diff --combined debian/rules
index 70f4f11,a55c848..f6c493e
--- a/debian/rules
+++ b/debian/rules
@@@ -12,7 -12,7 +12,7 @@@ override_dh_auto_configure
  	                     --disable-builtin-equalizer \
  	                     --disable-gst-sharp \
  	                     --enable-user-help \
 -	                     --enable-boo \
 +	                     --disable-boo \
  	                     --enable-docs \
  	                     --enable-youtube \
  	                     --disable-hal \
@@@ -48,20 -48,13 +48,21 @@@ override_dh_clistrip
  override_dh_install:
  	# make sure we don't include a generated MIME database
  	find debian/tmp/usr/share/mime/ -mindepth 1 -maxdepth 1 -not -name packages -print0 | xargs -0 rm -rf
+ 	rm -f debian/tmp/usr/share/applications/mimeinfo.cache
  	dh_install
  	# Remove MeeGo stuff from banshee binary package
  	rm -r debian/banshee/usr/share/mutter-meego/ \
  	      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*
 +ifeq ($(shell dpkg-vendor --query vendor), Ubuntu)
 +	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 
 +endif
  
  %:
  	dh $@

-- 
banshee