[Scummvm-git-logs] scummvm branch-2-1-0 -> 857a8eb1f226a0439fd29bbe26022a0393d99fa0

sev- sev at scummvm.org
Fri Oct 4 23:20:28 CEST 2019


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
857a8eb1f2 RELEASE: This is 2.1.0


Commit: 857a8eb1f226a0439fd29bbe26022a0393d99fa0
    https://github.com/scummvm/scummvm/commit/857a8eb1f226a0439fd29bbe26022a0393d99fa0
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-10-04T23:19:58+02:00

Commit Message:
RELEASE: This is 2.1.0

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 11beec3..08f7ab8 100644
--- a/backends/platform/psp/README.PSP
+++ b/backends/platform/psp/README.PSP
@@ -1,4 +1,4 @@
-ScummVM-PSP 2.1.0pre README
+ScummVM-PSP 2.1.0 README
 ==============================================================================
 
 Installation
diff --git a/base/internal_version.h b/base/internal_version.h
index 3814cc7..f3c095a 100644
--- a/base/internal_version.h
+++ b/base/internal_version.h
@@ -16,7 +16,7 @@
 #define SCUMMVM_REVISION
 #endif
 
-#define SCUMMVM_VERSION "2.1.0pre"
+#define SCUMMVM_VERSION "2.1.0"
 
 #define SCUMMVM_VER_MAJOR 2
 #define SCUMMVM_VER_MINOR 1
diff --git a/dists/amiga/RM2AG.rexx b/dists/amiga/RM2AG.rexx
index 8025867..0cd892a 100644
--- a/dists/amiga/RM2AG.rexx
+++ b/dists/amiga/RM2AG.rexx
@@ -29,7 +29,7 @@ OPEN(guide_write,'README.guide','W')
 Prepare the Amiga guide file, add the intro and fixed text.
 */
 WRITELN(guide_write,'@DATABASE ScummVM README.guide')
-WRITELN(guide_write,'@$VER: ScummVM Readme 2.1.0pre')
+WRITELN(guide_write,'@$VER: ScummVM Readme 2.1.0')
 WRITELN(guide_write,'@(C) by The ScummVM team')
 WRITELN(guide_write,'@AUTHOR The ScummVM team')
 WRITELN(guide_write,'@WORDWRAP')
diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index f4684ec..31ad33a 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.0pre"
+		android:versionName="2.1.0"
 		android:sharedUserId="org.scummvm.scummvm">
 
 	<uses-sdk android:minSdkVersion="3"
diff --git a/dists/gph/README-GPH b/dists/gph/README-GPH
index 35b8e77..104ac58 100644
--- a/dists/gph/README-GPH
+++ b/dists/gph/README-GPH
@@ -1,4 +1,4 @@
-ScummVM 2.1.0pre - GPH DEVICE SPECIFIC README
+ScummVM 2.1.0 - GPH DEVICE SPECIFIC README
 
 ------------------------------------------------------------------------
 
diff --git a/dists/gph/scummvm.ini b/dists/gph/scummvm.ini
index b50639b..6eafe39 100644
--- a/dists/gph/scummvm.ini
+++ b/dists/gph/scummvm.ini
@@ -1,5 +1,5 @@
 [info]
-name="ScummVM 2.1.0pre"
+name="ScummVM 2.1.0"
 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 230203f..03e5ee2 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.0pre</string>
+	<string>2.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.1.0pre</string>
+	<string>2.1.0</string>
 	<key>LSSupportsOpeningDocumentsInPlace</key>
 	<true/>
 	<key>UIApplicationExitsOnSuspend</key>
diff --git a/dists/iphone/Info.plist b/dists/iphone/Info.plist
index 0eaf820..1743aae 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.0pre</string>
+	<string>2.1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.1.0pre</string>
+	<string>2.1.0</string>
 	<key>CFBundleIconFile</key>
 	<string>icon.png</string>
 	<key>CFBundleIconFiles</key>
diff --git a/dists/irix/scummvm.spec b/dists/irix/scummvm.spec
index 3c21c96..6b0b260 100644
--- a/dists/irix/scummvm.spec
+++ b/dists/irix/scummvm.spec
@@ -1,5 +1,5 @@
 product scummvm
