From 96c48693c0e382b4cadff236304a2a99c028209d Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Sat, 25 May 2013 20:53:36 +0200
Subject: [PATCH] get files from 0.15 branch
---
ChangeLog | 6 ++++++
autogen.sh | 2 +-
gajim.nsi | 2 +-
src/common/defs.py | 2 +-
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index f8e73e6bed..41912096c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,12 @@ Gajim 0.16 ()
* Support XEP-0224 Attention
* Support XEP-0191 Blocking command
+Gajim 0.15.4 (25 May 2013)
+
+ * Fix usage of OTR plugin
+ * Fix connection to non-SSL server
+ * Fix receiving GPG-encrypted messages while offline.
+
Gajim 0.15.3 (17 March 2013)
* Better handling of SSL errors
diff --git a/autogen.sh b/autogen.sh
index f68eb6f43f..8b99755eb0 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
- gajimversion="0.15.3"
+ gajimversion="0.15.4"
if [ -d ".hg" ]; then
node=$(hg tip --template "{node}")
hgversion="-${node:0:12}"
diff --git a/gajim.nsi b/gajim.nsi
index 7471e8d49a..e3380bc86e 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -200,7 +200,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.3"
+ WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.4"
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 b6e583c038..8bd5ab1631 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -27,7 +27,7 @@ docdir = '../'
basedir = '../'
localedir = '../po'
-version = '0.15.3.0'
+version = '0.15.4.0'
import subprocess
try:
node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,
--
GitLab