Complete rename of binaries and desktop files

Signed-off-by: Gabriel Burt <gabriel.burt@gmail.com>

10 files changed, 16 insertions, 16 deletions

diff --git a/extras/banshee-gather-debug b/extras/banshee-gather-debug
index 901a40c29..aaf0cb7a9 100755
--- a/extras/banshee-gather-debug
+++ b/extras/banshee-gather-debug
@@ -24,8 +24,8 @@ function begin_log () {
 }
 
 function find_pid () {
-	BANSHEE_PID=`(pidof banshee-1 2>/dev/null || 
-		(ps -eo pid,cmd | awk '/mono.*banshee-1\/.*.exe/ { print $1 }')2>/dev/null) | 
+	BANSHEE_PID=`(pidof banshee 2>/dev/null || 
+		(ps -eo pid,cmd | awk '/mono.*banshee\/.*.exe/ { print $1 }')2>/dev/null) | 
 		tr -d '[:space:]'`
 	
 	[[ -z "$BANSHEE_PID" ]] && \
@@ -41,7 +41,7 @@ function capture_mono_stack_trace () {
 function capture_gdb_stack_trace () {
 	echo -n " - Running gdb to get a stack dump: "
 	begin_log "Running gdb (where, detach, quit)"
-	gdb --quiet --pid=$(pidof banshee-1) -ex where -ex detach -ex quit 1>&2 \
+	gdb --quiet --pid=$(pidof banshee) -ex where -ex detach -ex quit 1>&2 \
 		&& echo "success" \
 		|| echo "error"
 }
diff --git a/extras/create-release-notes b/extras/create-release-notes
index 0ef3c9b52..430f5b0ed 100755
--- a/extras/create-release-notes
+++ b/extras/create-release-notes
@@ -36,10 +36,10 @@ $all_contributors = $3;
 $html = <<END;
 <ul>
 	<li><strong>Release Date:</strong> $release_date</li>
-	<li><strong>Source Tarball:</strong> <a href="http://download.banshee-project.org/banshee/$stable/$version/banshee-1-$version.tar.bz2">banshee-1-$version.tar.bz2</a></li>
+	<li><strong>Source Tarball:</strong> <a href="http://download.banshee-project.org/banshee/$stable/$version/banshee-$version.tar.bz2">banshee-1-$version.tar.bz2</a></li>
 	<li><strong>Release Information:</strong>
-<a href="http://download.banshee-project.org/banshee/$stable/$version/banshee-1-$version.news">NEWS</a>,
-<a href="http://download.banshee-project.org/banshee/$stable/$version/banshee-1-$version.sha256sum">sha256sum</a></li>
+<a href="http://download.banshee-project.org/banshee/$stable/$version/banshee-$version.news">NEWS</a>,
+<a href="http://download.banshee-project.org/banshee/$stable/$version/banshee-$version.sha256sum">sha256sum</a></li>
 </ul>
 <p style="margin-left: 1.5em"><a href="/download"><img title="Download the latest Banshee!" src="/theme/css/images/download-button.png" alt="Download Now" /></a></p>
 
diff --git a/extras/push-meego b/extras/push-meego
index 6b7e7f43b..2893902a1 100755
--- a/extras/push-meego
+++ b/extras/push-meego
@@ -4,7 +4,7 @@ import os
 import sys
 import subprocess
 
-prefix = '/usr/lib/banshee-1'
+prefix = '/usr/lib/banshee'
 exclude_files = []
 sync_files = {}
 last_sync_files = {}
@@ -50,4 +50,4 @@ for dirname, files in sync_files.iteritems ():
     scp.append (os.path.abspath (os.path.join (prefix, dirname)))
     os.waitpid (subprocess.Popen (scp).pid, 0)
 
-subprocess.call (['meego-ssh', 'killall', '-9', 'Xorg', 'mutter', 'banshee-1'])
+subprocess.call (['meego-ssh', 'killall', '-9', 'Xorg', 'mutter', 'banshee'])
diff --git a/gstreamer/gst-package.mk b/gstreamer/gst-package.mk
index 6f0efb4a6..66f51d22c 100644
--- a/gstreamer/gst-package.mk
+++ b/gstreamer/gst-package.mk
@@ -1,5 +1,5 @@
 GST_INFO_FLAGS = \
 	-DGST_LICENSE=\"LGPL\" \
-	-DGST_PACKAGE_NAME=\"banshee-1\" \
+	-DGST_PACKAGE_NAME=\"$(PACKAGE)\" \
 	-DGST_PACKAGE_ORIGIN=\"gst-plugins-good\"
 
diff --git a/src/Clients/Beroe/Beroe/IndexerClient.cs b/src/Clients/Beroe/Beroe/IndexerClient.cs
index 538ff87e1..69fffedb3 100644
--- a/src/Clients/Beroe/Beroe/IndexerClient.cs
+++ b/src/Clients/Beroe/Beroe/IndexerClient.cs
@@ -73,7 +73,7 @@ namespace Beroe
 
         private static void Startup ()
         {
-            Paths.ApplicationName = "banshee-1";
+            Paths.ApplicationName = "banshee";
 
             ThreadAssist.InitializeMainThread ();
 
@@ -113,7 +113,7 @@ namespace Beroe
                 // FIXME: Using Process.Start sucks, but DBus doesn't let you specify
                 // extra command line arguments
                 DBusConnection.Disconnect ("CollectionIndexer");
-                Process.Start ("banshee-1", builder.ToString ());
+                Process.Start ("banshee", builder.ToString ());
                 // Bus.Session.StartServiceByName (DBusConnection.DefaultBusName);
                 // Bus.Session.Iterate ();
             }
diff --git a/src/Clients/Booter/Booter/Entry.cs b/src/Clients/Booter/Booter/Entry.cs
index 5a676ef17..80530b884 100644
--- a/src/Clients/Booter/Booter/Entry.cs
+++ b/src/Clients/Booter/Booter/Entry.cs
@@ -145,7 +145,7 @@ namespace Booter
 
         private static void ShowHelp ()
         {
-            Console.WriteLine ("Usage: {0} [options...] [files|URIs...]", "banshee-1");
+            Console.WriteLine ("Usage: {0} [options...] [files|URIs...]", "banshee");
             Console.WriteLine ();
 
             Layout commands = new Layout (
diff --git a/src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs b/src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs
index 40acae3ab..f81d557bf 100644
--- a/src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs
+++ b/src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs
@@ -279,7 +279,7 @@ namespace Banshee.ServiceStack
         }
 
         public static string InternalName {
-            get { return "banshee-1"; }
+            get { return "banshee"; }
         }
 
         public static string IconName {
diff --git a/src/Extensions/Banshee.MeeGo/meego-panel-banshee b/src/Extensions/Banshee.MeeGo/meego-panel-banshee
index 9777ef37a..592e722f2 100755
--- a/src/Extensions/Banshee.MeeGo/meego-panel-banshee
+++ b/src/Extensions/Banshee.MeeGo/meego-panel-banshee
@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-banshee-1 --hide --redirect-log
+banshee --hide --redirect-log
diff --git a/src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs b/src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs
index af28a8508..f040ffb16 100644
--- a/src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs
+++ b/src/Extensions/Banshee.Mpris/Banshee.Mpris/MediaPlayer.cs
@@ -107,7 +107,7 @@ namespace Banshee.Mpris
         }
 
         public string DesktopEntry {
-            get { return "banshee-1"; }
+            get { return "banshee"; }
         }
 
         // This is just a list of commonly supported MIME types.
diff --git a/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs b/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs
index 83585f92f..353d370c2 100644
--- a/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs
+++ b/src/Extensions/Banshee.SoundMenu/Banshee.SoundMenu/SoundMenuProxy.cs
@@ -36,7 +36,7 @@ namespace Banshee.SoundMenu
     {
         private const string DBusInterface = "com.canonical.indicators.sound";
         private const string DBusPath = "/com/canonical/indicators/sound/service";
-        private const string desktop_name = "banshee-1";
+        private const string desktop_name = "banshee";
 
         private delegate void SoundStateUpdateHandler (int new_state);