Continue what we started; But preserve more of the hardcoded stuff

(Including manaplus.exe - no renaming Windows build I guess)

4 files changed, 42 insertions, 42 deletions

diff --git a/packaging/debian/control b/packaging/debian/control
index db0f97bb4..72cc50d2b 100644
--- a/packaging/debian/control
+++ b/packaging/debian/control
@@ -1,7 +1,7 @@
 Source: manaverse
 Section: games
 Priority: optional
-Homepage: http://manaplus.org/
+Homepage: http://manaplus.germantmw.de/
 Maintainer: Andrei Karas <akaras@inbox.ru>
 Uploaders: Patrick Matthäi <pmatthaei@debian.org>
 Standards-Version: 3.9.7
diff --git a/packaging/nacl/ports/manaplus/pkg_info b/packaging/nacl/ports/manaplus/pkg_info
index 4772aa305..1c805b0c4 100644
--- a/packaging/nacl/ports/manaplus/pkg_info
+++ b/packaging/nacl/ports/manaplus/pkg_info
@@ -1,6 +1,6 @@
 NAME=manaverse
 VERSION=1
-#URL=https://gitlab.com/manaplus/manaplus.git@master
+#URL=https://gitlab.com/themanaworld/manaplus/manaplus.git@master
 LICENSE=GPL
 DEPENDS=(sdl sdl-gfx sdl-mixer sdl-ttf sdl-image sdl-net curl libxml2 libwebp zlib)
 SHA1=4178d0c709b34b811d1781fc6dc183ea4979c2b5
diff --git a/packaging/windows/evol.nsi b/packaging/windows/evol.nsi
index ccf3aade4..6e1d5a447 100644
--- a/packaging/windows/evol.nsi
+++ b/packaging/windows/evol.nsi
@@ -3,8 +3,8 @@
 ; like the old install script.
 ;
 ; DLLDIR - directory containing required dlls
-; EXEDIR - directory containing manaverse.exe
-; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaverse.exe
+; EXEDIR - directory containing manaplus.exe
+; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaplus.exe
 ; PRODUCT_VERSION - software version
 ; UPX - upx binary name
 ;
@@ -46,7 +46,7 @@ RequestExecutionLevel admin
 !endif
 
 ;--- (and without !defines ) ---
-!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaverse.exe"
+!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaplus.exe"
 
 !define MULTIUSER_INSTALLMODE_COMMANDLINE
 !define MULTIUSER_EXECUTIONLEVEL "admin"
@@ -59,7 +59,7 @@ RequestExecutionLevel admin
 !endif
 !define PRODUCT_PUBLISHER "Evol Online Delopment Team"
 !define PRODUCT_WEB_SITE "http://www.germantmw.de/"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\manaverse.exe"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\manaplus.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "SHCTX"
 
@@ -107,7 +107,7 @@ RequestExecutionLevel admin
 
 Function RunEvol
 SetOutPath $INSTDIR
-Exec "$INSTDIR\manaverse.exe $INSTDIR\evol.manaplus"
+Exec "$INSTDIR\manaplus.exe $INSTDIR\evol.manaplus"
 FunctionEnd
 
 Function changeFinishImage
@@ -262,7 +262,7 @@ Section "Core files (required)" SecCore
   SetOverwrite ifnewer
   SetOutPath "$INSTDIR"
 
-  File "${EXEDIR}\manaverse.exe"
+  File "${EXEDIR}\manaplus.exe"
   File "${DLLDIR}\SDL.dll"
   File "${DLLDIR}\SDL_image.dll"
 ;  File "${DLLDIR}\SDL_mixer.dll"
@@ -344,7 +344,7 @@ Section "Core files (required)" SecCore
   SetOutPath "$INSTDIR\data\help\idx"
   File "${SRCDIR}\data\help\idx\*.idx"
   SetOutPath "$INSTDIR\data\icons\"
-  File "${SRCDIR}\data\icons\manaverse.ico"
+  File "${SRCDIR}\data\icons\manaplus.ico"
   SetOutPath "$INSTDIR\data\music\"
   File "${SRCDIR}\data\music\*.ogg"
   SetOutPath "$INSTDIR\data\perserver\default\"
@@ -364,14 +364,14 @@ Section "Create Shortcuts" SecShortcuts
   SetOutPath "$INSTDIR"
   SetOverwrite ifnewer
   CreateDirectory "$SMPROGRAMS\EvolOnline"
