[Scummvm-git-logs] scummvm branch-2-2 -> b7cab6b4a3187d131aa98a3101bd545aa98a7034

Sun Aug 30 11:47:55 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:
9e63a4ce7c DEVTOOLS: Remove obsolete file from update-version.pl
b7cab6b4a3 RELEASE: Update rest of the pre-generated files


Commit: 9e63a4ce7cd834bcb29b9fecb9c0f0763e2d171c
    https://github.com/scummvm/scummvm/commit/9e63a4ce7cd834bcb29b9fecb9c0f0763e2d171c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-30T13:43:37+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: b7cab6b4a3187d131aa98a3101bd545aa98a7034
    https://github.com/scummvm/scummvm/commit/b7cab6b4a3187d131aa98a3101bd545aa98a7034
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-30T13:43:57+02:00

Commit Message:
RELEASE: Update rest of the pre-generated files

Changed paths:
    backends/platform/psp/README.PSP
    dists/amiga/RM2AG.rexx
    dists/gph/README-GPH
    dists/gph/scummvm.ini
    dists/openpandora/PXML.xml
    dists/openpandora/README-OPENPANDORA
    dists/openpandora/README-PND.txt
    dists/openpandora/index.html
    dists/riscos/!Boot,feb


diff --git a/backends/platform/psp/README.PSP b/backends/platform/psp/README.PSP
index 378053f257..d3f648587f 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.2.0pre README
 ==============================================================================
 
 Installation
diff --git a/dists/amiga/RM2AG.rexx b/dists/amiga/RM2AG.rexx
index 165b94a06c..ef2bdf4586 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.2.0pre'
 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..2ea20f1546 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.2.0pre - GPH DEVICE SPECIFIC README
 
 ------------------------------------------------------------------------
 
diff --git a/dists/gph/scummvm.ini b/dists/gph/scummvm.ini
index 61f45d14bc..34e4023ef1 100644
--- a/dists/gph/scummvm.ini
+++ b/dists/gph/scummvm.ini
@@ -1,5 +1,5 @@
 [info]
-name="ScummVM 2.2.0git"
+name="ScummVM 2.2.0pre"
 path="/scummvm/scummvm.gpe"
 icon="/scummvm/scummvm.png"
 title="/scummvm/scummvmb.png"
diff --git a/dists/openpandora/PXML.xml b/dists/openpandora/PXML.xml
index 1dd1473f84..37906f69c4 100644
--- a/dists/openpandora/PXML.xml
+++ b/dists/openpandora/PXML.xml
@@ -6,9 +6,9 @@
         <!-- version type can be alpha, beta or release, set to release in branch -->
         <version major="2" minor="2" 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.2.0pre</title>
         <titles>
-            <title lang="en_US">ScummVM 2.2.0git</title>
+            <title lang="en_US">ScummVM 2.2.0pre</title>
         </titles>
         <descriptions>
             <description lang="en_US">
diff --git a/dists/openpandora/README-OPENPANDORA b/dists/openpandora/README-OPENPANDORA
index 90103ebfa2..4102ace85a 100644
--- a/dists/openpandora/README-OPENPANDORA
+++ b/dists/openpandora/README-OPENPANDORA
@@ -1,4 +1,4 @@
-ScummVM 2.2.0git - OPENPANDORA SPECIFIC README
+ScummVM 2.2.0pre - OPENPANDORA SPECIFIC README
 ------------------------------------------------------------------------
 Please refer to the:
 
diff --git a/dists/openpandora/README-PND.txt b/dists/openpandora/README-PND.txt
index 14273085a2..077ce2f9e3 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.2.0pre - OPENPANDORA README - HOW TO INSTALL
 ------------------------------------------------------------------------
 
 Please refer to the:
diff --git a/dists/openpandora/index.html b/dists/openpandora/index.html
index 3b4362e755..5ea48d6608 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.2.0pre: 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.2.0pre: General Documentation</p>
 </h4>
 
 <A href="https://www.scummvm.org/">ScummVM website</a><br/>
diff --git a/dists/riscos/!Boot,feb b/dists/riscos/!Boot,feb
index dbd9a0a79e..c8facb532a 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.2.0pre"


