From 1e510a588496ddf5a0132f290f78fe3814c3a4bf Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Sat, 26 Sep 2015 15:39:01 +0200 Subject: [PATCH] prepare 0.16.4 release --- ChangeLog | 6 ++++++ autogen.sh | 2 +- debian/changelog | 12 +++++++++--- gajim.nsi | 2 +- setup_win32.py | 2 +- src/common/defs.py | 2 +- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1bbe97599..106a1c68c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Gajim 0.16.4 (26 September 2015) + + * Fix trusting GPG keys + * Ability to disable synchronization of logs with server + * Improve MAM usage + Gajim 0.16.3 (31 July 2015) * Fix reading secret file diff --git a/autogen.sh b/autogen.sh index cf9b3e68d..47b9ed2fd 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.16.3" + gajimversion="0.16.4" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff --git a/debian/changelog b/debian/changelog index fcf152cde..5d28c7516 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,20 +1,26 @@ +gajim (0.16.4-1) unstable; urgency=low + + * New upstream release + + -- Yann Leboulanger Sun, 26 Sep 2015 15:28:29 +0200 + gajim (0.16.3-1) unstable; urgency=low * New upstream release - -- Yann Leboulanger Sat, 31 Jul 2014 23:12:04 +0200 + -- Yann Leboulanger Sat, 31 Jul 2015 23:12:04 +0200 gajim (0.16.2-1) unstable; urgency=low * New upstream release - -- Yann Leboulanger Sat, 24 Jul 2014 22:30:10 +0200 + -- Yann Leboulanger Sat, 24 Jul 2015 22:30:10 +0200 gajim (0.16.1-1) unstable; urgency=low * New upstream release - -- Yann Leboulanger Sat, 28 Feb 2014 22:30:10 +0200 + -- Yann Leboulanger Sat, 28 Feb 2015 22:30:10 +0200 gajim (0.16-1) unstable; urgency=low diff --git a/gajim.nsi b/gajim.nsi index 288e28124..9b0f49c44 100644 --- a/gajim.nsi +++ b/gajim.nsi @@ -212,7 +212,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.3" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.16.4" 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 81a2ee8e5..b0001f897 100644 --- a/setup_win32.py +++ b/setup_win32.py @@ -56,7 +56,7 @@ options = { setup( name='Gajim', - version='0.16.3', + version='0.16.4', 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 ba789f08c..7b24d67e3 100644 --- a/src/common/defs.py +++ b/src/common/defs.py @@ -27,7 +27,7 @@ docdir = '../' basedir = '../' localedir = '../po' -version = '0.16.3' +version = '0.16.4' import subprocess try: node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,