-  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline.lnk" '"$INSTDIR\manaverse.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
-  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (no opengl).lnk" '"$INSTDIR\manaverse.exe"' '"--no-opengl" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
-  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (safemode).lnk" '"$INSTDIR\manaverse.exe"' '"--safemode" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
-  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (tests).lnk" '"$INSTDIR\manaverse.exe"' '"--tests" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
-  CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaverse.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
-  CreateShortCut "$DESKTOP\EvolOnline (tests).lnk" '"$INSTDIR\manaverse.exe"' '"--tests" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
-
-  ${registerExtension} "$INSTDIR\manaverse.exe" ".manaplus" "ManaVerse brandings"
+  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (no opengl).lnk" '"$INSTDIR\manaplus.exe"' '"--no-opengl" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (safemode).lnk" '"$INSTDIR\manaplus.exe"' '"--safemode" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+  CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (tests).lnk" '"$INSTDIR\manaplus.exe"' '"--tests" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+  CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+  CreateShortCut "$DESKTOP\EvolOnline (tests).lnk" '"$INSTDIR\manaplus.exe"' '"--tests" "$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+
+  ${registerExtension} "$INSTDIR\manaplus.exe" ".manaplus" "ManaVerse brandings"
 SectionEnd
 
 Section /o "Portable" SecPortable
@@ -398,8 +398,8 @@ Section /o "Profiler" SecProfiler
   File "${EXEDIR}\manaversep.exe"
 
   ${If} ${SectionIsSelected} ${SecShortcuts}
-    CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (profiler).lnk" '"$INSTDIR\manaversep.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
-    CreateShortCut "$DESKTOP\EvolOnline (profiler).lnk" '"$INSTDIR\manaversep.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
+    CreateShortCut "$SMPROGRAMS\EvolOnline\EvolOnline (profiler).lnk" '"$INSTDIR\manaversep.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+    CreateShortCut "$DESKTOP\EvolOnline (profiler).lnk" '"$INSTDIR\manaversep.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
   ${EndIf}
 SectionEnd
 
@@ -437,10 +437,10 @@ SectionEnd
 
 Section -Post
   WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaverse.exe"
+  WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaplus.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaverse.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaplus.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"
diff --git a/packaging/windows/setup.nsi b/packaging/windows/setup.nsi
index 8148e8df7..283c1cbe9 100644
--- a/packaging/windows/setup.nsi
+++ b/packaging/windows/setup.nsi
@@ -3,8 +3,8 @@
 ; like the old install script.
 ;
 ; DLLDIR - directory containing required dlls
-; EXEDIR - directory containing manaverse.exe
-; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaverse.exe
+; EXEDIR - directory containing manaplus.exe
+; EXESUFFIX - offset to SRCDIR pointing to a directory containing manaplus.exe
 ; PRODUCT_VERSION - software version
 ; UPX - upx binary name
 ;
@@ -46,7 +46,7 @@ RequestExecutionLevel admin
 !endif
 
 ;--- (and without !defines ) ---
-!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaverse.exe"
+!System "${UPX} --best --crp-ms=999999 --compress-icons=0 --nrv2d ${EXEDIR}\manaplus.exe"
 
 !define MULTIUSER_INSTALLMODE_COMMANDLINE
 !define MULTIUSER_EXECUTIONLEVEL "admin"
@@ -59,7 +59,7 @@ RequestExecutionLevel admin
 !endif
 !define PRODUCT_PUBLISHER "ManaPlus Development Team"
 !define PRODUCT_WEB_SITE "http://manaplus.germantmw.de/"
-!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\manaverse.exe"
+!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\manaplus.exe"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "SHCTX"
 
@@ -71,9 +71,9 @@ RequestExecutionLevel admin
 ; MUI Settings
 !define MUI_ABORTWARNING
 ;!define MUI_ICON "${NSISDIR}\Contrib\Graphics\Icons\win-install.ico"
-!define MUI_ICON "${SRCDIR}\data\icons\manaverse.ico"
+!define MUI_ICON "${SRCDIR}\data\icons\manaplus.ico"
 ;!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\win-uninstall.ico"
-!define MUI_UNICON "${SRCDIR}\data\icons\manaverse.ico"
+!define MUI_UNICON "${SRCDIR}\data\icons\manaplus.ico"
 
 ;Language Selection Dialog Settings
 ;Remember the installer language
