From 75c3c6f65e95a4b9b13dd68e12c423921f5bf473 Mon Sep 17 00:00:00 2001
From: Albert Huang <ashuang@gmail.com>
Date: Tue, 18 Nov 2014 23:53:53 -0800
Subject: [PATCH] Release 1.2.0

---
 NEWS                | 30 ++++++++++++++++++++++++++++++
 configure.ac        |  4 ++--
 lcm-python/setup.py |  2 +-
 lcm/lcm.h           |  4 ++--
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 476d3d7c1..afc5ecd4b 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,33 @@
+Nov 18, 2014
+============
+
+Release 1.2.0
+
+This release adds charting to lcm-spy (Andy Barry) and updates the lcm-spy GUI.
+This release also marks the official migration of LCM to GitHub.  The new site
+is https://github.com/lcm-proj/lcm
+
+- C / C++
+    - Use select() instead of poll() in lcm_mpudpm.c
+- lcm-spy
+    - Add sparklines and charting (Andy Barry), via JChart2d
+- Python
+    - Fix setup.py
+- Java
+    - TCPService convert mutex to read/write lock.  Reduces deadlock when
+      send/receive buffers are full.
+    - Make TCPService interruptible (closes googlecode issue #94)
+- lcm-gen
+    - Fix regression for comments appearing in various places in a type
+      definition file (closes googlecode issue #97)
+- misc
+    - Build system cleanups
+    - Add more unit tests, cleanup existing tests.
+    - Documentation fixes.
+- OS/X
+    - reduce max packet sizes (closes googlecode issue #99)
+    - fix test/cpp/Makefile
+
 Aug 19, 2014
 ============
 
diff --git a/configure.ac b/configure.ac
index 756681448..b3a7a2011 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.50)
-AC_INIT([lcm], 1.1.2)
+AC_INIT([lcm], 1.2.0)
 AC_CONFIG_SRCDIR([lcm/lcm.h])
 AC_CANONICAL_SYSTEM
 AM_INIT_AUTOMAKE([foreign tar-ustar])
@@ -23,7 +23,7 @@ dnl  3. If the interface changes consist solely of additions, increment AGE.
 dnl  4. If the interface has removed or changed elements, set AGE to 0.
 dnl ---------------------------------------------------------------------------
 LIBLCM_AGE=3
-LIBLCM_REVISION=2
+LIBLCM_REVISION=3
 LIBLCM_CURRENT=4
 CHART2D_VERSION=3.2.2
 AC_SUBST(LIBLCM_AGE)
diff --git a/lcm-python/setup.py b/lcm-python/setup.py
index da9644f62..a0d8bdc0a 100644
--- a/lcm-python/setup.py
+++ b/lcm-python/setup.py
@@ -91,6 +91,6 @@
         libraries=libraries,
         extra_compile_args=extra_compile_args)
 
-setup(name="lcm", version="1.1.2",
+setup(name="lcm", version="1.2.0",
       ext_modules=[pylcm_extension],
       packages=["lcm"])
diff --git a/lcm/lcm.h b/lcm/lcm.h
index 40c8085ae..bbc5a9075 100644
--- a/lcm/lcm.h
+++ b/lcm/lcm.h
@@ -348,10 +348,10 @@ int lcm_subscription_set_queue_capacity(lcm_subscription_t* handler, int num_mes
 #define LCM_MAJOR_VERSION 1
 
 /// LCM release minor version - the Y in version X.Y.Z
-#define LCM_MINOR_VERSION 1
+#define LCM_MINOR_VERSION 2
 
 /// LCM release micro version - the Z in version X.Y.Z
-#define LCM_MICRO_VERSION 2
+#define LCM_MICRO_VERSION 0
 
 /**
  * @}