prepare 0.15.2 releasegajim-0.15.2

4 files changed, 10 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 268e637c5..2e77ea766 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 64a60db96..cc04b6344 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 ffaae77db..790730061 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 350c3c0ed..b7b711802 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -27,7 +27,7 @@ docdir = '../'
 basedir   = '../'
 localedir = '../po'
 
-version = '0.15.1'
+version = '0.15.2'
 import subprocess
 try:
     node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,