Commit 5cae3b94 authored by Yann Leboulanger's avatar Yann Leboulanger

get files from 0.15 branch

parent 4b3a1695
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
......
#!/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}"
......
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 @@ gajim (0.15.1-1) unstable; urgency=low
-- 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.
......
......@@ -39,11 +39,15 @@ Var StartMenuFolder
!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_SecGajim ${LANG_ENGLISH} "Installs the main Gajim files."
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_SecGajim ${LANG_FRENCH} "Installer les fichiers principaux de Ga
LangString DESC_SecGtk ${LANG_FRENCH} "Installer Gtk+ 2 (ncessaire 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 dmarrage de Windows."
LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement dja install."
LangString STR_Uninstall ${LANG_FRENCH} "Lancer la Dsinstallation"
LangString STR_Cancel ${LANG_FRENCH} "Annuler"
LangString STR_Installed ${LANG_FRENCH} "Gajim est apparement dj install. Lancer la dsinstallation ?"
LangString STR_Running ${LANG_FRENCH} "Gajim est apparament lanc.$\n\
Fermez-le et redmarrez le dsinstallateur."
......@@ -94,9 +94,7 @@ LangString DESC_SecGajim ${LANG_GERMAN} "Installiert die Hauptdateien von Gajim.
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 fr 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 luft.$\n\
Bitte beenden Sie es und starten Sie den Installer erneut.."
......@@ -112,9 +110,7 @@ LangString DESC_SecGajim ${LANG_ITALIAN} "Installa i file principali di Gajim."
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_SecGajim ${LANG_RUSSIAN} "
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 @@ 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.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 @@ Section $(NAME_SecLanguagesOther) SecLanguagesOther
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 @@ Section "Uninstall"
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 @@ launch:
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 @@ NotInstalled:
; 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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment