Switched to version 1.1.21.1.2

4 files changed, 69 insertions, 3 deletions

diff --git a/include/dix-config.h b/include/dix-config.h
index 06156eaa4..0c01266ad 100644
--- a/include/dix-config.h
+++ b/include/dix-config.h
@@ -396,7 +396,7 @@
 #undef XORG_RELEASE
 
 /* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((1) * 100000) + ((1) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((1) * 100000) + ((2) * 1000) + 0)
 
 /* Xorg release date */
 #define XORG_DATE "10 Sept 2009"
diff --git a/releasenotes/releasenote_1.1.2.txt b/releasenotes/releasenote_1.1.2.txt
new file mode 100644
index 000000000..c60978b69
--- /dev/null
+++ b/releasenotes/releasenote_1.1.2.txt
@@ -0,0 +1,66 @@
+Changes in 1.1.2

+----------------

+- Updated to the following packages:

+        xorg-server-1.6.99.902

+        xproto-7.0.16

+        libXdmcp-1.0.3

+        bdftopcf-1.0.2

+- Solved endless looping when clipboardthread is restarted due to winioerrhandler.

+  Caused an unexpected exit of the server when the -clipboard option was specified.

+- Solved possible crash upon server restart because some global pointers

+  were not initialised back to 0

+

+Changes in 1.1.1

+----------------

+- Updated to the following packages:

+        xorg-server-1.6.99.901

+        xkeyboard-config-1.6.99

+- Enabled support for xinerama

+- Rewritten part of the clipboard code (sometimes clipboard was

+  not working as expected)

+  One problem remains (clipboard thread exiting at startup.). This

+  one is hard to solve since no known recipy to reproduce.

+- Now also install the debug version of the executable (vcxsrv_dbg).

+  This version has some more logging and error checking.

+- Solved stack corruption in QueryMonitor. Now use multimon.h

+- Bug solved in xcb_conn.c: use closesocket instead of close.

+- Also display the number of active clients in the tray icon tooltip text.

+

+Changes in 1.1.0

+----------------

+- Updated to the following packages:

+        libX11-1.2.99.901.tar.gz

+        xtrans-1.2.4.tar.gz

+        fontsproto-2.1.0.tar.gz

+        damageproto-1.2.0.tar.gz

+        xcmiscproto-1.2.0.tar.gz

+        bigreqsproto-1.1.0.tar.gz

+        scrnsaverproto-1.2.0.tar.gz

+        resourceproto-1.1.0.tar.gz

+        xextproto-7.1.1.tar.gz

+        recordproto-1.13.99.1.tar.gz

+        inputproto-1.9.99.902.tar.gz

+        font-util-1.0.2.tar.gz

+        xorg-server-1.6.99.900.tar.gz

+- Make sure clipboard thread is cleaned up correctly on error.

+  Solved clipboard thread exits causing the clipboard not to be working.

+- Solved some errors in the fonts directory due to makefile problems

+

+Changes in 1.0.2

+----------------

+

+- installer: Do not show details by default

+- xlaunch: show message box when display number is nto filled in.

+- BUG: Solved right mouse button not working in multi window mode.

+- Added plink tool in installation.

+- Xlaunch is now a windows application in stead of a console application

+

+Changes in 1.0.1

+----------------

+

+- installer: make sure the latest version of the installed MSVC run-time is used.

+- BUG: Solved mouse wheel not behaving correctly (especially when there are multiple monitors)

+- locale: swith to the version of libX11/nls/C/makefile

+- clipboard: solved paste problem from X to windows (in Vista)

+- xkbcomp/listing.c: Solved uninitialised variable error in WIN32

+- xkbdata.src/symbols/level3: Removed warning when compiling for be keyboard.

diff --git a/xorg-server/hw/xwin/XWin.rc b/xorg-server/hw/xwin/XWin.rc
index bc845c0b1..dc6a325ee 100644
--- a/xorg-server/hw/xwin/XWin.rc
+++ b/xorg-server/hw/xwin/XWin.rc
@@ -45,7 +45,7 @@ FONT 8, "MS Shell Dlg 2"
 BEGIN

   CONTROL				IDI_XWIN, IDC_STATIC, "Static", SS_ICON, 8, 8, 32, 32

   LTEXT			"VcXsrv X Server ", IDC_STATIC, 36, 8, 220, 8

-  LTEXT			"Version 1.1.1 (21 Sept 2009)", IDC_STATIC, 36, 18, 220, 8

+  LTEXT			"Version 1.1.2 (25 Sept 2009)", IDC_STATIC, 36, 18, 220, 8

   DEFPUSHBUTTON		"OK", IDOK, 105, 75, 50, 15

 END

 

diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index e96408101..6b66a4cd6 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -11,7 +11,7 @@
 Name "VcXsrv"

 

 ; The file to write

-OutFile "vcxsrv.1.1.1.installer.exe"

+OutFile "vcxsrv.1.1.2.installer.exe"

 

 ; The default installation directory

 InstallDir $PROGRAMFILES\VcXsrv