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

Chow Loong Jin hyperair at ubuntu.com
Thu Jul 22 21:30:16 UTC 2010 

The following commit has been merged in the ubuntu/maverick branch:
commit c22ef84c70b1015db1ab72e1125777ae14a1cc2a
Author: Didier Roche <didrocks at ubuntu.com>
Date:   Tue Jul 20 12:23:28 2010 +0200

    Imported Debian patch 1.7.2-1ubuntu3

diff --git a/debian/banshee-meego.install b/debian/banshee-meego.install
index 40cac87..e0b55d0 100644
--- a/debian/banshee-meego.install
+++ b/debian/banshee-meego.install
@@ -1,4 +1,4 @@
 debian/tmp/usr/lib/banshee-1/MeeGo.exe
 debian/tmp/usr/lib/banshee-1/Extensions/Banshee.MeeGo.dll*
-debian/tmp/usr/share/mutter-moblin/panels/banshee-netbook.desktop usr/share/applications
+debian/tmp/usr/share/mutter-moblin/panels/banshee-1.desktop usr/share/une/applications
 debian/tmp/usr/share/dbus-1/services/org.moblin*
diff --git a/debian/changelog b/debian/changelog
index dd4d71d..b6cca5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+banshee (1.7.2-1ubuntu3) maverick; urgency=low
+
+  * debian/patches/06_add-meego-desktop-file.patch,
+    debian/banshee-meego.install:
+    - desktop file is now called banshee-1 and installed
+    in usr/share/une/applications/ to show the une desktop file in UNE
+    session only
+
+ -- Didier Roche <didrocks at ubuntu.com>  Tue, 20 Jul 2010 12:23:28 +0200
+
 banshee (1.7.2-1ubuntu2) maverick; urgency=low
 
   * add debian/patches/08_remove_unrelevant_media.patch:
diff --git a/debian/patches/06_add-meego-desktop-file.patch b/debian/patches/06_add-meego-desktop-file.patch
index 984d1da..8ddd4d7 100644
--- a/debian/patches/06_add-meego-desktop-file.patch
+++ b/debian/patches/06_add-meego-desktop-file.patch
@@ -1,30 +1,14 @@
-Index: banshee-1.7.1/src/Extensions/Banshee.MeeGo/banshee-netbook.desktop.in.in
+Index: banshee-1.7.2/src/Extensions/Banshee.MeeGo/Makefile.am
 ===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ banshee-1.7.1/src/Extensions/Banshee.MeeGo/banshee-netbook.desktop.in.in	2010-07-05 15:00:17.000000000 +0200
-@@ -0,0 +1,11 @@
-+[Desktop Entry]
-+_Name=Banshee Netbook
-+_GenericName=Netbook Media Player
-+_X-GNOME-FullName=Netbook Banshee Media Player
-+_Comment=Play and organize your media collection
-+Exec=banshee --client=MeeGo
-+Terminal=false
-+Type=Application
-+Icon=media-player-banshee
-+Categories=GNOME;Audio;Music;Player;AudioVideo;
-+StartupNotify=true
-Index: banshee-1.7.1/src/Extensions/Banshee.MeeGo/Makefile.am
-===================================================================
---- banshee-1.7.1.orig/src/Extensions/Banshee.MeeGo/Makefile.am	2010-04-28 19:15:07.000000000 +0200
-+++ banshee-1.7.1/src/Extensions/Banshee.MeeGo/Makefile.am	2010-07-05 15:00:17.000000000 +0200
+--- banshee-1.7.2.orig/src/Extensions/Banshee.MeeGo/Makefile.am	2010-05-29 05:03:52.000000000 +0200
++++ banshee-1.7.2/src/Extensions/Banshee.MeeGo/Makefile.am	2010-07-20 12:20:26.272524002 +0200
 @@ -37,7 +37,8 @@
  org.moblin.UX.Shell.Panels.banshee.service: org.moblin.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-netbook.desktop.in
++						banshee-1.desktop.in
  desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
  desktopfilesdir = $(datadir)/mutter-moblin/panels
  desktopfiles_DATA = $(desktopfiles_files)
