Hello community, here is the log from the commit of package djvusmooth for openSUSE:Factory checked in at 2014-10-14 07:10:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/djvusmooth (Old) and /work/SRC/openSUSE:Factory/.djvusmooth.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "djvusmooth" Changes: -------- --- /work/SRC/openSUSE:Factory/djvusmooth/djvusmooth.changes 2013-03-07 07:19:43.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.djvusmooth.new/djvusmooth.changes 2014-10-14 07:11:06.000000000 +0200 @@ -1,0 +2,17 @@ +Fri Oct 10 13:59:28 UTC 2014 - [email protected] + +- Update to 0.2.15. + * Improve the setup script: + + Run msgfmt with the --verbose option. + * Improve error handling. + * Use HTTPS URLs when they are available, in documentation and + code. + * Document that is possible to edit hyperlinks. + * Use the notebook widget regardless of wxPython version. + * Don't hardcode path to the binary in the desktop file. + * Add experimental support for wxPython 3.0. + * Drop support for wxPython 2.6. + * Add German translation for the desktop file. +- Correct build dependencies. + +------------------------------------------------------------------- Old: ---- djvusmooth-0.2.14.tar.gz djvusmooth-0.2.14.tar.gz.asc New: ---- djvusmooth-0.2.15.tar.gz djvusmooth-0.2.15.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ djvusmooth.spec ++++++ --- /var/tmp/diff_new_pack.UaqkLQ/_old 2014-10-14 07:11:07.000000000 +0200 +++ /var/tmp/diff_new_pack.UaqkLQ/_new 2014-10-14 07:11:07.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package djvusmooth # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: djvusmooth -Version: 0.2.14 +Version: 0.2.15 Release: 0 Summary: Graphical Text Editor for DjVu License: GPL-2.0 @@ -32,15 +32,7 @@ BuildRequires: gpg-offline %endif BuildRequires: hicolor-icon-theme -%if 0%{?suse_version} >= 1210 -BuildRequires: python-distribute -%else BuildRequires: python-setuptools -%endif -# Not actually needed for build, but in order to make the build fail -# if the runtime dependencies are not available in the repository: -BuildRequires: python-devel -BuildRequires: python-djvulibre Requires: djvulibre Requires: python-djvulibre Requires: python-wxWidgets @@ -63,16 +55,18 @@ %build %install -# Replace desktop file. Provided one isn't good enough. +# Replace a desktop file. Provided one isn't good enough. cat > extra/%{name}.desktop << EOF [Desktop Entry] Name=DjVuSmooth GenericName=Graphical Text Editor for DjVu GenericName[pl]=Graficzny edytor plików DjVu GenericName[ru]=Текстовый редактор DjVu-книг +GenericName[de]=Grafischer Editor für DjVu-Dateien Comment=Graphical Text Editor for DjVu Comment[pl]=Graficzny edytor plików DjVu Comment[ru]=Граффический текстовый редактор для DjVu-книг +Comment[de]=Grafischer Editor für DjVu-Dateien Type=Application Exec=djvusmooth %f Icon=djvusmooth ++++++ djvusmooth-0.2.14.tar.gz -> djvusmooth-0.2.15.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/PKG-INFO new/djvusmooth-0.2.15/PKG-INFO --- old/djvusmooth-0.2.14/PKG-INFO 2013-02-21 23:22:43.000000000 +0100 +++ new/djvusmooth-0.2.15/PKG-INFO 2014-10-07 21:46:31.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: djvusmooth -Version: 0.2.14 +Version: 0.2.15 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.14/djvusmooth new/djvusmooth-0.2.15/djvusmooth --- old/djvusmooth-0.2.14/djvusmooth 2011-06-06 19:55:54.000000000 +0200 +++ new/djvusmooth-0.2.15/djvusmooth 2014-10-07 20:51:30.000000000 +0200 @@ -1,5 +1,6 @@ #!/usr/bin/python # encoding=UTF-8 + # Copyright © 2008 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/doc/changelog new/djvusmooth-0.2.15/doc/changelog --- old/djvusmooth-0.2.14/doc/changelog 2013-02-21 23:18:36.000000000 +0100 +++ new/djvusmooth-0.2.15/doc/changelog 2014-10-07 21:46:09.000000000 +0200 @@ -1,3 +1,25 @@ +djvusmooth (0.2.15) unstable; urgency=low + + [ Jakub Wilk ] + * Improve the setup script: + + Run msgfmt with the --verbose option. + * Improve error handling. + * Use HTTPS URLs when they are available, in documentation and code. + * Document that is possible to edit hyperlinks. + Thanks to Janusz S. Bień for the bug report. + https://bitbucket.org/jwilk/djvusmooth/issue/13 + * Use the notebook widget regardless of wxPython version. + * Don't hardcode path to the binary in the desktop file. + * Add experimental support for wxPython 3.0. + Thanks to Olly Betts for the bug report and the initial patch. + https://bugs.debian.org/758950 + * Drop support for wxPython 2.6. + + [ Daniel Stender ] + * Add German translation for the desktop file. + + -- Jakub Wilk <[email protected]> Tue, 07 Oct 2014 21:46:07 +0200 + djvusmooth (0.2.14) unstable; urgency=low [ Jakub Wilk ] @@ -6,15 +28,15 @@ * Do not abort opening a new file if user chose to save the current one. * Check Python version at runtime. * Improve the manual page, as per man-pages(7) recommendations: - - Remove the “AUTHOR” section. - - Rename the “ENVIRONMENT VARIABLES” section as “ENVIRONMENT”. - - Make “PORTABILITY” and “REPORTING BUGS” subsections of the “BUGS” + + Remove the “AUTHOR” section. + + Rename the “ENVIRONMENT VARIABLES” section as “ENVIRONMENT”. + + Make “PORTABILITY” and “REPORTING BUGS” subsections of the “BUGS” section. * Improve the setup script: + Make “setup.py clean -a” remove compiled manual page (unless it was built by “setup.py sdist”). - + Fix compatiblity with Python 2.5 and 2.6 (broken in 0.2.12). - * Improve error handilng. + + Fix compatibility with Python 2.5 and 2.6 (broken in 0.2.12). + * Improve error handling. [ C. Daniel Sanchez R. ] * Update the Spanish translation. @@ -85,7 +107,7 @@ + Don't rely on atomic renames when saving configuration files. * Reset the SIGCHLD signal to SIG_IGN on start. Thanks to Heinrich Schwietering for the bug report. - http://bugs.debian.org/596232 + https://bugs.debian.org/596232 * Fix support for external editors that use the overwrite-by-rename technique. Thanks to Markus Baertschi for the bug report. @@ -98,9 +120,9 @@ [ Jakub Wilk ] * Handle directories with non-ASCII characters. - http://bugs.debian.org/595002 + https://bugs.debian.org/595002 * Fix editing line/arrow annotations. - http://bugs.debian.org/595012 + https://bugs.debian.org/595012 -- Jakub Wilk <[email protected]> Tue, 31 Aug 2010 15:15:01 +0200 @@ -143,13 +165,13 @@ * Fix issues with “Overprinted annotation properties” dialog: + Allow to turn off the “allow visible” property. Thanks to Janusz S. Bień for the bug report. - http://bugs.debian.org/574362 + https://bugs.debian.org/574362 + Disable the “allow visible” checkbox if a hyperlink has no border. - http://bugs.debian.org/574338 + https://bugs.debian.org/574338 + Display real border width instead of hard-coded 1. + Use the term “width” rather than “thickness” consistently. * Document that using shadow border thinner than 3 pixels is not portable. - http://bugs.debian.org/574361 + https://bugs.debian.org/574361 -- Jakub Wilk <[email protected]> Wed, 17 Mar 2010 21:59:58 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/doc/djvusmooth.1 new/djvusmooth-0.2.15/doc/djvusmooth.1 --- old/djvusmooth-0.2.14/doc/djvusmooth.1 2013-02-21 23:22:43.000000000 +0100 +++ new/djvusmooth-0.2.15/doc/djvusmooth.1 2014-10-07 21:46:31.000000000 +0200 @@ -2,13 +2,13 @@ '\" t .\" Title: djvusmooth .\" Author: Jakub Wilk <[email protected]> -.\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/> -.\" Date: 02/21/2013 +.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/> +.\" Date: 10/07/2014 .\" Manual: djvusmooth manual -.\" Source: djvusmooth 0.2.14 +.\" Source: djvusmooth 0.2.15 .\" Language: English .\" -.TH "DJVUSMOOTH" "1" 2013-02-21 "djvusmooth 0\&.2\&.14" "djvusmooth manual" +.TH "DJVUSMOOTH" "1" 2014-10-07 "djvusmooth 0\&.2\&.15" "djvusmooth manual" .\" ----------------------------------------------------------------- .\" * Define some portability stuff .\" ----------------------------------------------------------------- @@ -67,6 +67,17 @@ .sp -1 .IP \(bu 2.3 .\} +add, remove or edit hyperlinks, +.RE +.sp +.RS 4 +.ie n \{\ +\h'-04'\(bu\h'+03'\c +.\} +.el \{\ +.sp -1 +.IP \(bu 2.3 +.\} correct occasional errors in the hidden text layer\&. .RE .sp @@ -98,7 +109,6 @@ \m[blue]\fI\%https://bitbucket.org/jwilk/djvusmooth/issues\fR\m[] .SH "SEE ALSO" .PP - \fBdjvu\fR(1) .SH "NOTES" .IP " 1." 4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/doc/djvusmooth.xml new/djvusmooth-0.2.15/doc/djvusmooth.xml --- old/djvusmooth-0.2.14/doc/djvusmooth.xml 2013-02-20 17:48:19.000000000 +0100 +++ new/djvusmooth-0.2.15/doc/djvusmooth.xml 2014-08-24 09:22:04.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.14'> + <!ENTITY version '0.2.15'> ]> <refentry> @@ -41,6 +41,7 @@ <itemizedlist> <listitem><para>edit document metadata,</para></listitem> <listitem><para>edit document outline (bookmarks),</para></listitem> + <listitem><para>add, remove or edit hyperlinks,</para></listitem> <listitem><para>correct occasional errors in the hidden text layer.</para></listitem> </itemizedlist> </para> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/edit-text new/djvusmooth-0.2.15/edit-text --- old/djvusmooth-0.2.14/edit-text 2011-05-28 12:51:53.000000000 +0200 +++ new/djvusmooth-0.2.15/edit-text 2014-10-07 20:51:19.000000000 +0200 @@ -1,5 +1,6 @@ #!/usr/bin/python # encoding=UTF-8 + # Copyright © 2008 Jakub Wilk <[email protected]> # # This package is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/extra/djvusmooth.desktop new/djvusmooth-0.2.15/extra/djvusmooth.desktop --- old/djvusmooth-0.2.14/extra/djvusmooth.desktop 2011-12-20 19:47:30.000000000 +0100 +++ new/djvusmooth-0.2.15/extra/djvusmooth.desktop 2014-08-25 11:50:49.000000000 +0200 @@ -3,8 +3,9 @@ Type=Application Name=djvusmooth GenericName=Graphical editor for DjVu +GenericName[de]=Grafischer Editor für DjVu-Dateien GenericName[pl]=Graficzny edytor plików DjVu -Exec=/usr/bin/djvusmooth %f +Exec=djvusmooth %f Terminal=false MimeType=image/x-djvu;image/x.djvu;image/vnd.djvu; Categories=Graphics; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/__init__.py new/djvusmooth-0.2.15/lib/__init__.py --- old/djvusmooth-0.2.14/lib/__init__.py 2013-02-20 17:48:19.000000000 +0100 +++ new/djvusmooth-0.2.15/lib/__init__.py 2014-08-24 09:22:04.000000000 +0200 @@ -1,4 +1,4 @@ -__version__ = '0.2.14' +__version__ = '0.2.15' __author__ = 'Jakub Wilk <[email protected]>' import sys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/config.py new/djvusmooth-0.2.15/lib/config.py --- old/djvusmooth-0.2.14/lib/config.py 2012-10-09 21:17:21.000000000 +0200 +++ new/djvusmooth-0.2.15/lib/config.py 2014-10-07 20:43:37.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2009, 2010, 2011, 2012 Jakub Wilk <[email protected]> + +# Copyright © 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/dependencies.py new/djvusmooth-0.2.15/lib/dependencies.py --- old/djvusmooth-0.2.14/lib/dependencies.py 2012-10-01 21:30:45.000000000 +0200 +++ new/djvusmooth-0.2.15/lib/dependencies.py 2014-10-07 20:43:07.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009, 2010, 2011, 2012 Jakub Wilk <[email protected]> + +# Copyright © 2008-2014 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 @@ -14,16 +15,15 @@ Checks for djvusmooth dependencies. ''' -WX_VERSIONS = ('2.8-unicode', '2.6-unicode') DDJVU_API_MIN_VERSION = 26 PYTHON_DJVULIBRE_MIN_VERSION = (0, 1, 4) djvulibre_path = None def _check_signals(): - # Protect from scanadf[0] and possibly other brain-dead software that set - # SIGCHLD to SIG_IGN. - # [0] http://bugs.debian.org/596232 + # Protect from scanadf and possibly other software that sets SIGCHLD to + # SIG_IGN. + # https://bugs.debian.org/596232 import os import signal if os.name == 'posix': @@ -54,9 +54,15 @@ import wxversion except ImportError, ex: raise ImportError('%s; perhaps wxPython is not installed' % (ex,)) - if not wxversion.checkInstalled(WX_VERSIONS): - raise ImportError('wxPython 2.6 or 2.8 with Unicode support is required') - wxversion.select(WX_VERSIONS) + for ver in ['2.8-unicode', '3.0']: + try: + wxversion.select(ver, optionsRequired=True) + except wxversion.VersionError: + continue + else: + break + else: + raise ImportError('wxPython 3.0 or 2.8 in Unicode mode is required') _check_signals() del _check_signals diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/djvused.py new/djvusmooth-0.2.15/lib/djvused.py --- old/djvusmooth-0.2.14/lib/djvused.py 2011-06-06 19:55:54.000000000 +0200 +++ new/djvusmooth-0.2.15/lib/djvused.py 2014-10-07 20:43:56.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009, 2010, 2011 Jakub Wilk <[email protected]> + +# Copyright © 2008-2011 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.14/lib/external_editor.py new/djvusmooth-0.2.15/lib/external_editor.py --- old/djvusmooth-0.2.14/lib/external_editor.py 2013-02-21 22:01:45.000000000 +0100 +++ new/djvusmooth-0.2.15/lib/external_editor.py 2014-10-07 20:43:22.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009, 2011, 2013 Jakub Wilk <[email protected]> + +# Copyright © 2008-2013 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.14/lib/gui/dialogs.py new/djvusmooth-0.2.15/lib/gui/dialogs.py --- old/djvusmooth-0.2.14/lib/gui/dialogs.py 2011-06-06 19:55:54.000000000 +0200 +++ new/djvusmooth-0.2.15/lib/gui/dialogs.py 2014-10-07 20:48:17.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009 Jakub Wilk <[email protected]> + +# Copyright © 2008-2014 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 @@ -37,6 +38,6 @@ def GetValue(self): return int(wx.SingleChoiceDialog.GetStringSelection(self)) -__all__ = 'ProgressDialog', 'NumberEntryDialog' +__all__ = ['ProgressDialog', 'NumberEntryDialog'] # vim:ts=4 sw=4 et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/gui/flatten_text.py new/djvusmooth-0.2.15/lib/gui/flatten_text.py --- old/djvusmooth-0.2.14/lib/gui/flatten_text.py 2011-06-06 19:55:54.000000000 +0200 +++ new/djvusmooth-0.2.15/lib/gui/flatten_text.py 2014-10-07 20:48:48.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009 Jakub Wilk <[email protected]> + +# Copyright © 2008-2014 Jakub Wilk <[email protected]> # Copyright © 2009 Mateusz Turcza <[email protected]> # # This package is free software; you can redistribute it and/or modify @@ -66,6 +67,6 @@ label, zone = ZONES_MAP[self._zone_box.GetSelection()] return zone -__all__ = 'FlattenTextDialog', +__all__ = ['FlattenTextDialog'] # vim:ts=4 sw=4 et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/gui/main.py new/djvusmooth-0.2.15/lib/gui/main.py --- old/djvusmooth-0.2.14/lib/gui/main.py 2013-02-21 22:11:12.000000000 +0100 +++ new/djvusmooth-0.2.15/lib/gui/main.py 2014-10-07 20:44:46.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009, 2010, 2011, 2012, 2013 Jakub Wilk <[email protected]> + +# Copyright © 2008-2014 Jakub Wilk <[email protected]> # Copyright © 2009 Mateusz Turcza <[email protected]> # # This package is free software; you can redistribute it and/or modify @@ -62,10 +63,6 @@ system_encoding = locale.getpreferredencoding() -if wx.__version__.startswith('2.8.'): - wx.Choicebook = wx.Notebook - wx.EVT_CHOICEBOOK_PAGE_CHANGED = wx.EVT_NOTEBOOK_PAGE_CHANGED - class OpenDialog(wx.FileDialog): __wildcard = _( @@ -75,7 +72,7 @@ def __init__(self, parent): wx.FileDialog.__init__(self, parent, - style=wx.OPEN, + style=wx.FD_OPEN, wildcard=self.__wildcard, message=_('Open a DjVu document') ) @@ -355,7 +352,7 @@ self.status_bar = self.CreateStatusBar(2, style = wx.ST_SIZEGRIP) self.splitter = wx.SplitterWindow(self, style = wx.SP_LIVE_UPDATE) self.splitter.Bind(wx.EVT_SPLITTER_SASH_POS_CHANGED, self.on_splitter_sash_changed) - self.sidebar = wx.Choicebook(self.splitter, wx.ID_ANY) + self.sidebar = wx.Notebook(self.splitter, wx.ID_ANY) self.text_browser = TextBrowser(self.sidebar) self.outline_browser = OutlineBrowser(self.sidebar) self.maparea_browser = MapAreaBrowser(self.sidebar) @@ -363,7 +360,7 @@ self.sidebar.AddPage(self.maparea_browser, _('Hyperlinks')) self.sidebar.AddPage(self.text_browser, _('Text')) self.sidebar.Bind( - wx.EVT_CHOICEBOOK_PAGE_CHANGED, + wx.EVT_NOTEBOOK_PAGE_CHANGED, self._on_sidebar_page_changed( self.on_display_no_nonraster, self.on_display_maparea, @@ -868,7 +865,7 @@ except text_mangle.LengthChanged: self.error_box(_('Number of lines changed.')) return - except: + except Exception: self.on_external_edit_failed(exception) return if sexpr is None: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/gui/maparea_browser.py new/djvusmooth-0.2.15/lib/gui/maparea_browser.py --- old/djvusmooth-0.2.14/lib/gui/maparea_browser.py 2013-02-21 22:08:12.000000000 +0100 +++ new/djvusmooth-0.2.15/lib/gui/maparea_browser.py 2014-10-07 20:44:23.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009 Jakub Wilk <[email protected]> + +# Copyright © 2008-2014 Jakub Wilk <[email protected]> # Copyright © 2009 Mateusz Turcza <[email protected]> # # This package is free software; you can redistribute it and/or modify @@ -19,6 +20,7 @@ import djvusmooth.gui.maparea_menu from djvusmooth import gui from djvusmooth.i18n import _ +from djvusmooth.gui import wxcompat class PageAnnotationsCallback(models.annotations.PageAnnotationsCallback): @@ -68,7 +70,7 @@ self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.on_selection_changed, self) self.Bind(wx.EVT_LIST_ITEM_RIGHT_CLICK, self.on_item_right_click, self) self.Bind(wx.EVT_CHAR, self.on_char, self) - + self.Bind(wx.EVT_KEY_DOWN, self.on_key_down) def do_remove_node(self, node): node.delete() @@ -82,6 +84,7 @@ try: method = self._WXK_TO_METHOD[key_code] except KeyError: + event.Skip() return item = self.GetFirstSelected() node = self.GetPyData(item) @@ -89,6 +92,9 @@ return method(self, node) + def on_key_down(self, event): + return wxcompat.on_key_down(self, event) + def on_node_add(self, node): item = self._insert_item(node) self.Focus(item) @@ -200,6 +206,6 @@ for node in self._model.mapareas: self._insert_item(node) -__all__ = 'MapAreaBrowser', +__all__ = ['MapAreaBrowser'] # vim:ts=4 sw=4 et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/gui/maparea_menu.py new/djvusmooth-0.2.15/lib/gui/maparea_menu.py --- old/djvusmooth-0.2.14/lib/gui/maparea_menu.py 2011-06-06 19:55:54.000000000 +0200 +++ new/djvusmooth-0.2.15/lib/gui/maparea_menu.py 2014-10-07 20:45:25.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009 Jakub Wilk <[email protected]> + +# Copyright © 2008-2009 Jakub Wilk <[email protected]> # Copyright © 2009 Mateusz Turcza <[email protected]> # # This package is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/gui/maparea_properties.py new/djvusmooth-0.2.15/lib/gui/maparea_properties.py --- old/djvusmooth-0.2.14/lib/gui/maparea_properties.py 2013-02-21 22:08:12.000000000 +0100 +++ new/djvusmooth-0.2.15/lib/gui/maparea_properties.py 2014-10-07 20:49:04.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009, 2010 Jakub Wilk <[email protected]> + +# Copyright © 2008-2014 Jakub Wilk <[email protected]> # Copyright © 2009 Mateusz Turcza <[email protected]> # # This package is free software; you can redistribute it and/or modify @@ -400,6 +401,6 @@ node = property(get_node) -__all__ = 'MapareaPropertiesDialog' +__all__ = ['MapareaPropertiesDialog'] # vim:ts=4 sw=4 et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/gui/metadata.py new/djvusmooth-0.2.15/lib/gui/metadata.py --- old/djvusmooth-0.2.14/lib/gui/metadata.py 2011-06-06 19:55:54.000000000 +0200 +++ new/djvusmooth-0.2.15/lib/gui/metadata.py 2014-10-07 20:49:13.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009 Jakub Wilk <[email protected]> + +# Copyright © 2008-2014 Jakub Wilk <[email protected]> # Copyright © 2009 Mateusz Turcza <[email protected]> # # This package is free software; you can redistribute it and/or modify @@ -137,6 +138,6 @@ sizer.Add(button_sizer, 0, wx.EXPAND | wx.ALL, 5) self.SetSizerAndFit(sizer) -__all__ = 'MetadataDialog', +__all__ = ['MetadataDialog'] # vim:ts=4 sw=4 et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/gui/outline_browser.py new/djvusmooth-0.2.15/lib/gui/outline_browser.py --- old/djvusmooth-0.2.14/lib/gui/outline_browser.py 2013-02-21 22:08:12.000000000 +0100 +++ new/djvusmooth-0.2.15/lib/gui/outline_browser.py 2014-10-07 21:23:03.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009, 2010, 2011, 2013 Jakub Wilk <[email protected]> + +# Copyright © 2008-2014 Jakub Wilk <[email protected]> # Copyright © 2009 Mateusz Turcza <[email protected]> # # This package is free software; you can redistribute it and/or modify @@ -17,6 +18,7 @@ from djvusmooth import models from djvusmooth.varietes import replace_control_characters from djvusmooth.i18n import _ +from djvusmooth.gui import wxcompat def get_label_for_node(node): return replace_control_characters(' ', node.text) @@ -49,6 +51,7 @@ self.Bind(wx.EVT_TREE_END_LABEL_EDIT, self.on_end_edit, self) self.Bind(wx.EVT_TREE_SEL_CHANGED, self.on_selection_changed, self) self.Bind(wx.EVT_CHAR, self.on_char) + self.Bind(wx.EVT_KEY_DOWN, self.on_key_down) self.Bind(wx.EVT_TREE_BEGIN_DRAG, self.on_begin_drag) self.Bind(wx.EVT_TREE_END_DRAG, self.on_end_drag) @@ -91,6 +94,8 @@ source_node.notify_select() def do_goto_node(self, node): + if isinstance(node, models.outline.RootNode): + return uri = node.uri if uri.startswith('#'): try: @@ -118,6 +123,7 @@ try: method = self._WXK_TO_METHOD[key_code] except KeyError: + event.Skip() return item = self.GetSelection() node = self.GetPyData(item) @@ -125,6 +131,9 @@ return method(self, node) + def on_key_down(self, event): + return wxcompat.on_key_down(self, event) + def on_node_select(self, node): try: item = self._items[node] @@ -257,6 +266,6 @@ if self._create_root_item(): self._add_children(self._root_item, self.document.outline.root) -__all__ = 'OutlineBrowser', +__all__ = ['OutlineBrowser'] # vim:ts=4 sw=4 et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/gui/page.py new/djvusmooth-0.2.15/lib/gui/page.py --- old/djvusmooth-0.2.14/lib/gui/page.py 2013-02-21 22:08:12.000000000 +0100 +++ new/djvusmooth-0.2.15/lib/gui/page.py 2014-10-07 20:49:29.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009, 2010 Jakub Wilk <[email protected]> + +# Copyright © 2008-2014 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 @@ -327,7 +328,7 @@ } def _get_frame_color(self): - return wx.Color(*self._FRAME_COLORS[self._node.type]) + return wx.Colour(*self._FRAME_COLORS[self._node.type]) def _get_text(self): if self._node.is_inner(): @@ -626,7 +627,7 @@ if self.GetSize() == size: return self.SetSize(size) - self.SetBestFittingSize(size) + self.SetInitialSize(size) self.GetParent().Layout() self.GetParent().SetupScrolling() @@ -670,10 +671,10 @@ except decode.NotAvailable: pass -__all__ = ( +__all__ = [ 'Zoom', 'PercentZoom', 'OneToOneZoom', 'StretchZoom', 'FitWidthZoom', 'FitPageZoom', 'PageWidget', 'RENDER_NONRASTER_TEXT', 'RENDER_NONRASTER_MAPAREA' -) +] # vim:ts=4 sw=4 et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/gui/text_browser.py new/djvusmooth-0.2.15/lib/gui/text_browser.py --- old/djvusmooth-0.2.14/lib/gui/text_browser.py 2013-02-21 22:08:12.000000000 +0100 +++ new/djvusmooth-0.2.15/lib/gui/text_browser.py 2014-10-07 20:45:15.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009, 2010 Jakub Wilk <[email protected]> + +# Copyright © 2008-2014 Jakub Wilk <[email protected]> # Copyright © 2009 Mateusz Turcza <[email protected]> # # This package is free software; you can redistribute it and/or modify @@ -17,6 +18,7 @@ from djvusmooth import models from djvusmooth.varietes import replace_control_characters from djvusmooth.i18n import _ +from djvusmooth.gui import wxcompat def get_label_for_node(node): zone_type = str(node.type) @@ -54,6 +56,10 @@ self.Bind(wx.EVT_TREE_BEGIN_LABEL_EDIT, self.on_begin_edit, self) self.Bind(wx.EVT_TREE_END_LABEL_EDIT, self.on_end_edit, self) self.Bind(wx.EVT_TREE_SEL_CHANGED, self.on_selection_changed, self) + self.Bind(wx.EVT_KEY_DOWN, self.on_key_down) + + def on_key_down(self, event): + return wxcompat.on_key_down(self, event) def on_node_change(self, node): try: @@ -156,6 +162,6 @@ self._have_root = True self._add_children(root, node) -__all__ = 'TextBrowser', +__all__ = ['TextBrowser'] # vim:ts=4 sw=4 et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/gui/wxcompat.py new/djvusmooth-0.2.15/lib/gui/wxcompat.py --- old/djvusmooth-0.2.14/lib/gui/wxcompat.py 1970-01-01 01:00:00.000000000 +0100 +++ new/djvusmooth-0.2.15/lib/gui/wxcompat.py 2014-10-07 20:53:30.000000000 +0200 @@ -0,0 +1,63 @@ +# encoding=UTF-8 + +# Copyright © 2014 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 +# the Free Software Foundation; version 2 dated June, 1991. +# +# This package is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. + +''' +work-arounds for wxPython 3.0 quirks +''' + +import wx + +# In wxPython 3.0, if the focus is on a wxTreeCtrl or a wxListCtrl, menu +# events for at last Page Up, Page Down, Ctrl+Home and Ctrl+End are getting +# lost. This module implementes wxEVT_KEY_DOWN handler to work-around this +# problem. +# +# https://bugs.debian.org/758950#26 + +def iter_menu(menu): + for item in menu.MenuItems: + submenu = item.SubMenu + if submenu is None: + yield item + else: + for item in iter_menu(submenu): + yield item + +def on_key_down(ctrl, event): + window = wx.GetTopLevelParent(ctrl) + menubar = window.MenuBar + for menu, label in menubar.Menus: + for item in iter_menu(menu): + if item.Accel is None: + continue + if item.Accel.Flags != event.Modifiers: + continue + if item.Accel.KeyCode != event.KeyCode: + continue + break + else: + item = None + if item is not None: + break + if item is None: + event.Skip() + else: + evt = wx.CommandEvent(wx.EVT_MENU.typeId, item.Id) + evt.SetEventObject(window) + wx.PostEvent(window, evt) + +if wx.VERSION < (3, 0): + def on_key_down(ctrl, event): + event.Skip() + +# vim:ts=4 sw=4 et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/models/__init__.py new/djvusmooth-0.2.15/lib/models/__init__.py --- old/djvusmooth-0.2.14/lib/models/__init__.py 2011-06-06 19:55:54.000000000 +0200 +++ new/djvusmooth-0.2.15/lib/models/__init__.py 2014-10-07 20:50:00.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009 Jakub Wilk <[email protected]> + +# Copyright © 2008-2014 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 @@ -36,6 +37,6 @@ for id in sorted(self._pages): self._pages[id].export(djvused) -__all__ = 'MultiPageModel', 'SHARED_ANNOTATIONS_PAGENO' +__all__ = ['MultiPageModel', 'SHARED_ANNOTATIONS_PAGENO'] # vim:ts=4 sw=4 et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/models/annotations.py new/djvusmooth-0.2.15/lib/models/annotations.py --- old/djvusmooth-0.2.14/lib/models/annotations.py 2011-06-06 19:55:54.000000000 +0200 +++ new/djvusmooth-0.2.15/lib/models/annotations.py 2014-10-07 20:44:02.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009, 2010 Jakub Wilk <[email protected]> + +# Copyright © 2008-2010 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.14/lib/models/metadata.py new/djvusmooth-0.2.15/lib/models/metadata.py --- old/djvusmooth-0.2.14/lib/models/metadata.py 2011-06-06 19:55:54.000000000 +0200 +++ new/djvusmooth-0.2.15/lib/models/metadata.py 2014-10-07 20:50:10.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009, 2010 Jakub Wilk <[email protected]> + +# Copyright © 2008-2014 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 @@ -84,6 +85,6 @@ def export_select(self, djvused): djvused.create_shared_annotations() -__all__ = 'Metadata', 'PageMetadata', 'SharedMetadata' +__all__ = ['Metadata', 'PageMetadata', 'SharedMetadata'] # vim:ts=4 sw=4 et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/models/outline.py new/djvusmooth-0.2.15/lib/models/outline.py --- old/djvusmooth-0.2.14/lib/models/outline.py 2013-02-20 17:53:38.000000000 +0100 +++ new/djvusmooth-0.2.15/lib/models/outline.py 2014-10-07 21:23:04.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009, 2012 Jakub Wilk <[email protected]> + +# Copyright © 2008-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.14/lib/models/text.py new/djvusmooth-0.2.15/lib/models/text.py --- old/djvusmooth-0.2.14/lib/models/text.py 2011-06-06 19:55:54.000000000 +0200 +++ new/djvusmooth-0.2.15/lib/models/text.py 2014-10-07 20:50:21.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009 Jakub Wilk <[email protected]> + +# Copyright © 2008-2014 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 @@ -443,6 +444,6 @@ for item in _get_leafs(child): yield item -__all__ = 'Text', 'PageText' +__all__ = ['Text', 'PageText'] # vim:ts=4 sw=4 et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/pkgconfig.py new/djvusmooth-0.2.15/lib/pkgconfig.py --- old/djvusmooth-0.2.14/lib/pkgconfig.py 2011-06-06 19:55:54.000000000 +0200 +++ new/djvusmooth-0.2.15/lib/pkgconfig.py 2014-10-07 20:43:11.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009 Jakub Wilk <[email protected]> + +# Copyright © 2008-2009 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.14/lib/text/levenshtein.py new/djvusmooth-0.2.15/lib/text/levenshtein.py --- old/djvusmooth-0.2.14/lib/text/levenshtein.py 2011-06-06 19:55:54.000000000 +0200 +++ new/djvusmooth-0.2.15/lib/text/levenshtein.py 2014-10-07 20:50:31.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009 Jakub Wilk <[email protected]> + +# Copyright © 2008-2014 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 @@ -68,6 +69,6 @@ break return reversed(ops) -__all__ = 'distance', +__all__ = ['distance'] # vim:ts=4 sw=4 et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/text/mangle.py new/djvusmooth-0.2.15/lib/text/mangle.py --- old/djvusmooth-0.2.14/lib/text/mangle.py 2012-10-01 21:29:32.000000000 +0200 +++ new/djvusmooth-0.2.15/lib/text/mangle.py 2014-10-07 20:50:42.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009, 2012 Jakub Wilk <[email protected]> + +# Copyright © 2008-2014 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 @@ -132,10 +133,9 @@ class CharacterZoneFound(Exception): pass -__all__ = \ -( +__all__ = [ 'import_', 'export', 'NothingChanged', 'CharacterZoneFound', 'LengthChanged' -) +] # vim:ts=4 sw=4 et diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/lib/varietes.py new/djvusmooth-0.2.15/lib/varietes.py --- old/djvusmooth-0.2.14/lib/varietes.py 2012-11-06 23:08:32.000000000 +0100 +++ new/djvusmooth-0.2.15/lib/varietes.py 2014-10-07 20:45:44.000000000 +0200 @@ -1,5 +1,6 @@ # encoding=UTF-8 -# Copyright © 2008, 2009 Jakub Wilk <[email protected]> + +# Copyright © 2008-2009 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 Files old/djvusmooth-0.2.14/locale/es/LC_MESSAGES/djvusmooth.mo and new/djvusmooth-0.2.15/locale/es/LC_MESSAGES/djvusmooth.mo differ Files old/djvusmooth-0.2.14/locale/pl/LC_MESSAGES/djvusmooth.mo and new/djvusmooth-0.2.15/locale/pl/LC_MESSAGES/djvusmooth.mo differ Files old/djvusmooth-0.2.14/locale/ru/LC_MESSAGES/djvusmooth.mo and new/djvusmooth-0.2.15/locale/ru/LC_MESSAGES/djvusmooth.mo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/po/es.po new/djvusmooth-0.2.15/po/es.po --- old/djvusmooth-0.2.14/po/es.po 2013-02-21 10:46:31.000000000 +0100 +++ new/djvusmooth-0.2.15/po/es.po 2014-08-24 09:22:04.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.14\n" +"Project-Id-Version: djvusmooth 0.2.15\n" "Report-Msgid-Bugs-To: Jakub Wilk <[email protected]>\n" "POT-Creation-Date: 2013-02-20 17:57+0100\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.14/po/pl.po new/djvusmooth-0.2.15/po/pl.po --- old/djvusmooth-0.2.14/po/pl.po 2013-02-20 18:00:28.000000000 +0100 +++ new/djvusmooth-0.2.15/po/pl.po 2014-08-24 09:22:04.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.14\n" +"Project-Id-Version: djvusmooth 0.2.15\n" "Report-Msgid-Bugs-To: Jakub Wilk <[email protected]>\n" "POT-Creation-Date: 2013-02-20 17:57+0100\n" "PO-Revision-Date: 2012-10-09 20:41+0200\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/po/ru.po new/djvusmooth-0.2.15/po/ru.po --- old/djvusmooth-0.2.14/po/ru.po 2013-02-21 15:43:17.000000000 +0100 +++ new/djvusmooth-0.2.15/po/ru.po 2014-08-24 09:22:04.000000000 +0200 @@ -6,7 +6,7 @@ # msgid "" msgstr "" -"Project-Id-Version: djvusmooth 0.2.14\n" +"Project-Id-Version: djvusmooth 0.2.15\n" "Report-Msgid-Bugs-To: Jakub Wilk <[email protected]>\n" "POT-Creation-Date: 2013-02-20 17:57+0100\n" "PO-Revision-Date: 2013-02-21 18:33+0300\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/private/update-i18n new/djvusmooth-0.2.15/private/update-i18n --- old/djvusmooth-0.2.14/private/update-i18n 2013-02-20 20:45:54.000000000 +0100 +++ new/djvusmooth-0.2.15/private/update-i18n 2014-10-07 20:45:41.000000000 +0200 @@ -1,6 +1,6 @@ #!/usr/bin/make -f -# Copyright © 2009, 2011, 2012 Jakub Wilk <[email protected]> +# Copyright © 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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/djvusmooth-0.2.14/setup.py new/djvusmooth-0.2.15/setup.py --- old/djvusmooth-0.2.14/setup.py 2013-02-21 22:00:47.000000000 +0100 +++ new/djvusmooth-0.2.15/setup.py 2014-10-07 20:46:27.000000000 +0200 @@ -1,6 +1,7 @@ #!/usr/bin/python # encoding=UTF-8 -# Copyright © 2008, 2009, 2010, 2011, 2012, 2013 Jakub Wilk <[email protected]> + +# Copyright © 2008-2014 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 @@ -55,13 +56,13 @@ def run(self): if os.name != 'posix': return - for poname in glob.glob(os.path.join('po', '*.po')): + for poname in glob.iglob(os.path.join('po', '*.po')): lang, _ = os.path.splitext(os.path.basename(poname)) modir = os.path.join('locale', lang, 'LC_MESSAGES') if not os.path.isdir(modir): os.makedirs(modir) moname = os.path.join(modir, 'djvusmooth.mo') - command = ['msgfmt', '-o', moname, '--check', '--check-accelerators', poname] + command = ['msgfmt', '-o', moname, '--verbose', '--check', '--check-accelerators', poname] self.make_file([poname], moname, distutils.spawn.spawn, [command]) data_files.append((os.path.join('share', modir), [moname])) @@ -70,7 +71,7 @@ description = 'perform some checks on message catalogs' def run(self): - for poname in glob.glob(os.path.join('po', '*.po')): + for poname in glob.iglob(os.path.join('po', '*.po')): checkname = poname + '.sdist-check' with open(checkname, 'w'): pass @@ -121,7 +122,7 @@ def run(self): if os.name != 'posix': return - for xmlname in glob.glob(os.path.join('doc', '*.xml')): + for xmlname in glob.iglob(os.path.join('doc', '*.xml')): manname = os.path.splitext(xmlname)[0] + '.1' command = [ 'xsltproc', '--nonet', @@ -146,7 +147,7 @@ distutils_clean.run(self) if not self.all: return - for manname in glob.glob(os.path.join('doc', '*.1')): + for manname in glob.iglob(os.path.join('doc', '*.1')): with open(manname, 'r') as file: stamp = file.readline() if stamp != sdist.manpage_stamp: @@ -172,7 +173,7 @@ def make_release_tree(self, base_dir, files): distutils_sdist.make_release_tree(self, base_dir, files) - for manname in glob.glob(os.path.join(base_dir, 'doc', '*.1')): + for manname in glob.iglob(os.path.join(base_dir, 'doc', '*.1')): self.execute(self._rewrite_manpage, [manname], 'rewriting %s' % manname) distutils.core.setup( ++++++ djvusmooth.keyring ++++++ --- /var/tmp/diff_new_pack.UaqkLQ/_old 2014-10-14 07:11:08.000000000 +0200 +++ /var/tmp/diff_new_pack.UaqkLQ/_new 2014-10-14 07:11:08.000000000 +0200 @@ -1,4 +1,4 @@ -pub 4096R/015475F5 2009-10-23 [expires: 2014-01-01] +pub 4096R/015475F5 2009-10-23 [expires: 2015-01-01] uid Jakub Wilk <[email protected]> uid Jakub Wilk <[email protected]> uid Jakub Wilk <[email protected]> @@ -18,31 +18,31 @@ 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 -svhVjm8/5EyEaChDa0dDtjuWe+J8/kRDboR/6gfW7c056YBpd8iS3ljU7O6fbLwI -yNGfFjhNCponbh1F4z5wIbQgSmFrdWIgV2lsayA8dWJhbnVzQHVzZXJzLnNmLm5l +AQIXgAUCUlScgAUJCcJyMwAKCRAtTrOmAVR19cN9D/sFFyKal/KByXa/gUYQcM+u +Cf0HNcEiL1hyYGx0yXxCgE0V5RGk5sfGw4gCNdYujLtMzfC1TfRlB2Zo8OEz7OfQ +qCTdqMRnRjZSE6d1c3EcaUAPMMSunyLaFhC7B3E6Ge6xGiRF47udFIesoOIhTCOg +2nRbtyHNF8Tt2EwhiOBHxdU9op0cdt7l30Evb1a2pFbTDaT5WCKedElBEjFARe1Q +oaf2+CpIRugdOHq4A4CU4cGZGSsWzloDpXK7bsWsl7iEDvAQ4/rGjWRTGRymsKJX +/JVMzROmhAe1cv/JrFXk7IjC5hOinxa10ZKDsgTprFZ8dUB0IkZxooSDfsRTt2WR +AX0+Gcxnjux181uLEbwGlqocczvvaRkCrRTAOi+DFC71rgAAiNepsX6F92bSFjU8 +B0DmBwoAjIdSHzDROOvwHXT83nWMRX1RQGYeZBPGk3Oj3G7VYQUAGVuVbMa/rI0k +YTjO1H0A0g2jT7FJ30osa+LTdTwHtVS+PJf3ucHWtFNCq8sZtUj/5QDTPYqoRV27 +j9Ljru+988YFRxj6dnMDtFQqJAkC/V0p1TWHhy84dlXN7yOlENKz9/WZvv9eWTeV +M3ffVcxafQP6JNhe1g3EFRxYOV7eABlzsiXoa1xF1O38f06evug6LwlFMJUYXQ4I +7WTsZL0KCeGnA8ca6HYoV7QgSmFrdWIgV2lsayA8dWJhbnVzQHVzZXJzLnNmLm5l dD6JAj0EEwEIACcCGwMFCwkIBwMFFQoJCAsFFgMCAQACHgECF4AFAk3uTjgFCQXU HDgACgkQLU6zpgFUdfWAxg/+PqysL3WIDROwiInHhW3zkaPRhpjOMfHzjptu3K+2 GIL6yXQJtekld6DaFXh6PWIQ/Huw6qvzg/wof9NB/zXeaE/aeP9b9BVq4zz3DPeK @@ -78,5 +78,5 @@ doynJ60razRgyqz9/UJ77+2wn50YVJutP44WiP5NF9ELufGkDo9/r/DfknlIS5py c55t4YjFjD6M2V8oO8pHuQ2TO14TkX629hChBlVCQQBUSU07toQ3iDw5umCFH7To bN5AxyPui0i3KQXs09FW/+n9DTw= -=AA/F +=1quD -----END PGP PUBLIC KEY BLOCK----- -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
