From 88275ce9485598666abfa9f658e07f240e35ba0d Mon Sep 17 00:00:00 2001
From: Volker Ruppert <Volker.Ruppert@t-online.de>
Date: Sun, 13 Jun 2021 05:15:32 +0000
Subject: [PATCH] Preparing pre-release.

---
 bochs/README                     | 30 ++++++++++--------------------
 bochs/build/win32/bochs.manifest |  2 +-
 bochs/configure.in               |  8 ++++----
 3 files changed, 15 insertions(+), 25 deletions(-)

diff --git a/bochs/README b/bochs/README
index 0052834a3..8372a8058 100644
--- a/bochs/README
+++ b/bochs/README
@@ -1,6 +1,6 @@
 Bochs - The cross platform IA-32 (x86) emulator
-Updated: Sun Jan  5 08:36:00 CET 2020
-Version: 2.6.11
+Updated: Sun Jun 13 07:15:00 CEST 2021
+Version: 2.7.pre1
 
 WHAT IS BOCHS?
 
@@ -81,23 +81,13 @@ many ways you could help out.  For example:
 
 CHANGES
 
-Summary of changes in 2.6.11:
-  - General
-    - Added 64-bit support to the NSIS installer script
-    - Several fixes in the build system based on Debian patches
-  - CPU / CPUDB
-    - Bugfixes for CPU emulation correctness
-      - Many critical bugfixes for Protection Keys, AVX512*, VMX/SVM, SHA, GFNI emulation
-    ! Implemented CET (Control Flow Enforcement Technology) emulation according to Intel SDM rev071
-  - I/O Devices
-    - Added missing Cirrus SVGA bitblt feature "transparent color compare"
-    - Some fixes in HPET emulation (patch by Oleg)
-    - Fixed disk image lock mechanism in the USB MSD case
-  - BIOS / VGABIOS
-    - LGPL'd VGABIOS updated to version 0.7b (Fixed VESA extension 'read EDID'
-      for Bochs VBE and Cirrus)
-    - Updated SeaBIOS ROM image to current version 1.13.0
-    - Added SeaVGABIOS ROM image for the Cirrus adapter
-    - Bochs BIOS built to work with CPU level 5 again
+Brief summary of changes in 2.7.pre1:
+  - Improvements for the plugin handling to simplify Bochs extensions
+  - Added "multiple NICs" support to the NE2000 and E1000 devices
+  - Added experimental FTP service for networking modules 'vnet' and 'socket'
+  - Fixes and improvements for all supported Voodoo graphics adapters
+  - Added USB keyboard emulation with most of the keys supported
+  - GUI "cmdmode": create a headerbar event with key combo starting with F7
+  - LGPL'd VGABIOS updated to version 0.8a (new VGABIOS for Voodoo Banshee)
 
 See CHANGES file for more information!
diff --git a/bochs/build/win32/bochs.manifest b/bochs/build/win32/bochs.manifest
index 5fa3dc6f5..21636eb75 100644
--- a/bochs/build/win32/bochs.manifest
+++ b/bochs/build/win32/bochs.manifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <assemblyIdentity
-    version="2.6.11.0"
+    version="2.6.91.0"
     processorArchitecture="*"
     name="Bochs.Bochs.Bochs"
     type="win32"
diff --git a/bochs/configure.in b/bochs/configure.in
index 39b3d3609..468eaabce 100644
--- a/bochs/configure.in
+++ b/bochs/configure.in
@@ -8,14 +8,14 @@ AC_CONFIG_HEADER(ltdlconf.h)
 
 dnl // Put Bochs version information right here so that it gets substituted
 dnl // into all the right places.
-VERSION="2.6.11.svn"
+VERSION="2.7.pre1"
 VER_MAJOR=2
 VER_MINOR=6
 dnl // this should be > 90 for pre-release of next version otherwise revision level
-VER_REVISION=11
+VER_REVISION=91
 dnl // this should be 0 for release and 1 for svn version
-VER_SVN=1
-REL_STRING="Built from SVN snapshot after release 2.6.11"
+VER_SVN=0
+REL_STRING="Built from SVN snapshot on June 13, 2021"
 REL_TIMESTAMP=`grep "Updated:" $srcdir/README | sed 's/Updated: //'`
 
 changequote(<<, >>)