From fd8ba9ebf18261e2ee6ef85a04836e6b94b5200a Mon Sep 17 00:00:00 2001 From: antoniou79 Date: Sun, 26 Mar 2023 14:52:26 +0300 Subject: [PATCH] ANDROID: Revert "This is 2.7.0.4 (beta 4)" This reverts commit 603ff5ae6c216128d740452968d70f8a0a7ed619. A few more changes are pending before beta 4 --- backends/platform/psp/README.PSP | 2 +- base/internal_version.h | 2 +- dists/amigaos/md2ag.rexx | 2 +- dists/android/build.gradle | 7 +++---- dists/gph/README-GPH | 2 +- dists/gph/scummvm.ini | 2 +- dists/ios7/Info.plist | 4 ++-- dists/iphone/Info.plist | 4 ++-- dists/irix/scummvm.spec | 2 +- dists/macosx/Info.plist | 6 +++--- dists/macosx/dockplugin/Info.plist | 4 ++-- dists/openpandora/PXML.xml | 4 ++-- dists/openpandora/README-OPENPANDORA | 2 +- dists/openpandora/README-PND.txt | 2 +- dists/openpandora/index.html | 4 ++-- dists/redhat/scummvm-tools.spec | 2 +- dists/redhat/scummvm.spec | 2 +- dists/riscos/!Boot,feb | 2 +- dists/slackware/scummvm.SlackBuild | 2 +- dists/wii/meta.xml | 2 +- 20 files changed, 29 insertions(+), 30 deletions(-) diff --git a/backends/platform/psp/README.PSP b/backends/platform/psp/README.PSP index 89be6ab126e..56bb0e53b03 100644 --- a/backends/platform/psp/README.PSP +++ b/backends/platform/psp/README.PSP @@ -1,4 +1,4 @@ -ScummVM-PSP 2.7.0.4 README +ScummVM-PSP 2.7.0.2 README ============================================================================== Installation diff --git a/base/internal_version.h b/base/internal_version.h index 1fbf0bc57e4..d417edd2ecf 100644 --- a/base/internal_version.h +++ b/base/internal_version.h @@ -16,7 +16,7 @@ #define SCUMMVM_REVISION #endif -#define SCUMMVM_VERSION "2.7.0.4" +#define SCUMMVM_VERSION "2.7.0.2" #define SCUMMVM_VER_MAJOR 2 #define SCUMMVM_VER_MINOR 7 diff --git a/dists/amigaos/md2ag.rexx b/dists/amigaos/md2ag.rexx index 639f84b992d..13e2a721ad7 100644 --- a/dists/amigaos/md2ag.rexx +++ b/dists/amigaos/md2ag.rexx @@ -63,7 +63,7 @@ CALL OPEN write_guide,'README.guide','W' Prepare Amiga guide, add intro and fixed text. */ CALL WRITELN write_guide,'@DATABASE ScummVM README.guide' -CALL WRITELN write_guide,'@$VER: ScummVM Readme 2.7.0.4' +CALL WRITELN write_guide,'@$VER: ScummVM Readme 2.7.0.2' CALL WRITELN write_guide,'@(C) by The ScummVM team' CALL WRITELN write_guide,'@AUTHOR The ScummVM team' CALL WRITELN write_guide,'@WORDWRAP' diff --git a/dists/android/build.gradle b/dists/android/build.gradle index 30b69e5a30c..d8479e39fbb 100644 --- a/dists/android/build.gradle +++ b/dists/android/build.gradle @@ -40,12 +40,11 @@ android { minSdkVersion 16 targetSdkVersion 33 - versionName "2.7.0.4" - versionCode 101 + versionName "2.7.0.2" + versionCode 97 // versioncode must be incremented for each market upload - // ScummVM 2.7.0.4: 101 - 104 (arm-v7a, arm64-v8a, x86, x86_64 respectively) (beta 4 on Play Store) - // Historical version codes: // ScummVM 2.7.0.2: 97 - 100 (arm-v7a, arm64-v8a, x86, x86_64 respectively) (beta 3 on Play Store) + // Historical version codes: // ScummVM 2.7.0.1: 93 - 96 (arm-v7a, arm64-v8a, x86, x86_64 respectively) (beta 2 on Play Store) // ScummVM 2.7.0: 89 - 92 (arm-v7a, arm64-v8a, x86, x86_64 respectively) (beta 1 on Play Store) // ScummVM 2.6.x: 85 - 88 (skipped - was reserved for potential beta or 2.6.x bugfix builds) diff --git a/dists/gph/README-GPH b/dists/gph/README-GPH index 15dd4e4d8fc..c3f99f07584 100644 --- a/dists/gph/README-GPH +++ b/dists/gph/README-GPH @@ -1,4 +1,4 @@ -ScummVM 2.7.0.4 - GPH DEVICE SPECIFIC README +ScummVM 2.7.0.2 - GPH DEVICE SPECIFIC README ------------------------------------------------------------------------ diff --git a/dists/gph/scummvm.ini b/dists/gph/scummvm.ini index 24b226e1698..411d75cda72 100644 --- a/dists/gph/scummvm.ini +++ b/dists/gph/scummvm.ini @@ -1,5 +1,5 @@ [info] -name="ScummVM 2.7.0.4" +name="ScummVM 2.7.0.2" path="/scummvm/scummvm.gpe" icon="/scummvm/scummvm.png" title="/scummvm/scummvmb.png" diff --git a/dists/ios7/Info.plist b/dists/ios7/Info.plist index 24a09abeb61..591eeda0dcd 100644 --- a/dists/ios7/Info.plist +++ b/dists/ios7/Info.plist @@ -19,11 +19,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.7.0.4 + 2.7.0.2 CFBundleSignature ???? CFBundleVersion - 2.7.0.4 + 2.7.0.2 GCSupportedGameControllers diff --git a/dists/iphone/Info.plist b/dists/iphone/Info.plist index 0e926af55ce..2336064b569 100644 --- a/dists/iphone/Info.plist +++ b/dists/iphone/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.7.0.4 + 2.7.0.2 CFBundleSignature ???? CFBundleVersion - 2.7.0.4 + 2.7.0.2 CFBundleIconFile icon.png CFBundleIconFiles diff --git a/dists/irix/scummvm.spec b/dists/irix/scummvm.spec index 9b1d2102c33..6e177f8cde6 100644 --- a/dists/irix/scummvm.spec +++ b/dists/irix/scummvm.spec @@ -1,5 +1,5 @@ product scummvm - id "ScummVM 2.7.0.4" + id "ScummVM 2.7.0.2" image sw id "software" version 18 diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist index 621837bff71..d3d96a135e2 100644 --- a/dists/macosx/Info.plist +++ b/dists/macosx/Info.plist @@ -25,7 +25,7 @@ CFBundleExecutable scummvm CFBundleGetInfoString - 2.7.0.4, Copyright 2001-2023 The ScummVM Team + 2.7.0.2, Copyright 2001-2023 The ScummVM Team CFBundleIconFile scummvm.icns CFBundleIdentifier @@ -61,9 +61,9 @@ CFBundlePackageType APPL CFBundleShortVersionString - 2.7.0.4 + 2.7.0.2 CFBundleVersion - 2.7.0.4 + 2.7.0.2 NSHumanReadableCopyright Copyright 2001-2023 The ScummVM Team NSPrincipalClass diff --git a/dists/macosx/dockplugin/Info.plist b/dists/macosx/dockplugin/Info.plist index d320ae4a316..063f69ff152 100644 --- a/dists/macosx/dockplugin/Info.plist +++ b/dists/macosx/dockplugin/Info.plist @@ -15,9 +15,9 @@ CFBundlePackageType BNDL CFBundleShortVersionString - 2.7.0.4 + 2.7.0.2 CFBundleVersion - 2.7.0.4 + 2.7.0.2 NSHumanReadableCopyright Copyright 2001-2023 The ScummVM Team NSPrincipalClass diff --git a/dists/openpandora/PXML.xml b/dists/openpandora/PXML.xml index 1ccdbb04807..627f1e30347 100644 --- a/dists/openpandora/PXML.xml +++ b/dists/openpandora/PXML.xml @@ -6,9 +6,9 @@ - ScummVM 2.7.0.4 + ScummVM 2.7.0.2 - ScummVM 2.7.0.4 + ScummVM 2.7.0.2 diff --git a/dists/openpandora/README-OPENPANDORA b/dists/openpandora/README-OPENPANDORA index d2cc8950865..bb7d91703fb 100644 --- a/dists/openpandora/README-OPENPANDORA +++ b/dists/openpandora/README-OPENPANDORA @@ -1,4 +1,4 @@ -ScummVM 2.7.0.4 - OPENPANDORA SPECIFIC README +ScummVM 2.7.0.2 - OPENPANDORA SPECIFIC README ------------------------------------------------------------------------ Please refer to the: diff --git a/dists/openpandora/README-PND.txt b/dists/openpandora/README-PND.txt index 64e0ea454c3..b3540cc17a3 100644 --- a/dists/openpandora/README-PND.txt +++ b/dists/openpandora/README-PND.txt @@ -1,4 +1,4 @@ -ScummVM 2.7.0.4 - OPENPANDORA README - HOW TO INSTALL +ScummVM 2.7.0.2 - OPENPANDORA README - HOW TO INSTALL ------------------------------------------------------------------------ Please refer to the: diff --git a/dists/openpandora/index.html b/dists/openpandora/index.html index 03bc875fb0e..8de0273982c 100644 --- a/dists/openpandora/index.html +++ b/dists/openpandora/index.html @@ -5,7 +5,7 @@

