diff --git a/NEWS b/NEWS index 05f97a850e9f1f8be04a9b6ebe18e019618a27d4..3dff759009fca759ec351d17450dba4ce489f7b1 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 9c40e20ff420faebe94b2471d1382076d476260e..a23b5187ea0206db8343d7408ea7559d223e74dc 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 4e252cdd4f6dda70ec919e1c4d2cb12e4eba3db7..d1121accb46bad9d0ec3444d7b585c96a9f7fd1b 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 3099e91500ec8cdc736c75947f744f9a2f80c6a2..38100bb9a8fcb41764d4cb1984cca246aac8e2dc 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 26ca24548b34c3073118fe206385f96e2f734dfd..f1303c097beaec27fc1b334320fc9d6f276e39f2 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 dd73e58a2faf492d2fabaf33e2dc7b5a91a4827d..7435d2c5f800fb23a23e472e1c87283d43eaa8b0 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