[Scummvm-git-logs] scummvm branch-2-6 -> 3001e893d911994ba0110cbef94b44d62d4b35d0
lotharsm
noreply at scummvm.org
Sat Jul 16 19:46:32 UTC 2022
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:
1b7dfd0737 RELEASE: This is 2.6.1pre
3001e893d9 DISTS: WIN32: Specify release date for 2.6.0
Commit: 1b7dfd0737e78729f59042e6fa0e25ebe4e84bc7
https://github.com/scummvm/scummvm/commit/1b7dfd0737e78729f59042e6fa0e25ebe4e84bc7
Author: Lothar Serra Mari (mail at serra.me)
Date: 2022-07-16T21:44:59+02:00
Commit Message:
RELEASE: This is 2.6.1pre
Changed paths:
backends/platform/psp/README.PSP
base/internal_version.h
dists/amigaos/md2ag.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 3dc959e3890..05563757c93 100644
--- a/backends/platform/psp/README.PSP
+++ b/backends/platform/psp/README.PSP
@@ -1,4 +1,4 @@
-ScummVM-PSP 2.6.0pre README
+ScummVM-PSP 2.6.1pre README
==============================================================================
Installation
diff --git a/base/internal_version.h b/base/internal_version.h
index 182e165fdbe..6d505a1c1a8 100644
--- a/base/internal_version.h
+++ b/base/internal_version.h
@@ -16,8 +16,8 @@
#define SCUMMVM_REVISION
#endif
-#define SCUMMVM_VERSION "2.6.0pre"
+#define SCUMMVM_VERSION "2.6.1pre"
#define SCUMMVM_VER_MAJOR 2
#define SCUMMVM_VER_MINOR 6
-#define SCUMMVM_VER_PATCH 0
+#define SCUMMVM_VER_PATCH 1
diff --git a/dists/amigaos/md2ag.rexx b/dists/amigaos/md2ag.rexx
index d80db0e1f5d..74389ba0c5b 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.6.0pre'
+CALL WRITELN write_guide,'@$VER: ScummVM Readme 2.6.1pre'
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/gph/README-GPH b/dists/gph/README-GPH
index 6e26df8929d..cb16bd510a6 100644
--- a/dists/gph/README-GPH
+++ b/dists/gph/README-GPH
@@ -1,4 +1,4 @@
-ScummVM 2.6.0pre - GPH DEVICE SPECIFIC README
+ScummVM 2.6.1pre - GPH DEVICE SPECIFIC README
------------------------------------------------------------------------
diff --git a/dists/gph/scummvm.ini b/dists/gph/scummvm.ini
index fdd6756f8ab..1bd2ce5a0f5 100644
--- a/dists/gph/scummvm.ini
+++ b/dists/gph/scummvm.ini
@@ -1,5 +1,5 @@
[info]
-name="ScummVM 2.6.0pre"
+name="ScummVM 2.6.1pre"
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 ffdbe9a93f2..32027f4afd9 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.6.0pre</string>
+ <string>2.6.1pre</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.6.0pre</string>
+ <string>2.6.1pre</string>
<key>LSSupportsOpeningDocumentsInPlace</key>
<true/>
<key>UIApplicationExitsOnSuspend</key>
diff --git a/dists/iphone/Info.plist b/dists/iphone/Info.plist
index 4cb16f799c4..e58b7e9914c 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.6.0pre</string>
+ <string>2.6.1pre</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>2.6.0pre</string>
+ <string>2.6.1pre</string>
<key>CFBundleIconFile</key>
<string>icon.png</string>
<key>CFBundleIconFiles</key>
diff --git a/dists/irix/scummvm.spec b/dists/irix/scummvm.spec
index fa8b3bc41b9..43268b68602 100644
--- a/dists/irix/scummvm.spec
+++ b/dists/irix/scummvm.spec
@@ -1,5 +1,5 @@
product scummvm
- id "ScummVM 2.6.0pre"
+ id "ScummVM 2.6.1pre"
image sw
id "software"
version 18
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index 2e18eb391fc..72858795cd8 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.6.0pre, Copyright 2001-2022 The ScummVM Team</string>
+ <string>2.6.1pre, Copyright 2001-2022 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.6.0pre</string>
+ <string>2.6.1pre</string>
<key>CFBundleVersion</key>
- <string>2.6.0pre</string>
+ <string>2.6.1pre</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2001-2022 The ScummVM Team</string>
<key>NSPrincipalClass</key>
diff --git a/dists/macosx/dockplugin/Info.plist b/dists/macosx/dockplugin/Info.plist
index 6f3f204c4a2..a2fedbeaa86 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.6.0pre</string>
+ <string>2.6.1pre</string>
<key>CFBundleVersion</key>
- <string>2.6.0pre</string>
+ <string>2.6.1pre</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright 2001-2022 The ScummVM Team</string>
<key>NSPrincipalClass</key>
diff --git a/dists/openpandora/PXML.xml b/dists/openpandora/PXML.xml
index 68a69c3b5f9..e8f9da1327d 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="6" release="0" build="1" type="release"/>
+ <version major="2" minor="6" release="1" build="1" type="release"/>
<!-- Both title and titles are needed -->
- <title lang="en_US">ScummVM 2.6.0pre</title>
+ <title lang="en_US">ScummVM 2.6.1pre</title>
<titles>
- <title lang="en_US">ScummVM 2.6.0pre</title>
+ <title lang="en_US">ScummVM 2.6.1pre</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="6" release="0" build="1" type="release"/>
+ <version major="2" minor="6" release="1" 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 7ee4b342c4f..61141d95781 100644
--- a/dists/openpandora/README-OPENPANDORA
+++ b/dists/openpandora/README-OPENPANDORA
@@ -1,4 +1,4 @@
-ScummVM 2.6.0pre - OPENPANDORA SPECIFIC README
+ScummVM 2.6.1pre - OPENPANDORA SPECIFIC README
------------------------------------------------------------------------
Please refer to the:
diff --git a/dists/openpandora/README-PND.txt b/dists/openpandora/README-PND.txt
index 3c6f74e5244..6178fd5f027 100644
--- a/dists/openpandora/README-PND.txt
+++ b/dists/openpandora/README-PND.txt
@@ -1,4 +1,4 @@
-ScummVM 2.6.0pre - OPENPANDORA README - HOW TO INSTALL
+ScummVM 2.6.1pre - OPENPANDORA README - HOW TO INSTALL
------------------------------------------------------------------------
Please refer to the:
diff --git a/dists/openpandora/index.html b/dists/openpandora/index.html
index af464fcbd9c..5dea6548285 100644
--- a/dists/openpandora/index.html
+++ b/dists/openpandora/index.html
@@ -5,7 +5,7 @@
</h3>
<h4>
- <p>ScummVM 2.6.0pre: OpenPandora Specific Documentation</p>
+ <p>ScummVM 2.6.1pre: 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.6.0pre: General Documentation</p>
+ <p>ScummVM 2.6.1pre: 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 0e4491aac3e..0cc4ccac508 100644
--- a/dists/redhat/scummvm-tools.spec
+++ b/dists/redhat/scummvm-tools.spec
@@ -7,7 +7,7 @@
# Prologue information
#------------------------------------------------------------------------------
Name : scummvm-tools
-Version : 2.6.0pre
+Version : 2.6.1pre
Release : 1
Summary : ScummVM-related tools
Group : Interpreters
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index 346819afea1..8e005f58a7d 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -7,7 +7,7 @@
# Prologue information
#------------------------------------------------------------------------------
Name : scummvm
-Version : 2.6.0pre
+Version : 2.6.1pre
Release : 1
Summary : Graphic adventure game interpreter
Group : Interpreters
diff --git a/dists/riscos/!Boot,feb b/dists/riscos/!Boot,feb
index bc56e7e2d38..83624b494c8 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.6.0pre"
+Set ScummVM$Version "2.6.1pre"
diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild
index 947c477c2b5..55e20826f8c 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.6.0pre
+VERSION=2.6.1pre
ARCH=i486
BUILD=1
diff --git a/dists/wii/meta.xml b/dists/wii/meta.xml
index 2c5c4abd304..ddd1e92a746 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.6.0pre at REVISION@</version>
+ <version>2.6.1pre 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!
Commit: 3001e893d911994ba0110cbef94b44d62d4b35d0
https://github.com/scummvm/scummvm/commit/3001e893d911994ba0110cbef94b44d62d4b35d0
Author: Lothar Serra Mari (mail at serra.me)
Date: 2022-07-16T21:46:15+02:00
Commit Message:
DISTS: WIN32: Specify release date for 2.6.0
Changed paths:
dists/win32/scummvm.gdf.xml
diff --git a/dists/win32/scummvm.gdf.xml b/dists/win32/scummvm.gdf.xml
index fbfe9494bfb..b329b24a6bd 100644
--- a/dists/win32/scummvm.gdf.xml
+++ b/dists/win32/scummvm.gdf.xml
@@ -3,7 +3,7 @@
<GameDefinition gameID="{F2475C5C-EA7C-41F0-A56D-1ABF7CFEA389}">
<Name>ScummVM</Name>
<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!</Description>
- <ReleaseDate>2021-10-09</ReleaseDate>
+ <ReleaseDate>2022-08-01</ReleaseDate>
<Genres>
<Genre>Adventure</Genre>
</Genres>
More information about the Scummvm-git-logs
mailing list