From 858fc77a48ae7825ebcfea052b39d16930c58202 Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Tue, 30 Oct 2012 17:31:43 +0100
Subject: [PATCH] prepare 0.15.2 release
---
ChangeLog | 7 +++++++
autogen.sh | 2 +-
gajim.nsi | 2 +-
src/common/defs.py | 2 +-
4 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 268e637c5a..2e77ea766e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Gajim 0.15.2 (30 October 2012)
+
+ * Show punycode encoded urls if they contain non-ascii chars
+ * Fix crash when pressing Esc in chat window
+ * Support Network Manager 0.9
+ * decrypt GPG messages in the correct order
+
Gajim 0.15.1 (29 August 2012)
* Switch from python-farsight to python-farstream
diff --git a/autogen.sh b/autogen.sh
index 64a60db963..cc04b6344a 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
- gajimversion="0.15.1"
+ gajimversion="0.15.2"
if [ -d ".hg" ]; then
node=$(hg tip --template "{node}")
hgversion="-${node:0:12}"
diff --git a/gajim.nsi b/gajim.nsi
index ffaae77db4..7907300615 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -191,7 +191,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.15.1"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.2"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/"
WriteUninstaller "$INSTDIR\Uninstall.exe"
diff --git a/src/common/defs.py b/src/common/defs.py
index 350c3c0edf..b7b7118027 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -27,7 +27,7 @@
basedir = '../'
localedir = '../po'
-version = '0.15.1'
+version = '0.15.2'
import subprocess
try:
node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,
--
GitLab