diff options
| author | Brian P. Hinz <bphinz@users.sf.net> | 2015-01-23 18:13:22 -0500 |
|---|---|---|
| committer | Brian P. Hinz <bphinz@users.sf.net> | 2015-01-23 18:13:22 -0500 |
| commit | 3ebdcfe1618b48fb0661938aed5306d13083c630 (patch) | |
| tree | c0a3de060b45b3c1bbc72e742cdab9b313197204 | |
| parent | bb78495eb23ca6681822712187a8b0a6ce9b4b14 (diff) | |
| download | tigervnc-3ebdcfe1618b48fb0661938aed5306d13083c630.tar.gz tigervnc-3ebdcfe1618b48fb0661938aed5306d13083c630.zip | |
TigerVNC 1.4.2
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | contrib/packages/rpm/el5/SPECS/tigervnc.spec | 3 | ||||
| -rw-r--r-- | contrib/packages/rpm/el6/SPECS/tigervnc.spec | 5 | ||||
| -rw-r--r-- | java/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | unix/xserver/hw/vnc/xvnc.cc | 4 |
5 files changed, 11 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f2615bd2..e19fd9e2 100644 --- 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 d1b2065d..2c8bc718 100644 --- 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 d16a416c..91da776c 100644 --- 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 2afd1e21..ae71bcaa 100644 --- 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 b04c1ddf..05fb662f 100644 --- 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") |