[Scummvm-git-logs] scummvm master -> 98e0b148521f7d2eef21bfe5b1cb1f440020e6ab
sev-
sev at scummvm.org
Sun Aug 30 11:42:41 UTC 2020
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2454faf767 DEVTOOLS: Remove obsolete file from update-version.pl
98e0b14852 RELEASE: This is 2.3.0git
Commit: 2454faf767d0ade5dd07ea682eecf111e7b1014d
https://github.com/scummvm/scummvm/commit/2454faf767d0ade5dd07ea682eecf111e7b1014d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-30T13:41:53+02:00
Commit Message:
DEVTOOLS: Remove obsolete file from update-version.pl
Changed paths:
devtools/update-version.pl
diff --git a/devtools/update-version.pl b/devtools/update-version.pl
index b5fb6643b1..72a5e9ad89 100755
--- a/devtools/update-version.pl
+++ b/devtools/update-version.pl
@@ -40,8 +40,7 @@ my @subs_files = qw(
dists/iphone/Info.plist
dists/ios7/Info.plist
dists/irix/scummvm.spec
- dists/wii/meta.xml
- dists/android/AndroidManifest.xml
+ dists/wii/meta.xml
dists/openpandora/PXML.xml
dists/openpandora/README-OPENPANDORA
dists/openpandora/README-PND.txt
Commit: 98e0b148521f7d2eef21bfe5b1cb1f440020e6ab
https://github.com/scummvm/scummvm/commit/98e0b148521f7d2eef21bfe5b1cb1f440020e6ab
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-30T13:42:19+02:00
Commit Message:
RELEASE: This is 2.3.0git
Changed paths:
backends/platform/psp/README.PSP
base/internal_version.h
dists/amiga/RM2AG.rexx
dists/gph/README-GPH
dists/gph/scummvm.ini
dists/ios7/Info.plist
dists/iphone/Info.plist
dists/irix/scummvm.spec
dists/macosx/Info.plist
dists/macosx/dockplugin/Info.plist
dists/openpandora/PXML.xml
dists/openpandora/README-OPENPANDORA
dists/openpandora/README-PND.txt
dists/openpandora/index.html
dists/redhat/scummvm-tools.spec
dists/redhat/scummvm.spec
dists/riscos/!Boot,feb
dists/slackware/scummvm.SlackBuild
dists/wii/meta.xml
diff --git a/backends/platform/psp/README.PSP b/backends/platform/psp/README.PSP
index 378053f257..a8796a545f 100644
--- a/backends/platform/psp/README.PSP
+++ b/backends/platform/psp/README.PSP
@@ -1,4 +1,4 @@
-ScummVM-PSP 2.2.0git README
+ScummVM-PSP 2.3.0git README
==============================================================================
Installation
diff --git a/base/internal_version.h b/base/internal_version.h
index e0ec6bf2de..cee4c70434 100644
--- a/base/internal_version.h
+++ b/base/internal_version.h
@@ -16,8 +16,8 @@
#define SCUMMVM_REVISION
#endif
-#define SCUMMVM_VERSION "2.2.0git"
+#define SCUMMVM_VERSION "2.3.0git"
#define SCUMMVM_VER_MAJOR 2
-#define SCUMMVM_VER_MINOR 2
+#define SCUMMVM_VER_MINOR 3
#define SCUMMVM_VER_PATCH 0
diff --git a/dists/amiga/RM2AG.rexx b/dists/amiga/RM2AG.rexx
index 165b94a06c..2942480337 100644
--- a/dists/amiga/RM2AG.rexx
+++ b/dists/amiga/RM2AG.rexx
@@ -78,7 +78,7 @@ END
Prepare the Amiga guide file, add intro and fixed text.
*/
CALL WRITELN guide_write,'@DATABASE ScummVM README.guide'
-CALL WRITELN guide_write,'@$VER: ScummVM Readme 2.2.0git'
+CALL WRITELN guide_write,'@$VER: ScummVM Readme 2.3.0git'
CALL WRITELN guide_write,'@(C) by The ScummVM team'
CALL WRITELN guide_write,'@AUTHOR The ScummVM team'
CALL WRITELN guide_write,'@WORDWRAP'
@@ -124,7 +124,7 @@ DO WHILE EOF(readme_read) = 0
Two chapters (1.0 and 7.8) are "empty", consisting of only
it`s chapter names. Link them to their respective sub chapters
(1.1 and 7.8.1) to not display a blank page.
-
+
If chapter 1.0 is found, add a link node to chapter 1.1.
*/
IF POS(' - [<>1.0<>)',working_line) = 1 THEN DO
@@ -228,7 +228,7 @@ DO WHILE EOF(readme_read) = 0
Two chapters (1.0 and 7.8) are "empty", consisting of only
it`s chapter names. Link them to their respective sub chapters
(1.1 and 7.8.1) to not display a blank page.
-
+
If chapter 1.1 is found, don`t close the NODE, just write the line.
*/
IF POS('<>1.1<>',working_line) = 1 THEN DO
diff --git a/dists/gph/README-GPH b/dists/gph/README-GPH
index d34edec2af..9b28490e50 100644
--- a/dists/gph/README-GPH
+++ b/dists/gph/README-GPH
@@ -1,4 +1,4 @@
-ScummVM 2.2.0git - GPH DEVICE SPECIFIC README
+ScummVM 2.3.0git - GPH DEVICE SPECIFIC README
------------------------------------------------------------------------
diff --git a/dists/gph/scummvm.ini b/dists/gph/scummvm.ini
index 61f45d14bc..1d67f55a1d 100644
--- a/dists/gph/scummvm.ini
+++ b/dists/gph/scummvm.ini
@@ -1,5 +1,5 @@
[info]
-name="ScummVM 2.2.0git"
+name="ScummVM 2.3.0git"
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 d850d9a64c..eeeeaba81f 100644
--- a/dists/ios7/Info.plist
+++ b/dists/ios7/Info.plist
@@ -19,11 +19,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.2.0git</string>
+ <string>2.3.0git</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.2.0git</string>
+ <string>2.3.0git</string>
<key>LSSupportsOpeningDocumentsInPlace</key>
<true/>
<key>UIApplicationExitsOnSuspend</key>
diff --git a/dists/iphone/Info.plist b/dists/iphone/Info.plist
index 3bd3c0d820..3af6fa02c5 100644
--- a/dists/iphone/Info.plist
+++ b/dists/iphone/Info.plist
@@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.2.0git</string>
+ <string>2.3.0git</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.2.0git</string>
+ <string>2.3.0git</string>
<key>CFBundleIconFile</key>
<string>icon.png</string>
<key>CFBundleIconFiles</key>
diff --git a/dists/irix/scummvm.spec b/dists/irix/scummvm.spec
index e326a583ab..ff3a58c230 100644
--- a/dists/irix/scummvm.spec
+++ b/dists/irix/scummvm.spec
@@ -1,5 +1,5 @@
product scummvm
- id "ScummVM 2.2.0git"
+ id "ScummVM 2.3.0git"
image sw
id "software"
version 18
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index 2ce4d68d25..c3f8e4faab 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -23,7 +23,7 @@
<key>CFBundleExecutable</key>
<string>scummvm</string>
<key>CFBundleGetInfoString</key>
- <string>2.2.0git, Copyright 2001-2020 The ScummVM Team</string>
+ <string>2.3.0git, Copyright 2001-2020 The ScummVM Team</string>
<key>CFBundleIconFile</key>
<string>scummvm.icns</string>
<key>CFBundleIdentifier</key>
@@ -59,9 +59,9 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
- <string>2.2.0git</string>
+ <string>2.3.0git</string>
<key>CFBundleVersion</key>
- <string>2.2.0git</string>
+ <string>2.3.0git</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2001-2020 The ScummVM Team</string>
<key>NSPrincipalClass</key>
diff --git a/dists/macosx/dockplugin/Info.plist b/dists/macosx/dockplugin/Info.plist
index 50402e5ae4..99e9333774 100644
--- a/dists/macosx/dockplugin/Info.plist
+++ b/dists/macosx/dockplugin/Info.plist
@@ -15,9 +15,9 @@
<key>CFBundlePackageType</key>
<string>BNDL</string>
<key>CFBundleShortVersionString</key>
- <string>2.2.0git</string>
+ <string>2.3.0git</string>
<key>CFBundleVersion</key>
- <string>2.2.0git</string>
+ <string>2.3.0git</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2001-2020 The ScummVM Team</string>
<key>NSPrincipalClass</key>
diff --git a/dists/openpandora/PXML.xml b/dists/openpandora/PXML.xml
index 1dd1473f84..a228db6374 100644
--- a/dists/openpandora/PXML.xml
+++ b/dists/openpandora/PXML.xml
@@ -4,11 +4,11 @@
<package id="scummvm.djwillis.0001">
<author name="DJWillis" website="https://www.scummvm.org/"/>
<!-- version type can be alpha, beta or release, set to release in branch -->
- <version major="2" minor="2" release="0" build="1" type="release"/>
+ <version major="2" minor="3" release="0" build="1" type="release"/>
<!-- Both title and titles are needed -->
- <title lang="en_US">ScummVM 2.2.0git</title>
+ <title lang="en_US">ScummVM 2.3.0git</title>
<titles>
- <title lang="en_US">ScummVM 2.2.0git</title>
+ <title lang="en_US">ScummVM 2.3.0git</title>
</titles>
<descriptions>
<description lang="en_US">
@@ -25,7 +25,7 @@
<exec command="./runscummvm.sh"/>
<author name="DJWillis" website="https://www.scummvm.org/"/>
<!-- version type can be alpha, beta or release, set to release in branch -->
- <version major="2" minor="2" release="0" build="1" type="release"/>
+ <version major="2" minor="3" release="0" build="1" type="release"/>
<!-- Both title and titles are needed -->
<title lang="en_US">ScummVM</title>
<titles>
diff --git a/dists/openpandora/README-OPENPANDORA b/dists/openpandora/README-OPENPANDORA
index 90103ebfa2..37f9fc249e 100644
--- a/dists/openpandora/README-OPENPANDORA
+++ b/dists/openpandora/README-OPENPANDORA
@@ -1,4 +1,4 @@
-ScummVM 2.2.0git - OPENPANDORA SPECIFIC README
+ScummVM 2.3.0git - OPENPANDORA SPECIFIC README
------------------------------------------------------------------------
Please refer to the:
diff --git a/dists/openpandora/README-PND.txt b/dists/openpandora/README-PND.txt
index 14273085a2..4ea8e52a67 100644
--- a/dists/openpandora/README-PND.txt
+++ b/dists/openpandora/README-PND.txt
@@ -1,4 +1,4 @@
-ScummVM 2.2.0git - OPENPANDORA README - HOW TO INSTALL
+ScummVM 2.3.0git - OPENPANDORA README - HOW TO INSTALL
------------------------------------------------------------------------
Please refer to the:
diff --git a/dists/openpandora/index.html b/dists/openpandora/index.html
index 3b4362e755..fedab720a2 100644
--- a/dists/openpandora/index.html
+++ b/dists/openpandora/index.html
@@ -5,7 +5,7 @@
</h3>
<h4>
- <p>ScummVM 2.2.0git: OpenPandora Specific Documentation</p>
+ <p>ScummVM 2.3.0git: OpenPandora Specific Documentation</p>
</h4>
<A href="docs/README-OPENPANDORA">ScummVM OpenPandora README</a><br/>
@@ -13,7 +13,7 @@
<A href="https://wiki.scummvm.org/index.php/OpenPandora">ScummVM OpenPandora WiKi</a><br/>
<h4>
- <p>ScummVM 2.2.0git: General Documentation</p>
+ <p>ScummVM 2.3.0git: General Documentation</p>
</h4>
<A href="https://www.scummvm.org/">ScummVM website</a><br/>
diff --git a/dists/redhat/scummvm-tools.spec b/dists/redhat/scummvm-tools.spec
index dc90cd7a63..15d964e2ec 100644
--- a/dists/redhat/scummvm-tools.spec
+++ b/dists/redhat/scummvm-tools.spec
@@ -7,7 +7,7 @@
# Prologue information
#------------------------------------------------------------------------------
Name : scummvm-tools
-Version : 2.2.0git
+Version : 2.3.0git
Release : 1
Summary : ScummVM-related tools
Group : Interpreters
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index 250737817e..3668472f9b 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -7,7 +7,7 @@
# Prologue information
#------------------------------------------------------------------------------
Name : scummvm
-Version : 2.2.0git
+Version : 2.3.0git
Release : 1
Summary : Graphic adventure game interpreter
Group : Interpreters
diff --git a/dists/riscos/!Boot,feb b/dists/riscos/!Boot,feb
index dbd9a0a79e..b42e3ca05b 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.2.0git"
+Set ScummVM$Version "2.3.0git"
diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild
index 9e02405ef3..29462647ac 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.2.0git
+VERSION=2.3.0git
ARCH=i486
BUILD=1
diff --git a/dists/wii/meta.xml b/dists/wii/meta.xml
index fe521e16de..1aac5a1c41 100644
--- a/dists/wii/meta.xml
+++ b/dists/wii/meta.xml
@@ -2,7 +2,7 @@
<app version="1">
<name>ScummVM</name>
<coder>The ScummVM Team</coder>
- <version>2.2.0git at REVISION@</version>
+ <version>2.3.0git at REVISION@</version>
<release_date>@TIMESTAMP@</release_date>
<short_description>Point & Click Adventures</short_description>
<long_description>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!
More information about the Scummvm-git-logs
mailing list