Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Aug 2017 15:22:34 +0000 (UTC)
From:      Guido Falsi <madpilot@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r447346 - head/deskutils/calibre
Message-ID:  <201708041522.v74FMYwh093310@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: madpilot
Date: Fri Aug  4 15:22:34 2017
New Revision: 447346
URL: https://svnweb.freebsd.org/changeset/ports/447346

Log:
  - Update deskutils/calibre to 3.6.0
  - While here, sort plist

Modified:
  head/deskutils/calibre/Makefile
  head/deskutils/calibre/distinfo
  head/deskutils/calibre/pkg-plist

Modified: head/deskutils/calibre/Makefile
==============================================================================
--- head/deskutils/calibre/Makefile	Fri Aug  4 15:22:12 2017	(r447345)
+++ head/deskutils/calibre/Makefile	Fri Aug  4 15:22:34 2017	(r447346)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	calibre
-PORTVERSION=	3.5.0
+PORTVERSION=	3.6.0
 CATEGORIES=	deskutils python
 MASTER_SITES=	http://download.calibre-ebook.com/${PORTVERSION}/
 

Modified: head/deskutils/calibre/distinfo
==============================================================================
--- head/deskutils/calibre/distinfo	Fri Aug  4 15:22:12 2017	(r447345)
+++ head/deskutils/calibre/distinfo	Fri Aug  4 15:22:34 2017	(r447346)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501231218
-SHA256 (calibre-3.5.0.tar.xz) = bb13d96cbe24c6cc75f3affe750ff13005b2cc0dc3c4015ca69dee1f82df80aa
-SIZE (calibre-3.5.0.tar.xz) = 36347912
+TIMESTAMP = 1501834770
+SHA256 (calibre-3.6.0.tar.xz) = 4c13463764ac9dd4955daf1e6e9b11ed8d040e0eece6003564ab974574b3e26e
+SIZE (calibre-3.6.0.tar.xz) = 36421368

Modified: head/deskutils/calibre/pkg-plist
==============================================================================
--- head/deskutils/calibre/pkg-plist	Fri Aug  4 15:22:12 2017	(r447345)
+++ head/deskutils/calibre/pkg-plist	Fri Aug  4 15:22:34 2017	(r447346)
@@ -33,9 +33,9 @@ lib/calibre/calibre/db/backup.py
 lib/calibre/calibre/db/cache.py
 lib/calibre/calibre/db/categories.py
 lib/calibre/calibre/db/cli/__init__.py
-lib/calibre/calibre/db/cli/cmd_add.py
 lib/calibre/calibre/db/cli/cmd_add_custom_column.py
 lib/calibre/calibre/db/cli/cmd_add_format.py
+lib/calibre/calibre/db/cli/cmd_add.py
 lib/calibre/calibre/db/cli/cmd_backup_metadata.py
 lib/calibre/calibre/db/cli/cmd_catalog.py
 lib/calibre/calibre/db/cli/cmd_check_library.py
@@ -43,11 +43,11 @@ lib/calibre/calibre/db/cli/cmd_clone.py
 lib/calibre/calibre/db/cli/cmd_custom_columns.py
 lib/calibre/calibre/db/cli/cmd_embed_metadata.py
 lib/calibre/calibre/db/cli/cmd_export.py
-lib/calibre/calibre/db/cli/cmd_list.py
 lib/calibre/calibre/db/cli/cmd_list_categories.py
-lib/calibre/calibre/db/cli/cmd_remove.py
+lib/calibre/calibre/db/cli/cmd_list.py
 lib/calibre/calibre/db/cli/cmd_remove_custom_column.py
 lib/calibre/calibre/db/cli/cmd_remove_format.py
+lib/calibre/calibre/db/cli/cmd_remove.py
 lib/calibre/calibre/db/cli/cmd_restore_database.py
 lib/calibre/calibre/db/cli/cmd_saved_searches.py
 lib/calibre/calibre/db/cli/cmd_search.py
@@ -179,10 +179,10 @@ lib/calibre/calibre/devices/user_defined/__init__.py
 lib/calibre/calibre/devices/user_defined/driver.py
 lib/calibre/calibre/devices/utils.py
 lib/calibre/calibre/devices/winusb.py
-lib/calibre/calibre/ebooks/BeautifulSoup.py
 lib/calibre/calibre/ebooks/__init__.py
 lib/calibre/calibre/ebooks/azw4/__init__.py
 lib/calibre/calibre/ebooks/azw4/reader.py
+lib/calibre/calibre/ebooks/BeautifulSoup.py
 lib/calibre/calibre/ebooks/chardet.py
 lib/calibre/calibre/ebooks/chm/__init__.py
 lib/calibre/calibre/ebooks/chm/metadata.py
@@ -283,11 +283,11 @@ lib/calibre/calibre/ebooks/epub/pages.py
 lib/calibre/calibre/ebooks/epub/periodical.py
 lib/calibre/calibre/ebooks/fb2/__init__.py
 lib/calibre/calibre/ebooks/fb2/fb2ml.py
+lib/calibre/calibre/ebooks/html_entities.py
 lib/calibre/calibre/ebooks/html/__init__.py
 lib/calibre/calibre/ebooks/html/input.py
 lib/calibre/calibre/ebooks/html/meta.py
 lib/calibre/calibre/ebooks/html/to_zip.py
-lib/calibre/calibre/ebooks/html_entities.py
 lib/calibre/calibre/ebooks/htmlz/__init__.py
 lib/calibre/calibre/ebooks/htmlz/oeb2html.py
 lib/calibre/calibre/ebooks/hyphenate.py
@@ -307,8 +307,8 @@ lib/calibre/calibre/ebooks/lrf/html/__init__.py
 lib/calibre/calibre/ebooks/lrf/html/color_map.py
 lib/calibre/calibre/ebooks/lrf/html/convert_from.py
 lib/calibre/calibre/ebooks/lrf/html/convert_to.py
-lib/calibre/calibre/ebooks/lrf/html/table.py
 lib/calibre/calibre/ebooks/lrf/html/table_as_image.py
+lib/calibre/calibre/ebooks/lrf/html/table.py
 lib/calibre/calibre/ebooks/lrf/input.py
 lib/calibre/calibre/ebooks/lrf/lrfparser.py
 lib/calibre/calibre/ebooks/lrf/lrs/__init__.py
@@ -376,8 +376,8 @@ lib/calibre/calibre/ebooks/metadata/mobi.py
 lib/calibre/calibre/ebooks/metadata/odt.py
 lib/calibre/calibre/ebooks/metadata/opf.py
 lib/calibre/calibre/ebooks/metadata/opf2.py
-lib/calibre/calibre/ebooks/metadata/opf3.py
 lib/calibre/calibre/ebooks/metadata/opf3_test.py
+lib/calibre/calibre/ebooks/metadata/opf3.py
 lib/calibre/calibre/ebooks/metadata/pdb.py
 lib/calibre/calibre/ebooks/metadata/pdf.py
 lib/calibre/calibre/ebooks/metadata/plucker.py
