[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/1.9.5-1-6-g07e33c7

[Chow Loong Jin]

The following commit has been merged in the master branch:
commit 07f8bb8f4544754c56d1d5c4df646633d842c74d
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Thu Mar 24 22:58:53 2011 +0800

    Refresh 06_add-meego-desktop-file.patch
    
    This commit also renames banshee-1.desktop.in to banshee.desktop.in

diff --git a/debian/patches/06_add-meego-desktop-file.patch b/debian/patches/06_add-meego-desktop-file.patch
index 3bf71ad..312e1cf 100644
--- a/debian/patches/06_add-meego-desktop-file.patch
+++ b/debian/patches/06_add-meego-desktop-file.patch
@@ -1,14 +1,14 @@
 Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.am
 ===================================================================
---- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.am	2011-03-10 01:06:03.000000000 +0800
-+++ banshee/src/Extensions/Banshee.MeeGo/Makefile.am	2011-03-11 01:08:01.643675151 +0800
+--- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.am	2011-03-11 01:17:14.000000000 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/Makefile.am	2011-03-24 22:56:12.838012982 +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)|" $< > $@
  
 -desktopfiles_in_files = meego-panel-banshee.desktop.in
 +desktopfiles_in_files = meego-panel-banshee.desktop.in \
-+						banshee-1.desktop.in
++						banshee.desktop.in
  desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
  desktopfilesdir = $(datadir)/mutter-meego/panels
  desktopfiles_DATA = $(desktopfiles_files)
@@ -18,8 +18,8 @@ Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.am
  		meego-panel-banshee.desktop \
 -		meego-panel-banshee.desktop.in
 +		meego-panel-banshee.desktop.in \
-+		banshee-1.desktop \
-+		banshee-1.desktop.in
++		banshee.desktop \
++		banshee.desktop.in
  
  else
  EXTRA_DIST = $(SOURCES) $(RESOURCES)
@@ -27,53 +27,41 @@ Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.am
  	meego-panel-banshee \
  	com.meego.UX.Shell.Panels.banshee.service.in \
  	meego-panel-banshee.desktop.in.in
-+	banshee-1.desktop.in.in
++	banshee.desktop.in.in
 Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.in
 ===================================================================
---- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.in	2011-03-11 01:02:59.000000000 +0800
-+++ banshee/src/Extensions/Banshee.MeeGo/Makefile.in	2011-03-11 01:08:53.596708123 +0800
-@@ -637,12 +637,14 @@
+--- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.in	2011-03-24 11:22:43.000000000 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/Makefile.in	2011-03-24 22:56:12.838012982 +0800
+@@ -638,12 +638,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 \
 - at HAVE_MEEGO_FALSE@	meego-panel-banshee.desktop.in.in
 + at HAVE_MEEGO_FALSE@	meego-panel-banshee.desktop.in.in \
-+ at HAVE_MEEGO_FALSE@	banshee-1.desktop.in.in
++ at HAVE_MEEGO_FALSE@	banshee.desktop.in.in
  @HAVE_MEEGO_TRUE at EXTRA_DIST = $(SOURCES_BUILD) $(RESOURCES_EXPANDED) \
  @HAVE_MEEGO_TRUE@	$(THEME_ICONS_SOURCE) \
  @HAVE_MEEGO_TRUE@	Banshee.MeeGo.dll.config meego-panel-banshee \
  @HAVE_MEEGO_TRUE@	com.meego.UX.Shell.Panels.banshee.service.in \
 - at HAVE_MEEGO_TRUE@	meego-panel-banshee.desktop.in.in
 + at HAVE_MEEGO_TRUE@	meego-panel-banshee.desktop.in.in \
-+ at HAVE_MEEGO_TRUE@	banshee-1.desktop.in.in
++ at HAVE_MEEGO_TRUE@	banshee.desktop.in.in
  @HAVE_MEEGO_TRUE at CLEANFILES = $(OUTPUT_FILES)
  @HAVE_MEEGO_TRUE at DISTCLEANFILES = *.pidb
  @HAVE_MEEGO_TRUE at MAINTAINERCLEANFILES = Makefile.in
-@@ -650,7 +652,7 @@
+@@ -651,7 +653,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
 - at HAVE_MEEGO_TRUE@desktopfiles_in_files = meego-panel-banshee.desktop.in
-+ at HAVE_MEEGO_TRUE@desktopfiles_in_files = meego-panel-banshee.desktop.in banshee-1.desktop.in
++ at HAVE_MEEGO_TRUE@desktopfiles_in_files = meego-panel-banshee.desktop.in banshee.desktop.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)
-@@ -973,7 +975,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 \
-- at HAVE_MEEGO_TRUE@		meego-panel-banshee.desktop.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.
- .NOEXPORT:
-Index: banshee/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in
+Index: banshee/src/Extensions/Banshee.MeeGo/banshee.desktop.in.in
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ banshee/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in	2011-03-11 01:08:01.643675151 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/banshee.desktop.in.in	2011-03-24 22:56:12.898012624 +0800
 @@ -0,0 +1,11 @@
 +[Desktop Entry]
 +_Name=Banshee Netbook

-- 
banshee