-

ScummVM 2.7.0.4: OpenPandora Specific Documentation

+

ScummVM 2.7.0.2: OpenPandora Specific Documentation

ScummVM OpenPandora README
@@ -13,7 +13,7 @@ ScummVM OpenPandora WiKi

-

ScummVM 2.7.0.4: General Documentation

+

ScummVM 2.7.0.2: General Documentation

ScummVM website
diff --git a/dists/redhat/scummvm-tools.spec b/dists/redhat/scummvm-tools.spec index 873fc005e1a..dc66ff0a61c 100644 --- a/dists/redhat/scummvm-tools.spec +++ b/dists/redhat/scummvm-tools.spec @@ -7,7 +7,7 @@ # Prologue information #------------------------------------------------------------------------------ Name : scummvm-tools -Version : 2.7.0.4 +Version : 2.7.0.2 Release : 1 Summary : ScummVM-related tools Group : Interpreters diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec index 6b4f02ae99b..e82c9d410b2 100644 --- a/dists/redhat/scummvm.spec +++ b/dists/redhat/scummvm.spec @@ -7,7 +7,7 @@ # Prologue information #------------------------------------------------------------------------------ Name : scummvm -Version : 2.7.0.4 +Version : 2.7.0.2 Release : 1 Summary : Graphic adventure game interpreter Group : Interpreters diff --git a/dists/riscos/!Boot,feb b/dists/riscos/!Boot,feb index 7c058d7a130..5e71ae3a92a 100644 --- a/dists/riscos/!Boot,feb +++ b/dists/riscos/!Boot,feb @@ -5,4 +5,4 @@ Set ScummVM$Title "ScummVM" Set ScummVM$Description "Play certain classic graphical point-and-click adventure games" Set ScummVM$Publisher "ScummVM Developers" Set ScummVM$Web "https://www.scummvm.org/" -Set ScummVM$Version "2.7.0.4" +Set ScummVM$Version "2.7.0.2" diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild index 2b14f8fd387..4f690f28b1e 100755 --- a/dists/slackware/scummvm.SlackBuild +++ b/dists/slackware/scummvm.SlackBuild @@ -9,7 +9,7 @@ if [ "$TMP" = "" ]; then fi PKG=$TMP/package-scummvm -VERSION=2.7.0.4 +VERSION=2.7.0.2 ARCH=i486 BUILD=1 diff --git a/dists/wii/meta.xml b/dists/wii/meta.xml index 0ec3e6414e1..7ae0081b80a 100644 --- a/dists/wii/meta.xml +++ b/dists/wii/meta.xml @@ -2,7 +2,7 @@ ScummVM The ScummVM Team - 2.7.0.4@REVISION@ + 2.7.0.2@REVISION@ @TIMESTAMP@ Point & Click Adventures ScummVM is a program which allows you to run certain classic graphical point-and-click adventure games, provided you already have their data files. The clever part about this: ScummVM just replaces the executables shipped with the games, allowing you to play them on systems for which they were never designed!