From 5be6c7a2837007233510009e2a845a1d7f0e87f7 Mon Sep 17 00:00:00 2001
From: Adrian Robert <Adrian.B.Robert@gmail.com>
Date: Wed, 22 Oct 2008 13:14:33 +0000
Subject: [PATCH] * Cocoa/Emacs.base/Contents/Info.plist  *
 Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings  *
 GNUstep/Emacs.base/Resources/Emacs.desktop  *
 GNUstep/Emacs.base/Resources/Info-gnustep.plist: Replace 9.0 version numbers
 with 23.0.60-involving strings.

---
 nextstep/ChangeLog                                        | 8 ++++++++
 nextstep/Cocoa/Emacs.base/Contents/Info.plist             | 7 ++++---
 .../Contents/Resources/English.lproj/InfoPlist.strings    | 2 +-
 nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop       | 2 +-
 nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist  | 5 ++---
 5 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 3da6949ec2a..56efde08373 100644
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-22  Adrian Robert  <Adrian.B.Robert@gmail.com>
+
+	* Cocoa/Emacs.base/Contents/Info.plist
+	* Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
+	* GNUstep/Emacs.base/Resources/Emacs.desktop
+	* GNUstep/Emacs.base/Resources/Info-gnustep.plist: Replace 9.0 version
+	numbers with 23.0.60-involving strings.
+
 2008-10-08  Yavor Doganov  <yavor@gnu.org>  (tiny change)
 
 	* GNUstep/Emacs.base/Resources/Info-gnustep.plist:
diff --git a/nextstep/Cocoa/Emacs.base/Contents/Info.plist b/nextstep/Cocoa/Emacs.base/Contents/Info.plist
index f8bf9278e58..054ebf8fc72 100644
--- a/nextstep/Cocoa/Emacs.base/Contents/Info.plist
+++ b/nextstep/Cocoa/Emacs.base/Contents/Info.plist
@@ -551,13 +551,14 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 	<string>Emacs</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<!-- This should be the emacs version number. -->
 	<key>CFBundleShortVersionString</key>
-	<string>Version 23.0.60</string>
+	<string>23.0.60</string>
 	<key>CFBundleSignature</key>
-<!--	<string>Emcs</string> -->
 	<string>EMAx</string>
+	<!-- This SHOULD be a build number. -->
 	<key>CFBundleVersion</key>
-	<string>NS 9.0</string>
+	<string>9.0</string>
 	<key>NSPrincipalClass</key>
 	<string>EmacsApp</string>
 	<key>CFBundleURLTypes</key>
diff --git a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
index 6ebe9f88386..d3bcdfaf66e 100644
--- a/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
+++ b/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
@@ -2,5 +2,5 @@
 
 CFBundleName = "Emacs";
 CFBundleShortVersionString = "Version 23.0.60";
-CFBundleGetInfoString = "Emacs version 23.0.60, GNUstep / MacOS X Cocoa version 9.0";
+CFBundleGetInfoString = "Emacs version 23.0.60, NS Windowing";
 NSHumanReadableCopyright = "Copyright 2008 Free Software Foundation.";
diff --git a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
index 3720826a4d0..0b9f67109bb 100644
--- a/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
+++ b/nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Encoding=UTF-8
 Type=Application
-Version=9.0
+Version=23.0.60
 Categories=GNUstep
 Name=Emacs
 Comment=GNU Emacs for NeXT/Open/GNUstep and OS X
diff --git a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
index f35b821ee92..4155bb091b4 100644
--- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
+++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
@@ -1,9 +1,8 @@
 {
-    "!" = "Generated by ProjectCenter, do not edit";
     ApplicationDescription = "GNU Emacs for GNUstep / OS X";
     ApplicationIcon = emacs.tiff;
     ApplicationName = Emacs;
-    ApplicationRelease = "9.0";
+    ApplicationRelease = "23.0.60";
     Authors = (
 	"Adrian Robert (GNUstep)",
 	"Christophe de Dinechin (MacOS X)",
@@ -14,7 +13,7 @@
     );
     Copyright = "Copyright (C) 2008 Free Software Foundation, Inc.";
     CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
-    FullVersionID = "Emacs 23.0.60 NS 9.0";
+    FullVersionID = "Emacs 23.0.60, NS Windowing";
     NSExecutable = Emacs;
     NSIcon = emacs.tiff;
     NSPrincipalClass = NSApplication;
-- 
2.39.5