changeset 428111015d68 in /home/hg/repos/gajim
branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=428111015d68 description: get files from 0.15 branch
diffstat:
ChangeLog | 13 ++++++++++++ autogen.sh | 2 +- debian/changelog | 35 ++++++++++++++++++++++++++++++++ gajim.nsi | 60 ++++++++++++++++++++++++++++--------------------------- 4 files changed, 80 insertions(+), 30 deletions(-)
diffs (224 lines):
diff -r 4b726d480778 -r 428111015d68 ChangeLog --- a/ChangeLog Sat Mar 30 23:13:48 2013 +0100 +++ b/ChangeLog Sun Mar 31 15:17:10 2013 +0200 @@ -1,3 +1,16 @@ +Gajim 0.15.3 (17 March 2013) + * Better handling of SSL errors + * Better handling of canceling file transfer + * Improve farstream calls + * Minor fixes and improvements + +Gajim 0.15.2 (30 October 2012) + + * Show punycode encoded urls if they contain non-ascii chars + * Fix crash when pressing Esc in chat window + * Support Network Manager 0.9 + * decrypt GPG messages in the correct order + Gajim 0.15.1 (29 August 2012)
* Switch from python-farsight to python-farstream diff -r 4b726d480778 -r 428111015d68 autogen.sh --- a/autogen.sh Sat Mar 30 23:13:48 2013 +0100 +++ b/autogen.sh Sun Mar 31 15:17:10 2013 +0200 @@ -1,5 +1,5 @@ #!/usr/bin/env bash - gajimversion="0.15.2.0" + gajimversion="0.15.3" if [ -d ".hg" ]; then node=$(hg tip --template "{node}") hgversion="-${node:0:12}" diff -r 4b726d480778 -r 428111015d68 debian/changelog --- a/debian/changelog Sat Mar 30 23:13:48 2013 +0100 +++ b/debian/changelog Sun Mar 31 15:17:10 2013 +0200 @@ -1,3 +1,30 @@ +gajim (0.15.3-1) experimental; urgency=low + + * New upstream release + * Switch to 3.0 (quilt) source format. + + -- Yann Leboulanger yann@leboulanger.org Sun, 17 Mar 2013 18:32:12 +0200 + +gajim (0.15.1-4) unstable; urgency=low + + * apply patches using dpatch in debian/rules + + -- Yann Leboulanger asterix@lagaule.org Fri, 15 Feb 2013 23:34:36 +0200 + +gajim (0.15.1-3) unstable; urgency=low + + * Go back to old patch format so that Gajim can go in testing. + + -- Yann Leboulanger asterix@lagaule.org Sun, 02 Dec 2012 19:42:34 +0200 + +gajim (0.15.1-2) unstable; urgency=low + + * re-add missing 0.15-1.1 changelog entry + * add a patch to prevent a traceback. + * add a patch to fix a crash. Closes: #690937 + + -- Yann Leboulanger asterix@lagaule.org Sun, 14 Oct 2012 18:02:36 +0200 + gajim (0.15.1-1) unstable; urgency=low
* New upstream release. @@ -8,6 +35,14 @@
-- Yann Leboulanger asterix@lagaule.org Tue, 29 Aug 2012 09:51:52 +0200
+gajim (0.15-1.1) unstable; urgency=high + + * Non-maintainer upload by the Security Team. + * Fix CVE-2012-2093: insecure use of temporary files when convering LaTeX + IM messages to png images. Closes: #668710 + + -- Luk Claes luk@debian.org Sat, 16 Jun 2012 18:22:00 +0200 + gajim (0.15-1) unstable; urgency=low
* New upstream release. diff -r 4b726d480778 -r 428111015d68 gajim.nsi --- a/gajim.nsi Sat Mar 30 23:13:48 2013 +0100 +++ b/gajim.nsi Sun Mar 31 15:17:10 2013 +0200 @@ -39,11 +39,15 @@ !insertmacro MUI_UNPAGE_INSTFILES !insertmacro MUI_UNPAGE_FINISH
+;Show all languages, despite user's codepage +!define MUI_LANGDLL_ALLLANGUAGES + !insertmacro MUI_LANGUAGE "English" !insertmacro MUI_LANGUAGE "French" !insertmacro MUI_LANGUAGE "German" !insertmacro MUI_LANGUAGE "Italian" !insertmacro MUI_LANGUAGE "Russian" +!insertmacro MUI_LANGUAGE "Hebrew" !insertmacro MUI_RESERVEFILE_LANGDLL
; English @@ -58,9 +62,7 @@ LangString DESC_SecGtk ${LANG_ENGLISH} "Installs Gtk+ 2 (necessary to run Gajim)." LangString DESC_SecDesktopIcon ${LANG_ENGLISH} "If set, a shortcut for Gajim will be created on the desktop." LangString DESC_SecAutostart ${LANG_ENGLISH} "If set, Gajim will be automatically started when Windows starts." -LangString STR_Installed ${LANG_ENGLISH} "Apparently, Gajim is already installed." -LangString STR_Uninstall ${LANG_ENGLISH} "Launch Uninstaller" -LangString STR_Cancel ${LANG_ENGLISH} "Cancel" +LangString STR_Installed ${LANG_ENGLISH} "Apparently, Gajim is already installed. Uninstall it?" LangString STR_Running ${LANG_ENGLISH} "It appears that Gajim is currently running.$\n\ Please quit Gajim and restart the uninstaller."
@@ -76,9 +78,7 @@ LangString DESC_SecGtk ${LANG_FRENCH} "Installer Gtk+ 2 (nécessaire à Gajim)." LangString DESC_SecDesktopIcon ${LANG_FRENCH} "Si selectionné, un raccourci pour Gajim sera créé sur le bureau." LangString DESC_SecAutostart ${LANG_FRENCH} "Si activé, Gajim sera automatiquement lancé au démarrage de Windows." -LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement déja installé." -LangString STR_Uninstall ${LANG_FRENCH} "Lancer la Désinstallation" -LangString STR_Cancel ${LANG_FRENCH} "Annuler" +LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement déjà installé. Lancer la désinstallation ?" LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lancé.$\n\ Fermez-le et redémarrez le désinstallateur."
@@ -94,9 +94,7 @@ LangString DESC_SecGtk ${LANG_GERMAN} "Installert Gtk+ 2 (notwendig um Gajim zu benutzen)." LangString DESC_SecDesktopIcon ${LANG_GERMAN} "Wenn dies aktiviert wird, wird ein Icon für Gajim auf dem Desktop erstellt." LangString DESC_SecAutostart ${LANG_GERMAN} "Gajim wird automatisch gestartet, sowie Windows startet, wenn dies aktivier wird." -LangString STR_Installed ${LANG_GERMAN} "Gajim scheint bereits installiert zu sein." -LangString STR_Uninstall ${LANG_GERMAN} "Deinstallations-Programm starten" -LangString STR_Cancel ${LANG_GERMAN} "Abbrechen" +LangString STR_Installed ${LANG_GERMAN} "Gajim is apparently already installed. Uninstall it?" LangString STR_Running ${LANG_GERMAN} "Es scheint, dass Gajim bereits läuft.$\n\ Bitte beenden Sie es und starten Sie den Installer erneut.."
@@ -112,9 +110,7 @@ LangString DESC_SecGtk ${LANG_ITALIAN} "Installa Gtk+ 2 (necessario per eseguire Gajim)." LangString DESC_SecDesktopIcon ${LANG_ITALIAN} "Se selezionato, un'icona verrà creata sul desktop." LangString DESC_SecAutostart ${LANG_ITALIAN} "Se selezionato, Gajim sarà eseguito all'avvio di Windows." -LangString STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed." -LangString STR_Uninstall ${LANG_ITALIAN} "Launch Uninstall" -LangString STR_Cancel ${LANG_ITALIAN} "Cancel" +LangString STR_Installed ${LANG_ITALIAN} "Gajim is apparently already installed. Uninstall it?" LangString STR_Running ${LANG_ITALIAN} "It appears that Gajim is currently running.$\n\ Close it and restart uninstaller."
@@ -130,11 +126,24 @@ LangString DESC_SecGtk ${LANG_RUSSIAN} "Óñòàíîâêà Gtk+ 2 (íåîáõîäèìî äëÿ ðàáîòû Gajim)." LangString DESC_SecDesktopIcon ${LANG_RUSSIAN} "Åñëè îòìå÷åíî, íà ðàáî÷åì ñòîëå áóäåò ñîçäàí ÿðëûê Gajim." LangString DESC_SecAutostart ${LANG_RUSSIAN} "Åñëè îòìå÷åíî, Gajim áóäåò àâòîìàòè÷åñêè çàïóñêàòüñÿ ïðè çàãðóçêå Windows." -LangString STR_Installed ${LANG_RUSSIAN} "Gajim is apparently already installed." -LangString STR_Uninstall ${LANG_RUSSIAN} "Launch Uninstall" -LangString STR_Cancel ${LANG_RUSSIAN} "Cancel" -LangString STR_Running ${LANG_RUSSIAN} "It appears that Gajim is currently running.$\n\ - Close it and restart uninstaller." +LangString STR_Installed ${LANG_RUSSIAN} "Ïîõîæå, Gajim óæå óñòàíîâëåí. Äåèíñòàëëèðîâàòü óñòàíîâëåííóþ âåðñèþ?" +LangString STR_Running ${LANG_RUSSIAN} "Ïîõîæå, Gajim óæå çàïóùåí.$\nÇàêðîéòå åãî è çàïóñòèòå äåèíñòàëëÿòîð ñíîâà." + +; Hebrew +LangString NAME_Emoticons ${LANG_HEBREW} "øâùåðéí" +LangString NAME_Iconsets ${LANG_HEBREW} "îòøëé öìîéú" +LangString NAME_Languages ${LANG_HEBREW} "ùôåú" +LangString NAME_SecLanguagesOther ${LANG_HEBREW} "àçøåú" +LangString NAME_Themes ${LANG_HEBREW} "òøëàåú ðåùà" +LangString NAME_SecDesktopIcon ${LANG_HEBREW} "öåø ñîì áùåìçï òáåãä" +LangString NAME_SecAutostart ${LANG_HEBREW} "äôòì àú Gajim ëàùø Windows îúçéì" +LangString DESC_SecGajim ${LANG_HEBREW} "îú÷éï ÷áöé Gajim òé÷øééí." +LangString DESC_SecGtk ${LANG_HEBREW} "îú÷éï Gtk+ 2 (ðçåöä ìäøöú Gajim)." +LangString DESC_SecDesktopIcon ${LANG_HEBREW} "áîéãä åð÷áòú, ÷éöåø ãøê òáåø Gajim éåùí òì ùåìçï äòáåãä." +LangString DESC_SecAutostart ${LANG_HEBREW} "áîéãä åð÷áòú, Gajim éåôòì àåèåîèéú ëàùø Windows îúçéì." +LangString STR_Installed ${LANG_HEBREW} "ëôé äðøàä, Gajim ëáø îåú÷ï. ìäñéø àåúå?" +LangString STR_Running ${LANG_HEBREW} "ðøàä ùäúåëðéú Gajim îåøöú ëòú.$\n\ + àðà öà îï Gajim åàúçì àú îñéø ääú÷ðä."
Section "Gajim" SecGajim SectionIn RO @@ -191,7 +200,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.1" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "DisplayVersion" "0.15.3" WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "URLInfoAbout" "http://www.gajim.org/" WriteUninstaller "$INSTDIR\Uninstall.exe"
@@ -354,6 +363,7 @@ File /r "po\eo" File /r "po\eu" File /r "po\gl" + File /r "po\he" File /r "po\hr" File /r "po\lt" File /r "po\nb" @@ -598,6 +608,7 @@ RMDir /r "$INSTDIR\po\eu" RMDir /r "$INSTDIR\po\fr" RMDir /r "$INSTDIR\po\gl" + RMDir /r "$INSTDIR\po\he" RMDir /r "$INSTDIR\po\hr" RMDir /r "$INSTDIR\po\it" RMDir /r "$INSTDIR\po\lt" @@ -678,11 +689,7 @@ IntOp $0 $0 - 2 strcpy $1 $R0 $0 1 IfFileExists $1 +1 NotInstalled - messagebox::show MB_DEFBUTTON4|MB_TOPMOST "Gajim" \ - "0,103" \ - $(STR_Installed) \ - $(STR_Uninstall) $(STR_Cancel) - Pop $R1 + MessageBox MB_YESNO|MB_DEFBUTTON2|MB_TOPMOST $(STR_Installed) IDNO Quit StrCmp $R1 2 Quit +1 ExecWait '$R0 _?=$INSTDIR' $R2 StrCmp $R2 0 +1 Quit @@ -691,12 +698,7 @@ ; Check to see if new installer (NSIS)already installed ReadRegStr $R3 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\Gajim" "UninstallString" IfFileExists $R3 +1 ReallyNotInstalled - - messagebox::show MB_DEFBUTTON4|MB_TOPMOST "Gajim" \ - "0,103" \ - $(STR_Installed) \ - $(STR_Uninstall) $(STR_Cancel) - Pop $R4 + MessageBox MB_YESNO|MB_DEFBUTTON2|MB_TOPMOST $(STR_Installed) IDNO Quit StrCmp $R4 2 Quit +1 ExecWait '$R3 _?=$INSTDIR' $R5 StrCmp $R5 0 ReallyNotInstalled Quit