From fbb09465217418feb6913b3eb47055024709ed8c Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
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 d6f89d3b54..dfc2e6160c 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 0cdfdf56d0..89714f56e2 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 e9a3bb919c..f1cad3438b 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 5d28c75161..770b12719b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gajim (0.16.5-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Yann Leboulanger <yann@leboulanger.org> 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 007e1cf4c1..9b3f708021 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 9bd12263db..325dfc155f 100644
--- a/setup_win32.py
+++ b/setup_win32.py
@@ -57,7 +57,7 @@
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 28aa8b8c81..29d5714a99 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -27,7 +27,7 @@
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,
--
GitLab