From 877f2c9f3c28de42ff3292b186161fdf955409f3 Mon Sep 17 00:00:00 2001 From: stephena Date: Tue, 28 Oct 2014 16:44:18 +0000 Subject: [PATCH] Final updates for 4.2 release. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3026 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- Announce.txt | 22 +++++++++++----------- Changes.txt | 2 +- debian/changelog | 7 +++++++ src/common/Version.hxx | 2 +- src/debugger/CartDebug.cxx | 1 + src/macosx/Info-Stella.plist | 2 +- src/unix/stella.spec | 6 ++++-- src/windows/stella.rc | 8 ++++---- 8 files changed, 30 insertions(+), 20 deletions(-) diff --git a/Announce.txt b/Announce.txt index d35ed4855..35c6f61b4 100644 --- a/Announce.txt +++ b/Announce.txt @@ -9,7 +9,7 @@ SSSS ttt eeeee llll llll aaaaa =========================================================================== - Release 4.1.1 for Linux, MacOSX and Windows + Release 4.2 for Linux, MacOSX and Windows =========================================================================== The Atari 2600 Video Computer System (VCS), introduced in 1977, was the @@ -21,27 +21,27 @@ 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 4.1.1 release of Stella for Linux, Mac OSX and Windows. The +This is the 4.2 release of Stella for Linux, Mac OSX and Windows. The distributions currently available are: * Binaries for Windows XP_SP3/Vista/7/8 : - Stella-4.1.1-win32.exe (32-bit EXE installer) - Stella-4.1.1-x64.exe (64-bit EXE installer) - Stella-4.1.1-windows.zip (32/64 bit versions) + Stella-4.2-win32.exe (32-bit EXE installer) + Stella-4.2-x64.exe (64-bit EXE installer) + Stella-4.2-windows.zip (32/64 bit versions) * Binary distribution for MacOS X 10.5 and above : - Stella-4.1.1-macosx.dmg (32/64-bit Intel Universal Binary) + Stella-4.2-macosx.dmg (32/64-bit Intel Universal Binary) * Binary distribution in 32-bit & 64-bit Ubuntu DEB format : - stella_4.1.1-1_i386.deb - stella_4.1.1-1_amd64.deb + stella_4.2-1_i386.deb + stella_4.2-1_amd64.deb * Binary distribution in 32-bit & 64-bit RPM format : - stella-4.1.1-2.i386.rpm - stella-4.1.1-2.x86_64.rpm + stella-4.2-2.i386.rpm + stella-4.2-2.x86_64.rpm * Source code distribution for all platforms : - stella-4.1.1-src.tar.gz + stella-4.2-src.tar.gz Distribution Site diff --git a/Changes.txt b/Changes.txt index b69a94b6b..163285335 100644 --- a/Changes.txt +++ b/Changes.txt @@ -12,7 +12,7 @@ Release History =========================================================================== -4.1.1 to 4.2: (xxx xx, 2014) +4.1.1 to 4.2: (October 28, 2014) * Text input from non-US keyboard layouts is now supported. Note that all text in Stella is still ASCII-only, but at least it can now be diff --git a/debian/changelog b/debian/changelog index b22f09ed3..1a190468b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +stella (4.2-1) stable; urgency=high + + * Version 4.2 release + + -- Stephen Anthony Tue, 28 Oct 2014 13:50:43 -0230 + + stella (4.1.1-1) stable; urgency=high * Version 4.1.1 release diff --git a/src/common/Version.hxx b/src/common/Version.hxx index e1fa300bb..cfe49dc68 100644 --- a/src/common/Version.hxx +++ b/src/common/Version.hxx @@ -22,7 +22,7 @@ #include -#define STELLA_VERSION "4.2_beta2" +#define STELLA_VERSION "4.2" #define STELLA_BUILD atoi("$Rev$" + 6) #endif diff --git a/src/debugger/CartDebug.cxx b/src/debugger/CartDebug.cxx index 98675f210..8ca128540 100644 --- a/src/debugger/CartDebug.cxx +++ b/src/debugger/CartDebug.cxx @@ -39,6 +39,7 @@ CartDebug::CartDebug(Debugger& dbg, Console& console, const OSystem& osystem) : DebuggerSystem(dbg, console), myOSystem(osystem), myDebugWidget(0), + myAddrToLineIsROM(true), myRWPortAddress(0), myLabelLength(8) // longest pre-defined label { diff --git a/src/macosx/Info-Stella.plist b/src/macosx/Info-Stella.plist index fb06a044b..84a012dc9 100644 --- a/src/macosx/Info-Stella.plist +++ b/src/macosx/Info-Stella.plist @@ -53,7 +53,7 @@ CFBundleSignature StLa CFBundleVersion - 4.1.1 + 4.2 LSMinimumSystemVersionByArchitecture i386 diff --git a/src/unix/stella.spec b/src/unix/stella.spec index 98a384bcf..f5f81b8c4 100644 --- a/src/unix/stella.spec +++ b/src/unix/stella.spec @@ -1,8 +1,7 @@ %define name stella -%define version 4.1.1 +%define version 4.2 %define rel 1 -%define enable_gl 1 %define enable_sound 1 %define enable_debugger 1 %define enable_joystick 1 @@ -102,6 +101,9 @@ rm -rf $RPM_BUILD_DIR/%{name}-%{version} %_datadir/icons/large/%{name}.png %changelog +* Tue Oct 28 2014 Stephen Anthony 4.2-1 +- Version 4.2 release + * Sun Sep 14 2014 Stephen Anthony 4.1.1-1 - Version 4.1.1 release diff --git a/src/windows/stella.rc b/src/windows/stella.rc index f24832845..ce2e638bc 100755 --- a/src/windows/stella.rc +++ b/src/windows/stella.rc @@ -36,8 +36,8 @@ IDI_ICON ICON "stella.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 4,1,1,0 - PRODUCTVERSION 4,1,1,0 + FILEVERSION 4,2,0,0 + PRODUCTVERSION 4,2,0,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", "4.1.1" + VALUE "FileVersion", "4.2" VALUE "InternalName", "Stella" VALUE "LegalCopyright", "Copyright (C) 1995-2014 The Stella Team" VALUE "OriginalFilename", "Stella.exe" VALUE "ProductName", "Stella" - VALUE "ProductVersion", "4.1.1" + VALUE "ProductVersion", "4.2" END END BLOCK "VarFileInfo"