RELEASE: This is 2.1.0git

18 files changed, 34 insertions, 30 deletions

diff --git a/dists/android/AndroidManifest.xml b/dists/android/AndroidManifest.xml
index 3201fbee7e..178e084840 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.0.0git"
+		android:versionName="2.1.0git"
 		android:sharedUserId="org.scummvm.scummvm">
 
 	<uses-sdk android:minSdkVersion="3"
diff --git a/dists/gph/README-GPH b/dists/gph/README-GPH
index 55136e5352..8116b41c2b 100644
--- a/dists/gph/README-GPH
+++ b/dists/gph/README-GPH
@@ -1,4 +1,4 @@
-ScummVM 2.0.0git - GPH DEVICE SPECIFIC README
+ScummVM 2.1.0git - GPH DEVICE SPECIFIC README
 
 ------------------------------------------------------------------------
 
diff --git a/dists/gph/scummvm.ini b/dists/gph/scummvm.ini
index 339554d9ee..1218cd8762 100644
--- a/dists/gph/scummvm.ini
+++ b/dists/gph/scummvm.ini
@@ -1,5 +1,5 @@
 [info]
-name="ScummVM 2.0.0git"
+name="ScummVM 2.1.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 6cc5f6ede9..b730b4189b 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.0.0git</string>
+	<string>2.1.0git</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.0git</string>
+	<string>2.1.0git</string>
 	<key>UIApplicationExitsOnSuspend</key>
 	<false/>
 	<key>UIDeviceFamily</key>
diff --git a/dists/iphone/Info.plist b/dists/iphone/Info.plist
index a757eb645f..d12d121ee6 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.0.0git</string>
+	<string>2.1.0git</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.0git</string>
+	<string>2.1.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 3e121d8a82..9ecd4dc951 100644
--- a/dists/irix/scummvm.spec
+++ b/dists/irix/scummvm.spec
@@ -1,5 +1,5 @@
 product scummvm
-    id "ScummVM 2.0.0git"
+    id "ScummVM 2.1.0git"
     image sw
         id "software"
         version 18
diff --git a/dists/macosx/Info.plist b/dists/macosx/Info.plist
index ffeb9dd569..f61bb3b462 100644
--- a/dists/macosx/Info.plist
+++ b/dists/macosx/Info.plist
@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>scummvm</string>
 	<key>CFBundleGetInfoString</key>
-	<string>2.0.0git, Copyright 2001-2017 The ScummVM Team</string>
+	<string>2.1.0git, Copyright 2001-2017 The ScummVM Team</string>
 	<key>CFBundleIconFile</key>
 	<string>scummvm.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -45,9 +45,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0git</string>
+	<string>2.1.0git</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.0git</string>
+	<string>2.1.0git</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright 2001-2017 The ScummVM Team</string>
 	<key>NSPrincipalClass</key>
diff --git a/dists/macosx/dockplugin/Info.plist b/dists/macosx/dockplugin/Info.plist
index 7f51ef4d4a..f030b60b9b 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.0.0git</string>
+	<string>2.1.0git</string>
 	<key>CFBundleVersion</key>
-	<string>2.0.0git</string>
+	<string>2.1.0git</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright 2001-2017 The ScummVM Team</string>
 	<key>NSPrincipalClass</key>
diff --git a/dists/openpandora/PXML.xml b/dists/openpandora/PXML.xml
index b728e9201b..37dcaa653b 100644
--- a/dists/openpandora/PXML.xml
+++ b/dists/openpandora/PXML.xml
@@ -4,11 +4,11 @@
     <package id="scummvm.djwillis.0001">
         <author name="DJWillis" website="http://www.scummvm.org/"/>
         <!-- version type can be alpha, beta or release, set to release in branch -->
-        <version major="2" minor="0" release="0" build="1" type="release"/>
+        <version major="2" minor="1" release="0" build="1" type="release"/>
         <!-- Both title and titles are needed -->
-        <title lang="en_US">ScummVM 2.0.0git</title>
+        <title lang="en_US">ScummVM 2.1.0git</title>
         <titles>
-            <title lang="en_US">ScummVM 2.0.0git</title>
+            <title lang="en_US">ScummVM 2.1.0git</title>
         </titles>
         <descriptions>
             <description lang="en_US">
@@ -25,7 +25,7 @@
         <exec command="./runscummvm.sh"/>
         <author name="DJWillis" website="http://www.scummvm.org/"/>
         <!-- version type can be alpha, beta or release, set to release in branch -->
-        <version major="2" minor="0" release="0" build="1" type="release"/>
+        <version major="2" minor="1" 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 daa3197146..5b105a1ddb 100644
--- a/dists/openpandora/README-OPENPANDORA
+++ b/dists/openpandora/README-OPENPANDORA
@@ -1,4 +1,4 @@
-ScummVM 2.0.0git - OPENPANDORA SPECIFIC README
+ScummVM 2.1.0git - OPENPANDORA SPECIFIC README
 ------------------------------------------------------------------------
 Please refer to the:
 
