[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/maverick, updated. debian/1.7.5-0ubuntu2-10-g1d90351

[Chow Loong Jin]

The following commit has been merged in the ubuntu/maverick branch:
commit 8f4151c8e367b75fe4466b47c01d5c9ddc9ab48c
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Sat Sep 18 14:15:54 2010 +0800

    Refresh 06_add-meego-desktop-file.patch

diff --git a/debian/patches/06_add-meego-desktop-file.patch b/debian/patches/06_add-meego-desktop-file.patch
index 7fc6d2b..bce53be 100644
--- a/debian/patches/06_add-meego-desktop-file.patch
+++ b/debian/patches/06_add-meego-desktop-file.patch
@@ -1,7 +1,7 @@
-Index: banshee.git/src/Extensions/Banshee.MeeGo/Makefile.am
+Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.am
 ===================================================================
---- banshee.git.orig/src/Extensions/Banshee.MeeGo/Makefile.am	2010-09-06 18:24:37.000000000 +0100
-+++ banshee.git/src/Extensions/Banshee.MeeGo/Makefile.am	2010-09-06 18:35:34.157961126 +0100
+--- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.am	2010-09-18 14:13:50.000000000 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/Makefile.am	2010-09-18 14:13:55.420497653 +0800
 @@ -37,7 +37,8 @@
  com.meego.UX.Shell.Panels.banshee.service: com.meego.UX.Shell.Panels.banshee.service.in $(top_builddir)/config.log
  	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
@@ -28,11 +28,11 @@ Index: banshee.git/src/Extensions/Banshee.MeeGo/Makefile.am
  	com.meego.UX.Shell.Panels.banshee.service.in \
  	meego-panel-banshee.desktop.in.in
 +	banshee-1.desktop.in.in
-Index: banshee.git/src/Extensions/Banshee.MeeGo/Makefile.in
+Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.in
 ===================================================================
---- banshee.git.orig/src/Extensions/Banshee.MeeGo/Makefile.in	2010-09-06 18:31:43.000000000 +0100
-+++ banshee.git/src/Extensions/Banshee.MeeGo/Makefile.in	2010-09-06 18:37:01.100668172 +0100
-@@ -624,12 +624,14 @@
+--- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.in	2010-09-18 14:13:50.000000000 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/Makefile.in	2010-09-18 14:14:32.482118523 +0800
+@@ -627,12 +627,14 @@
  @HAVE_MEEGO_FALSE at EXTRA_DIST = $(SOURCES) $(RESOURCES) \
  @HAVE_MEEGO_FALSE@	Banshee.MeeGo.dll.config meego-panel-banshee \
  @HAVE_MEEGO_FALSE@	com.meego.UX.Shell.Panels.banshee.service.in \
@@ -49,7 +49,7 @@ Index: banshee.git/src/Extensions/Banshee.MeeGo/Makefile.in
  @HAVE_MEEGO_TRUE at CLEANFILES = $(OUTPUT_FILES)
  @HAVE_MEEGO_TRUE at DISTCLEANFILES = *.pidb
  @HAVE_MEEGO_TRUE at MAINTAINERCLEANFILES = Makefile.in
-@@ -637,7 +639,7 @@
+@@ -640,7 +642,7 @@
  @HAVE_MEEGO_TRUE at panel_SCRIPTS = meego-panel-banshee
  @HAVE_MEEGO_TRUE at servicedir = $(datadir)/dbus-1/services
  @HAVE_MEEGO_TRUE at service_DATA = com.meego.UX.Shell.Panels.banshee.service
@@ -58,7 +58,7 @@ Index: banshee.git/src/Extensions/Banshee.MeeGo/Makefile.in
  @HAVE_MEEGO_TRUE at desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
  @HAVE_MEEGO_TRUE at desktopfilesdir = $(datadir)/mutter-meego/panels
  @HAVE_MEEGO_TRUE at desktopfiles_DATA = $(desktopfiles_files)
-@@ -1012,7 +1014,9 @@
+@@ -963,7 +965,10 @@
  @HAVE_MEEGO_TRUE at clean-local:
  @HAVE_MEEGO_TRUE@	rm -f com.meego.UX.Shell.Panels.banshee.service \
  @HAVE_MEEGO_TRUE@		meego-panel-banshee.desktop \
@@ -66,13 +66,14 @@ Index: banshee.git/src/Extensions/Banshee.MeeGo/Makefile.in
 + at HAVE_MEEGO_TRUE@		meego-panel-banshee.desktop.in \
 + at HAVE_MEEGO_TRUE@		banshee-1.desktop \
 + at HAVE_MEEGO_TRUE@		banshee-1.desktop.in
- 
++
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-Index: banshee.git/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in
+ .NOEXPORT:
+Index: banshee/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ banshee.git/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in	2010-09-06 18:35:34.157961126 +0100
++++ banshee/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in	2010-09-18 14:13:55.430498112 +0800
 @@ -0,0 +1,11 @@
 +[Desktop Entry]
 +_Name=Banshee Netbook

-- 
banshee