@@ -395,8 +395,8 @@ lib/calibre/calibre/ebooks/metadata/sources/cli.py
 lib/calibre/calibre/ebooks/metadata/sources/covers.py
 lib/calibre/calibre/ebooks/metadata/sources/douban.py
 lib/calibre/calibre/ebooks/metadata/sources/edelweiss.py
-lib/calibre/calibre/ebooks/metadata/sources/google.py
 lib/calibre/calibre/ebooks/metadata/sources/google_images.py
+lib/calibre/calibre/ebooks/metadata/sources/google.py
 lib/calibre/calibre/ebooks/metadata/sources/identify.py
 lib/calibre/calibre/ebooks/metadata/sources/isbndb.py
 lib/calibre/calibre/ebooks/metadata/sources/openlibrary.py
@@ -457,8 +457,8 @@ lib/calibre/calibre/ebooks/odt/input.py
 lib/calibre/calibre/ebooks/oeb/__init__.py
 lib/calibre/calibre/ebooks/oeb/base.py
 lib/calibre/calibre/ebooks/oeb/display/__init__.py
-lib/calibre/calibre/ebooks/oeb/display/test-cfi/run.py
 lib/calibre/calibre/ebooks/oeb/display/test-cfi/run_rapydscript.py
+lib/calibre/calibre/ebooks/oeb/display/test-cfi/run.py
 lib/calibre/calibre/ebooks/oeb/display/webview.py
 lib/calibre/calibre/ebooks/oeb/iterator/__init__.py
 lib/calibre/calibre/ebooks/oeb/iterator/book.py
@@ -584,7 +584,6 @@ lib/calibre/calibre/ebooks/rtf/__init__.py
 lib/calibre/calibre/ebooks/rtf/input.py
 lib/calibre/calibre/ebooks/rtf/preprocess.py
 lib/calibre/calibre/ebooks/rtf/rtfml.py
-lib/calibre/calibre/ebooks/rtf2xml/ParseRtf.py
 lib/calibre/calibre/ebooks/rtf2xml/__init__.py
 lib/calibre/calibre/ebooks/rtf2xml/add_brackets.py
 lib/calibre/calibre/ebooks/rtf2xml/body_styles.py
@@ -623,6 +622,7 @@ lib/calibre/calibre/ebooks/rtf2xml/output.py
 lib/calibre/calibre/ebooks/rtf2xml/override_table.py
 lib/calibre/calibre/ebooks/rtf2xml/paragraph_def.py
 lib/calibre/calibre/ebooks/rtf2xml/paragraphs.py
+lib/calibre/calibre/ebooks/rtf2xml/ParseRtf.py
 lib/calibre/calibre/ebooks/rtf2xml/pict.py
 lib/calibre/calibre/ebooks/rtf2xml/preamble_div.py
 lib/calibre/calibre/ebooks/rtf2xml/preamble_rest.py
@@ -630,8 +630,8 @@ lib/calibre/calibre/ebooks/rtf2xml/process_tokens.py
 lib/calibre/calibre/ebooks/rtf2xml/replace_illegals.py
 lib/calibre/calibre/ebooks/rtf2xml/sections.py
 lib/calibre/calibre/ebooks/rtf2xml/styles.py
-lib/calibre/calibre/ebooks/rtf2xml/table.py
 lib/calibre/calibre/ebooks/rtf2xml/table_info.py
+lib/calibre/calibre/ebooks/rtf2xml/table.py
 lib/calibre/calibre/ebooks/rtf2xml/tokenize.py
 lib/calibre/calibre/ebooks/sgmllib.py
 lib/calibre/calibre/ebooks/snb/__init__.py
@@ -664,10 +664,11 @@ lib/calibre/calibre/ebooks/unihandecode/unidecoder.py
 lib/calibre/calibre/ebooks/unihandecode/vncodepoints.py
 lib/calibre/calibre/ebooks/unihandecode/vndecoder.py
 lib/calibre/calibre/ebooks/unihandecode/zhcodepoints.py
+lib/calibre/calibre/gui_launch.py
 lib/calibre/calibre/gui2/__init__.py
 lib/calibre/calibre/gui2/actions/__init__.py
-lib/calibre/calibre/gui2/actions/add.py
 lib/calibre/calibre/gui2/actions/add_to_library.py
+lib/calibre/calibre/gui2/actions/add.py
 lib/calibre/calibre/gui2/actions/annotate.py
 lib/calibre/calibre/gui2/actions/catalog.py
 lib/calibre/calibre/gui2/actions/choose_library.py
@@ -701,87 +702,87 @@ lib/calibre/calibre/gui2/actions/toc_edit.py
 lib/calibre/calibre/gui2/actions/tweak_epub.py
 lib/calibre/calibre/gui2/actions/unpack_book.py
 lib/calibre/calibre/gui2/actions/view.py
-lib/calibre/calibre/gui2/add.py
 lib/calibre/calibre/gui2/add_filters.py
+lib/calibre/calibre/gui2/add.py
 lib/calibre/calibre/gui2/auto_add.py
 lib/calibre/calibre/gui2/bars.py
 lib/calibre/calibre/gui2/book_details.py
 lib/calibre/calibre/gui2/catalog/__init__.py
-lib/calibre/calibre/gui2/catalog/catalog_bibtex.py
 lib/calibre/calibre/gui2/catalog/catalog_bibtex_ui.py
+lib/calibre/calibre/gui2/catalog/catalog_bibtex.py
 lib/calibre/calibre/gui2/catalog/catalog_csv_xml.py
-lib/calibre/calibre/gui2/catalog/catalog_epub_mobi.py
 lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py
+lib/calibre/calibre/gui2/catalog/catalog_epub_mobi.py
 lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py
 lib/calibre/calibre/gui2/changes.py
 lib/calibre/calibre/gui2/comments_editor.py
 lib/calibre/calibre/gui2/complete2.py
 lib/calibre/calibre/gui2/convert/__init__.py
-lib/calibre/calibre/gui2/convert/azw3_output.py
 lib/calibre/calibre/gui2/convert/azw3_output_ui.py
+lib/calibre/calibre/gui2/convert/azw3_output.py
 lib/calibre/calibre/gui2/convert/bulk.py
-lib/calibre/calibre/gui2/convert/comic_input.py
 lib/calibre/calibre/gui2/convert/comic_input_ui.py
-lib/calibre/calibre/gui2/convert/debug.py
+lib/calibre/calibre/gui2/convert/comic_input.py
 lib/calibre/calibre/gui2/convert/debug_ui.py
-lib/calibre/calibre/gui2/convert/docx_input.py
+lib/calibre/calibre/gui2/convert/debug.py
 lib/calibre/calibre/gui2/convert/docx_input_ui.py
+lib/calibre/calibre/gui2/convert/docx_input.py
 lib/calibre/calibre/gui2/convert/docx_output.py
-lib/calibre/calibre/gui2/convert/epub_output.py
 lib/calibre/calibre/gui2/convert/epub_output_ui.py
-lib/calibre/calibre/gui2/convert/fb2_input.py
+lib/calibre/calibre/gui2/convert/epub_output.py
 lib/calibre/calibre/gui2/convert/fb2_input_ui.py
-lib/calibre/calibre/gui2/convert/fb2_output.py
+lib/calibre/calibre/gui2/convert/fb2_input.py
 lib/calibre/calibre/gui2/convert/fb2_output_ui.py
-lib/calibre/calibre/gui2/convert/font_key.py
+lib/calibre/calibre/gui2/convert/fb2_output.py
 lib/calibre/calibre/gui2/convert/font_key_ui.py
+lib/calibre/calibre/gui2/convert/font_key.py
 lib/calibre/calibre/gui2/convert/gui_conversion.py
-lib/calibre/calibre/gui2/convert/heuristics.py
 lib/calibre/calibre/gui2/convert/heuristics_ui.py
-lib/calibre/calibre/gui2/convert/htmlz_output.py
+lib/calibre/calibre/gui2/convert/heuristics.py
 lib/calibre/calibre/gui2/convert/htmlz_output_ui.py
-lib/calibre/calibre/gui2/convert/look_and_feel.py
+lib/calibre/calibre/gui2/convert/htmlz_output.py
 lib/calibre/calibre/gui2/convert/look_and_feel_ui.py
-lib/calibre/calibre/gui2/convert/lrf_output.py
+lib/calibre/calibre/gui2/convert/look_and_feel.py
 lib/calibre/calibre/gui2/convert/lrf_output_ui.py
-lib/calibre/calibre/gui2/convert/metadata.py
+lib/calibre/calibre/gui2/convert/lrf_output.py
 lib/calibre/calibre/gui2/convert/metadata_ui.py
-lib/calibre/calibre/gui2/convert/mobi_output.py
+lib/calibre/calibre/gui2/convert/metadata.py
 lib/calibre/calibre/gui2/convert/mobi_output_ui.py
-lib/calibre/calibre/gui2/convert/page_setup.py
+lib/calibre/calibre/gui2/convert/mobi_output.py
 lib/calibre/calibre/gui2/convert/page_setup_ui.py
-lib/calibre/calibre/gui2/convert/pdb_output.py
+lib/calibre/calibre/gui2/convert/page_setup.py
 lib/calibre/calibre/gui2/convert/pdb_output_ui.py
-lib/calibre/calibre/gui2/convert/pdf_input.py
+lib/calibre/calibre/gui2/convert/pdb_output.py
 lib/calibre/calibre/gui2/convert/pdf_input_ui.py
-lib/calibre/calibre/gui2/convert/pdf_output.py
+lib/calibre/calibre/gui2/convert/pdf_input.py
 lib/calibre/calibre/gui2/convert/pdf_output_ui.py
+lib/calibre/calibre/gui2/convert/pdf_output.py
 lib/calibre/calibre/gui2/convert/pml_output.py
 lib/calibre/calibre/gui2/convert/pmlz_output_ui.py
-lib/calibre/calibre/gui2/convert/rb_output.py
 lib/calibre/calibre/gui2/convert/rb_output_ui.py
-lib/calibre/calibre/gui2/convert/regex_builder.py
+lib/calibre/calibre/gui2/convert/rb_output.py
 lib/calibre/calibre/gui2/convert/regex_builder_ui.py
-lib/calibre/calibre/gui2/convert/rtf_input.py
+lib/calibre/calibre/gui2/convert/regex_builder.py
 lib/calibre/calibre/gui2/convert/rtf_input_ui.py
-lib/calibre/calibre/gui2/convert/search_and_replace.py
+lib/calibre/calibre/gui2/convert/rtf_input.py
 lib/calibre/calibre/gui2/convert/search_and_replace_ui.py
-lib/calibre/calibre/gui2/convert/single.py
+lib/calibre/calibre/gui2/convert/search_and_replace.py
 lib/calibre/calibre/gui2/convert/single_ui.py
-lib/calibre/calibre/gui2/convert/snb_output.py
+lib/calibre/calibre/gui2/convert/single.py
 lib/calibre/calibre/gui2/convert/snb_output_ui.py
-lib/calibre/calibre/gui2/convert/structure_detection.py
+lib/calibre/calibre/gui2/convert/snb_output.py
 lib/calibre/calibre/gui2/convert/structure_detection_ui.py
-lib/calibre/calibre/gui2/convert/toc.py
+lib/calibre/calibre/gui2/convert/structure_detection.py
 lib/calibre/calibre/gui2/convert/toc_ui.py
-lib/calibre/calibre/gui2/convert/txt_input.py
+lib/calibre/calibre/gui2/convert/toc.py
 lib/calibre/calibre/gui2/convert/txt_input_ui.py
-lib/calibre/calibre/gui2/convert/txt_output.py
+lib/calibre/calibre/gui2/convert/txt_input.py
 lib/calibre/calibre/gui2/convert/txt_output_ui.py
+lib/calibre/calibre/gui2/convert/txt_output.py
 lib/calibre/calibre/gui2/convert/txtz_output.py
 lib/calibre/calibre/gui2/convert/xexp_edit_ui.py
-lib/calibre/calibre/gui2/convert/xpath_wizard.py
 lib/calibre/calibre/gui2/convert/xpath_wizard_ui.py
+lib/calibre/calibre/gui2/convert/xpath_wizard.py
 lib/calibre/calibre/gui2/cover_flow.py
 lib/calibre/calibre/gui2/covers.py
 lib/calibre/calibre/gui2/css_transform_rules.py
@@ -794,77 +795,77 @@ lib/calibre/calibre/gui2/dbus_export/menu2.py
 lib/calibre/calibre/gui2/dbus_export/tray.py
 lib/calibre/calibre/gui2/dbus_export/utils.py
 lib/calibre/calibre/gui2/dbus_export/widgets.py
-lib/calibre/calibre/gui2/device.py
 lib/calibre/calibre/gui2/device_drivers/__init__.py
-lib/calibre/calibre/gui2/device_drivers/configwidget.py
 lib/calibre/calibre/gui2/device_drivers/configwidget_ui.py
+lib/calibre/calibre/gui2/device_drivers/configwidget.py
 lib/calibre/calibre/gui2/device_drivers/mtp_config.py
 lib/calibre/calibre/gui2/device_drivers/mtp_folder_browser.py
 lib/calibre/calibre/gui2/device_drivers/tabbed_device_config.py
+lib/calibre/calibre/gui2/device.py
 lib/calibre/calibre/gui2/dialogs/__init__.py
 lib/calibre/calibre/gui2/dialogs/add_empty_book.py
 lib/calibre/calibre/gui2/dialogs/add_from_isbn.py
 lib/calibre/calibre/gui2/dialogs/authors_edit.py
 lib/calibre/calibre/gui2/dialogs/book_info.py
-lib/calibre/calibre/gui2/dialogs/catalog.py
 lib/calibre/calibre/gui2/dialogs/catalog_ui.py
+lib/calibre/calibre/gui2/dialogs/catalog.py
 lib/calibre/calibre/gui2/dialogs/check_library.py
-lib/calibre/calibre/gui2/dialogs/choose_format.py
-lib/calibre/calibre/gui2/dialogs/choose_format_device.py
 lib/calibre/calibre/gui2/dialogs/choose_format_device_ui.py
