[#19045] Update code with new release number (1.2.1)

This commit is contained in:
Emmanuel Milou
2013-01-07 17:50:21 -05:00
parent bed5748b9f
commit 80764d6dda
6 changed files with 7 additions and 7 deletions

1
NEWS
View File

@ -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

View File

@ -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$])

View File

@ -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

View File

@ -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])

View File

@ -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

View File

@ -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