Merge pull request #2360 from bmiklautz/version_update

Update version to 1.2.1

CMakeLists.txt

@@ -65,7 +65,7 @@ endif()
 set(WITH_LIBRARY_VERSIONING "ON")
 set(FREERDP_VERSION_MAJOR "1")
 set(FREERDP_VERSION_MINOR "2")
-set(FREERDP_VERSION_REVISION "0")
+set(FREERDP_VERSION_REVISION "1")
 set(FREERDP_VERSION_SUFFIX "dev")
 set(FREERDP_API_VERSION "${FREERDP_VERSION_MAJOR}.${FREERDP_VERSION_MINOR}")
 set(FREERDP_VERSION "${FREERDP_API_VERSION}.${FREERDP_VERSION_REVISION}")

packaging/deb/freerdp-nightly/changelog

@@ -1,3 +1,9 @@
+freerdp-nightly (1.2.1) unstable; urgency=low
+
+  * Update version to 1.2.1
+
+ -- FreeRDP <team@freerdp.com>  Tue, 03 Feb 2015 13:44:33 +0100
+
 freerdp-nightly (1.2.0) unstable; urgency=medium
 
   * Initial version of freerdp-nightly

packaging/rpm/freerdp-nightly.spec

@@ -8,7 +8,7 @@
 
 %define   INSTALL_PREFIX /opt/freerdp-nightly/
 Name:           freerdp-nightly
-Version:        1.2.0
+Version:        1.2.1
 Release:        0
 License:        ASL 2.0
 Summary:        Free implementation of the Remote Desktop Protocol (RDP)
@@ -155,3 +155,5 @@ export NO_BRP_CHECK_RPATH true
 %changelog
 * Fri Jan 23 2015 Bernhard Miklautz <bmiklautz+freerdp@shacknet.at> - 1.2.0-0
 - Initial version
+* Fri Feb 03 2015 FreeRDP Team <team@freerdp.com> - 1.2.1-0
+- Update version information