-lib/calibre/calibre/gui2/dialogs/choose_library.py
+lib/calibre/calibre/gui2/dialogs/choose_format_device.py
+lib/calibre/calibre/gui2/dialogs/choose_format.py
 lib/calibre/calibre/gui2/dialogs/choose_library_ui.py
+lib/calibre/calibre/gui2/dialogs/choose_library.py
 lib/calibre/calibre/gui2/dialogs/choose_plugin_toolbars.py
-lib/calibre/calibre/gui2/dialogs/comicconf.py
 lib/calibre/calibre/gui2/dialogs/comicconf_ui.py
-lib/calibre/calibre/gui2/dialogs/comments_dialog.py
+lib/calibre/calibre/gui2/dialogs/comicconf.py
 lib/calibre/calibre/gui2/dialogs/comments_dialog_ui.py
-lib/calibre/calibre/gui2/dialogs/confirm_delete.py
-lib/calibre/calibre/gui2/dialogs/confirm_delete_location.py
+lib/calibre/calibre/gui2/dialogs/comments_dialog.py
 lib/calibre/calibre/gui2/dialogs/confirm_delete_location_ui.py
+lib/calibre/calibre/gui2/dialogs/confirm_delete_location.py
+lib/calibre/calibre/gui2/dialogs/confirm_delete.py
 lib/calibre/calibre/gui2/dialogs/confirm_merge.py
-lib/calibre/calibre/gui2/dialogs/conversion_error.py
 lib/calibre/calibre/gui2/dialogs/conversion_error_ui.py
+lib/calibre/calibre/gui2/dialogs/conversion_error.py
 lib/calibre/calibre/gui2/dialogs/custom_recipes.py
-lib/calibre/calibre/gui2/dialogs/delete_matching_from_device.py
 lib/calibre/calibre/gui2/dialogs/delete_matching_from_device_ui.py
-lib/calibre/calibre/gui2/dialogs/device_category_editor.py
+lib/calibre/calibre/gui2/dialogs/delete_matching_from_device.py
 lib/calibre/calibre/gui2/dialogs/device_category_editor_ui.py
-lib/calibre/calibre/gui2/dialogs/drm_error.py
+lib/calibre/calibre/gui2/dialogs/device_category_editor.py
 lib/calibre/calibre/gui2/dialogs/drm_error_ui.py
+lib/calibre/calibre/gui2/dialogs/drm_error.py
 lib/calibre/calibre/gui2/dialogs/duplicates.py
-lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py
 lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py
+lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py
 lib/calibre/calibre/gui2/dialogs/exim.py
 lib/calibre/calibre/gui2/dialogs/jobs_ui.py
-lib/calibre/calibre/gui2/dialogs/match_books.py
 lib/calibre/calibre/gui2/dialogs/match_books_ui.py
+lib/calibre/calibre/gui2/dialogs/match_books.py
 lib/calibre/calibre/gui2/dialogs/message_box.py
-lib/calibre/calibre/gui2/dialogs/metadata_bulk.py
 lib/calibre/calibre/gui2/dialogs/metadata_bulk_ui.py
+lib/calibre/calibre/gui2/dialogs/metadata_bulk.py
 lib/calibre/calibre/gui2/dialogs/opml.py
-lib/calibre/calibre/gui2/dialogs/password.py
 lib/calibre/calibre/gui2/dialogs/password_ui.py
+lib/calibre/calibre/gui2/dialogs/password.py
 lib/calibre/calibre/gui2/dialogs/plugin_updater.py
 lib/calibre/calibre/gui2/dialogs/progress.py
-lib/calibre/calibre/gui2/dialogs/quickview.py
 lib/calibre/calibre/gui2/dialogs/quickview_ui.py
+lib/calibre/calibre/gui2/dialogs/quickview.py
 lib/calibre/calibre/gui2/dialogs/restore_library.py
-lib/calibre/calibre/gui2/dialogs/saved_search_editor.py
 lib/calibre/calibre/gui2/dialogs/saved_search_editor_ui.py
+lib/calibre/calibre/gui2/dialogs/saved_search_editor.py
 lib/calibre/calibre/gui2/dialogs/scheduler.py
 lib/calibre/calibre/gui2/dialogs/search.py
 lib/calibre/calibre/gui2/dialogs/select_formats.py
-lib/calibre/calibre/gui2/dialogs/smartdevice.py
 lib/calibre/calibre/gui2/dialogs/smartdevice_ui.py
-lib/calibre/calibre/gui2/dialogs/tag_categories.py
+lib/calibre/calibre/gui2/dialogs/smartdevice.py
 lib/calibre/calibre/gui2/dialogs/tag_categories_ui.py
-lib/calibre/calibre/gui2/dialogs/tag_editor.py
+lib/calibre/calibre/gui2/dialogs/tag_categories.py
 lib/calibre/calibre/gui2/dialogs/tag_editor_ui.py
-lib/calibre/calibre/gui2/dialogs/tag_list_editor.py
+lib/calibre/calibre/gui2/dialogs/tag_editor.py
 lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py
-lib/calibre/calibre/gui2/dialogs/template_dialog.py
+lib/calibre/calibre/gui2/dialogs/tag_list_editor.py
 lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py
+lib/calibre/calibre/gui2/dialogs/template_dialog.py
 lib/calibre/calibre/gui2/dialogs/template_line_editor.py
 lib/calibre/calibre/gui2/dialogs/trim_image.py
 lib/calibre/calibre/gui2/dnd.py
@@ -872,47 +873,49 @@ lib/calibre/calibre/gui2/ebook_download.py
 lib/calibre/calibre/gui2/email.py
 lib/calibre/calibre/gui2/filename_pattern_ui.py
 lib/calibre/calibre/gui2/font_family_chooser.py
+lib/calibre/calibre/gui2/gestures.py
 lib/calibre/calibre/gui2/icon_theme.py
 lib/calibre/calibre/gui2/init.py
 lib/calibre/calibre/gui2/job_indicator.py
 lib/calibre/calibre/gui2/jobs.py
 lib/calibre/calibre/gui2/keyboard.py
 lib/calibre/calibre/gui2/languages.py
-lib/calibre/calibre/gui2/layout.py
 lib/calibre/calibre/gui2/layout_menu.py
+lib/calibre/calibre/gui2/layout.py
 lib/calibre/calibre/gui2/library/__init__.py
 lib/calibre/calibre/gui2/library/alternate_views.py
 lib/calibre/calibre/gui2/library/caches.py
 lib/calibre/calibre/gui2/library/delegates.py
 lib/calibre/calibre/gui2/library/models.py
 lib/calibre/calibre/gui2/library/views.py
+lib/calibre/calibre/gui2/linux_file_dialogs.py
 lib/calibre/calibre/gui2/lrf_renderer/__init__.py
 lib/calibre/calibre/gui2/lrf_renderer/bookview.py
 lib/calibre/calibre/gui2/lrf_renderer/config_ui.py
 lib/calibre/calibre/gui2/lrf_renderer/document.py
-lib/calibre/calibre/gui2/lrf_renderer/main.py
 lib/calibre/calibre/gui2/lrf_renderer/main_ui.py
