From ea807a156364ab0bcead62d5b5cf8b03cccfdbda Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Mon, 28 Dec 2015 13:45:43 +0100 Subject: [PATCH] prepare 0.16.5 release --- ChangeLog | 6 ++++++ THANKS | 1 + autogen.sh | 2 +- debian/changelog | 6 ++++++ gajim.nsi | 2 +- setup_win32.py | 2 +- src/common/defs.py | 2 +- 7 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 106a1c68c..450ca79c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Gajim 0.16.5 (28 December 2015) + + * Improve MAM implementation + * Improve security on connexion and for roster managment + * Ability for emoticons to be sorted in menu + Gajim 0.16.4 (26 September 2015) * Fix trusting GPG keys diff --git a/THANKS b/THANKS index 0cdfdf56d..89714f56e 100644 --- a/THANKS +++ b/THANKS @@ -35,6 +35,7 @@ Petr Menšík Sergey Kuleshov Stavros Giannouris Stian B. Barmen +Thilo Molitor Thomas Klein-Hitpaß Urtzi Alfaro Witold Kieraś diff --git a/autogen.sh b/autogen.sh index e9a3bb919..f1cad3438 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.16.4" + gajimversion="0.16.5" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff --git a/debian/changelog b/debian/changelog index 5d28c7516..770b12719 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gajim (0.16.5-1) unstable; urgency=low + + * New upstream release + + -- Yann Leboulanger Sun, 28 Dec 2015 13:36:41 +0200 + gajim (0.16.4-1) unstable; urgency=low * New upstream release diff --git a/gajim.nsi b/gajim.nsi index 007e1cf4c..9b3f70802 100644 --- a/gajim.nsi +++ b/gajim.nsi @@ -213,7 +213,7 @@ Section "Gajim" SecGajim WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayName" "Gajim" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayIcon" "$INSTDIR\bin\Gajim.exe" - WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.4" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.5" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" diff --git a/setup_win32.py b/setup_win32.py index e3d829b0e..a2917d9b0 100644 --- a/setup_win32.py +++ b/setup_win32.py @@ -57,7 +57,7 @@ options = { setup( name='Gajim', - version='0.16.4', + version='0.16.5', description='A full featured Jabber client', author='Gajim Development Team', url='http://gajim.org/', diff --git a/src/common/defs.py b/src/common/defs.py index 9107df07f..c3bb2aa72 100644 --- a/src/common/defs.py +++ b/src/common/defs.py @@ -27,7 +27,7 @@ docdir = '../' basedir = '../' localedir = '../po' -version = '0.16.4.1' +version = '0.16.5' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,