[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/1.7.3-2-11-g24fcf17

[Chow Loong Jin]

The following commit has been merged in the experimental branch:
commit 24fcf17470fa45c50d7ad7b1d07deac09e751dde
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Fri Aug 13 00:30:49 2010 +0800

    Drop everything but packages/ in /usr/share/mime

diff --git a/debian/changelog b/debian/changelog
index 4d3862a..b01c1b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,8 +25,10 @@ banshee (1.7.4-1) UNRELEASED; urgency=low
     + Add Breaks: banshee-extensions-common (<< 1.6.1-2.) due to ABI break
   * debian/(banshee-meego.install, rules):
     + Change meego paths to match upstream
+  * debian/rules:
+    + Drop everything but packages/ in /usr/share/mime (Thanks Loic Minier)
 
- -- Chow Loong Jin <hyperair at ubuntu.com>  Thu, 12 Aug 2010 15:56:28 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 13 Aug 2010 00:30:24 +0800
 
 banshee (1.7.3-2) experimental; urgency=low
 
diff --git a/debian/rules b/debian/rules
index cec63aa..634a9eb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,12 +43,15 @@ override_dh_clistrip:
 	dh_clistrip --dbg-package=banshee-dbg
 
 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
 	dh_install
 	# Remove MeeGo stuff from banshee binary package
-	rm -r $(CURDIR)/debian/banshee/usr/share/mutter-meego/ \
-	$(CURDIR)/debian/banshee/usr/lib/banshee-1/MeeGo.exe \
-	$(CURDIR)/debian/banshee/usr/lib/banshee-1/Extensions/Banshee.MeeGo* \
-	$(CURDIR)/debian/banshee/usr/share/dbus-1/services/com.meego* \
+	rm -r debian/banshee/usr/share/mutter-moblin/ \
+	      debian/banshee/usr/lib/banshee-1/MeeGo.exe \
+	      debian/banshee/usr/lib/banshee-1/Extensions/Banshee.MeeGo* \
+	      debian/banshee/usr/share/dbus-1/services/org.moblin*
 
 %:
 	dh $@
+

-- 
banshee