+lib/calibre/calibre/gui2/lrf_renderer/main.py
 lib/calibre/calibre/gui2/lrf_renderer/text.py
-lib/calibre/calibre/gui2/main.py
 lib/calibre/calibre/gui2/main_window.py
+lib/calibre/calibre/gui2/main.py
 lib/calibre/calibre/gui2/metadata/__init__.py
 lib/calibre/calibre/gui2/metadata/basic_widgets.py
 lib/calibre/calibre/gui2/metadata/bulk_download.py
 lib/calibre/calibre/gui2/metadata/config.py
 lib/calibre/calibre/gui2/metadata/diff.py
 lib/calibre/calibre/gui2/metadata/pdf_covers.py
-lib/calibre/calibre/gui2/metadata/single.py
 lib/calibre/calibre/gui2/metadata/single_download.py
+lib/calibre/calibre/gui2/metadata/single.py
 lib/calibre/calibre/gui2/notify.py
 lib/calibre/calibre/gui2/open_with.py
 lib/calibre/calibre/gui2/preferences/__init__.py
-lib/calibre/calibre/gui2/preferences/adding.py
 lib/calibre/calibre/gui2/preferences/adding_ui.py
-lib/calibre/calibre/gui2/preferences/behavior.py
+lib/calibre/calibre/gui2/preferences/adding.py
 lib/calibre/calibre/gui2/preferences/behavior_ui.py
+lib/calibre/calibre/gui2/preferences/behavior.py
 lib/calibre/calibre/gui2/preferences/coloring.py
-lib/calibre/calibre/gui2/preferences/columns.py
 lib/calibre/calibre/gui2/preferences/columns_ui.py
+lib/calibre/calibre/gui2/preferences/columns.py
 lib/calibre/calibre/gui2/preferences/conversion.py
 lib/calibre/calibre/gui2/preferences/create_custom_column.py
 lib/calibre/calibre/gui2/preferences/device_debug.py
@@ -922,66 +925,67 @@ lib/calibre/calibre/gui2/preferences/emailp.py
 lib/calibre/calibre/gui2/preferences/history.py
 lib/calibre/calibre/gui2/preferences/ignored_devices.py
 lib/calibre/calibre/gui2/preferences/keyboard.py
-lib/calibre/calibre/gui2/preferences/look_feel.py
 lib/calibre/calibre/gui2/preferences/look_feel_ui.py
+lib/calibre/calibre/gui2/preferences/look_feel.py
 lib/calibre/calibre/gui2/preferences/main.py
-lib/calibre/calibre/gui2/preferences/metadata_sources.py
 lib/calibre/calibre/gui2/preferences/metadata_sources_ui.py
-lib/calibre/calibre/gui2/preferences/misc.py
+lib/calibre/calibre/gui2/preferences/metadata_sources.py
 lib/calibre/calibre/gui2/preferences/misc_ui.py
-lib/calibre/calibre/gui2/preferences/plugboard.py
+lib/calibre/calibre/gui2/preferences/misc.py
 lib/calibre/calibre/gui2/preferences/plugboard_ui.py
-lib/calibre/calibre/gui2/preferences/plugins.py
+lib/calibre/calibre/gui2/preferences/plugboard.py
 lib/calibre/calibre/gui2/preferences/plugins_ui.py
-lib/calibre/calibre/gui2/preferences/save_template.py
+lib/calibre/calibre/gui2/preferences/plugins.py
 lib/calibre/calibre/gui2/preferences/save_template_ui.py
-lib/calibre/calibre/gui2/preferences/saving.py
+lib/calibre/calibre/gui2/preferences/save_template.py
 lib/calibre/calibre/gui2/preferences/saving_ui.py
-lib/calibre/calibre/gui2/preferences/search.py
+lib/calibre/calibre/gui2/preferences/saving.py
 lib/calibre/calibre/gui2/preferences/search_ui.py
-lib/calibre/calibre/gui2/preferences/sending.py
+lib/calibre/calibre/gui2/preferences/search.py
 lib/calibre/calibre/gui2/preferences/sending_ui.py
+lib/calibre/calibre/gui2/preferences/sending.py
 lib/calibre/calibre/gui2/preferences/server.py
-lib/calibre/calibre/gui2/preferences/template_functions.py
 lib/calibre/calibre/gui2/preferences/template_functions_ui.py
+lib/calibre/calibre/gui2/preferences/template_functions.py
 lib/calibre/calibre/gui2/preferences/texture_chooser.py
-lib/calibre/calibre/gui2/preferences/toolbar.py
 lib/calibre/calibre/gui2/preferences/toolbar_ui.py
+lib/calibre/calibre/gui2/preferences/toolbar.py
 lib/calibre/calibre/gui2/preferences/tweaks.py
 lib/calibre/calibre/gui2/proceed.py
 lib/calibre/calibre/gui2/progress_indicator/__init__.py
+lib/calibre/calibre/gui2/qt_file_dialogs.py
 lib/calibre/calibre/gui2/save.py
 lib/calibre/calibre/gui2/search_box.py
 lib/calibre/calibre/gui2/search_restriction_mixin.py
 lib/calibre/calibre/gui2/shortcuts.py
 lib/calibre/calibre/gui2/splash_screen.py
 lib/calibre/calibre/gui2/store/__init__.py
-lib/calibre/calibre/gui2/store/basic_config.py
 lib/calibre/calibre/gui2/store/basic_config_widget_ui.py
+lib/calibre/calibre/gui2/store/basic_config.py
 lib/calibre/calibre/gui2/store/config/__init__.py
 lib/calibre/calibre/gui2/store/config/chooser/__init__.py
-lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder.py
 lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder_ui.py
+lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder.py
 lib/calibre/calibre/gui2/store/config/chooser/chooser_dialog.py
-lib/calibre/calibre/gui2/store/config/chooser/chooser_widget.py
 lib/calibre/calibre/gui2/store/config/chooser/chooser_widget_ui.py
+lib/calibre/calibre/gui2/store/config/chooser/chooser_widget.py
 lib/calibre/calibre/gui2/store/config/chooser/models.py
 lib/calibre/calibre/gui2/store/config/chooser/results_view.py
 lib/calibre/calibre/gui2/store/config/search/__init__.py
-lib/calibre/calibre/gui2/store/config/search/search_widget.py
 lib/calibre/calibre/gui2/store/config/search/search_widget_ui.py
+lib/calibre/calibre/gui2/store/config/search/search_widget.py
 lib/calibre/calibre/gui2/store/config/store.py
 lib/calibre/calibre/gui2/store/loader.py
 lib/calibre/calibre/gui2/store/opensearch_store.py
+lib/calibre/calibre/gui2/store/search_result.py
 lib/calibre/calibre/gui2/store/search/__init__.py
-lib/calibre/calibre/gui2/store/search/adv_search_builder.py
 lib/calibre/calibre/gui2/store/search/adv_search_builder_ui.py
+lib/calibre/calibre/gui2/store/search/adv_search_builder.py
 lib/calibre/calibre/gui2/store/search/download_thread.py
 lib/calibre/calibre/gui2/store/search/models.py
 lib/calibre/calibre/gui2/store/search/results_view.py
