get files from 0.15 branch

This commit is contained in:
Yann Leboulanger 2012-08-29 10:38:15 +02:00
parent 401f19282a
commit c89ea5f6cf
6 changed files with 28 additions and 7 deletions

View File

@ -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) Gajim 0.15 (18 March 2012)
* Plugin system * Plugin system

View File

@ -1,5 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
gajimversion="0.15.1" gajimversion="0.15.1.0"
if [ -d ".hg" ]; then if [ -d ".hg" ]; then
node=$(hg tip --template "{node}") node=$(hg tip --template "{node}")
hgversion="-${node:0:12}" hgversion="-${node:0:12}"

10
debian/changelog vendored
View File

@ -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 gajim (0.15-1) unstable; urgency=low
* New upstream release. * New upstream release.

View File

@ -159,7 +159,6 @@ Section "Gajim" SecGajim
File "bin\Crypto.Hash.SHA256.pyd" File "bin\Crypto.Hash.SHA256.pyd"
File "bin\Crypto.Random.OSRNG.winrandom.pyd" File "bin\Crypto.Random.OSRNG.winrandom.pyd"
File "bin\Crypto.Util._counter.pyd" File "bin\Crypto.Util._counter.pyd"
File "bin\Crypto.Util.strxor.pyd"
File "bin\gajim.exe" File "bin\gajim.exe"
File "bin\gio._gio.pyd" File "bin\gio._gio.pyd"
File "bin\glib._glib.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" "DisplayName" "Gajim"
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" "$INSTDIR\Uninstall.exe" 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" "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/" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/"
WriteUninstaller "$INSTDIR\Uninstall.exe" WriteUninstaller "$INSTDIR\Uninstall.exe"
@ -533,7 +532,6 @@ Section "Uninstall"
Delete "$INSTDIR\bin\Crypto.Hash.SHA256.pyd" Delete "$INSTDIR\bin\Crypto.Hash.SHA256.pyd"
Delete "$INSTDIR\bin\Crypto.Random.OSRNG.winrandom.pyd" Delete "$INSTDIR\bin\Crypto.Random.OSRNG.winrandom.pyd"
Delete "$INSTDIR\bin\Crypto.Util._counter.pyd" Delete "$INSTDIR\bin\Crypto.Util._counter.pyd"
Delete "$INSTDIR\bin\Crypto.Util.strxor.pyd"
Delete "$INSTDIR\bin\gajim.exe" Delete "$INSTDIR\bin\gajim.exe"
Delete "$INSTDIR\bin\gio._gio.pyd" Delete "$INSTDIR\bin\gio._gio.pyd"
Delete "$INSTDIR\bin\glib._glib.pyd" Delete "$INSTDIR\bin\glib._glib.pyd"

View File

@ -32,3 +32,6 @@ uk
ja ja
kk kk
he he
zh_TW
hu
tr

View File

@ -31,8 +31,9 @@ if 'gtk' in os.listdir('.'):
options = { options = {
'build_exe': { 'build_exe': {
'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new', 'potr', 'includes': ['gtk.keysyms', 'dumbdbm', 'dbhash', 'bsddb', 'new',
'goocanvas'], 'goocanvas', 'Crypto.PublicKey.DSA', 'Crypto.Hash.HMAC',
'numbers'],
'base': 'Win32GUI', 'base': 'Win32GUI',
'bin_excludes': [ 'bin_excludes': [
'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll', 'iconv.dll', 'intl.dll', 'libatk-1.0-0.dll',
@ -50,7 +51,7 @@ options = {
setup( setup(
name='Gajim', name='Gajim',
version='0.15', version='0.15.1',
description='A full featured Jabber client', description='A full featured Jabber client',
author='Gajim Development Team', author='Gajim Development Team',
url='http://gajim.org/', url='http://gajim.org/',