@@ -34,8 +18,8 @@ Index: banshee-1.7.1/src/Extensions/Banshee.MeeGo/Makefile.am
  		meego-panel-banshee.desktop \
 -		meego-panel-banshee.desktop.in
 +		meego-panel-banshee.desktop.in \
-+		banshee-netbook.desktop \
-+		banshee-netbook.desktop.in
++		banshee-1.desktop \
++		banshee-1.desktop.in
  
  else
  EXTRA_DIST = $(SOURCES) $(RESOURCES)
@@ -43,45 +27,61 @@ Index: banshee-1.7.1/src/Extensions/Banshee.MeeGo/Makefile.am
  	meego-panel-banshee \
  	org.moblin.UX.Shell.Panels.banshee.service.in \
  	meego-panel-banshee.desktop.in.in
-+	banshee-netbook.desktop.in.in
-Index: banshee-1.7.1/src/Extensions/Banshee.MeeGo/Makefile.in
++	banshee-1.desktop.in.in
+Index: banshee-1.7.2/src/Extensions/Banshee.MeeGo/Makefile.in
 ===================================================================
---- banshee-1.7.1.orig/src/Extensions/Banshee.MeeGo/Makefile.in	2010-07-05 15:01:00.057387001 +0200
-+++ banshee-1.7.1/src/Extensions/Banshee.MeeGo/Makefile.in	2010-07-05 15:03:43.569387001 +0200
-@@ -587,12 +587,14 @@
+--- banshee-1.7.2.orig/src/Extensions/Banshee.MeeGo/Makefile.in	2010-06-30 12:22:56.000000000 +0200
++++ banshee-1.7.2/src/Extensions/Banshee.MeeGo/Makefile.in	2010-07-20 12:20:57.140524000 +0200
+@@ -597,12 +597,14 @@
  @HAVE_MEEGO_FALSE at EXTRA_DIST = $(SOURCES) $(RESOURCES) \
  @HAVE_MEEGO_FALSE@	Banshee.MeeGo.dll.config meego-panel-banshee \
  @HAVE_MEEGO_FALSE@	org.moblin.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-netbook.desktop.in.in
++ at HAVE_MEEGO_FALSE@  banshee-1.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@	org.moblin.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-netbook.desktop.in.in
++ at HAVE_MEEGO_TRUE@	banshee-1.desktop.in.in
  @HAVE_MEEGO_TRUE at CLEANFILES = $(OUTPUT_FILES)
  @HAVE_MEEGO_TRUE at DISTCLEANFILES = *.pidb
  @HAVE_MEEGO_TRUE at MAINTAINERCLEANFILES = Makefile.in
-@@ -600,7 +602,7 @@
+@@ -610,7 +612,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 = org.moblin.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-netbook.desktop.in
++ at HAVE_MEEGO_TRUE@desktopfiles_in_files = meego-panel-banshee.desktop.in banshee-1.desktop.in
  @HAVE_MEEGO_TRUE at desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
  @HAVE_MEEGO_TRUE at desktopfilesdir = $(datadir)/mutter-moblin/panels
  @HAVE_MEEGO_TRUE at desktopfiles_DATA = $(desktopfiles_files)
-@@ -972,7 +974,9 @@
+@@ -982,7 +984,9 @@
  @HAVE_MEEGO_TRUE at clean-local:
  @HAVE_MEEGO_TRUE@	rm -f org.moblin.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-netbook.desktop \
-+ at HAVE_MEEGO_TRUE@		banshee-netbook.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-1.7.2/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ banshee-1.7.2/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in	2010-07-20 12:10:04.000000000 +0200
+@@ -0,0 +1,11 @@
++[Desktop Entry]
++_Name=Banshee Netbook
++_GenericName=Netbook Media Player
++_X-GNOME-FullName=Netbook Banshee Media Player
++_Comment=Play and organize your media collection
++Exec=banshee --client=MeeGo
++Terminal=false
++Type=Application
++Icon=media-player-banshee
++Categories=GNOME;Audio;Music;Player;AudioVideo;
++StartupNotify=true

-- 
banshee

More information about the Pkg-cli-apps-commits mailing list