-lib/calibre/calibre/gui2/store/search/search.py
 lib/calibre/calibre/gui2/store/search/search_ui.py
-lib/calibre/calibre/gui2/store/search_result.py
+lib/calibre/calibre/gui2/store/search/search.py
 lib/calibre/calibre/gui2/store/stores/__init__.py
 lib/calibre/calibre/gui2/store/stores/amazon_au_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_ca_plugin.py
@@ -1019,15 +1023,15 @@ lib/calibre/calibre/gui2/store/stores/litres_plugin.py
 lib/calibre/calibre/gui2/store/stores/manybooks_plugin.py
 lib/calibre/calibre/gui2/store/stores/mills_boon_uk_plugin.py
 lib/calibre/calibre/gui2/store/stores/mobileread/__init__.py
-lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder.py
 lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder_ui.py
-lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog.py
+lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder.py
 lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog_ui.py
+lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog.py
 lib/calibre/calibre/gui2/store/stores/mobileread/cache_update_thread.py
 lib/calibre/calibre/gui2/store/stores/mobileread/mobileread_plugin.py
 lib/calibre/calibre/gui2/store/stores/mobileread/models.py
-lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog.py
 lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog_ui.py
+lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog.py
 lib/calibre/calibre/gui2/store/stores/nexto_plugin.py
 lib/calibre/calibre/gui2/store/stores/open_books_plugin.py
 lib/calibre/calibre/gui2/store/stores/ozon_ru_plugin.py
@@ -1042,8 +1046,8 @@ lib/calibre/calibre/gui2/store/stores/woblink_plugin.p
 lib/calibre/calibre/gui2/store/stores/wolnelektury_plugin.py
 lib/calibre/calibre/gui2/store/stores/xinxii_plugin.py
 lib/calibre/calibre/gui2/store/web_control.py
-lib/calibre/calibre/gui2/store/web_store_dialog.py
 lib/calibre/calibre/gui2/store/web_store_dialog_ui.py
+lib/calibre/calibre/gui2/store/web_store_dialog.py
 lib/calibre/calibre/gui2/tag_browser/__init__.py
 lib/calibre/calibre/gui2/tag_browser/model.py
 lib/calibre/calibre/gui2/tag_browser/ui.py
@@ -1058,8 +1062,8 @@ lib/calibre/calibre/gui2/tools.py
 lib/calibre/calibre/gui2/tweak_book/__init__.py
 lib/calibre/calibre/gui2/tweak_book/boss.py
 lib/calibre/calibre/gui2/tweak_book/char_select.py
-lib/calibre/calibre/gui2/tweak_book/check.py
 lib/calibre/calibre/gui2/tweak_book/check_links.py
+lib/calibre/calibre/gui2/tweak_book/check.py
 lib/calibre/calibre/gui2/tweak_book/completion/__init__.py
 lib/calibre/calibre/gui2/tweak_book/completion/basic.py
 lib/calibre/calibre/gui2/tweak_book/completion/popup.py
@@ -1118,8 +1122,8 @@ lib/calibre/calibre/gui2/ui.py
 lib/calibre/calibre/gui2/update.py
 lib/calibre/calibre/gui2/viewer/__init__.py
 lib/calibre/calibre/gui2/viewer/bookmarkmanager.py
-lib/calibre/calibre/gui2/viewer/config.py
 lib/calibre/calibre/gui2/viewer/config_ui.py
+lib/calibre/calibre/gui2/viewer/config.py
 lib/calibre/calibre/gui2/viewer/documentview.py
 lib/calibre/calibre/gui2/viewer/fake_net.py
 lib/calibre/calibre/gui2/viewer/flip.py
@@ -1143,18 +1147,17 @@ lib/calibre/calibre/gui2/wizard/device_ui.py
 lib/calibre/calibre/gui2/wizard/finish_ui.py
 lib/calibre/calibre/gui2/wizard/kindle_ui.py
 lib/calibre/calibre/gui2/wizard/library_ui.py
-lib/calibre/calibre/gui2/wizard/send_email.py
 lib/calibre/calibre/gui2/wizard/send_email_ui.py
+lib/calibre/calibre/gui2/wizard/send_email.py
 lib/calibre/calibre/gui2/wizard/stanza_ui.py
-lib/calibre/calibre/gui_launch.py
 lib/calibre/calibre/library/__init__.py
 lib/calibre/calibre/library/add_to_library.py
 lib/calibre/calibre/library/caches.py
 lib/calibre/calibre/library/catalogs/__init__.py
 lib/calibre/calibre/library/catalogs/bibtex.py
 lib/calibre/calibre/library/catalogs/csv_xml.py
-lib/calibre/calibre/library/catalogs/epub_mobi.py
 lib/calibre/calibre/library/catalogs/epub_mobi_builder.py
+lib/calibre/calibre/library/catalogs/epub_mobi.py
 lib/calibre/calibre/library/catalogs/utils.py
 lib/calibre/calibre/library/check_library.py
 lib/calibre/calibre/library/coloring.py
@@ -1172,10 +1175,10 @@ lib/calibre/calibre/libunzip.py
 lib/calibre/calibre/linux.py
 lib/calibre/calibre/plugins/_patiencediff_c.so
 lib/calibre/calibre/plugins/bzzdec.so
-lib/calibre/calibre/plugins/cPalmdoc.so
 lib/calibre/calibre/plugins/certgen.so
 lib/calibre/calibre/plugins/chm_extra.so
 lib/calibre/calibre/plugins/chmlib.so
+lib/calibre/calibre/plugins/cPalmdoc.so
 lib/calibre/calibre/plugins/freetype.so
 lib/calibre/calibre/plugins/html.so
 lib/calibre/calibre/plugins/hunspell.so
@@ -1240,8 +1243,8 @@ lib/calibre/calibre/srv/tests/loop.py
 lib/calibre/calibre/srv/tests/main.py
 lib/calibre/calibre/srv/tests/routes.py
 lib/calibre/calibre/srv/tests/web_sockets.py
-lib/calibre/calibre/srv/users.py
 lib/calibre/calibre/srv/users_api.py
+lib/calibre/calibre/srv/users.py
 lib/calibre/calibre/srv/utils.py
 lib/calibre/calibre/srv/web_socket.py
 lib/calibre/calibre/startup.py
@@ -1249,7 +1252,6 @@ lib/calibre/calibre/test_build.py
 lib/calibre/calibre/translations/__init__.py
 lib/calibre/calibre/translations/dynamic.py
 lib/calibre/calibre/translations/msgfmt.py
-lib/calibre/calibre/utils/Zeroconf.py
 lib/calibre/calibre/utils/__init__.py
 lib/calibre/calibre/utils/apsw_shell.py
 lib/calibre/calibre/utils/bibtex.py
@@ -1260,8 +1262,8 @@ lib/calibre/calibre/utils/chm/chm.py
 lib/calibre/calibre/utils/chm/chmlib.py
 lib/calibre/calibre/utils/cleantext.py
 lib/calibre/calibre/utils/complete.py
-lib/calibre/calibre/utils/config.py
 lib/calibre/calibre/utils/config_base.py
