Hello community, here is the log from the commit of package djvusmooth for openSUSE:Factory checked in at 2012-10-12 14:12:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/djvusmooth (Old) and /work/SRC/openSUSE:Factory/.djvusmooth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "djvusmooth", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/djvusmooth/djvusmooth.changes 2012-06-18 17:33:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.djvusmooth.new/djvusmooth.changes 2012-10-12 14:15:49.000000000 +0200 @@ -1,0 +2,10 @@ +Thu Oct 4 15:18:04 UTC 2012 - [email protected] + +- Update to 0.2.13. + * Add keyboard shortcuts for “Zoom in” and “Zoom out”. + * Fix editing text in external editor: when a zone broader than + line without sub-zones existed, djvusmooth incorrectly skipped + it when importing text. + * Fix segmentation fault on shutdown. + +------------------------------------------------------------------- Old: ---- djvusmooth-0.2.12.tar.gz New: ---- djvusmooth-0.2.13.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ djvusmooth.spec ++++++ --- /var/tmp/diff_new_pack.pjiqAN/_old 2012-10-12 14:15:50.000000000 +0200 +++ /var/tmp/diff_new_pack.pjiqAN/_new 2012-10-12 14:15:50.000000000 +0200 @@ -17,7 +17,7 @@ Name: djvusmooth -Version: 0.2.12 +Version: 0.2.13 Release: 0 Summary: Graphical Text Editor for DjVu License: GPL-2.0 ++++++ djvusmooth-0.2.12.tar.gz -> djvusmooth-0.2.13.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.12/COPYING new/djvusmooth-0.2.13/COPYING --- old/djvusmooth-0.2.12/COPYING 2011-05-28 12:51:53.000000000 +0200 +++ new/djvusmooth-0.2.13/COPYING 2012-08-07 12:29:43.000000000 +0200 @@ -1,12 +1,12 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble + Preamble The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public @@ -56,7 +56,7 @@ The precise terms and conditions for copying, distribution and modification follow. - GNU GENERAL PUBLIC LICENSE + GNU GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 0. This License applies to any program or other work which contains @@ -255,7 +255,7 @@ of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - NO WARRANTY + NO WARRANTY 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN @@ -277,9 +277,9 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - END OF TERMS AND CONDITIONS + END OF TERMS AND CONDITIONS - How to Apply These Terms to Your New Programs + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.12/PKG-INFO new/djvusmooth-0.2.13/PKG-INFO --- old/djvusmooth-0.2.12/PKG-INFO 2012-06-13 20:57:01.000000000 +0200 +++ new/djvusmooth-0.2.13/PKG-INFO 2012-10-02 12:14:53.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: djvusmooth -Version: 0.2.12 +Version: 0.2.13 Summary: graphical editor for DjVu Home-page: http://jwilk.net/software/djvusmooth Author: Jakub Wilk diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.12/doc/changelog new/djvusmooth-0.2.13/doc/changelog --- old/djvusmooth-0.2.12/doc/changelog 2012-06-13 20:53:50.000000000 +0200 +++ new/djvusmooth-0.2.13/doc/changelog 2012-10-02 12:02:46.000000000 +0200 @@ -1,3 +1,15 @@ +djvusmooth (0.2.13) unstable; urgency=low + + * Add keyboard shortcuts for “Zoom in” and “Zoom out”. + https://bitbucket.org/jwilk/djvusmooth/issue/8 + * Fix editing text in external editor: when a zone broader than line without + sub-zones existed, djvusmooth incorrectly skipped it when importing text. + Thanks to Janusz S. Bień for the bug report. + * Fix segmentation fault on shutdown. + Thanks to Janusz S. Bień for the bug report. + + -- Jakub Wilk <[email protected]> Tue, 02 Oct 2012 12:02:42 +0200 + djvusmooth (0.2.12) unstable; urgency=low * Install desktop file. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.12/doc/djvusmooth.1 new/djvusmooth-0.2.13/doc/djvusmooth.1 --- old/djvusmooth-0.2.12/doc/djvusmooth.1 2012-06-12 20:22:38.000000000 +0200 +++ new/djvusmooth-0.2.13/doc/djvusmooth.1 2012-10-02 12:03:11.000000000 +0200 @@ -2,12 +2,12 @@ .\" Title: djvusmooth .\" Author: Jakub Wilk <[email protected]> .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 06/12/2012 +.\" Date: 10/02/2012 .\" Manual: djvusmooth manual -.\" Source: djvusmooth 0.2.12 +.\" Source: djvusmooth 0.2.13 .\" Language: English .\" -.TH "DJVUSMOOTH" "1" 2012-06-12 "djvusmooth 0\&.2\&.12" "djvusmooth manual" +.TH "DJVUSMOOTH" "1" 2012-10-02 "djvusmooth 0\&.2\&.13" "djvusmooth manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.12/doc/djvusmooth.xml new/djvusmooth-0.2.13/doc/djvusmooth.xml --- old/djvusmooth-0.2.12/doc/djvusmooth.xml 2012-03-29 22:41:53.000000000 +0200 +++ new/djvusmooth-0.2.13/doc/djvusmooth.xml 2012-09-05 20:35:35.000000000 +0200 @@ -2,7 +2,7 @@ <!DOCTYPE refentry PUBLIC '-//OASIS//DTD DocBook XML V4.5//EN' 'http://www.docbook.org/xml/4.5/docbookx.dtd' [ <!ENTITY p 'djvusmooth'> - <!ENTITY version '0.2.12'> + <!ENTITY version '0.2.13'> ]> <refentry> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.12/lib/__init__.py new/djvusmooth-0.2.13/lib/__init__.py --- old/djvusmooth-0.2.12/lib/__init__.py 2011-12-20 19:47:02.000000000 +0100 +++ new/djvusmooth-0.2.13/lib/__init__.py 2012-09-05 20:35:35.000000000 +0200 @@ -1,2 +1,2 @@ -__version__ = '0.2.12' +__version__ = '0.2.13' __author__ = 'Jakub Wilk <[email protected]>' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.12/lib/dependencies.py new/djvusmooth-0.2.13/lib/dependencies.py --- old/djvusmooth-0.2.12/lib/dependencies.py 2012-04-18 17:16:42.000000000 +0200 +++ new/djvusmooth-0.2.13/lib/dependencies.py 2012-10-01 21:30:45.000000000 +0200 @@ -1,5 +1,5 @@ # encoding=UTF-8 -# Copyright © 2008, 2009, 2010, 2011 Jakub Wilk <[email protected]> +# Copyright © 2008, 2009, 2010, 2011, 2012 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.12/lib/gui/main.py new/djvusmooth-0.2.13/lib/gui/main.py --- old/djvusmooth-0.2.12/lib/gui/main.py 2012-03-29 19:22:16.000000000 +0200 +++ new/djvusmooth-0.2.13/lib/gui/main.py 2012-10-01 22:19:49.000000000 +0200 @@ -1,5 +1,5 @@ # encoding=UTF-8 -# Copyright © 2008, 2009, 2010, 2011 Jakub Wilk <[email protected]> +# Copyright © 2008, 2009, 2010, 2011, 2012 Jakub Wilk <[email protected]> # Copyright © 2009 Mateusz Turcza <[email protected]> # # This package is free software; you can redistribute it and/or modify @@ -18,6 +18,7 @@ import sys import itertools +import functools import locale import os.path import threading @@ -262,6 +263,17 @@ # So just skip the event: event.Skip() +def skip_if_being_deleted(method): + @functools.wraps(method) + def method_wrapper(self, *args, **kwargs): + if self.IsBeingDeleted(): + # This method could be called via an event while the window is + # being deleted. Do *not* fiddle with menu in such a case, as it + # would provoke segmentation fault. + return + return method(self, *args, **kwargs) + return method_wrapper + class MainWindow(wx.Frame): def _menu_item(self, menu, caption, help, method, style = wx.ITEM_NORMAL, icon = None, id = wx.ID_ANY): @@ -406,8 +418,8 @@ submenu = wx.Menu() for caption, help, method, id in \ [ - (_('Zoom &in'), _('Increase the magnification'), self.on_zoom_in, wx.ID_ZOOM_IN), - (_('Zoom &out'), _('Decrease the magnification'), self.on_zoom_out, wx.ID_ZOOM_OUT), + (_('Zoom &in') + '\tCtrl++', _('Increase the magnification'), self.on_zoom_in, wx.ID_ZOOM_IN), + (_('Zoom &out') + '\tCtrl+-', _('Decrease the magnification'), self.on_zoom_out, wx.ID_ZOOM_OUT), ]: self._menu_item(submenu, caption, help, method, id = id or wx.ID_ANY) submenu.AppendSeparator() @@ -644,14 +656,17 @@ def on_display_none(self, event): self.page_widget.render_mode = None + @skip_if_being_deleted def on_display_text(self, event): self.page_widget.render_nonraster = RENDER_NONRASTER_TEXT self._menu_item_display_text.Check() + @skip_if_being_deleted def on_display_maparea(self, event): self.page_widget.render_nonraster = RENDER_NONRASTER_MAPAREA self._menu_item_display_maparea.Check() + @skip_if_being_deleted def on_display_no_nonraster(self, event): self.page_widget.render_nonraster = None self._menu_item_display_no_nonraster.Check() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.12/lib/text/mangle.py new/djvusmooth-0.2.13/lib/text/mangle.py --- old/djvusmooth-0.2.12/lib/text/mangle.py 2011-05-28 12:51:53.000000000 +0200 +++ new/djvusmooth-0.2.13/lib/text/mangle.py 2012-10-01 21:29:32.000000000 +0200 @@ -1,5 +1,5 @@ # encoding=UTF-8 -# Copyright © 2008, 2009 Jakub Wilk <[email protected]> +# Copyright © 2008, 2009, 2012 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -74,42 +74,45 @@ j += 1 yield input_head[:5] + [current_word] -def linearlize_for_export(expr): +def linearize_for_export(expr): if expr[0].value == djvu.const.TEXT_ZONE_CHARACTER: raise CharacterZoneFound if len(expr) == 6 and isinstance(expr[5], djvu.sexpr.StringExpression): yield expr[5].value elif expr[0].value == djvu.const.TEXT_ZONE_LINE: - yield ' '.join(linearlize_for_export(expr[5:])) + yield ' '.join(linearize_for_export(expr[5:])) else: for subexpr in expr: if not isinstance(subexpr, djvu.sexpr.ListExpression): continue - for item in linearlize_for_export(subexpr): + for item in linearize_for_export(subexpr): yield item -def linearlize_for_import(expr): +def linearize_for_import(expr): if expr[0].value == djvu.const.TEXT_ZONE_CHARACTER: raise CharacterZoneFound - if expr[0].value == djvu.const.TEXT_ZONE_LINE: + if len(expr) == 6 and isinstance(expr[5], djvu.sexpr.StringExpression): + yield expr + elif expr[0].value == djvu.const.TEXT_ZONE_LINE: yield expr else: for subexpr in expr: if not isinstance(subexpr, djvu.sexpr.ListExpression): continue - for item in linearlize_for_import(subexpr): + for item in linearize_for_import(subexpr): yield item def export(sexpr, stream): - for line in linearlize_for_export(sexpr): + for line in linearize_for_export(sexpr): print >>stream, line def import_(sexpr, stdin): - exported = tuple(linearlize_for_export(sexpr)) - inputs = tuple(linearlize_for_import(sexpr)) + exported = tuple(linearize_for_export(sexpr)) + inputs = tuple(linearize_for_import(sexpr)) stdin = tuple(line for line in stdin) if len(exported) != len(stdin): raise LengthChanged + assert len(exported) == len(inputs) == len(stdin) dirty = False for n, line, xline, input in itertools.izip(itertools.count(1), stdin, exported, inputs): line = line.rstrip('\n') Files old/djvusmooth-0.2.12/locale/es/LC_MESSAGES/djvusmooth.mo and new/djvusmooth-0.2.13/locale/es/LC_MESSAGES/djvusmooth.mo differ Files old/djvusmooth-0.2.12/locale/pl/LC_MESSAGES/djvusmooth.mo and new/djvusmooth-0.2.13/locale/pl/LC_MESSAGES/djvusmooth.mo differ Files old/djvusmooth-0.2.12/locale/ru/LC_MESSAGES/djvusmooth.mo and new/djvusmooth-0.2.13/locale/ru/LC_MESSAGES/djvusmooth.mo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.12/po/es.po new/djvusmooth-0.2.13/po/es.po --- old/djvusmooth-0.2.12/po/es.po 2012-05-23 18:38:07.000000000 +0200 +++ new/djvusmooth-0.2.13/po/es.po 2012-09-05 20:35:35.000000000 +0200 @@ -3,7 +3,7 @@ # This file is distributed under the same license as the djvusmooth package. msgid "" msgstr "" -"Project-Id-Version: djvusmooth 0.2.12\n" +"Project-Id-Version: djvusmooth 0.2.13\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-05-23 18:36+0200\n" "PO-Revision-Date: 2012-05-21 00:20-0500\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.12/po/pl.po new/djvusmooth-0.2.13/po/pl.po --- old/djvusmooth-0.2.12/po/pl.po 2012-05-23 18:38:07.000000000 +0200 +++ new/djvusmooth-0.2.13/po/pl.po 2012-09-05 20:35:35.000000000 +0200 @@ -3,7 +3,7 @@ # This file is distributed under the same license as the djvusmooth package. msgid "" msgstr "" -"Project-Id-Version: djvusmooth 0.2.12\n" +"Project-Id-Version: djvusmooth 0.2.13\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-05-23 18:36+0200\n" "PO-Revision-Date: 2009-05-31 14:45+CEST\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.12/po/ru.po new/djvusmooth-0.2.13/po/ru.po --- old/djvusmooth-0.2.12/po/ru.po 2012-06-13 20:47:58.000000000 +0200 +++ new/djvusmooth-0.2.13/po/ru.po 2012-09-05 20:35:35.000000000 +0200 @@ -5,7 +5,7 @@ # msgid "" msgstr "" -"Project-Id-Version: djvusmooth 0.2.12\n" +"Project-Id-Version: djvusmooth 0.2.13\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2012-05-23 18:36+0200\n" "PO-Revision-Date: 2012-06-13 10:33+0300\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.12/update-i18n new/djvusmooth-0.2.13/update-i18n --- old/djvusmooth-0.2.12/update-i18n 2012-05-23 18:37:48.000000000 +0200 +++ new/djvusmooth-0.2.13/update-i18n 2012-10-01 21:31:36.000000000 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/make -f -# Copyright © 2009, 2011 Jakub Wilk +# Copyright © 2009, 2011, 2012 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
