From 3c01d9f72ee2a48152c41e0c1bab3b0673018edb Mon Sep 17 00:00:00 2001 From: stephena Date: Sat, 24 Apr 2010 18:03:57 +0000 Subject: [PATCH] Getting ready for the 3.1.1 release. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2025 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- Announce.txt | 24 ++++++++++++------------ Changes.txt | 10 ++++++++-- Readme.txt | 4 ++-- debian/changelog | 9 ++++++++- docs/index.html | 2 +- src/macosx/Info-Stella.plist | 2 +- src/unix/stella.SlackBuild | 2 +- src/unix/stella.spec | 7 +++++-- src/win32/stella.iss | 1 - src/win32/stella.rc | 8 ++++---- 10 files changed, 42 insertions(+), 27 deletions(-) diff --git a/Announce.txt b/Announce.txt index 877ecaba8..d0e02c295 100644 --- a/Announce.txt +++ b/Announce.txt @@ -9,7 +9,7 @@ SSSS ttt eeeee llll llll aaaaa =========================================================================== - Release 3.1 for Linux, MacOSX and Windows + Release 3.1.1 for Linux, MacOSX and Windows =========================================================================== The Atari 2600 Video Computer System (VCS), introduced in 1977, was the @@ -21,30 +21,30 @@ all of your favourite Atari 2600 games again! Stella was originally developed for Linux by Bradford W. Mott, however, it has been ported to a number of other platforms and is currently maintained by Stephen Anthony. -This is the 3.1 release of Stella for Linux, Mac OSX and Windows. The +This is the 3.1.1 release of Stella for Linux, Mac OSX and Windows. The distributions currently available are: * Binary installer (exe) for Windows 32-bit & 64-bit : - Stella-3.1-win32.exe - Stella-3.1-x64.exe + Stella-3.1.1-win32.exe + Stella-3.1.1-x64.exe * Binary zip for Windows, containing 32 and 64-bit versions : - Stella-3.1-windows.zip + Stella-3.1.1-windows.zip * Binary distribution for MacOSX 32-bit & 64-bit : - Stella-3.1-macosx.dmg (32-bit Universal Binary) - Stella-3.1_intel_10.6-macosx.dmg (32/64-bit Intel/Snow-Leopard only) + Stella-3.1.1-macosx.dmg (32-bit Universal Binary) + Stella-3.1.1_intel_10.6-macosx.dmg (32/64-bit Intel/Snow-Leopard only) * Binary distribution in 32-bit & 64-bit Ubuntu DEB format : - stella_3.1-1_i386.deb - stella_3.1-1_amd64.deb + stella_3.1.1-1_i386.deb + stella_3.1.1-1_amd64.deb * Binary distribution in 32-bit & 64-bit RPM format : - stella-3.1-2.i386.rpm - stella-3.1-2.x86_64.rpm + stella-3.1.1-2.i386.rpm + stella-3.1.1-2.x86_64.rpm * Source code distribution for all platforms : - stella-3.1-src.tar.gz + stella-3.1.1-src.tar.gz PLEASE DO NOT WRITE ASKING FOR ROM IMAGES TO USE WITH STELLA! ALL SUCH REQUESTS WILL BE IGNORED! diff --git a/Changes.txt b/Changes.txt index eec775256..cdaa03ca5 100644 --- a/Changes.txt +++ b/Changes.txt @@ -12,6 +12,14 @@ Release History =========================================================================== +3.1 to 3.1.1: (April 26, 2010) + + * Fixed program crash when using RIOT addresses and labels in the + debugger console prompt. + +-Have fun! + + 3.0 to 3.1: (April 22, 2010) * Fixed a major bug with text drawing in software rendering mode. @@ -172,8 +180,6 @@ * Fixed bug in certain editable text fields, where pressing Return/Enter would disable any further input. --Have fun! - 2.8.4 to 3.0: (September 11, 2009) diff --git a/Readme.txt b/Readme.txt index 3e643c48f..bcd330981 100644 --- a/Readme.txt +++ b/Readme.txt @@ -1,4 +1,4 @@ -This is release 3.1 of Stella. Stella is a multi-platform Atari 2600 VCS +This is release 3.1.1 of Stella. Stella is a multi-platform Atari 2600 VCS emulator which allows you to play all of your favourite Atari 2600 games on your PC. You'll find the Stella Users Manual in the docs subdirectory. If you'd like to verify that you have the latest release of Stella visit @@ -9,4 +9,4 @@ the Stella Website at: Enjoy, The Stella Team -April 22, 2010 +April 26, 2010 diff --git a/debian/changelog b/debian/changelog index 23fe8e6ad..9ae7e65f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,15 @@ +stella (3.1.1-1) stable; urgency=high + + * Version 3.1.1 release + + -- Stephen Anthony Mon, 26 April 2010 18:38:25 +0200 + + stella (3.1-1) stable; urgency=high * Version 3.1 release - -- Stephen Anthony Fri, 16 April 2010 18:38:25 +0200 + -- Stephen Anthony Thu, 22 April 2010 18:38:25 +0200 stella (3.0-1) stable; urgency=high diff --git a/docs/index.html b/docs/index.html index c05fede2b..930147ab0 100644 --- a/docs/index.html +++ b/docs/index.html @@ -10,7 +10,7 @@

