From c89ea5f6cfec3f9f15391c912c139d3041429d99 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Wed, 29 Aug 2012 10:38:15 +0200 Subject: [PATCH] get files from 0.15 branch --- ChangeLog | 9 +++++++++ autogen.sh | 2 +- debian/changelog | 10 ++++++++++ gajim.nsi | 4 +--- po/LINGUAS | 3 +++ setup_win32.py | 7 ++++--- 6 files changed, 28 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index e07512b7a..333c7c975 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Gajim 0.15.1 (29 August 2012) + + * Switch from python-farsight to python-farstream + * improve performences + * Fix roster filter with unicode chars + * Fix connection to msn jabber server + * Fix some GPG issues + * Fix other small issues + Gajim 0.15 (18 March 2012) * Plugin system diff --git a/autogen.sh b/autogen.sh index 64a60db96..e7771684b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15.1" + gajimversion="0.15.1.0" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff --git a/debian/changelog b/debian/changelog index 34541378e..7916661a4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +gajim (0.15.1-1) unstable; urgency=low + + * New upstream release. + * change python-farsight to python-farstream in suggests list. Closes: #682598 + * Add python-gupnp-igd to suggests list. Closes: #668194 + * Fix shortcut behaviour in roster window. Closes: #667870 + * Improve GPG status handling. Closes: #670243 + + -- Yann Leboulanger Tue, 29 Aug 2012 09:51:52 +0200 + gajim (0.15-1) unstable; urgency=low * New upstream release. diff --git a/gajim.nsi b/gajim.nsi index ffbd294ef..ffaae77db 100644 --- a/gajim.nsi +++ b/gajim.nsi @@ -159,7 +159,6 @@ Section "Gajim" SecGajim File "bin\Crypto.Hash.SHA256.pyd" File "bin\Crypto.Random.OSRNG.winrandom.pyd" File "bin\Crypto.Util._counter.pyd" - File "bin\Crypto.Util.strxor.pyd" File "bin\gajim.exe" File "bin\gio._gio.pyd" File "bin\glib._glib.pyd" @@ -192,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" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.1" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe" @@ -533,7 +532,6 @@ Section "Uninstall" Delete "$INSTDIR\bin\Crypto.Hash.SHA256.pyd" Delete "$INSTDIR\bin\Crypto.Random.OSRNG.winrandom.pyd" Delete "$INSTDIR\bin\Crypto.Util._counter.pyd" - Delete "$INSTDIR\bin\Crypto.Util.strxor.pyd" Delete "$INSTDIR\bin\gajim.exe" Delete "$INSTDIR\bin\gio._gio.pyd" Delete "$INSTDIR\bin\glib._glib.pyd" diff --git a/po/LINGUAS b/po/LINGUAS index f480dc1d6..9d903dc17 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -32,3 +32,6 @@ uk ja kk he +zh_TW +hu +tr diff --git a/setup_win32.py b/setup_win32.py index 079c95942..00c53e831 100644 --- a/setup_win32.py +++ b/setup_win32.py @@ -31,8 +31,9 @@ if 'gtk' in os.listdir('.'): options = { 'build_exe': { - 'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new', 'potr', - 'goocanvas'], + 'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new', + 'goocanvas', 'Crypto.PublicKey.DSA', 'Crypto.Hash.HMAC', + 'numbers'], 'base': 'Win32GUI', 'bin_excludes': [ 'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll', @@ -50,7 +51,7 @@ options = { setup( name='Gajim', - version='0.15', + version='0.15.1', description='A full featured Jabber client', author='Gajim Development Team', url='http://gajim.org/',