Welcome to mirror list, hosted at ThFree Co, Russian Federation.

dev.gajim.org/gajim/gajim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYann Leboulanger <asterix@lagaule.org>2012-01-22 16:19:12 +0400
committerYann Leboulanger <asterix@lagaule.org>2012-01-22 16:19:12 +0400
commit8735a171213b8fe0693758db561f7ac1785940f6 (patch)
treea592ee2ead6e1c2fbe431ed3cf782c7642be8537
parent7c98b044f3fda1ecf237e79fc8c6129feffa26d0 (diff)
prepare beta4 release
-rw-r--r--ChangeLog3
-rwxr-xr-xautogen.sh2
-rw-r--r--gajim.nsi3
-rw-r--r--src/common/defs.py2
4 files changed, 4 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index fd3d30f63..8cc86f1e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Gajim 0.15 (XX XX 2011)
+Gajim 0.15 (XX XX 2012)
* Plugin system
* Whiteboard (via a plugin)
@@ -9,6 +9,7 @@ Gajim 0.15 (XX XX 2011)
* Roster filtrering
* UPower support
* GPG support for windows
+ * Spell checking support for windows
Gajim 0.14.4 (22 July 2011)
diff --git a/autogen.sh b/autogen.sh
index a187d9e92..4c1b791a5 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
- gajimversion="0.15-beta3"
+ gajimversion="0.15-beta4"
if [ -d ".hg" ]; then
node=$(hg tip --template "{node}")
hgversion="-${node:0:12}"
diff --git a/gajim.nsi b/gajim.nsi
index 25df14534..57638ef02 100644
--- a/gajim.nsi
+++ b/gajim.nsi
@@ -224,8 +224,6 @@ Section "Gtk+ 2" SecGtk
SetOutPath "$INSTDIR\bin\gtk"
File /r "bin\gtk\bin"
File /r "bin\gtk\etc"
- SetOutPath "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0"
- File /r "bin\gtk\lib\gtk-2.0\2.10.0\loaders"
SetOutPath "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines"
File "bin\gtk\lib\gtk-2.0\2.10.0\engines\libclearlooks.dll"
File "bin\gtk\lib\gtk-2.0\2.10.0\engines\libpixmap.dll"
@@ -527,7 +525,6 @@ SectionEnd
Section "Uninstall"
RMDir /r "$INSTDIR\bin\gtk\bin"
RMDir /r "$INSTDIR\bin\gtk\etc"
- RMDir /r "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\loaders"
Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libclearlooks.dll"
Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libpixmap.dll"
Delete "$INSTDIR\bin\gtk\lib\gtk-2.0\2.10.0\engines\libsvg.dll"
diff --git a/src/common/defs.py b/src/common/defs.py
index 8f8a96454..0999d4413 100644
--- a/src/common/defs.py
+++ b/src/common/defs.py
@@ -27,7 +27,7 @@ docdir = '../'
basedir = '../'
localedir = '../po'
-version = '0.15-beta3'
+version = '0.15-beta4'
import subprocess
try:
node = subprocess.Popen('hg tip --template "{node|short}"', shell=True,