@@ -107,7 +107,7 @@ RequestExecutionLevel admin
 
 Function RunMana
 SetOutPath $INSTDIR
-Exec "$INSTDIR\manaverse.exe"
+Exec "$INSTDIR\manaplus.exe"
 FunctionEnd
 
 Function changeFinishImage
@@ -259,7 +259,7 @@ Section "Core files (required)" SecCore
   SetOverwrite ifnewer
   SetOutPath "$INSTDIR"
 
-  File "${EXEDIR}\manaverse.exe"
+  File "${EXEDIR}\manaplus.exe"
   File "${DLLDIR}\SDL.dll"
   File "${DLLDIR}\SDL_image.dll"
 ;  File "${DLLDIR}\SDL_mixer.dll"
@@ -341,7 +341,7 @@ Section "Core files (required)" SecCore
   SetOutPath "$INSTDIR\data\help\idx"
   File "${SRCDIR}\data\help\idx\*.idx"
   SetOutPath "$INSTDIR\data\icons\"
-  File "${SRCDIR}\data\icons\manaverse.ico"
+  File "${SRCDIR}\data\icons\manaplus.ico"
   SetOutPath "$INSTDIR\data\music"
   File "${SRCDIR}\data\music\*.ogg"
   SetOutPath "$INSTDIR\data\perserver\default\"
@@ -355,14 +355,14 @@ Section "Create Shortcuts" SecShortcuts
   SetOutPath "$INSTDIR"
   SetOverwrite ifnewer
   CreateDirectory "$SMPROGRAMS\Mana"
-  CreateShortCut "$SMPROGRAMS\Mana\ManaVerse.lnk" "$INSTDIR\manaverse.exe"
-  CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (no opengl).lnk" "$INSTDIR\manaverse.exe" --no-opengl
-  CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (safemode).lnk" "$INSTDIR\manaverse.exe" --safemode
-  CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (tests).lnk" "$INSTDIR\manaverse.exe" --tests
-  CreateShortCut "$DESKTOP\ManaVerse.lnk" "$INSTDIR\manaverse.exe"
-  CreateShortCut "$DESKTOP\ManaVerse (tests).lnk" "$INSTDIR\manaverse.exe" --tests
-
-  ${registerExtension} "$INSTDIR\manaverse.exe" ".manaplus" "ManaVerse brandings"
+  CreateShortCut "$SMPROGRAMS\Mana\ManaVerse.lnk" "$INSTDIR\manaplus.exe"
+  CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (no opengl).lnk" "$INSTDIR\manaplus.exe" --no-opengl
+  CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (safemode).lnk" "$INSTDIR\manaplus.exe" --safemode
+  CreateShortCut "$SMPROGRAMS\Mana\ManaVerse (tests).lnk" "$INSTDIR\manaplus.exe" --tests
+  CreateShortCut "$DESKTOP\ManaVerse.lnk" "$INSTDIR\manaplus.exe"
+  CreateShortCut "$DESKTOP\ManaVerse (tests).lnk" "$INSTDIR\manaplus.exe" --tests
+
+  ${registerExtension} "$INSTDIR\manaplus.exe" ".manaplus" "ManaVerse brandings"
 SectionEnd
 
 Section /o "Portable" SecPortable
@@ -411,8 +411,8 @@ Section "Evol Online shortcuts" SecEvol
   SetOutPath "$INSTDIR\data\evol\icons"
   File "${SRCDIR}\data\evol\icons\*.ico"
 
-  CreateShortCut "$SMPROGRAMS\Mana\EvolOnline.lnk" '"$INSTDIR\manaverse.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
-  CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaverse.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaverse.exe" 1
+  CreateShortCut "$SMPROGRAMS\Mana\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
+  CreateShortCut "$DESKTOP\EvolOnline.lnk" '"$INSTDIR\manaplus.exe"' '"$INSTDIR\evol.manaplus"' "$INSTDIR\manaplus.exe" 1
 SectionEnd
 
 Section "Translations" SecTrans
@@ -443,10 +443,10 @@ SectionEnd
 
 Section -Post
   WriteUninstaller "$INSTDIR\uninst.exe"
-  WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaverse.exe"
+  WriteRegStr SHCTX "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\manaplus.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe"
-  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaverse.exe"
+  WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\manaplus.exe"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "URLInfoAbout" "${PRODUCT_WEB_SITE}"
   WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}"