From 83286ef0b70b6f719f0918fb0975662802faa640 Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tristan.matthews@savoirfairelinux.com>
Date: Thu, 17 May 2012 15:58:08 -0400
Subject: [PATCH] * #11208: bump version numbers for release 1.1.0
---
NEWS | 2 ++
daemon/configure.ac | 2 +-
gnome/configure.ac | 2 +-
kde/CMakeLists.txt | 2 +-
plugins/configure.ac | 2 +-
tools/build-system/launch-build-machine-2.sh | 2 +-
6 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/NEWS b/NEWS
index 622094a882..4adde3113d 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@
# SFLphone
################################################
+* 2012-05-17: 1.1.0 has been released
+
* 2011-11-18: 1.0.1 has been released
* 2011-09-30: 1.0.0 has been released
diff --git a/daemon/configure.ac b/daemon/configure.ac
index ba8a760be2..b46104dfeb 100644
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -2,7 +2,7 @@ dnl SFLPhone - configure.ac for automake 1.9 and autoconf 2.59
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ([2.65])
-AC_INIT([sflphone],[1.0.2],[sflphoneteam@savoirfairelinux.com],[sflphone])
+AC_INIT([sflphone],[1.1.0],[sflphoneteam@savoirfairelinux.com],[sflphone])
AC_COPYRIGHT([[Copyright (c) Savoir-Faire Linux 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012]])
AC_REVISION([$Revision$])
diff --git a/gnome/configure.ac b/gnome/configure.ac
index df520004db..820bdd500f 100644
--- a/gnome/configure.ac
+++ b/gnome/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([sflphone],[1.0.2],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
+AC_INIT([sflphone],[1.1.0],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE
diff --git a/kde/CMakeLists.txt b/kde/CMakeLists.txt
index 94ecff50cb..5c3b446632 100755
--- a/kde/CMakeLists.txt
+++ b/kde/CMakeLists.txt
@@ -34,7 +34,7 @@ add_subdirectory(man)
add_subdirectory(po)
add_subdirectory(plasma)
-set(PROJECT_VERSION "1.0.2")
+set(PROJECT_VERSION "1.1.0")
set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${PROJECT_VERSION})
add_custom_target(dist
COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD
diff --git a/plugins/configure.ac b/plugins/configure.ac
index 413d6be4d0..5c9157abce 100644
--- a/plugins/configure.ac
+++ b/plugins/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([sflphone],[1.0.2],[sflphoneteam@savoirfairelinux.com],[sflphone-plugins])
+AC_INIT([sflphone],[1.1.0],[sflphoneteam@savoirfairelinux.com],[sflphone-plugins])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE
diff --git a/tools/build-system/launch-build-machine-2.sh b/tools/build-system/launch-build-machine-2.sh
index 8202380ff7..b6d2de7068 100755
--- a/tools/build-system/launch-build-machine-2.sh
+++ b/tools/build-system/launch-build-machine-2.sh
@@ -22,7 +22,7 @@ DO_LOGGING=1
DO_UPLOAD=1
SNAPSHOT_TAG=`date +%Y%m%d`
TAG_NAME_PREFIX=
-VERSION_NUMBER="1.0.2"
+VERSION_NUMBER="1.1.0"
LAUNCHPAD_PACKAGES=( "sflphone-client-gnome" "sflphone-common" "sflphone-plugins")
--
GitLab