-    id "ScummVM 2.1.0pre"
+    id "ScummVM 2.1.0"
     image sw
         id "software"
         version 18
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index d5f99b1..d63f2b3 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.0pre, Copyright 2001-2019 The ScummVM Team</string>
+	<string>2.1.0, Copyright 2001-2019 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.0pre</string>
+	<string>2.1.0</string>
 	<key>CFBundleVersion</key>
-	<string>2.1.0pre</string>
+	<string>2.1.0</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright 2001-2019 The ScummVM Team</string>
 	<key>NSPrincipalClass</key>
diff --git a/dists/macosx/dockplugin/Info.plist b/dists/macosx/dockplugin/Info.plist
index 24f63fb..087be53 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.0pre</string>
+	<string>2.1.0</string>
 	<key>CFBundleVersion</key>
-	<string>2.1.0pre</string>
+	<string>2.1.0</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright 2001-2019 The ScummVM Team</string>
 	<key>NSPrincipalClass</key>
diff --git a/dists/openpandora/PXML.xml b/dists/openpandora/PXML.xml
index 7b7a4ac..f472043 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="1" release="0" build="1" type="release"/>
         <!-- Both title and titles are needed -->
-        <title lang="en_US">ScummVM 2.1.0pre</title>
+        <title lang="en_US">ScummVM 2.1.0</title>
         <titles>
-            <title lang="en_US">ScummVM 2.1.0pre</title>
+            <title lang="en_US">ScummVM 2.1.0</title>
         </titles>
         <descriptions>
             <description lang="en_US">
diff --git a/dists/openpandora/README-OPENPANDORA b/dists/openpandora/README-OPENPANDORA
index 3279851..dc8b0e7 100644
--- a/dists/openpandora/README-OPENPANDORA
+++ b/dists/openpandora/README-OPENPANDORA
@@ -1,4 +1,4 @@
-ScummVM 2.1.0pre - OPENPANDORA SPECIFIC README
+ScummVM 2.1.0 - OPENPANDORA SPECIFIC README
 ------------------------------------------------------------------------
 Please refer to the:
 
diff --git a/dists/openpandora/README-PND.txt b/dists/openpandora/README-PND.txt
index a42c4d3..901c1ac 100644
--- a/dists/openpandora/README-PND.txt
+++ b/dists/openpandora/README-PND.txt
@@ -1,4 +1,4 @@
-ScummVM 2.1.0pre - OPENPANDORA README - HOW TO INSTALL
+ScummVM 2.1.0 - OPENPANDORA README - HOW TO INSTALL
 ------------------------------------------------------------------------
 
 Please refer to the:
diff --git a/dists/openpandora/index.html b/dists/openpandora/index.html
index 7239986..84e3275 100644
--- a/dists/openpandora/index.html
+++ b/dists/openpandora/index.html
@@ -5,7 +5,7 @@
 </h3>
 
 <h4>
-  <p>ScummVM 2.1.0pre: OpenPandora Specific Documentation</p>
+  <p>ScummVM 2.1.0: 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.0pre: General Documentation</p>
+  <p>ScummVM 2.1.0: 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 5e8fbb9..f874791 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.0pre
+Version		: 2.1.0
 Release		: 1
 Summary		: ScummVM-related tools
 Group		: Interpreters
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index fa5bc13..7ab5b90 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -7,7 +7,7 @@
 #   Prologue information
 #------------------------------------------------------------------------------
 Name		: scummvm
-Version		: 2.1.0pre
+Version		: 2.1.0
 Release		: 1
 Summary		: Graphic adventure game interpreter
 Group		: Interpreters
diff --git a/dists/riscos/!Boot,feb b/dists/riscos/!Boot,feb
index d0a1169..817981e 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.0pre"
+Set ScummVM$Version "2.1.0"
diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild
index a2ce391..6bf9f59 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.0pre
+VERSION=2.1.0
 ARCH=i486
 BUILD=1
 
diff --git a/dists/wii/meta.xml b/dists/wii/meta.xml
index f9cc279..c6b54ad 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.0pre at REVISION@</version>
+  <version>2.1.0 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 9fd1f1e..f7a124d 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -1,5 +1,5 @@
 name: scummvm
-version: "2.1.0pre"
+version: "2.1.0"
 summary: ScummVM
 description: |
     ScummVM is a program which allows you to run certain classic graphical





More information about the Scummvm-git-logs mailing list