A multi-platform Atari 2600 VCS emulator

-

Release 3.1

+

Release 3.1.1



User's Guide

diff --git a/src/macosx/Info-Stella.plist b/src/macosx/Info-Stella.plist index 3fbbd7a67..7a60078e0 100644 --- a/src/macosx/Info-Stella.plist +++ b/src/macosx/Info-Stella.plist @@ -53,7 +53,7 @@ CFBundleSignature StLa CFBundleVersion - 3.1 + 3.1.1 NSMainNibFile SDLMain.nib NSPrincipalClass diff --git a/src/unix/stella.SlackBuild b/src/unix/stella.SlackBuild index 56aa5c47f..dd5da883d 100644 --- a/src/unix/stella.SlackBuild +++ b/src/unix/stella.SlackBuild @@ -13,7 +13,7 @@ die() { exit 1 } -VERSION=3.1 +VERSION=3.1.1 ARCH=${ARCH-i486} BUILD=1 diff --git a/src/unix/stella.spec b/src/unix/stella.spec index 07ab7d05c..e0c00eb55 100644 --- a/src/unix/stella.spec +++ b/src/unix/stella.spec @@ -1,5 +1,5 @@ %define name stella -%define version 3.1 +%define version 3.1.1 %define rel 1 %define enable_gl 1 @@ -107,7 +107,10 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %_datadir/icons/large/%{name}.png %changelog -* Fri Apr 22 2010 Stephen Anthony 3.1-1 +* Mon Apr 26 2010 Stephen Anthony 3.1.1-1 +- Version 3.1.1 release + +* Thu Apr 22 2010 Stephen Anthony 3.1-1 - Version 3.1 release * Fri Sep 11 2009 Stephen Anthony 3.0-1 diff --git a/src/win32/stella.iss b/src/win32/stella.iss index 04e60dbab..0159360f4 100755 --- a/src/win32/stella.iss +++ b/src/win32/stella.iss @@ -35,4 +35,3 @@ Name: "{group}\Stella"; Filename: "{app}\Stella.exe"; WorkingDir: "{app}" Name: "{userdesktop}\Stella"; Filename: "{app}\Stella.exe"; WorkingDir: "{app}"; Tasks: desktopicon Name: "{group}\Documentation"; Filename: "{app}\docs\index.html" Name: "{group}\Uninstall Stella"; Filename: "{uninstallexe}" - diff --git a/src/win32/stella.rc b/src/win32/stella.rc index 6133fdfc0..fa1f421c4 100755 --- a/src/win32/stella.rc +++ b/src/win32/stella.rc @@ -36,8 +36,8 @@ IDI_ICON ICON "stella.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 3,1,0,0 - PRODUCTVERSION 3,1,0,0 + FILEVERSION 3,1,1,0 + PRODUCTVERSION 3,1,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -55,12 +55,12 @@ BEGIN VALUE "Comments", "The multi-platform Atari 2600 emulator. Stella is released under the GPLv2." VALUE "CompanyName", "The Stella Team (http://stella.sourceforge.net)" VALUE "FileDescription", "Stella" - VALUE "FileVersion", "3.1" + VALUE "FileVersion", "3.1.1" VALUE "InternalName", "Stella" VALUE "LegalCopyright", "Copyright (C) 1995-2010 B. Mott & the Stella Team" VALUE "OriginalFilename", "Stella.exe" VALUE "ProductName", "Stella" - VALUE "ProductVersion", "3.1" + VALUE "ProductVersion", "3.1.1" END END BLOCK "VarFileInfo"