From 80764d6ddab2df0bb7de8dd457f5786f1dbdc235 Mon Sep 17 00:00:00 2001
From: Emmanuel Milou <emmanuel.milou@savoirfairelinux.com>
Date: Mon, 7 Jan 2013 17:50:21 -0500
Subject: [PATCH] [#19045] Update code with new release number (1.2.1)
---
NEWS | 1 +
daemon/configure.ac | 2 +-
gnome/configure.ac | 2 +-
plugins/configure.ac | 2 +-
tools/build-system/launch-build-machine-jenkins.sh | 5 ++---
.../launchpad/sflphone-client-gnome-video/debian/control | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/NEWS b/NEWS
index 05f97a850e..3dff759009 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,7 @@
################################################
# SFLphone
################################################
+* 2012-01-08: 1.2.1 has been released - Full annoucement here: http://sflphone.org/news/stable-version-121-released
* 2012-08-10: 1.2.0 has been released
diff --git a/daemon/configure.ac b/daemon/configure.ac
index 9c40e20ff4..a23b5187ea 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.2.0],[sflphoneteam@savoirfairelinux.com],[sflphone])
+AC_INIT([sflphone],[1.2.1],[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 4e252cdd4f..d1121accb4 100644
--- a/gnome/configure.ac
+++ b/gnome/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([sflphone],[1.2.0],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
+AC_INIT([sflphone],[1.2.1],[sflphoneteam@savoirfairelinux.com],[sflphone-client-gnome])
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE
diff --git a/plugins/configure.ac b/plugins/configure.ac
index 3099e91500..38100bb9a8 100644
--- a/plugins/configure.ac
+++ b/plugins/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([sflphone],[1.2.0],[sflphoneteam@savoirfairelinux.com],[sflphone-plugins])
+AC_INIT([sflphone],[1.2.1],[sflphoneteam@savoirfairelinux.com],[sflphone-plugins])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([build-aux])
diff --git a/tools/build-system/launch-build-machine-jenkins.sh b/tools/build-system/launch-build-machine-jenkins.sh
index 26ca24548b..f1303c097b 100755
--- a/tools/build-system/launch-build-machine-jenkins.sh
+++ b/tools/build-system/launch-build-machine-jenkins.sh
@@ -22,10 +22,9 @@ DO_LOGGING=1
DO_UPLOAD=1
SNAPSHOT_TAG=`date +%Y%m%d`
TAG_NAME_PREFIX=
-VERSION_NUMBER="1.2.0"
+VERSION_NUMBER="1.2.1"
-#LAUNCHPAD_PACKAGES=("sflphone-common" "sflphone-client-kde" "sflphone-client-gnome" "sflphone-plugins" "sflphone-common-video" "sflphone-client-gnome-video" "sflphone-video")
-LAUNCHPAD_PACKAGES=("sflphone-client-gnome-video" "sflphone-common-video")
+LAUNCHPAD_PACKAGES=("sflphone-common" "sflphone-client-kde" "sflphone-client-gnome" "sflphone-plugins" "sflphone-common-video" "sflphone-client-gnome-video")
# LAUNCHPAD_PACKAGES=("sflphone-client-kde")
echo
diff --git a/tools/build-system/launchpad/sflphone-client-gnome-video/debian/control b/tools/build-system/launchpad/sflphone-client-gnome-video/debian/control
index dd73e58a2f..7435d2c5f8 100644
--- a/tools/build-system/launchpad/sflphone-client-gnome-video/debian/control
+++ b/tools/build-system/launchpad/sflphone-client-gnome-video/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.7.3
Package: sflphone-client-gnome-video
Priority: optional
Architecture: any
-Depends: sflphone-common (=${source:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: sflphone-common-video (=${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Replaces: sflphone-client-gnome
Conflicts: sflphone-client-gnome
Homepage: http://www.sflphone.org
--
GitLab