[Pkg-cli-apps-commits] [SCM] banshee branch, ubuntu/maverick, updated. debian/1.7.3-2ubuntu2-15-g2577c6a

Chow Loong Jin hyperair at ubuntu.com
Fri Aug 13 02:56:32 UTC 2010 

The following commit has been merged in the ubuntu/maverick branch:
commit 656b5deb1fe0ace2b2f30226447a74ef4e706a54
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date:   Fri Aug 13 00:49:58 2010 +0800

    Refresh 06_add-meego-desktop-file.patch

diff --git a/debian/changelog b/debian/changelog
index b912b48..3691700 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,10 @@ banshee (1.7.4-1ubuntu1) maverick; urgency=low
       - 08_remove_unrelevant_media.patch: Don't show "media" in netbook
         interface as this is irrelevant on non-Meego interfaces
     + debian/banshee-meego.install: Install desktop file for Banshee netbook interface
+  * Ubuntu-specific changes from previous merge:
+    + debian/patches/06_add-meego-desktop-file.patch: Refreshed.
 
- -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 13 Aug 2010 00:37:19 +0800
+ -- Chow Loong Jin <hyperair at ubuntu.com>  Fri, 13 Aug 2010 00:49:27 +0800
 
 banshee (1.7.4-1) UNRELEASED; urgency=low
 
diff --git a/debian/patches/06_add-meego-desktop-file.patch b/debian/patches/06_add-meego-desktop-file.patch
index 8ddd4d7..ec951f6 100644
--- a/debian/patches/06_add-meego-desktop-file.patch
+++ b/debian/patches/06_add-meego-desktop-file.patch
@@ -1,20 +1,20 @@
-Index: banshee-1.7.2/src/Extensions/Banshee.MeeGo/Makefile.am
+Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.am
 ===================================================================
---- 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
+--- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.am	2010-08-13 00:32:56.000000000 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/Makefile.am	2010-08-13 00:41:07.564679264 +0800
 @@ -37,7 +37,8 @@
- org.moblin.UX.Shell.Panels.banshee.service: org.moblin.UX.Shell.Panels.banshee.service.in $(top_builddir)/config.log
+ 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
  desktopfiles_files = $(desktopfiles_in_files:.desktop.in=.desktop)
- desktopfilesdir = $(datadir)/mutter-moblin/panels
+ desktopfilesdir = $(datadir)/mutter-meego/panels
  desktopfiles_DATA = $(desktopfiles_files)
 @@ -48,7 +49,9 @@
  clean-local:
- 	rm -f org.moblin.UX.Shell.Panels.banshee.service \
+ 	rm -f com.meego.UX.Shell.Panels.banshee.service \
  		meego-panel-banshee.desktop \
 -		meego-panel-banshee.desktop.in
 +		meego-panel-banshee.desktop.in \
@@ -25,54 +25,54 @@ Index: banshee-1.7.2/src/Extensions/Banshee.MeeGo/Makefile.am
  EXTRA_DIST = $(SOURCES) $(RESOURCES)
 @@ -59,3 +62,4 @@
  	meego-panel-banshee \
- 	org.moblin.UX.Shell.Panels.banshee.service.in \
+ 	com.meego.UX.Shell.Panels.banshee.service.in \
  	meego-panel-banshee.desktop.in.in
 +	banshee-1.desktop.in.in
-Index: banshee-1.7.2/src/Extensions/Banshee.MeeGo/Makefile.in
+Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.in
 ===================================================================
---- 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 @@
+--- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.in	2010-08-13 00:32:56.000000000 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/Makefile.in	2010-08-13 00:45:28.823205322 +0800
+@@ -608,12 +608,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 \
+ @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-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 \
+ @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
  @HAVE_MEEGO_TRUE at CLEANFILES = $(OUTPUT_FILES)
  @HAVE_MEEGO_TRUE at DISTCLEANFILES = *.pidb
  @HAVE_MEEGO_TRUE at MAINTAINERCLEANFILES = Makefile.in
-@@ -610,7 +612,7 @@
+@@ -621,7 +623,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
+ @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
  @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 desktopfilesdir = $(datadir)/mutter-meego/panels
  @HAVE_MEEGO_TRUE at desktopfiles_DATA = $(desktopfiles_files)
-@@ -982,7 +984,9 @@
+@@ -944,7 +946,9 @@
  @HAVE_MEEGO_TRUE at clean-local:
- @HAVE_MEEGO_TRUE@	rm -f org.moblin.UX.Shell.Panels.banshee.service \
+ @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.
-Index: banshee-1.7.2/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-1.7.2/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in	2010-07-20 12:10:04.000000000 +0200
++++ banshee/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in	2010-08-13 00:41:07.564679264 +0800
 @@ -0,0 +1,11 @@
 +[Desktop Entry]
 +_Name=Banshee Netbook

-- 
banshee

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