From aedebfe9a9e41f2cdc6e1cc50bdc24046692af52 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Mon, 21 Mar 2011 09:21:58 +0100
Subject: [PATCH] * APPLICATION_NAME is now Tomahawk instead of Player. A few
 more build system fixes.

---
 CMakeLists.txt                 | 6 +++---
 admin/mac/Info.plist           | 4 ++--
 admin/mac/build-release-osx.sh | 3 ++-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f20d19228..6552d24e2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
 ###
 SET( ORGANIZATION_NAME "Tomahawk" )
 SET( ORGANIZATION_DOMAIN "tomahawk-player.org" )
-SET( APPLICATION_NAME  "Player" )
+SET( APPLICATION_NAME  "Tomahawk" )
 SET( VERSION  "0.0.1" )
 
 
@@ -18,10 +18,10 @@ SET( THIRDPARTY_DIR  ${CMAKE_SOURCE_DIR}/thirdparty )
 IF( "${gui}" STREQUAL "no" )
     ADD_DEFINITIONS( -DENABLE_HEADLESS )
     MESSAGE( STATUS "Building in HEADLESS mode ***" )
-	FIND_PACKAGE( Qt4 4.6.0 COMPONENTS QtCore QtXml QtNetwork REQUIRED )
+	FIND_PACKAGE( Qt4 4.7.0 COMPONENTS QtCore QtXml QtNetwork REQUIRED )
 ELSE()
     MESSAGE( STATUS "Building full GUI version ***" )
-	FIND_PACKAGE( Qt4 4.6.0 COMPONENTS QtGui QtCore QtXml QtNetwork REQUIRED )
+	FIND_PACKAGE( Qt4 4.7.0 COMPONENTS QtGui QtCore QtXml QtNetwork REQUIRED )
 ENDIF()
 
 #deps
diff --git a/admin/mac/Info.plist b/admin/mac/Info.plist
index f43437a4d..e14ff442a 100644
--- a/admin/mac/Info.plist
+++ b/admin/mac/Info.plist
@@ -5,9 +5,9 @@
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
-	<string>tomahawk</string>
+	<string>Tomahawk</string>
 	<key>CFBundleIdentifier</key>
-	<string>org.tomahawk-player.org.Tomahawk</string>
+	<string>org.tomahawk-player.Tomahawk</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
diff --git a/admin/mac/build-release-osx.sh b/admin/mac/build-release-osx.sh
index 2c9f17b6c..c3454be9c 100755
--- a/admin/mac/build-release-osx.sh
+++ b/admin/mac/build-release-osx.sh
@@ -48,8 +48,9 @@ CREATEDMG='1'
     header "Running install_name_tool"
     $ROOT/../admin/mac/deposx.sh
 
-    header "Renaming icon & copying Info.plist"
+    header "Renaming files & copying Info.plist"
     mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns
+    mv Contents/MacOS/tomahawk Contents/MacOS/Tomahawk
     cp $ROOT/../admin/mac/Info.plist Contents/Info.plist
 
     header "Copying Sparkle pubkey & framework, and qt.conf"