+lib/calibre/calibre/utils/config.py
 lib/calibre/calibre/utils/date.py
 lib/calibre/calibre/utils/dbus_service.py
 lib/calibre/calibre/utils/exim.py
@@ -1292,12 +1294,12 @@ lib/calibre/calibre/utils/fonts/sfnt/metrics.py
 lib/calibre/calibre/utils/fonts/sfnt/subset.py
 lib/calibre/calibre/utils/fonts/utils.py
 lib/calibre/calibre/utils/fonts/win_fonts.py
-lib/calibre/calibre/utils/formatter.py
 lib/calibre/calibre/utils/formatter_functions.py
+lib/calibre/calibre/utils/formatter.py
 lib/calibre/calibre/utils/html2text.py
 lib/calibre/calibre/utils/https.py
-lib/calibre/calibre/utils/icu.py
 lib/calibre/calibre/utils/icu_test.py
+lib/calibre/calibre/utils/icu.py
 lib/calibre/calibre/utils/img.py
 lib/calibre/calibre/utils/imghdr.py
 lib/calibre/calibre/utils/inotify.py
@@ -1372,6 +1374,7 @@ lib/calibre/calibre/utils/wmf/__init__.py
 lib/calibre/calibre/utils/wmf/emf.py
 lib/calibre/calibre/utils/wmf/parse.py
 lib/calibre/calibre/utils/wordcount.py
+lib/calibre/calibre/utils/Zeroconf.py
 lib/calibre/calibre/utils/zipfile.py
 lib/calibre/calibre/web/__init__.py
 lib/calibre/calibre/web/feeds/__init__.py
@@ -1511,8 +1514,8 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/images/apple-touch-icon.png
 %%DATADIR%%/images/arrow-down.png
 %%DATADIR%%/images/arrow-up.png
-%%DATADIR%%/images/auto-reload.png
 %%DATADIR%%/images/auto_author_sort.png
+%%DATADIR%%/images/auto-reload.png
 %%DATADIR%%/images/back.png
 %%DATADIR%%/images/beautify.png
 %%DATADIR%%/images/blank.png
@@ -1527,8 +1530,8 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/images/column.png
 %%DATADIR%%/images/compress-image.png
 %%DATADIR%%/images/config.png
-%%DATADIR%%/images/connect_share.png
 %%DATADIR%%/images/connect_share_on.png
+%%DATADIR%%/images/connect_share.png
 %%DATADIR%%/images/convert.png
 %%DATADIR%%/images/copy-to-library.png
 %%DATADIR%%/images/cover_flow.png
@@ -1549,17 +1552,19 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/images/dialog_warning.png
 %%DATADIR%%/images/dictionary.png
 %%DATADIR%%/images/diff.png
+%%DATADIR%%/images/document_open.png
 %%DATADIR%%/images/document-encrypt.png
 %%DATADIR%%/images/document-import.png
 %%DATADIR%%/images/document-new.png
 %%DATADIR%%/images/document-split.png
-%%DATADIR%%/images/document_open.png
 %%DATADIR%%/images/donate.png
 %%DATADIR%%/images/dot_green.png
 %%DATADIR%%/images/dot_red.png
 %%DATADIR%%/images/download-metadata.png
 %%DATADIR%%/images/drm-locked.png
 %%DATADIR%%/images/drm-unlocked.png
+%%DATADIR%%/images/edit_book.png
+%%DATADIR%%/images/edit_input.png
 %%DATADIR%%/images/edit-clear.png
 %%DATADIR%%/images/edit-copy.png
 %%DATADIR%%/images/edit-cut.png
@@ -1567,16 +1572,14 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/images/edit-redo.png
 %%DATADIR%%/images/edit-select-all.png
 %%DATADIR%%/images/edit-undo.png
-%%DATADIR%%/images/edit_book.png
-%%DATADIR%%/images/edit_input.png
 %%DATADIR%%/images/eject.png
 %%DATADIR%%/images/embed-fonts.png
 %%DATADIR%%/images/exec.png
 %%DATADIR%%/images/filter.png
 %%DATADIR%%/images/folder_saved_search.png
-%%DATADIR%%/images/font.png
 %%DATADIR%%/images/font_size_larger.png
 %%DATADIR%%/images/font_size_smaller.png
+%%DATADIR%%/images/font.png
 %%DATADIR%%/images/format-fill-color.png
 %%DATADIR%%/images/format-indent-less.png
 %%DATADIR%%/images/format-indent-more.png
@@ -1617,8 +1620,8 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/images/lt.png
 %%DATADIR%%/images/mail.png
 %%DATADIR%%/images/marked.png
-%%DATADIR%%/images/merge.png
 %%DATADIR%%/images/merge_books.png
+%%DATADIR%%/images/merge.png
 %%DATADIR%%/images/metadata.png
 %%DATADIR%%/images/mimetypes/azw2.png
 %%DATADIR%%/images/mimetypes/azw3.png
@@ -1667,11 +1670,11 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/images/plugins/plugin_disabled_invalid.png
 %%DATADIR%%/images/plugins/plugin_disabled_ok.png
 %%DATADIR%%/images/plugins/plugin_disabled_valid.png
-%%DATADIR%%/images/plugins/plugin_new.png
 %%DATADIR%%/images/plugins/plugin_new_invalid.png
 %%DATADIR%%/images/plugins/plugin_new_valid.png
-%%DATADIR%%/images/plugins/plugin_updater.png
+%%DATADIR%%/images/plugins/plugin_new.png
 %%DATADIR%%/images/plugins/plugin_updater_updates.png
+%%DATADIR%%/images/plugins/plugin_updater.png
 %%DATADIR%%/images/plugins/plugin_upgrade_invalid.png
 %%DATADIR%%/images/plugins/plugin_upgrade_ok.png
 %%DATADIR%%/images/plugins/plugin_upgrade_valid.png
@@ -1693,10 +1696,10 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/images/scheduler.png
 %%DATADIR%%/images/scroll.png
 %%DATADIR%%/images/sd.png
-%%DATADIR%%/images/search.png
 %%DATADIR%%/images/search_add_saved.png
 %%DATADIR%%/images/search_copy_saved.png
 %%DATADIR%%/images/search_delete_saved.png
+%%DATADIR%%/images/search.png
 %%DATADIR%%/images/series.png
 %%DATADIR%%/images/smarten-punctuation.png
 %%DATADIR%%/images/snippets.png
@@ -1762,10 +1765,10 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/template-functions.json
 %%DATADIR%%/templates/book_details.css
 %%DATADIR%%/templates/fb2.xsl
-%%DATADIR%%/templates/html.css
+%%DATADIR%%/templates/html_export_default_index.tmpl
 %%DATADIR%%/templates/html_export_default.css
 %%DATADIR%%/templates/html_export_default.tmpl
-%%DATADIR%%/templates/html_export_default_index.tmpl
+%%DATADIR%%/templates/html.css
 %%DATADIR%%/templates/inline_toc_styles.css
 %%DATADIR%%/templates/lrf.xsl
 %%DATADIR%%/templates/new_book.html
