[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/1.9.3-2-6-g9ede362
Chow Loong Jin
hyperair at ubuntu.com
Wed Feb 23 17:42:09 UTC 2011
The following commit has been merged in the master branch:
commit 61986b346319c3b3fc4acd0bf2882614bf840e6b
Author: Chow Loong Jin <hyperair at ubuntu.com>
Date: Thu Feb 24 01:31:33 2011 +0800
Refresh patches and drop upstreamed patches
diff --git a/debian/patches/0001-Don-t-copy-duplicate-libraries.patch b/debian/patches/0001-Don-t-copy-duplicate-libraries.patch
deleted file mode 100644
index 9fa42ee..0000000
--- a/debian/patches/0001-Don-t-copy-duplicate-libraries.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1ea0f3d0476d5e26fcbbfbf382fbef7352f10115 Mon Sep 17 00:00:00 2001
-From: Iain Lane <laney at ubuntu.com>
-Date: Sun, 5 Sep 2010 13:36:18 +0100
-Subject: [PATCH 1/2] Don't copy duplicate libraries
-
-GIO# and GTK#Beans both supply the same library, gio-sharp.dll. If we
-try to install both of these then automake falls over. Ensure that we
-only try to copy one of each library.
----
- build/m4/banshee/gio.m4 | 8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-Index: banshee/build/m4/banshee/gio.m4
-===================================================================
---- banshee.orig/build/m4/banshee/gio.m4 2010-09-18 01:48:55.000000000 +0800
-+++ banshee/build/m4/banshee/gio.m4 2010-09-18 02:04:25.358986523 +0800
-@@ -16,9 +16,13 @@
-
- asms="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0` `$PKG_CONFIG --variable=Libraries gtk-sharp-beans-2.0`"
- for asm in $asms; do
-- GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
-- [[ -r "$asm.config" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
-- [[ -r "$asm.mdb" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.mdb"
-+ FILENAME=`basename $asm`
-+ if [[ "`echo $SEENBEFORE | grep $FILENAME`" = "" ]]; then
-+ GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
-+ [[ -r "$asm.config" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
-+ [[ -r "$asm.mdb" ]] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.mdb"
-+ SEENBEFORE="$SEENBEFORE $FILENAME"
-+ fi
- done
- AC_SUBST(GIOSHARP_ASSEMBLIES)
-
-Index: banshee/configure
-===================================================================
---- banshee.orig/configure 2010-09-18 01:48:55.000000000 +0800
-+++ banshee/configure 2010-09-18 02:06:14.419521065 +0800
-@@ -17454,9 +17454,13 @@
-
- asms="`$PKG_CONFIG --variable=Libraries gio-sharp-2.0` `$PKG_CONFIG --variable=Libraries gtk-sharp-beans-2.0`"
- for asm in $asms; do
-- GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
-- [ -r "$asm.config" ] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
-- [ -r "$asm.mdb" ] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.mdb"
-+ FILENAME=`basename $asm`
-+ if [ "`echo $SEENBEFORE | grep $FILENAME`" = "" ]; then
-+ GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm"
-+ [ -r "$asm.config" ] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.config"
-+ [ -r "$asm.mdb" ] && GIOSHARP_ASSEMBLIES="$GIOSHARP_ASSEMBLIES $asm.mdb"
-+ SEENBEFORE="$SEENBEFORE $FILENAME"
-+ fi
- done
-
-
diff --git a/debian/patches/06_add-meego-desktop-file.patch b/debian/patches/06_add-meego-desktop-file.patch
index 6ed211a..72ad685 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-12-27 10:54:59.000000000 +0800
-+++ banshee/src/Extensions/Banshee.MeeGo/Makefile.am 2011-01-13 16:05:47.210631355 +0800
+--- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.am 2011-02-10 01:10:25.000000000 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/Makefile.am 2011-02-24 01:29:07.969611655 +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 2011-01-13 14:44:41.000000000 +0800
-+++ banshee/src/Extensions/Banshee.MeeGo/Makefile.in 2011-01-13 16:07:47.946674498 +0800
-@@ -633,12 +633,14 @@
+--- banshee.orig/src/Extensions/Banshee.MeeGo/Makefile.in 2011-02-24 01:28:42.000000000 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/Makefile.in 2011-02-24 01:30:17.862526921 +0800
+@@ -632,12 +632,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
-@@ -646,7 +648,7 @@
+@@ -645,7 +647,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/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)
-@@ -969,7 +971,10 @@
+@@ -1020,7 +1022,9 @@
@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 +66,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 2011-01-13 16:05:47.217297987 +0800
++++ banshee/src/Extensions/Banshee.MeeGo/banshee-1.desktop.in.in 2011-02-24 01:29:07.972944968 +0800
@@ -0,0 +1,11 @@
+[Desktop Entry]
+_Name=Banshee Netbook
diff --git a/debian/patches/series b/debian/patches/series
index bf67a79..8cacd23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,6 +7,5 @@
07_enable-library-watch-by-default.patch
07_enable-mpris-by-default.patch
08_remove_unrelevant_media.patch
-0001-Don-t-copy-duplicate-libraries.patch
0001-Revert-ArtworkManager-Cache-null-artwork-for-fast-lo.patch
99_ltmain_as-needed.patch
--
banshee
More information about the Pkg-cli-apps-commits
mailing list