From 372d2ed284efe8e5fdc34f9948f12a56d164b577 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Sat, 17 Sep 2011 19:47:10 +0200 Subject: [PATCH 1/4] prepare 0.15-beta1 --- ChangeLog | 2 ++ autogen.sh | 2 +- src/common/defs.py | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 657ed6337..fd3d30f63 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ Gajim 0.15 (XX XX 2011) * IBB * Nested roster group * Roster filtrering + * UPower support + * GPG support for windows Gajim 0.14.4 (22 July 2011) diff --git a/autogen.sh b/autogen.sh index f6c5575d6..a3f7cc0f5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15-alpha1" + gajimversion="0.15-beta1" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff --git a/src/common/defs.py b/src/common/defs.py index a4728df05..e035610f0 100644 --- a/src/common/defs.py +++ b/src/common/defs.py @@ -27,7 +27,7 @@ docdir = '../' basedir = '../' localedir = '../po' -version = '0.15-alpha1' +version = '0.15-beta1' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True, From ad487d8eff0bcab78a14095a7f230c993d4d4976 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Sat, 17 Sep 2011 22:22:56 +0200 Subject: [PATCH 2/4] update windows build script --- setup_win32.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup_win32.py b/setup_win32.py index b577a51eb..d8f24ba92 100644 --- a/setup_win32.py +++ b/setup_win32.py @@ -49,11 +49,11 @@ options = { setup( name='Gajim', - version='0.14.1', + version='0.15', description='A full featured Jabber client', author='Gajim Development Team', - url='http://www.gajim.org/', - download_url='http://www.gajim.org/downloads.php', + url='http://gajim.org/', + download_url='http://gajim.org/downloads.php', license='GPL', options=options, executables=[Executable('src/gajim.py', icon='data/pixmaps/gajim.ico'), From 3bce5332e050cde37fb4886938acde152ec9c70e Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Tue, 27 Sep 2011 17:14:40 +0200 Subject: [PATCH 4/4] prepare beta2 --- autogen.sh | 2 +- src/common/defs.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autogen.sh b/autogen.sh index a3f7cc0f5..b2e46611a 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15-beta1" + gajimversion="0.15-beta2" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff --git a/src/common/defs.py b/src/common/defs.py index e035610f0..d5e73a8c4 100644 --- a/src/common/defs.py +++ b/src/common/defs.py @@ -27,7 +27,7 @@ docdir = '../' basedir = '../' localedir = '../po' -version = '0.15-beta1' +version = '0.15-beta2' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,