[Pkg-cli-apps-commits] [SCM] banshee branch, master, updated. debian/1.4.3-5-11-g645aac9

Sat Jul 18 19:19:28 UTC 2009

The following commit has been merged in the master branch:
commit 645aac92a98b105c2cd7dbae3c80e6bbb8273d34
Author: Chow Loong Jin <hyperair at gmail.com>
Date:   Sun Jul 19 03:03:32 2009 +0800

    Add Muinshee booter script
    
    * debian/patches/03_muinshee-booter.patch,
      debian/banshee.links,
      debian/banshee.1:
      + Patch banshee booter script to autodetect whether to use Banshee or
        Muinshee interface based on the file name
      + Make /usr/bin/muinshee a symlink of /usr/bin/banshee-1
      + Update banshee.1 manpage and link it to muinshee.1
    
    Conflicts:
    
    	debian/banshee.links
    	debian/changelog
    	debian/patches/series

diff --git a/debian/banshee.1 b/debian/banshee.1
index 8cc90d8..f6dc3e6 100644
--- a/debian/banshee.1
+++ b/debian/banshee.1
@@ -1,9 +1,16 @@
 .TH BANSHEE "1" "June 2009" "Banshee 1.4.3 (1.4.3) http://banshee-project.org" "User Commands"
 .SH NAME
-Banshee \- Media Management and Playback application 
+Banshee \- Media Management and Playback application
+.
+.br
+Muinshee \- Media Management and Playback application
 .SH SYNOPSIS
 .B banshee-1
 [\fIoptions\fR...] [\fIfiles|URIs\fR...]
+.
+.br
+.B muinshee
+[\fIoptions\fR...] [\fIfiles|URIs\fR...]
 .SH DESCRIPTION
 Banshee is an media management and playback application for the GNOME desktop, allowing users to import audio from CDs, search their library, create playlists of selections of their library, sync music to/from iPods and other media devices, play and manage video files and burn selections to a CD. 
 .SH OPTIONS
diff --git a/debian/banshee.links b/debian/banshee.links
index 1ca6055..87fc0a9 100644
--- a/debian/banshee.links
+++ b/debian/banshee.links
@@ -1,2 +1,4 @@
 usr/bin/banshee-1 usr/bin/banshee
-usr/share/man1/banshee-1.1.gz usr/share/man1/banshee.1.gz
+usr/bin/banshee-1 usr/bin/muinshee
+usr/share/man/man1/banshee.1.gz usr/share/man/man1/banshee-1.1.gz
+usr/share/man/man1/banshee.1.gz usr/share/man/man1/muinshee.1.gz
diff --git a/debian/changelog b/debian/changelog
index 228e519..9dceec5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,13 @@ banshee (1.4.3-6) UNRELEASED; urgency=low
     + Updated to include changes in directory structure
   * debian/banshee.links:
     + Updated to symlink the banshee manpage to banshee-1
+    + Make /usr/bin/muinshee a symlink to /usr/bin/banshee-1
+    + Make muinshee.1 manpage a symlink to banshee.1
+  * debian/banshee.1:
+    + Update to show muinshee as well
+  * debian/patches/03_muinshee-booter.patch:
+    + Patch banshee booter script to autodetect whether to use Banshee or
+      Muinshee interface based on file name
 
   [ Iain Lane ]
   * debian/banshee.{1,manpages} Add manpage. This was initially generated by
diff --git a/debian/patches/03_muinshee-booter.patch b/debian/patches/03_muinshee-booter.patch
new file mode 100644
index 0000000..328c3a9
--- /dev/null
+++ b/debian/patches/03_muinshee-booter.patch
@@ -0,0 +1,52 @@
+From ce2645b8df5ae5aae16f511d664666631b872936 Mon Sep 17 00:00:00 2001
+From: Chow Loong Jin <hyperair at gmail.com>
+Date: Sat, 30 May 2009 03:28:51 +0800
+Subject: [PATCH] Add muinshee booter script
+
+* Patch banshee-1.in to automagically detect from $0 whether we're running
+  banshee-1 (or banshee for some systems which use that for backward
+  compatibility), or muinshee.
+* Symlink /usr/bin/muinshee to banshee-1
+---
+ src/Clients/Booter/Makefile.am  |    3 +++
+ src/Clients/Booter/banshee-1.in |    7 ++++++-
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/src/Clients/Booter/Makefile.am b/src/Clients/Booter/Makefile.am
+index 30433b1..621f8d6 100644
+--- a/src/Clients/Booter/Makefile.am
++++ b/src/Clients/Booter/Makefile.am
+@@ -8,3 +8,6 @@ include $(top_srcdir)/build/build.mk
+ bin_SCRIPTS = banshee-1
+ EXTRA_DIST += Banshee.exe.config
+ module_SCRIPTS += Banshee.exe.config
++
++install-exec-hook:
++	$(LN_S) banshee-1 $(DESTDIR)$(bindir)/muinshee
+diff --git a/src/Clients/Booter/banshee-1.in b/src/Clients/Booter/banshee-1.in
+index bf974c0..f0ff4db 100644
+--- a/src/Clients/Booter/banshee-1.in
++++ b/src/Clients/Booter/banshee-1.in
+@@ -4,13 +4,18 @@ prefix=@prefix@
+ libdir=@expanded_libdir@
+ exec_asm="Banshee.exe"
+ MONO_EXE="@expanded_libdir@/@PACKAGE@/$exec_asm"
+-BANSHEE_EXEC_NAME="banshee-1"
++BANSHEE_EXEC_NAME=$(basename $0)
+ BANSHEE_CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/banshee-1"
+ 
+ export DYLD_LIBRARY_PATH=@expanded_libdir@:@expanded_libdir@/@PACKAGE@${DYLD_LIBRARY_PATH+:$DYLD_LIBRARY_PATH}
+ export LD_LIBRARY_PATH=@expanded_libdir@:@expanded_libdir@/@PACKAGE@${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
+ export GST_PLUGIN_PATH=@expanded_libdir@/@PACKAGE@/gstreamer-0.10${GST_PLUGIN_PATH+:$GST_PLUGIN_PATH}
++if [ $BANSHEE_EXEC_NAME = "muinshee" ]; then
++    BANSHEE_CLIENT="Muinshee"
++    export MONO_PATH=@expanded_libdir@/@PACKAGE@/Extensions
++fi
+ 
++[ ${BANSHEE_EXEC_NAME%%-1} = "banshee" ] && BANSHEE_EXEC_NAME="banshee-1"
+ [ -n "$BANSHEE_DEBUG" -o -f "${BANSHEE_CONFIG_DIR}/always-debug" ] && BANSHEE_DEBUG="--debug"
+ [ -n "$BANSHEE_TRACE" ] && BANSHEE_TRACE="--trace=$BANSHEE_TRACE"
+ [ -n "$BANSHEE_PROFILE" ] && BANSHEE_PROFILE="--profile=$BANSHEE_PROFILE"
+-- 
+1.6.3.1
+
diff --git a/debian/patches/series b/debian/patches/series
index 2fcc058..decba2d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 01_remove-bash-dep.patch
 02_system-equalizer.patch
 03_fix-lastfm.patch
+03_muinshee-booter.patch
 20_check_notification_support.patch
 99_ltmain_as-needed.patch

-- 
banshee

