TigerVNC 1.4.2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2615bd2c1469f8e76e81e3ed2bf3a279719d2b2..e19fd9e2066a2e5e4a523241392241408fcb2b2c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ project(tigervnc)
 set(VERSION 1.4.1)
 
 # The RC version must always be four comma-separated numbers
-set(RCVERSION 1,4,1,0)
+set(RCVERSION 1,4,2,0)
 
 # Installation paths
 set(BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin")

diff --git a/contrib/packages/rpm/el5/SPECS/tigervnc.spec b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
index d1b2065db61b2f0b6270299f2d6d77b02bc8cc16..2c8bc718372f72603d56202721179c6a42c18217 100644 (file)
--- a/contrib/packages/rpm/el5/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el5/SPECS/tigervnc.spec
@@ -914,6 +914,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Fri Jan 23 2015 Brian P. Hinz <bphinz@users.sourceforge.net> 1.4.2-1
+- 1.4.2 release
+
 * Mon Jan 19 2015 Brian P. Hinz <bphinz@users.sourceforge.net> 1.4.0-3
 - Added default font paths to Xvnc and fontconfig
 - Added vendor strings to Xvnc

diff --git a/contrib/packages/rpm/el6/SPECS/tigervnc.spec b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
index d16a416ce09e84cd89b56bdb15c06c236ef02229..91da776c44486f814081d1bc2b94c1a3dfa8a3fb 100644 (file)
--- a/contrib/packages/rpm/el6/SPECS/tigervnc.spec
+++ b/contrib/packages/rpm/el6/SPECS/tigervnc.spec
@@ -2,7 +2,7 @@
 
 Name: tigervnc
 Version: @VERSION@
-Release: 18%{?snap:.%{snap}}%{?dist}
+Release: 1%{?snap:.%{snap}}%{?dist}
 Summary: A TigerVNC remote display system
 
 Group: User Interface/Desktops
@@ -344,6 +344,9 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Fri Jan 23 2015 Brian P. Hinz <bphinz@users.sourceforge.net> 1.4.2-1
+- 1.4.2 release
+
 * Tue Nov 04 2014 Brian P. Hinz <bphinz@users.sourceforge.net> 1.3.80-18.20131128svn5139
 - Bumped xserver patch to keep pace with native version
 

diff --git a/java/CMakeLists.txt b/java/CMakeLists.txt
index 2afd1e21ea75af7b2400a65ccb6f75157a532a3f..ae71bcaa3d7e6acaa9387c7ecfb4abdf051be26e 100644 (file)
--- a/java/CMakeLists.txt
+++ b/java/CMakeLists.txt
@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
 
 project(tigervnc-java Java)
 if(NOT VERSION)
-  set(VERSION 1.4.1)
+  set(VERSION 1.4.2)
 endif()
 
 find_package(Java)

diff --git a/unix/xserver/hw/vnc/xvnc.cc b/unix/xserver/hw/vnc/xvnc.cc
index b04c1ddf24fed95635f7e1233f8427696a042636..05fb662f89c0266cf03556e708f8cda746d7d529 100644 (file)
--- a/unix/xserver/hw/vnc/xvnc.cc
+++ b/unix/xserver/hw/vnc/xvnc.cc
@@ -98,8 +98,8 @@ extern "C" {
 #define Xfree free
 #endif
 
-#define XVNCVERSION "TigerVNC 1.4.1"
-#define XVNCCOPYRIGHT ("Copyright (C) 1999-2013 TigerVNC Team and many others (see README.txt)\n" \
+#define XVNCVERSION "TigerVNC 1.4.2"
+#define XVNCCOPYRIGHT ("Copyright (C) 1999-2015 TigerVNC Team and many others (see README.txt)\n" \
                        "See http://www.tigervnc.org for information on TigerVNC.\n")