changeset 84dbf1856a7a in /home/hg/repos/gajim
branches: gajim_0.15
details:http://hg.gajim.org/gajim?cmd=changeset;node=84dbf1856a7a
description: prepare 0.15.3 release
diffstat:
ChangeLog | 6 +
autogen.sh | 2 +-
debian/changelog | 28 +++++++
debian/control | 2 +-
debian/patches/00_connection_handlers.diff | 25 ++++++
debian/patches/00list | 2 +
debian/patches/01_accel_group.diff | 109 +++++++++++++++++++++++++++++
debian/rules | 10 ++
gajim.nsi | 24 ++++++-
src/common/defs.py | 2 +-
10 files changed, 206 insertions(+), 4 deletions(-)
diffs (truncated from 326 to 300 lines):
diff -r 1d677aad0201 -r 84dbf1856a7a ChangeLog
--- a/ChangeLog Thu Mar 14 12:45:53 2013 +0100
+++ b/ChangeLog Sun Mar 17 18:28:39 2013 +0100
@@ -1,3 +1,9 @@
+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
diff -r 1d677aad0201 -r 84dbf1856a7a autogen.sh
--- a/autogen.sh Thu Mar 14 12:45:53 2013 +0100
+++ b/autogen.sh Sun Mar 17 18:28:39 2013 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env bash
- gajimversion="0.15.2"
+ gajimversion="0.15.3"
if [ -d ".hg" ]; then
node=$(hg tip --template "{node}")
hgversion="-${node:0:12}"
diff -r 1d677aad0201 -r 84dbf1856a7a debian/changelog
--- a/debian/changelog Thu Mar 14 12:45:53 2013 +0100
+++ b/debian/changelog Sun Mar 17 18:28:39 2013 +0100
@@ -1,3 +1,23 @@
+gajim (0.15.1-4) unstable; urgency=low
+
+ * apply patches using dpatch in debian/rules
+
+ -- Yann Leboulanger <[email protected]> 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 <[email protected]> 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 <[email protected]> Sun, 14 Oct 2012 18:02:36 +0200
+
gajim (0.15.1-1) unstable; urgency=low
* New upstream release.
@@ -8,6 +28,14 @@
-- Yann Leboulanger <[email protected]> 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 <[email protected]> Sat, 16 Jun 2012 18:22:00 +0200
+
gajim (0.15-1) unstable; urgency=low
* New upstream release.
diff -r 1d677aad0201 -r 84dbf1856a7a debian/control
--- a/debian/control Thu Mar 14 12:45:53 2013 +0100
+++ b/debian/control Sun Mar 17 18:28:39 2013 +0100
@@ -2,7 +2,7 @@
Section: net
Priority: optional
Maintainer: Yann Leboulanger <[email protected]>
-Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), gettext (>=
0.17-4), intltool (>= 0.40.1), imagemagick, libglib2.0-dev
+Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), gettext (>=
0.17-4), intltool (>= 0.40.1), imagemagick, libglib2.0-dev, dpatch
Standards-Version: 3.9.3
Homepage: http://www.gajim.org
Vcs-Hg: http://hg.gajim.org/gajim/
diff -r 1d677aad0201 -r 84dbf1856a7a debian/patches/00_connection_handlers.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/00_connection_handlers.diff Sun Mar 17 18:28:39
2013 +0100
@@ -0,0 +1,25 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 00_connection_handlers.diff by <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix variable name
+#
+# Description: fix variable name
+# Author: Yann Leboulanger <[email protected]>
+# Last-Update: 2012-10-28
+
+@DPATCH@
+
+Index: src/common/connection_handlers.py
+===================================================================
+--- a/src/common/connection_handlers.py
++++ b/src/common/connection_handlers.py
+@@ -1993,7 +1993,7 @@
+ def _StreamCB(self, con, iq_obj):
+ log.debug('StreamCB')
+ gajim.nec.push_incoming_event(StreamReceivedEvent(None,
+- conn=self, stanza=obj))
++ conn=self, stanza=iq_obj))
+
+ def _register_handlers(self, con, con_type):
+ # try to find another way to register handlers in each class
diff -r 1d677aad0201 -r 84dbf1856a7a debian/patches/00list
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/00list Sun Mar 17 18:28:39 2013 +0100
@@ -0,0 +1,2 @@
+00_connection_handlers.diff
+01_accel_group.diff
diff -r 1d677aad0201 -r 84dbf1856a7a debian/patches/01_accel_group.diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/patches/01_accel_group.diff Sun Mar 17 18:28:39 2013 +0100
@@ -0,0 +1,109 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_connection_handlers.dpatch by <[email protected]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix using accel group
+#
+# Description: fix using accel group
+# Author: Yann Leboulanger <[email protected]>
+# Origin: upstream,http://hg.gajim.org/gajim/rev/fdd7c9b81c1b
+# Last-Update: 2012-10-28
+
+@DPATCH@
+
+--- a/src/message_window.py
++++ b/src/message_window.py
+@@ -352,6 +352,7 @@
+ if modifier & gtk.gdk.CONTROL_MASK:
+ if keyval == gtk.keysyms.h: # CTRL + h
+ control._on_history_menuitem_activate()
++ return True
+ elif control.type_id == message_control.TYPE_CHAT and \
+ keyval == gtk.keysyms.f: # CTRL + f
+ # CTRL + f moves cursor one char forward when user uses Emacs
+@@ -359,28 +360,35 @@
+ if not gtk.settings_get_default().get_property(
+ 'gtk-key-theme-name') == 'Emacs':
+ control._on_send_file_menuitem_activate(None)
++ return True
+ elif control.type_id == message_control.TYPE_CHAT and \
+ keyval == gtk.keysyms.g: # CTRL + g
+ control._on_convert_to_gc_menuitem_activate(None)
++ return True
+ elif control.type_id in (message_control.TYPE_CHAT,
+ message_control.TYPE_PM) and keyval == gtk.keysyms.i: # CTRL + i
+ control._on_contact_information_menuitem_activate(None)
+ elif keyval == gtk.keysyms.l or keyval == gtk.keysyms.L: # CTRL +
l|L
+ control.conv_textview.clear()
++ return True
+ elif keyval == gtk.keysyms.u: # CTRL + u: emacs style clear line
+ control.clear(control.msg_textview)
++ return True
+ elif control.type_id == message_control.TYPE_GC and \
+ keyval == gtk.keysyms.b: # CTRL + b
+ control._on_bookmark_room_menuitem_activate(None)
++ return True
+ # Tab switch bindings
+ elif keyval == gtk.keysyms.F4: # CTRL + F4
+ self.remove_tab(control, self.CLOSE_CTRL_KEY)
++ return True
+ elif keyval == gtk.keysyms.w: # CTRL + w
+ # CTRL + w removes latest word before sursor when User uses
emacs
+ # theme
+ if not gtk.settings_get_default().get_property(
+ 'gtk-key-theme-name') == 'Emacs':
+ self.remove_tab(control, self.CLOSE_CTRL_KEY)
++ return True
+ elif keyval in (gtk.keysyms.Page_Up, gtk.keysyms.Page_Down):
+ # CTRL + PageUp | PageDown
+ # Create event and send it to notebook
+@@ -390,12 +398,14 @@
+ event.state = gtk.gdk.CONTROL_MASK
+ event.keyval = int(keyval)
+ self.notebook.emit('key_press_event', event)
++ return True
+
+ if modifier & gtk.gdk.SHIFT_MASK:
+ # CTRL + SHIFT
+ if control.type_id == message_control.TYPE_GC and \
+ keyval == gtk.keysyms.n: # CTRL + SHIFT + n
+ control._on_change_nick_menuitem_activate(None)
++ return True
+ # MOD1 (ALT) mask
+ elif modifier & gtk.gdk.MOD1_MASK:
+ # Tab switch bindings
+@@ -404,26 +414,34 @@
+ if new >= self.notebook.get_n_pages():
+ new = 0
+ self.notebook.set_current_page(new)
++ return True
+ elif keyval == gtk.keysyms.Left: # ALT + LEFT
+ new = self.notebook.get_current_page() - 1
+ if new < 0:
+ new = self.notebook.get_n_pages() - 1
+ self.notebook.set_current_page(new)
++ return True
+ elif chr(keyval) in st: # ALT + 1,2,3..
+ self.notebook.set_current_page(st.index(chr(keyval)))
++ return True
+ elif keyval == gtk.keysyms.c: # ALT + C toggles chat buttons
+ control.chat_buttons_set_visible(not
control.hide_chat_buttons)
++ return True
+ elif keyval == gtk.keysyms.m: # ALT + M show emoticons menu
+ control.show_emoticons_menu()
++ return True
+ elif keyval == gtk.keysyms.d: # ALT + D show actions menu
+ control.on_actions_button_clicked(control.actions_button)
++ return True
+ elif control.type_id == message_control.TYPE_GC and \
+ keyval == gtk.keysyms.t: # ALT + t
+ control._on_change_subject_menuitem_activate(None)
++ return True
+ # Close tab bindings
+ elif keyval == gtk.keysyms.Escape and \
+ gajim.config.get('escape_key_closes'): # Escape
+ self.remove_tab(control, self.CLOSE_ESC)
++ return True
+
+ def _on_close_button_clicked(self, button, control):
+ """
diff -r 1d677aad0201 -r 84dbf1856a7a debian/rules
--- a/debian/rules Thu Mar 14 12:45:53 2013 +0100
+++ b/debian/rules Sun Mar 17 18:28:39 2013 +0100
@@ -1,8 +1,18 @@
#!/usr/bin/make -f
+include /usr/share/dpatch/dpatch.make
%:
dh $@ --with python2
+build: build-stamp
+
+build-stamp: patch-stamp
+ dh build
+ touch $@
+
+clean: unpatch
+ dh clean
+
# test target is broken
override_dh_auto_test:
diff -r 1d677aad0201 -r 84dbf1856a7a gajim.nsi
--- a/gajim.nsi Thu Mar 14 12:45:53 2013 +0100
+++ b/gajim.nsi Sun Mar 17 18:28:39 2013 +0100
@@ -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
@@ -125,6 +129,22 @@
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
@@ -180,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.2"
+ 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"
@@ -343,6 +363,7 @@
File /r "po\eo"
_______________________________________________
Commits mailing list
[email protected]
http://lists.gajim.org/cgi-bin/listinfo/commits