diff --git a/dists/openpandora/README-PND.txt b/dists/openpandora/README-PND.txt
index 0a1f4435e6..37513f34d7 100644
--- a/dists/openpandora/README-PND.txt
+++ b/dists/openpandora/README-PND.txt
@@ -1,4 +1,4 @@
-ScummVM 2.0.0git - OPENPANDORA README - HOW TO INSTALL
+ScummVM 2.1.0git - OPENPANDORA README - HOW TO INSTALL
 ------------------------------------------------------------------------
 
 Please refer to the:
diff --git a/dists/openpandora/index.html b/dists/openpandora/index.html
index 6c241bdf8a..66493ddeac 100644
--- a/dists/openpandora/index.html
+++ b/dists/openpandora/index.html
@@ -5,7 +5,7 @@
 </h3>
 
 <h4>
-  <p>ScummVM 2.0.0git: OpenPandora Specific Documentation</p>
+  <p>ScummVM 2.1.0git: OpenPandora Specific Documentation</p>
 </h4>
 
 <A href="docs/README-OPENPANDORA">ScummVM OpenPandora README</a><br/>
@@ -13,7 +13,7 @@
 <A href="http://wiki.scummvm.org/index.php/OpenPandora">ScummVM OpenPandora WiKi</a><br/>
 
 <h4>
-  <p>ScummVM 2.0.0git: General Documentation</p>
+  <p>ScummVM 2.1.0git: General Documentation</p>
 </h4>
 
 <A href="http://www.scummvm.org/">ScummVM website</a><br/>
diff --git a/dists/redhat/scummvm-tools.spec b/dists/redhat/scummvm-tools.spec
index 8a87b95ffb..0de3747c00 100644
--- a/dists/redhat/scummvm-tools.spec
+++ b/dists/redhat/scummvm-tools.spec
@@ -7,7 +7,7 @@
 #   Prologue information
 #------------------------------------------------------------------------------
 Name		: scummvm-tools
-Version		: 2.0.0git
+Version		: 2.1.0git
 Release		: 1
 Summary		: ScummVM-related tools
 Group		: Interpreters
@@ -67,5 +67,9 @@ rm -Rf ${RPM_BUILD_ROOT}
 #   Change Log
 #------------------------------------------------------------------------------
 %changelog
+* Thu Nov 23 2017 (2.0.0)
+  - remove own libmad since this is now in Fedora itself
+* Sat Apr 03 2010 (1.2.0)
+  - include libmad
 * Sat Mar 26 2005 (0.7.1)
   - first tools package
diff --git a/dists/redhat/scummvm.spec b/dists/redhat/scummvm.spec
index eb84b6e324..21f0aec404 100644
--- a/dists/redhat/scummvm.spec
+++ b/dists/redhat/scummvm.spec
@@ -7,7 +7,7 @@
 #   Prologue information
 #------------------------------------------------------------------------------
 Name		: scummvm
-Version		: 2.0.0git
+Version		: 2.1.0git
 Release		: 1
 Summary		: Graphic adventure game interpreter
 Group		: Interpreters
diff --git a/dists/riscos/!Boot,feb b/dists/riscos/!Boot,feb
index fc6cb78b3c..ad4fef1709 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 "http://www.scummvm.org/"
-Set ScummVM$Version "2.0.0git"
+Set ScummVM$Version "2.1.0git"
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 89c1905026..2cdeeb8227 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -73,8 +73,8 @@ pred.dic               FILE    "dists/pred.dic"
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION     2,0,0,0
- PRODUCTVERSION  2,0,0,0
+ FILEVERSION     2,1,0,0
+ PRODUCTVERSION  2,1,0,0
  FILEFLAGSMASK   VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS       VS_FF_DEBUG
@@ -92,13 +92,13 @@ BEGIN
             VALUE "Comments", "Look! A three headed monkey (TM)! .. Nice use of the TM!\0"
             VALUE "CompanyName", "scummvm.org\0"
             VALUE "FileDescription", "http://www.scummvm.org/\0"
-            VALUE "FileVersion", "2.0.0git\0"
+            VALUE "FileVersion", "2.1.0git\0"
             VALUE "InternalName", "scummvm\0"
             VALUE "LegalCopyright", "Copyright © 2001-2017 The ScummVM Team\0"
             VALUE "LegalTrademarks", "'SCUMM', and all SCUMM games are a TM of LucasArts. Simon The Sorcerer is a TM of AdventureSoft. Beneath a Steel Sky and Broken Sword are a TM of Revolution. Flight of the Amazon Queen is a TM of John Passfield and Steve Stamatiadis. \0"
             VALUE "OriginalFilename", "scummvm.exe\0"
             VALUE "ProductName", "ScummVM\0"
-            VALUE "ProductVersion", "2.0.0git\0"
+            VALUE "ProductVersion", "2.1.0git\0"
         END
     END
 
diff --git a/dists/slackware/scummvm.SlackBuild b/dists/slackware/scummvm.SlackBuild
index 4a20d01fab..14b2b492c5 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.0.0git
+VERSION=2.1.0git
 ARCH=i486
 BUILD=1
 
diff --git a/dists/wii/meta.xml b/dists/wii/meta.xml
index e961fd16f9..4d3801a47a 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.0.0git@REVISION@</version>
+  <version>2.1.0git@REVISION@</version>
   <release_date>@TIMESTAMP@</release_date>
   <short_description>Point &amp; 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!