From 1fbdd7d9e5a60638154af3d055cec15e7048f6ed Mon Sep 17 00:00:00 2001
From: skyjake <skyjake@users.sf.net>
Date: Sat, 16 Feb 2013 22:02:22 +0200
Subject: [PATCH] Mac OS X: Cleaned up bundle metadata for Doomsday and Shell

---
 doomsday/client/client.pro                    |   2 +-
 .../res/macx/English.lproj/InfoPlist.strings  | Bin 590 -> 594 bytes
 .../{build/mac => client/res/macx}/Info.plist |   2 ++
 .../res/macx/English.lproj/InfoPlist.strings  | Bin 0 -> 596 bytes
 .../tools/shell/shell-gui/res/macx/Info.plist |  22 ++++++++++++++++++
 doomsday/tools/shell/shell-gui/shell-gui.pro  |   6 ++++-
 .../tools/shell/shell-text/shell-text.pro     |   2 +-
 snowberry/buildapp.py                         |   2 +-
 8 files changed, 32 insertions(+), 4 deletions(-)
 rename doomsday/{build/mac => client/res/macx}/Info.plist (89%)
 create mode 100755 doomsday/tools/shell/shell-gui/res/macx/English.lproj/InfoPlist.strings
 create mode 100644 doomsday/tools/shell/shell-gui/res/macx/Info.plist

diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro
index fa41c3a3c6..42b0d5f81e 100644
--- a/doomsday/client/client.pro
+++ b/doomsday/client/client.pro
@@ -690,7 +690,7 @@ macx {
 
     QMAKE_BUNDLE_DATA += mod res data startupfonts startupgfx
 
-    QMAKE_INFO_PLIST = ../build/mac/Info.plist
+    QMAKE_INFO_PLIST = res/macx/Info.plist
 
     # Since qmake is unable to copy directories as bundle data, let's copy
     # the frameworks manually.
diff --git a/doomsday/client/res/macx/English.lproj/InfoPlist.strings b/doomsday/client/res/macx/English.lproj/InfoPlist.strings
index 70f9902c6baf44d6e25c6ee1bf0d77189d41a113..41afe4e0e541108f0b5376900ee711067d57637c 100755
GIT binary patch
delta 35
lcmX@da*1WaWp+ab0|q??gNZj{Va&-^jPDtZCu=dO006f62{Hfx

delta 31
jcmcb_a*k!fWmZcDJqF8(w_+iT$##tI8I30EF{uCmpVbKY

diff --git a/doomsday/build/mac/Info.plist b/doomsday/client/res/macx/Info.plist
similarity index 89%
rename from doomsday/build/mac/Info.plist
rename to doomsday/client/res/macx/Info.plist
index 8080291fc2..5fb4a42f6d 100644
--- a/doomsday/build/mac/Info.plist
+++ b/doomsday/client/res/macx/Info.plist
@@ -4,6 +4,8 @@
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
+	<key>CFBundleIdentifier</key>
+	<string>net.dengine.doomsday</string>
 	<key>CFBundleExecutable</key>
 	<string>Doomsday</string>
 	<key>CFBundleIconFile</key>
diff --git a/doomsday/tools/shell/shell-gui/res/macx/English.lproj/InfoPlist.strings b/doomsday/tools/shell/shell-gui/res/macx/English.lproj/InfoPlist.strings
new file mode 100755
index 0000000000000000000000000000000000000000..324a93292087ef01cf2b58cee5f721be89f91885
GIT binary patch
literal 596
zcmaKp%}&EW420**Q>=P|9s;39#03!LPgO;MdrFcLwaua=fXego9Kh#YS}p}eiFfVs
zWIX=-(!Tm~x{=qTGA&f;U4?RTuf#?z8Lyh?h$Y`kZYAeL&jH`6BRdDZ3aCDuJ3Oa4
z*NI+0=imyB;9nA*j(K}JgTs?)sb};$P4q;4!PC>x76z+(G<A9a_p5C}ra@<|*@itu
zU#f#Yn1=Lsn@P6y|EJEu9N828cZaGfOx~idg!heknlNe1=b;`oPI088W)4ShY!XM#
zX18c}b7k%Kx-!JUd$Ojz4k+7~(-@v9r-}{QCM_DG<(vG>Kf>D!a7&ccx}}l@*R8K$
rQ=VO}f`>D7*goTqcH!FNc8HUy2Ar<w%-Hsv9;a)%8+`;lb^O;i>rZ9s

literal 0
HcmV?d00001

diff --git a/doomsday/tools/shell/shell-gui/res/macx/Info.plist b/doomsday/tools/shell/shell-gui/res/macx/Info.plist
new file mode 100644
index 0000000000..23d2330682
--- /dev/null
+++ b/doomsday/tools/shell/shell-gui/res/macx/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>Doomsday Shell</string>
+	<key>CFBundleIdentifier</key>
+	<string>net.dengine.shell</string>
+	<key>CFBundleIconFile</key>
+	<string>shell.icns</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.10</string>
+</dict>
+</plist>
diff --git a/doomsday/tools/shell/shell-gui/shell-gui.pro b/doomsday/tools/shell/shell-gui/shell-gui.pro
index 31d5d7b74e..b07385fa85 100644
--- a/doomsday/tools/shell/shell-gui/shell-gui.pro
+++ b/doomsday/tools/shell/shell-gui/shell-gui.pro
@@ -13,7 +13,7 @@ TEMPLATE = app
 else:win32: TARGET = Doomsday-Shell
       else: TARGET = doomsday-shell
 
-VERSION = 1.0.0
+VERSION = $$DENG_VERSION
 
 # Build Configuration -------------------------------------------------------
 
@@ -62,6 +62,10 @@ RESOURCES += \
 
 macx {
     ICON = res/macx/shell.icns
+    QMAKE_INFO_PLIST = res/macx/Info.plist
+    QMAKE_BUNDLE_DATA += res
+    res.path = Contents/Resources
+    res.files = res/macx/English.lproj
 
     # Clean up previous deployment.
     doPostLink("rm -rf \"Doomsday Shell.app/Contents/PlugIns/\"")
diff --git a/doomsday/tools/shell/shell-text/shell-text.pro b/doomsday/tools/shell/shell-text/shell-text.pro
index 31aacf3bbc..4e35ffe1aa 100644
--- a/doomsday/tools/shell/shell-text/shell-text.pro
+++ b/doomsday/tools/shell/shell-text/shell-text.pro
@@ -9,7 +9,7 @@ include(../../../config.pri)
 
 TEMPLATE = app
 TARGET   = doomsday-shell-text
-VERSION  = 1.0.0
+VERSION  = $$DENG_VERSION
 
 # Build Configuration -------------------------------------------------------
 
diff --git a/snowberry/buildapp.py b/snowberry/buildapp.py
index 8cae5112f9..1ecc9c0f41 100644
--- a/snowberry/buildapp.py
+++ b/snowberry/buildapp.py
@@ -28,7 +28,7 @@
     CFBundleShortVersionString = ver,
     CFBundleGetInfoString      = verstr,
     CFBundleExecutable         = name,
-    CFBundleIdentifier         = 'net.sourceforge.deng'
+    CFBundleIdentifier         = 'net.dengine.snowberry'
 )
 
 opts = dict(py2app = dict(