From ff06b617a4f69bf0bd99fa4d2520bb88ce94b2da Mon Sep 17 00:00:00 2001
From: Hylke Bons <hylkebons@gmail.com>
Date: Thu, 13 Jun 2013 23:32:29 +0100
Subject: [PATCH] Bump version and update news

---
 News.txt                              | 10 ++++++++++
 SparkleLib/Defines.cs                 |  2 +-
 SparkleShare/Mac/Info.plist           |  4 ++--
 SparkleShare/Windows/SparkleShare.wxs |  2 +-
 configure.ac                          |  2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/News.txt b/News.txt
index b131b4dd..295984bc 100755
--- a/News.txt
+++ b/News.txt
@@ -1,3 +1,13 @@
+1.2.0 for Linux, Mac and Windows (???):
+      
+      Hylke:
+      - Fixes to the invite feature, now works when SparkleShare 
+        isn't running, by Jo Shields
+      - Don't crash, but complain when FIPS is enabled on Windows
+      - Fix some interface logic in Add dialog
+      - Fix some inaccurate sync state messages in the status icon
+
+
 1.1.0 for Linux, Mac and Windows (Sun 26 May 2013):
 
        Hylke:
diff --git a/SparkleLib/Defines.cs b/SparkleLib/Defines.cs
index 037291a4..c816050a 100644
--- a/SparkleLib/Defines.cs
+++ b/SparkleLib/Defines.cs
@@ -19,7 +19,7 @@ using System;
 using System.Reflection;
 
 [assembly:AssemblyTitle ("SparkleLib")]
-[assembly:AssemblyVersion ("1.1.0")]
+[assembly:AssemblyVersion ("1.2")]
 [assembly:AssemblyCopyright ("Copyright (c) 2010 Hylke Bons and others")]
 [assembly:AssemblyTrademark ("SparkleShare is a trademark of SparkleShare Ltd.")]
 
diff --git a/SparkleShare/Mac/Info.plist b/SparkleShare/Mac/Info.plist
index 00defa64..3a9a9040 100755
--- a/SparkleShare/Mac/Info.plist
+++ b/SparkleShare/Mac/Info.plist
@@ -9,9 +9,9 @@
 	<key>CFBundleName</key>
 	<string>SparkleShare</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.0</string>
+	<string>1.2</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.2</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/SparkleShare/Windows/SparkleShare.wxs b/SparkleShare/Windows/SparkleShare.wxs
index ad1ef624..dfbe47e3 100644
--- a/SparkleShare/Windows/SparkleShare.wxs
+++ b/SparkleShare/Windows/SparkleShare.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi' xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
   <Product Name='SparkleShare' Id='184950D5-67F6-4D06-9717-7E2F1607A7B0' UpgradeCode='D3DF1D99-87F5-47A7-A349-863DD6E4B73A'
-    Language='1033' Codepage='1252' Version='1.1.0' Manufacturer='SparkleShare'>
+    Language='1033' Codepage='1252' Version='1.2' Manufacturer='SparkleShare'>
 
     <Package Id='*' Keywords='Installer' Description="SparkleShare Setup" Manufacturer='SparkleShare'
       InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
diff --git a/configure.ac b/configure.ac
index 863be567..2dde1f1c 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-m4_define([sparkleshare_version], [1.1.0])
+m4_define([sparkleshare_version], [1.2])
 
 AC_PREREQ([2.54])
 AC_INIT([SparkleShare], sparkleshare_version)