changeset c142f6a33f4b in /home/hg/repos/gajim

details:http://hg.gajim.org/gajim?cmd=changeset;node=c142f6a33f4b description: get files from 0.15 branch

diffstat:

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(-)

diffs (105 lines):

diff -r 3a718170c531 -r c142f6a33f4b ChangeLog --- a/ChangeLog Tue Aug 28 15:10:19 2012 -0400 +++ b/ChangeLog Wed Aug 29 10:38:15 2012 +0200 @@ -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 -r 3a718170c531 -r c142f6a33f4b autogen.sh --- a/autogen.sh Tue Aug 28 15:10:19 2012 -0400 +++ b/autogen.sh Wed Aug 29 10:38:15 2012 +0200 @@ -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 -r 3a718170c531 -r c142f6a33f4b debian/changelog --- a/debian/changelog Tue Aug 28 15:10:19 2012 -0400 +++ b/debian/changelog Wed Aug 29 10:38:15 2012 +0200 @@ -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 asterix@lagaule.org Tue, 29 Aug 2012 09:51:52 +0200 + gajim (0.15-1) unstable; urgency=low

* New upstream release. diff -r 3a718170c531 -r c142f6a33f4b gajim.nsi --- a/gajim.nsi Tue Aug 28 15:10:19 2012 -0400 +++ b/gajim.nsi Wed Aug 29 10:38:15 2012 +0200 @@ -159,7 +159,6 @@ 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 @@ 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 @@ 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 -r 3a718170c531 -r c142f6a33f4b po/LINGUAS --- a/po/LINGUAS Tue Aug 28 15:10:19 2012 -0400 +++ b/po/LINGUAS Wed Aug 29 10:38:15 2012 +0200 @@ -32,3 +32,6 @@ ja kk he +zh_TW +hu +tr diff -r 3a718170c531 -r c142f6a33f4b setup_win32.py --- a/setup_win32.py Tue Aug 28 15:10:19 2012 -0400 +++ b/setup_win32.py Wed Aug 29 10:38:15 2012 +0200 @@ -31,8 +31,9 @@

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 @@

setup( name='Gajim', - version='0.15', + version='0.15.1', description='A full featured Jabber client', author='Gajim Development Team', url='http://gajim.org/',