[Scummvm-git-logs] scummvm branch-2-1 -> c53afbd08a2495adc275a9078fb565f86fcdca5b
sev-
sev at scummvm.org
Fri Jan 17 21:14:57 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:
ae364930e2 AMIGAOS4: Propagated changes from RM2AG.rexx to .in
c53afbd08a RELEASE: This is 2.1.2pre
Commit: ae364930e2cde9914da185360d398d264d0638f4
https://github.com/scummvm/scummvm/commit/ae364930e2cde9914da185360d398d264d0638f4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-17T22:14:17+01:00
Commit Message:
AMIGAOS4: Propagated changes from RM2AG.rexx to .in
Changed paths:
dists/amiga/RM2AG.rexx.in
diff --git a/dists/amiga/RM2AG.rexx.in b/dists/amiga/RM2AG.rexx.in
index 62d6ef6..8eb3971 100644
--- a/dists/amiga/RM2AG.rexx.in
+++ b/dists/amiga/RM2AG.rexx.in
@@ -1,32 +1,81 @@
/*
-README(.md) to .guide converter $VER: RM2AG.rexx 0.20 (18.05.2019)
-This script converts a given markdown README file of ScummVM to a basic
-hypertext Amiga guide file.
+$VER: RM2AG.rexx 0.23 (24.10.2019) README(.md) to .guide converter.
+This script converts a given markdown README file (right now, only
+ScummVM is supported) to a basic hypertext Amiga guide file and installs
+it to a given path, if available.
*/
-PARSE ARG readme_md
+PARSE ARG readme_md install_path
/*
-Check if the given file is really the readme.
-If a given filename has spaces, AmigaDOS/AmigaCLI will add extra
-quotation marks to secure a sane working path. We get rid of them to make
-AREXX find the file.
+Check if arguments are available, otherwise quit.
*/
-readme_md=COMPRESS(readme_md,'"')
-OPEN(check_readme,readme_md,'R')
-IF READCH(check_readme,18) = '# [ScummVM README]' THEN
- CLOSE(check_readme)
+IF ~ARG() THEN DO
+ SAY 'No Arguments given!'
+ SAY 'Usage: RM2AG.rexx README_MD INSTALL_PATH'
+ EXIT
+END
+
+/*
+If the given filename/path has spaces in it, AmigaDOS/CLI
+will add extra quotation marks to secure a sane working path.
+Get rid of them to make AREXX find the file and remove leading
+and trailing spaces.
+*/
+IF ~EXISTS(readme_md) THEN DO
+ SAY readme_md' not available!'
+ EXIT
+END
+ELSE DO
+ readme_md=STRIP(readme_md)
+ readme_md=COMPRESS(readme_md,'"')
+END
+IF installpath='' THEN DO
+ SAY 'No installation destination given!'
+ EXIT
+END
+ELSE DO
+ install_path=STRIP(install_path)
+ install_path=STRIP(install_path,'T','/')
+ install_path=COMPRESS(install_path,'"')
+ /*
+ Check for destination path and create it, if needed.
+ */
+ IF ~EXISTS(install_path'/') THEN
+ ADDRESS COMMAND 'makedir 'install_path
+END
+
+IF ~OPEN(check_readme,readme_md,'R') THEN DO
+ SAY readme_md' opening failed!'
+ EXIT
+END
+
+IF READCH(check_readme,18) = '# [ScummVM README]' THEN DO
+ IF ~CLOSE(check_readme) THEN DO
+ SAY readme_md' closing failed!'
+ EXIT
+ END
+END
ELSE DO
+ IF ~CLOSE(check_readme) THEN DO
+ SAY readme_md' closing failed!'
+ EXIT
+ END
SAY "Not the ScummVM README.md file. Aborting!"
- CLOSE(check_readme)
- EXIT 0
+ EXIT
END
-OPEN(readme_read,readme_md,'R')
-OPEN(guide_write,'README.guide','W')
+IF ~OPEN(readme_read,readme_md,'R') THEN DO
+ SAY 'File 'readme_md' opening failed!'
+ EXIT
+END
+IF ~OPEN(guide_write,'README.guide','W') THEN DO
+ SAY README.guide' opening failed!'
+ EXIT
+END
/*
-Prepare the Amiga guide file, add the intro and fixed text.
+Prepare the Amiga guide file, add intro and fixed text.
*/
WRITELN(guide_write,'@DATABASE ScummVM README.guide')
WRITELN(guide_write,'@$VER: ScummVM Readme @VERSION@')
@@ -39,22 +88,21 @@ WRITELN(guide_write,SUBSTR(READLN(readme_read),4,14))
WRITELN(guide_write,'@{ub}')
/*
-Creating the main (TOC) link nodes.
+Creating main (TOC) link nodes.
*/
DO WHILE EOF(readme_read) = 0
working_line=READLN(readme_read)
/*
- Check for the start of actual the content and, if found, leave the
- TOC link loop.
+ Check for start of actual content and, if available, leave TOC link loop.
*/
IF POS('## <>1.0<>)',working_line) = 1 THEN
LEAVE
/*
- Check for any "rolled over" lines, if found, read in the rest (on the
- following line) and rejoin them again, before processing any further.
+ Check for any "rolled over" lines and, if available, read in the rest
+ (on the following line) and rejoin them again before processing any further.
e.g. - [<>3.6.3<>) Broken Sword games
cutscenes](#363-broken-sword-games-cutscenes)
*/
@@ -72,19 +120,19 @@ DO WHILE EOF(readme_read) = 0
WRITELN(guide_write,working_line)
ELSE DO
/*
- Fix the empty chapters:
- Two chapters (1.0 and 7.8) are "empty", consisting of only it's
- chapter names. We link them to their respective sub chapters
- (1.1 and 7.8.1), so we don't end up displaying a blank page.
-
- If chapter 1.0 is found, add a link node to chapter 1.1.
+ Fix empty chapters:
+ 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
/*
- Get rid of the markers, so the following loops won't process
+ Get rid of the markers, so the following loops won`t process
them again.
*/
- working_line=COMPRESS(working_line,'-[<>')
+ working_line=COMPRESS(working_line,'[<>')
WRITELN(guide_write,' @{" 1.0 " Link "1.1"} 'SUBSTR(working_line,1,LASTPOS(']',working_line)-1))
END
@@ -93,38 +141,38 @@ DO WHILE EOF(readme_read) = 0
*/
IF POS(' - [<>7.8<>)',working_line) = 1 THEN DO
/*
- Get rid of the markers, so the following loops won't process
+ Get rid of the markers, so the following loops won`t process
them again.
*/
- working_line=COMPRESS(working_line,'-[<>')
+ working_line=COMPRESS(working_line,'[<>')
WRITELN(guide_write,' @{" 7.8 " Link "7.8.1"} 'SUBSTR(working_line,1,LASTPOS(']',working_line)-1))
END
/*
- If a single number main chapter is found (1.0 upto 9.0), prepare
- and write the link node.
+ If a single number main chapter is found (1.0 upto 9.0),
+ prepare and write the link node.
Just for the record:
A "\" (backslash) is treated as escape character in AmigaGuides.
- Thus we remove it from the node links.
+ Remove it from the node links.
*/
IF POS('- [<>',working_line) = 3 THEN DO
WRITELN(guide_write,' ')
WRITELN(guide_write,' @{" 'SUBSTR(working_line,POS('<>',working_line)+2,LASTPOS('<>',working_line)-POS('<>',working_line)-2) '" Link "'SUBSTR(working_line,POS('<>',working_line)+2,LASTPOS('<>',working_line)-POS('<>',working_line)-2)'"} 'COMPRESS(SUBSTR(working_line,1,LASTPOS(']',working_line)-1),'*<>[]\'))
/*
- Get rid of the markers, so the following loops won't process
+ Get rid of the markers, so the following loops won`t process
them again.
*/
working_line=COMPRESS(working_line,'-[<>')
END
/*
- If a single number level one sub chapter is found
- (i.e. 1.1, 1.2 etc.), prepare and write the link node.
+ If a level one sub chapter is found (i.e. 1.1, 1.2 etc.),
+ prepare and write the link node.
*/
IF POS('- [<>',working_line) = 7 THEN DO
WRITELN(guide_write,' @{" 'SUBSTR(working_line,POS('<>',working_line)+2,LASTPOS('<>',working_line)-POS('<>',working_line)-2) '" Link "'SUBSTR(working_line,POS('<>',working_line)+2,LASTPOS('<>',working_line)-POS('<>',working_line)-2)'"} 'COMPRESS(SUBSTR(working_line,1,LASTPOS(']',working_line)-1),'*<>[]\'))
/*
- Get rid of the markers, so the following loops won't process
+ Get rid of the markers, so the following loops won`t process
them again.
*/
working_line=COMPRESS(working_line,'.[<>')
@@ -137,7 +185,7 @@ DO WHILE EOF(readme_read) = 0
IF POS('- [<>',working_line) = 11 THEN DO
WRITELN(guide_write,' @{" 'SUBSTR(working_line,POS('<>',working_line)+2,LASTPOS('<>',working_line)-POS('<>',working_line)-2) '" Link "'SUBSTR(working_line,POS('<>',working_line)+2,LASTPOS('<>',working_line)-POS('<>',working_line)-2)'"} 'COMPRESS(SUBSTR(working_line,1,LASTPOS(']',working_line)-1),'*<>[]\'))
/*
- Get rid of the markers, so the following loops won't process
+ Get rid of the markers, so the following loops won`t process
them again.
*/
working_line=COMPRESS(working_line,'.[<>')
@@ -146,8 +194,8 @@ DO WHILE EOF(readme_read) = 0
END
/*
-Finish the TOC (Hardcoded due the outro text would be read in last, but
-needs to be written after the TOC creation).
+Finish TOC (hardcoded as the outro text would be read in last,
+but needs to be written after TOC creation finished).
*/
WRITELN(guide_write,'-----')
WRITELN(guide_write,' ')
@@ -156,11 +204,11 @@ WRITELN(guide_write,'The ScummVM team.')
WRITELN(guide_write,'@{"https://www.scummvm.org/" System "URLOpen https://www.scummvm.org/"}')
/*
-Creating the sub link nodes.
+Creating sub link nodes.
*/
DO WHILE EOF(readme_read) = 0
/*
- Change the html/markdown links to AmigaGuide ones
+ Change html/markdown links to AmigaGuide ones.
*/
IF POS('[here](',working_line) > 0 THEN DO
working_line=INSERT('@{"',working_line,POS('[',working_line)-1)
@@ -177,26 +225,26 @@ DO WHILE EOF(readme_read) = 0
ELSE DO
/*
Fix empty chapters:
- Two chapters (1.0 and 7.8) are "empty", consisting of only it's
- chapter names. We link them to their respective sub chapters
- (1.1 and 7.8.1), so we don't end up displaying a blank page.
- If chapter 1.1 is found don't close the NODE, just write the line.
+ 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
/*
- Get rid of the markers, so the following loops won't process
+ Get rid of the markers, so the following loops won`t process
them again.
*/
WRITELN(guide_write,COMPRESS(working_line,'<>'))
END
/*
- If chapter 7.8.1 is found don't close the NODE, just write the
- line.
+ If chapter 7.8.1 is found don`t close the NODE, just write the line.
*/
IF POS('<>7.8.1<>',working_line) = 1 THEN DO
/*
- Get rid of the markers, so the following loops won't process
+ Get rid of the markers, so the following loops won`t process
them again.
*/
WRITELN(guide_write,COMPRESS(working_line,'<>'))
@@ -210,20 +258,20 @@ DO WHILE EOF(readme_read) = 0
IF POS('section <>',working_line) > 0 THEN DO
working_line=SUBSTR(working_line,1,POS('<>',working_line)-1)'@{"'SUBSTR(working_line,POS('<>',working_line)+2,LASTPOS('<>',working_line)-POS('<>',working_line)-2)'" Link "'SUBSTR(working_line,POS('<>',working_line)+2,LASTPOS('<>',working_line)-POS('<>',working_line)-2)'"}'SUBSTR(working_line,LASTPOS('<>',working_line)+2)
/*
- Get rid of the markers, so the following loops won't
+ Get rid of the markers, so the following loops won`t
process them again.
*/
WRITELN(guide_write,COMPRESS(working_line,'<>'))
END
ELSE DO
/*
- If a chapter has been found, prepare and write the link.
+ If a chapter has been found, prepare and write the link node.
*/
WRITELN(guide_write,'@ENDNODE')
WRITELN(guide_write,'@NODE "'SUBSTR(working_line,POS('<>',working_line)+2,LASTPOS('<>',working_line)-POS('<>',working_line)-2)'" "'COMPRESS(working_line,'<>#')'"')
WRITELN(guide_write,' ')
/*
- Get rid of the markers, so the following loops won't process
+ Get rid of the markers, so the following loops won`t process
them again.
*/
WRITELN(guide_write,COMPRESS(working_line,'<>'))
@@ -237,7 +285,7 @@ DO WHILE EOF(readme_read) = 0
working_line=READLN(readme_read)
/*
- If the outtro text is found, leave the loop and prepare for closing.
+ If the outtro text has been found, leave loop and prepare for closing.
*/
IF POS('-----',working_line,1) =1 THEN
LEAVE
@@ -246,11 +294,24 @@ END
WRITELN(guide_write,'@ENDNODE')
/*
-Close the guide and clean up.
+Close guide and clean up.
*/
WRITELN(guide_write,'@ENDNODE')
-CLOSE(readme_read)
-CLOSE(guide_write)
+IF ~CLOSE(readme_read) THEN DO
+ SAY readme_md' closing failed!'
+ EXIT
+END
+IF ~CLOSE(guide_write) THEN DO
+ SAY 'README.guide closing failed!'
+ EXIT
+END
+
+/*
+Install finished README.guide to installation path
+and delete README.guide.
+*/
+ADDRESS COMMAND 'copy README.guide 'install_path
+ADDRESS COMMAND 'delete README.guide'
-EXIT 0
+EXIT
Commit: c53afbd08a2495adc275a9078fb565f86fcdca5b
https://github.com/scummvm/scummvm/commit/c53afbd08a2495adc275a9078fb565f86fcdca5b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-01-17T22:14:47+01:00
Commit Message:
RELEASE: This is 2.1.2pre
Changed paths:
backends/platform/psp/README.PSP
base/internal_version.h
dists/amiga/RM2AG.rexx
dists/android/AndroidManifest.xml
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
snapcraft.yaml
diff --git a/backends/platform/psp/README.PSP b/backends/platform/psp/README.PSP
index eb0cc49..4c1b733 100644
--- a/backends/platform/psp/README.PSP
+++ b/backends/platform/psp/README.PSP
@@ -1,4 +1,4 @@
-ScummVM-PSP 2.1.1pre README
+ScummVM-PSP 2.1.2pre README
==============================================================================
Installation
diff --git a/base/internal_version.h b/base/internal_version.h
index 89befd4..bb8dffc 100644
--- a/base/internal_version.h
+++ b/base/internal_version.h
@@ -16,8 +16,8 @@
#define SCUMMVM_REVISION
#endif
-#define SCUMMVM_VERSION "2.1.1pre"
+#define SCUMMVM_VERSION "2.1.2pre"
#define SCUMMVM_VER_MAJOR 2
#define SCUMMVM_VER_MINOR 1
-#define SCUMMVM_VER_PATCH 1
+#define SCUMMVM_VER_PATCH 2
diff --git a/dists/amiga/RM2AG.rexx b/dists/amiga/RM2AG.rexx
index 56959ee..ee7f0e4 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.
*/
WRITELN(guide_write,'@DATABASE ScummVM README.guide')
-WRITELN(guide_write,'@$VER: ScummVM Readme 2.1.1pre')
+WRITELN(guide_write,'@$VER: ScummVM Readme 2.1.2pre')
WRITELN(guide_write,'@(C) by The ScummVM team')
WRITELN(guide_write,'@AUTHOR The ScummVM team')
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/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index 9efb9aa..6f51811 100644
--- a/dists/android/AndroidManifest.xml
+++ b/dists/android/AndroidManifest.xml
@@ -4,7 +4,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.scummvm.scummvm"
android:versionCode="@ANDROID_VERSIONCODE@"
- android:versionName="2.1.1pre"
+ android:versionName="2.1.2pre"
android:launchMode="singleTask"
android:installLocation="auto"
android:sharedUserId="org.scummvm.scummvm">
diff --git a/dists/gph/README-GPH b/dists/gph/README-GPH
index dcadff3..fb8f2d6 100644
--- a/dists/gph/README-GPH
+++ b/dists/gph/README-GPH
@@ -1,4 +1,4 @@
-ScummVM 2.1.1pre - GPH DEVICE SPECIFIC README
+ScummVM 2.1.2pre - GPH DEVICE SPECIFIC README
------------------------------------------------------------------------
diff --git a/dists/gph/scummvm.ini b/dists/gph/scummvm.ini
index fc50959..588717a 100644
--- a/dists/gph/scummvm.ini
+++ b/dists/gph/scummvm.ini
@@ -1,5 +1,5 @@
[info]
-name="ScummVM 2.1.1pre"
+name="ScummVM 2.1.2pre"
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 27e4303..a965892 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.1.1pre</string>
+ <string>2.1.2pre</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.1.1pre</string>
+ <string>2.1.2pre</string>
<key>LSSupportsOpeningDocumentsInPlace</key>
<true/>
<key>UIApplicationExitsOnSuspend</key>
diff --git a/dists/iphone/Info.plist b/dists/iphone/Info.plist
index 6499d4d..f99d395 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.1.1pre</string>
+ <string>2.1.2pre</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.1.1pre</string>
+ <string>2.1.2pre</string>
<key>CFBundleIconFile</key>
<string>icon.png</string>
<key>CFBundleIconFiles</key>
diff --git a/dists/irix/scummvm.spec b/dists/irix/scummvm.spec
index 8131e82..4d7e50d 100644
--- a/dists/irix/scummvm.spec
+++ b/dists/irix/scummvm.spec
@@ -1,5 +1,5 @@
product scummvm
- id "ScummVM 2.1.1pre"
+ id "ScummVM 2.1.2pre"
image sw
id "software"
version 18
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index ba62e3f..904508f 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.1.1pre, Copyright 2001-2020 The ScummVM Team</string>
+ <string>2.1.2pre, 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.1.1pre</string>
+ <string>2.1.2pre</string>
<key>CFBundleVersion</key>
- <string>2.1.1pre</string>
+ <string>2.1.2pre</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 2d08466..ccae8a4 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.1.1pre</string>
+ <string>2.1.2pre</string>
<key>CFBundleVersion</key>
- <string>2.1.1pre</string>
+ <string>2.1.2pre</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 1e599c3..6e4facb 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="1" release="1" build="1" type="release"/>
+ <version major="2" minor="1" release="2" build="1" type="release"/>
<!-- Both title and titles are needed -->
- <title lang="en_US">ScummVM 2.1.1pre</title>
+ <title lang="en_US">ScummVM 2.1.2pre</title>
<titles>
- <title lang="en_US">ScummVM 2.1.1pre</title>
+ <title lang="en_US">ScummVM 2.1.2pre</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="1" release="1" build="1" type="release"/>
+ <version major="2" minor="1" release="2" 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 bfaf9f0..5604b1a 100644
--- a/dists/openpandora/README-OPENPANDORA
+++ b/dists/openpandora/README-OPENPANDORA
@@ -1,4 +1,4 @@
-ScummVM 2.1.1pre - OPENPANDORA SPECIFIC README
+ScummVM 2.1.2pre - OPENPANDORA SPECIFIC README
------------------------------------------------------------------------
Please refer to the:
diff --git a/dists/openpandora/README-PND.txt b/dists/openpandora/README-PND.txt
index 32ced0e..c237f92 100644
--- a/dists/openpandora/README-PND.txt
+++ b/dists/openpandora/README-PND.txt
@@ -1,4 +1,4 @@
-ScummVM 2.1.1pre - OPENPANDORA README - HOW TO INSTALL
+ScummVM 2.1.2pre - OPENPANDORA README - HOW TO INSTALL
------------------------------------------------------------------------
Please refer to the:
diff --git a/dists/openpandora/index.html b/dists/openpandora/index.html
index 2fe4710..a82bcd1 100644
--- a/dists/openpandora/index.html
+++ b/dists/openpandora/index.html
@@ -5,7 +5,7 @@
</h3>
<h4>
- <p>ScummVM 2.1.1pre: OpenPandora Specific Documentation</p>
+ <p>ScummVM 2.1.2pre: 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.1.1pre: General Documentation</p>
+ <p>ScummVM 2.1.2pre: 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 7728bb9..5615920 100644
--- a/dists/redhat/scummvm-tools.spec
+++ b/dists/redhat/scummvm-tools.spec
@@ -7,7 +7,7 @@
# Prologue information
#------------------------------------------------------------------------------
Name : scummvm-tools
-Version : 2.1.1pre
+Version : 2.1.2pre
Release : 1
Summary : ScummVM-related tools
Group : Interpreters
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index 8958931..d7478e7 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -7,7 +7,7 @@
# Prologue information
#------------------------------------------------------------------------------
Name : scummvm
-Version : 2.1.1pre
+Version : 2.1.2pre
Release : 1
Summary : Graphic adventure game interpreter
Group : Interpreters
diff --git a/dists/riscos/!Boot,feb b/dists/riscos/!Boot,feb
index 6f1f1e9..6195894 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.1.1pre"
+Set ScummVM$Version "2.1.2pre"
diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild
index f95a870..c6719fe 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.1.1pre
+VERSION=2.1.2pre
ARCH=i486
BUILD=1
diff --git a/dists/wii/meta.xml b/dists/wii/meta.xml
index 224f5e6..d216352 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.1.1pre at REVISION@</version>
+ <version>2.1.2pre 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!
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 062cbf5..70c12da 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
name: scummvm
-version: "2.1.1pre"
+version: "2.1.2pre"
summary: ScummVM
description: |
ScummVM is a program which allows you to run certain classic graphical
More information about the Scummvm-git-logs
mailing list