[Pkg-cli-apps-commits] [SCM] banshee branch, experimental, updated. debian/1.9.0-1-10-g93a69ad
Iain Lane
laney at ubuntu.com
Sun Dec 19 20:34:36 UTC 2010
The following commit has been merged in the experimental branch:
commit b2cc56de93e5a03fd66c21f802a8d938e618fa57
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Sun Nov 21 12:21:09 2010 +0800
debian/patches/06_add-meego-desktop-file.patch: Refresh
diff --git a/debian/patches/06_add-meego-desktop-file.patch b/debian/patches/06_add-meego-desktop-file.patch
index bce53be..c23b78b 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/src/Extensions/Banshee.MeeGo/Makefile.am
===================================================================
---- 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
+--- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.am 2010-11-11 22:43:50.000000000 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/Makefile.am 2010-11-21 12:18:53.953788761 +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)|" $< > $@
@@ -30,9 +30,9 @@ Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.am
+ banshee-1.desktop.in.in
Index: banshee/src/Extensions/Banshee.MeeGo/Makefile.in
===================================================================
---- 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 @@
+--- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.in 2010-11-21 12:14:19.000000000 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/Makefile.in 2010-11-21 12:19:48.903832680 +0800
+@@ -618,12 +618,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/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
-@@ -640,7 +642,7 @@
+@@ -631,7 +633,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,11 @@ Index: banshee/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)
-@@ -963,7 +965,10 @@
+@@ -1002,11 +1004,12 @@
+
+ @HAVE_MEEGO_TRUE@%.desktop.in: %.desktop.in.in Makefile
+ @HAVE_MEEGO_TRUE@ sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+-
@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,14 +70,13 @@ Index: banshee/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.
- .NOEXPORT:
Index: banshee/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ banshee/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in 2010-09-18 14:13:55.430498112 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in 2010-11-21 12:18:53.953788761 +0800
@@ -0,0 +1,11 @@
+[Desktop Entry]
+_Name=Banshee Netbook
--
banshee
More information about the Pkg-cli-apps-commits
mailing list