[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/maverick, updated. debian/1.7.3-2ubuntu1-1-gbbcfce9

[Chow Loong Jin]

The following commit has been merged in the ubuntu/maverick branch:
commit bbcfce9bd7bf0c3c94e4bf448544c86e01eb4c14
Author: Loïc Minier <loic.minier at ubuntu.com>
Date:   Thu Aug 5 00:49:55 2010 -0400

    Imported Debian patch 1.7.3-2ubuntu2

diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches
deleted file mode 100644
index 6857a8d..0000000
--- a/.pc/.quilt_patches
+++ /dev/null
@@ -1 +0,0 @@
-debian/patches
diff --git a/.pc/.quilt_series b/.pc/.quilt_series
deleted file mode 100644
index c206706..0000000
--- a/.pc/.quilt_series
+++ /dev/null
@@ -1 +0,0 @@
-series
diff --git a/.pc/.version b/.pc/.version
deleted file mode 100644
index 0cfbf08..0000000
--- a/.pc/.version
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/debian/changelog b/debian/changelog
index b3c71bd..29d25b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+banshee (1.7.3-2ubuntu2) maverick; urgency=low
+
+  * banshee shipped a generated MIME database (/usr/share/mime/*) breaking the
+    system one.  Change debian/rules to delete everything below
+    debian/tmp/usr/share/mime/ except "packages" before dh_install.
+  * Minor syntax tweaks to rules.
+
+ -- Loïc Minier <loic.minier at ubuntu.com>  Thu, 05 Aug 2010 00:49:55 -0400
+
 banshee (1.7.3-2ubuntu1) maverick; urgency=low
 
   * Merge from Debian Experimental, remaining changes:
diff --git a/debian/rules b/debian/rules
index 2e7490c..44941e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -43,12 +43,16 @@ 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
+	rm -rf debian/tmp/usr/share/mime/
 	dh_install
 	# Remove MeeGo stuff from banshee binary package
-	rm -r $(CURDIR)/debian/banshee/usr/share/mutter-moblin/ \
-	$(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/org.moblin* \
+	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