Bump version to 1.2mosh-1.2

5 files changed, 21 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 6a68321..b1f3d9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,15 @@
-2012-04-99 Keith Winstein <mosh-devel@mit.edu>
+2012-04-26 Keith Winstein <mosh-devel@mit.edu>
 
 	* Version 1.2 released.
 
 	* Remove Boost as a dependency (Keegan McAllister)
 
+	* Add support for FreeBSD, Cygwin, RHEL/CentOS 5, OS X 10.5 on PPC.
+
+	* More verbose and helpful diagnostics. Server now has -v flag.
+
+	* Client now has --ssh= flag to set SSH options (like port)
+
 	* Remove skalibs as a dependency on Debian/Ubuntu (Keegan McAllister)
 
 	* Now passes locale-related env vars over the connection
@@ -16,15 +22,11 @@
 
 	* Now prints message of the day
 
-	* Add support for FreeBSD, Cygwin, RHEL/CentOS 5, OS X 10.5 on PPC.
-
 	* Use binary hardening flags where available (Keegan McAllister)
 
 	* Responsiveness and CPU-usage improvements
 
-	* Several terminal-emulation bug fixes
-
-	* More verbose and helpful diagnostics. Server now has -v flag.
+	* Several terminal-emulation improvements and bug fixes
 
 2012-04-03 Keith Winstein <mosh-devel@mit.edu>
 
diff --git a/NEWS b/NEWS
index 7a3068b..9f40a73 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,8 @@
+2012-04-26
+----------
+
+* Version 1.2 released
+
 2012-03-22
 ----------
 
diff --git a/configure.ac b/configure.ac
index 1b286ff..215cf57 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.61])
-AC_INIT([mosh], [1.1.99b], [mosh-devel@mit.edu])
+AC_INIT([mosh], [1.2], [mosh-devel@mit.edu])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_SRCDIR([src/frontend/mosh-client.cc])
diff --git a/debian/changelog b/debian/changelog
index 031c208..0af7755 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+mosh (1.2-1) unstable; urgency=low
+
+  * Version 1.2 released.
+
+ -- Keith Winstein <keithw@mit.edu>  Thu, 26 Apr 2012 01:35:59 -0400
+
 mosh (1.1.99b-1) unstable; urgency=low
 
   * Update THANKS and copyright information
diff --git a/scripts/mosh b/scripts/mosh
index 91f5dd6..829c399 100755
--- a/scripts/mosh
+++ b/scripts/mosh
@@ -16,7 +16,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-my $MOSH_VERSION = '1.1.99b';
+my $MOSH_VERSION = '1.2';
 
 use warnings;
 use strict;