[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/1.7.1-1-1-g24df710

[Iain Lane]

The following commit has been merged in the experimental branch:
commit 24df710b3f52553f99c3d1008039f1e9385bdfbf
Author: Iain Lane <laney at ubuntu.com>
Date:   Thu Jun 10 00:23:12 2010 +0100

    Move missed moblin desktop file to banshee-meego
    
    * debian/(rules, banshee-meego.install):
      + Move missed desktop moblin panel .desktop file to banshee-meego package.
      + Be more explicit about the files which shouldn't be duplicated in the
        banshee binary package.

diff --git a/debian/banshee-meego.install b/debian/banshee-meego.install
index 34a761d..db2f2f0 100644
--- a/debian/banshee-meego.install
+++ b/debian/banshee-meego.install
@@ -1,2 +1,3 @@
 debian/tmp/usr/lib/banshee-1/MeeGo.exe
 debian/tmp/usr/lib/banshee-1/Extensions/Banshee.MeeGo.dll*
+debian/tmp/usr/share/mutter-moblin
diff --git a/debian/changelog b/debian/changelog
index 06367a9..10def8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+banshee (1.7.1-2) UNRELEASED; urgency=low
+
+  * debian/(rules, banshee-meego.install):
+    + Move missed desktop moblin panel .desktop file to banshee-meego package.
+    + Be more explicit about the files which shouldn't be duplicated in the
+      banshee binary package.
+
+ -- Iain Lane <laney at ubuntu.com>  Thu, 10 Jun 2010 00:21:22 +0100
+
 banshee (1.7.1-1) experimental; urgency=low
 
   [ Chow Loong Jin ]
diff --git a/debian/rules b/debian/rules
index f2f7f4a..29aa48f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,6 +42,10 @@ override_dh_clistrip:
 
 override_dh_install:
 	dh_install
-	find $(CURDIR)/debian/banshee -name "*MeeGo*" -delete
+	# 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*
+
 %:
 	dh $@

-- 
banshee