@@ -1780,26 +1783,28 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/viewer/hyphenate/patterns.zip
 %%DATADIR%%/viewer/hyphenation.js
 %%DATADIR%%/viewer/images.js
-%%DATADIR%%/viewer/jquery.js
 %%DATADIR%%/viewer/jquery_scrollTo.js
-%%DATADIR%%/viewer/mathjax/MathJax.js
+%%DATADIR%%/viewer/jquery.js
+%%DATADIR%%/viewer/mathjax/extensions/asciimath2jax.js
 %%DATADIR%%/viewer/mathjax/extensions/AssistiveMML.js
 %%DATADIR%%/viewer/mathjax/extensions/CHTML-preview.js
+%%DATADIR%%/viewer/mathjax/extensions/fast-preview.js
 %%DATADIR%%/viewer/mathjax/extensions/FontWarnings.js
-%%DATADIR%%/viewer/mathjax/extensions/HTML-CSS/handle-floats.js
 %%DATADIR%%/viewer/mathjax/extensions/HelpDialog.js
+%%DATADIR%%/viewer/mathjax/extensions/HTML-CSS/handle-floats.js
+%%DATADIR%%/viewer/mathjax/extensions/jsMath2jax.js
 %%DATADIR%%/viewer/mathjax/extensions/MatchWebFonts.js
 %%DATADIR%%/viewer/mathjax/extensions/MathEvents.js
+%%DATADIR%%/viewer/mathjax/extensions/MathMenu.js
 %%DATADIR%%/viewer/mathjax/extensions/MathML/content-mathml.js
 %%DATADIR%%/viewer/mathjax/extensions/MathML/mml3.js
-%%DATADIR%%/viewer/mathjax/extensions/MathMenu.js
 %%DATADIR%%/viewer/mathjax/extensions/MathZoom.js
+%%DATADIR%%/viewer/mathjax/extensions/mml2jax.js
 %%DATADIR%%/viewer/mathjax/extensions/Safe.js
+%%DATADIR%%/viewer/mathjax/extensions/TeX/action.js
 %%DATADIR%%/viewer/mathjax/extensions/TeX/AMScd.js
 %%DATADIR%%/viewer/mathjax/extensions/TeX/AMSmath.js
 %%DATADIR%%/viewer/mathjax/extensions/TeX/AMSsymbols.js
-%%DATADIR%%/viewer/mathjax/extensions/TeX/HTML.js
-%%DATADIR%%/viewer/mathjax/extensions/TeX/action.js
 %%DATADIR%%/viewer/mathjax/extensions/TeX/autobold.js
 %%DATADIR%%/viewer/mathjax/extensions/TeX/autoload-all.js
 %%DATADIR%%/viewer/mathjax/extensions/TeX/bbox.js
@@ -1809,6 +1814,7 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/viewer/mathjax/extensions/TeX/color.js
 %%DATADIR%%/viewer/mathjax/extensions/TeX/enclose.js
 %%DATADIR%%/viewer/mathjax/extensions/TeX/extpfeil.js
+%%DATADIR%%/viewer/mathjax/extensions/TeX/HTML.js
 %%DATADIR%%/viewer/mathjax/extensions/TeX/mathchoice.js
 %%DATADIR%%/viewer/mathjax/extensions/TeX/mediawiki-texvc.js
 %%DATADIR%%/viewer/mathjax/extensions/TeX/mhchem.js
@@ -1817,10 +1823,6 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/viewer/mathjax/extensions/TeX/noUndefined.js
 %%DATADIR%%/viewer/mathjax/extensions/TeX/unicode.js
 %%DATADIR%%/viewer/mathjax/extensions/TeX/verb.js
-%%DATADIR%%/viewer/mathjax/extensions/asciimath2jax.js
-%%DATADIR%%/viewer/mathjax/extensions/fast-preview.js
-%%DATADIR%%/viewer/mathjax/extensions/jsMath2jax.js
-%%DATADIR%%/viewer/mathjax/extensions/mml2jax.js
 %%DATADIR%%/viewer/mathjax/extensions/tex2jax.js
 %%DATADIR%%/viewer/mathjax/extensions/toMathML.js
 %%DATADIR%%/viewer/mathjax/extensions/v1.0-warning.js
@@ -1841,9 +1843,9 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/viewer/mathjax/jax/element/mml/optable/MiscSymbolsAndArrows.js
 %%DATADIR%%/viewer/mathjax/jax/element/mml/optable/MiscTechnical.js
 %%DATADIR%%/viewer/mathjax/jax/element/mml/optable/SpacingModLetters.js
-%%DATADIR%%/viewer/mathjax/jax/element/mml/optable/SuppMathOperators.js
 %%DATADIR%%/viewer/mathjax/jax/element/mml/optable/SupplementalArrowsA.js
 %%DATADIR%%/viewer/mathjax/jax/element/mml/optable/SupplementalArrowsB.js
+%%DATADIR%%/viewer/mathjax/jax/element/mml/optable/SuppMathOperators.js
 %%DATADIR%%/viewer/mathjax/jax/input/AsciiMath/config.js
 %%DATADIR%%/viewer/mathjax/jax/input/AsciiMath/jax.js
 %%DATADIR%%/viewer/mathjax/jax/input/MathML/config.js
@@ -1909,6 +1911,8 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/AMS/Regular/SuppMathOperators.js
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Caligraphic/Bold/Main.js
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Caligraphic/Regular/Main.js
+%%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata-extra.js
+%%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata.js
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Fraktur/Bold/BasicLatin.js
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Fraktur/Bold/Main.js
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Fraktur/Bold/Other.js
@@ -1934,8 +1938,8 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/MiscSymbols.js
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/MiscTechnical.js
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/SpacingModLetters.js
-%%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/SuppMathOperators.js
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/SupplementalArrowsA.js
+%%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Bold/SuppMathOperators.js
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Italic/BasicLatin.js
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Italic/CombDiacritMarks.js
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Main/Italic/GeneralPunctuation.js
@@ -1981,12 +1985,10 @@ lib/calibre/tinycss/version.py
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/CombDiacritMarks.js
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/Main.js
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/Other.js
-%%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata-extra.js
-%%DATADIR%%/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata.js
 %%DATADIR%%/viewer/mathjax/jax/output/SVG/jax.js
+%%DATADIR%%/viewer/mathjax/MathJax.js
 %%DATADIR%%/viewer/referencing.js
 %%PYTHON_SITELIBDIR%%/init_calibre.py
-share/bash-completion/completions/calibre
 share/appdata/calibre-ebook-edit.appdata.xml
 share/appdata/calibre-ebook-viewer.appdata.xml
 share/appdata/calibre-gui.appdata.xml
@@ -1994,6 +1996,7 @@ share/applications/calibre-ebook-edit.desktop
 share/applications/calibre-ebook-viewer.desktop
 share/applications/calibre-gui.desktop
 share/applications/calibre-lrfviewer.desktop
+share/bash-completion/completions/calibre
 share/icons/hicolor/128x128/apps/calibre-ebook-edit.png
 share/icons/hicolor/128x128/apps/calibre-gui.png
 share/icons/hicolor/128x128/apps/calibre-viewer.png



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708041522.v74FMYwh093310>