From 3f291cb32f9cc01f5dbe388222104290f7f2013e Mon Sep 17 00:00:00 2001
From: Thomas Bernard <miniupnp@free.fr>
Date: Tue, 14 Sep 2021 23:49:32 +0200
Subject: [PATCH] Info.plist: use x.y.z version strings

---
 src/English.lproj/InfoPlist.strings | Bin 660 -> 664 bytes
 src/Info.plist                      |   7 +++++--
 src/Makefile                        |   5 +++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/English.lproj/InfoPlist.strings b/src/English.lproj/InfoPlist.strings
index 5b8bc99a2426d83cb057453cdaa9bca7b1cd076d..ec5d012caada44b77c7cc760181f48ec96a5ee25 100644
GIT binary patch
delta 87
zcmbQjI)in>S;-&<M+P^B2nHjDc!n?rSB4;lU<OYHe+IvaKf>kRfm|HY3_1)7lix9_
SG8#^<W1I>mjVHS^`2qky0~0R*

delta 55
zcmbQiI)!z@*~yBGGW<pidJN`3Y{X#6V8UQD@mV-4SZHztqb8%lWC<qY$y*tdz^n!U
DVf757

diff --git a/src/Info.plist b/src/Info.plist
index 039fcc61..5b00bc39 100644
--- a/src/Info.plist
+++ b/src/Info.plist
@@ -19,12 +19,15 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0</string>
+	<string>GRAFX2_VERSION</string>
 	<key>CFBundleShortVersionString</key>
-	<string>Grafx2 version 2.8.3104</string>
+	<string>GRAFX2_VERSION</string>
 	<key>NSMainNibFile</key>
 	<string>SDLMain</string>
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 2008-2021 the Grafx2 project team.
+MacOS X version by Franck Charlet.</string>
 </dict>
 </plist>
diff --git a/src/Makefile b/src/Makefile
index f4b9e1ad..a92c5af6 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -72,6 +72,7 @@ else
 endif
 
   VERSIONTAG = $(subst wip.,wip,$(LABEL).$(GIT_REVISION))
+  VERSIONPLIST = $(shell echo $(VERSIONTAG) | cut -d- -f1)
 
   CFLAGS_CACHE = $(OBJDIR)/.cflags.cache
 
@@ -932,8 +933,8 @@ $(MACAPPEXE) : $(BIN)
 	cp Grafx2.icns Grafx2.app/Contents/Resources
 	cp ../share/grafx2/gfx2.png Grafx2.app/Contents/Resources
 	mkdir -p Grafx2.app/Contents/Resources/English.lproj
-	cat Info.plist | sed -e 's/Grafx2 version [.0-9]*/Grafx2 version $(VERSIONTAG)/' > Grafx2.app/Contents/Info.plist
-	iconv -f UTF-16BE English.lproj/InfoPlist.strings | sed -e 's/Grafx2 version [.0-9]*/Grafx2 version $(VERSIONTAG)/' | iconv -t UTF-16BE > Grafx2.app/Contents/Resources/English.lproj/InfoPlist.strings
+	cat Info.plist | sed -e 's/GRAFX2_VERSION/$(VERSIONPLIST)/' > Grafx2.app/Contents/Info.plist
+	iconv -f UTF-16BE English.lproj/InfoPlist.strings | sed -e 's/GRAFX2_VERSION/$(VERSIONPLIST)/' | iconv -t UTF-16BE > Grafx2.app/Contents/Resources/English.lproj/InfoPlist.strings
 	cp -r ../share/grafx2/fonts Grafx2.app/Contents/Resources
 	cp -r ../share/grafx2/skins Grafx2.app/Contents/Resources
 	cp -r ../share/grafx2/gfx2def.ini Grafx2.app/Contents/Resources