Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Jul 2010 23:29:25 -0500 (CDT)
From:      Rusty Nejdl <rnejdl@tethys.ringofsaturn.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/148831: Update ports/deskutils/calibre to current version
Message-ID:  <201007220429.o6M4TPP5038769@tethys.ringofsaturn.com>
Resent-Message-ID: <201007220430.o6M4U35l012390@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         148831
>Category:       ports
>Synopsis:       Update ports/deskutils/calibre to current version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 22 04:30:02 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Rusty Nejdl
>Release:        FreeBSD 8.1-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD tethys.ringofsaturn.com 8.1-PRERELEASE FreeBSD 8.1-PRERELEASE #0: Mon Jul 19 11:33:26 CDT 2010 root@tethys.ringofsaturn.com:/usr/obj/usr/src/sys/SATURN amd64


	
>Description:
	Patch updates calibre port to current version without USB support
>How-To-Repeat:
	Apply patch and update
>Fix:

	Apply patch and update

--- calibre.diff begins here ---
diff -ur calibre/Makefile calibre-new/Makefile
--- calibre/Makefile	2010-05-30 20:57:52.000000000 -0500
+++ calibre-new/Makefile	2010-07-21 10:17:14.000000000 -0500
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	calibre
-PORTVERSION=	0.6.27
-PORTREVISION=	5
+PORTVERSION=	0.7.9
+PORTREVISION=	0
 CATEGORIES=	deskutils python
-MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/ \
+MASTER_SITES=	SF \
 		http://calibre-ebook.googlecode.com/files/
 
 MAINTAINER=	stas@FreeBSD.org
@@ -22,7 +22,10 @@
 BUILD_DEPENDS=	py*-setuptools>=0:${PORTSDIR}/devel/py-setuptools \
 		py*-sip>=0:${PORTSDIR}/devel/py-sip \
 		py*-qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \
-		py*-qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui
+		py*-qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
+		py*-cssutils>=0:${PORTSDIR}/www/py-cssutils \
+		py*-dateutil>=0:${PORTSDIR}/devel/py-dateutil \
+		py*-lxml>=0:${PORTSDIR}/devel/py-lxml
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
 		py*-dnspython>=0:${PORTSDIR}/dns/py-dnspython \
 		py*-dateutil>=0:${PORTSDIR}/devel/py-dateutil \
diff -ur calibre/distinfo calibre-new/distinfo
--- calibre/distinfo	2009-12-15 17:37:04.000000000 -0600
+++ calibre-new/distinfo	2010-07-21 09:42:15.000000000 -0500
@@ -1,3 +1,3 @@
-MD5 (calibre-0.6.27.tar.gz) = 4bfbf9b3630cd0b2c399906dd6df99b3
-SHA256 (calibre-0.6.27.tar.gz) = f8528e84b9f1f6a2ff5f9cad4cbd56ec372beef95eb17b47cd680c29b0fe5c02
-SIZE (calibre-0.6.27.tar.gz) = 10461078
+MD5 (calibre-0.7.9.tar.gz) = 5ec3c6685b710de2e02a343681ec6aef
+SHA256 (calibre-0.7.9.tar.gz) = 1d11a35f19529b15267870bcc33f4208ac5cea57238bfe146839bb0cc5aa3067
+SIZE (calibre-0.7.9.tar.gz) = 14947677
Only in calibre/files: patch-setup___init__.py
Only in calibre/files: patch-setup_extensions.py
Only in calibre/files: patch-setup_install.py
Only in calibre/files: patch-src_calibre___init__.py
Only in calibre/files: patch-src_calibre_constants.py
Only in calibre/files: patch-src_calibre_devices_libusb.c
Only in calibre/files: patch-src_calibre_devices_libusb.py
Only in calibre/files: patch-src_calibre_devices_usbms_device.py
Only in calibre/files: patch-src_calibre_ebooks_html_input.py
Only in calibre/files: patch-src_calibre_ebooks_lrf_html_table_as_image.py
Only in calibre/files: patch-src_calibre_ebooks_pdf_pdftohtml.py
Only in calibre/files: patch-src_calibre_ebooks_pdf_writer.py
Only in calibre/files: patch-src_calibre_gui2___init__.py
Only in calibre/files: patch-src_calibre_gui2_dialogs_metadata_single.py
Only in calibre/files: patch-src_calibre_gui2_lrf_renderer_main.py
Only in calibre/files: patch-src_calibre_gui2_main.py
Only in calibre/files: patch-src_calibre_gui2_viewer_documentview.py
Only in calibre/files: patch-src_calibre_gui2_viewer_main.py
Only in calibre/files: patch-src_calibre_gui2_viewer_printing.py
Only in calibre/files: patch-src_calibre_linux.py
Only in calibre/files: patch-src_calibre_utils_help2man.py
diff -ur calibre/pkg-plist calibre-new/pkg-plist
--- calibre/pkg-plist	2009-12-15 17:37:04.000000000 -0600
+++ calibre-new/pkg-plist	2010-07-21 23:22:31.000000000 -0500
@@ -31,18 +31,28 @@
 lib/calibre/calibre/devices/__init__.py
 lib/calibre/calibre/devices/android/__init__.py
 lib/calibre/calibre/devices/android/driver.py
-lib/calibre/calibre/devices/bebook/__init__.py
-lib/calibre/calibre/devices/bebook/driver.py
+lib/calibre/calibre/devices/apple/__init__.py
+lib/calibre/calibre/devices/apple/driver.py
+lib/calibre/calibre/devices/binatone/__init__.py
+lib/calibre/calibre/devices/binatone/driver.py
 lib/calibre/calibre/devices/blackberry/__init__.py
 lib/calibre/calibre/devices/blackberry/driver.py
-lib/calibre/calibre/devices/cybookg3/__init__.py
-lib/calibre/calibre/devices/cybookg3/driver.py
-lib/calibre/calibre/devices/cybookg3/t2b.py
+lib/calibre/calibre/devices/cybook/__init__.py
+lib/calibre/calibre/devices/cybook/driver.py
+lib/calibre/calibre/devices/cybook/t2b.py
 lib/calibre/calibre/devices/eb600/__init__.py
 lib/calibre/calibre/devices/eb600/driver.py
+lib/calibre/calibre/devices/edge/__init__.py
+lib/calibre/calibre/devices/edge/driver.py
 lib/calibre/calibre/devices/errors.py
 lib/calibre/calibre/devices/eslick/__init__.py
 lib/calibre/calibre/devices/eslick/driver.py
+lib/calibre/calibre/devices/folder_device/__init__.py
+lib/calibre/calibre/devices/folder_device/driver.py
+lib/calibre/calibre/devices/hanlin/__init__.py
+lib/calibre/calibre/devices/hanlin/driver.py
+lib/calibre/calibre/devices/hanvon/__init__.py
+lib/calibre/calibre/devices/hanvon/driver.py
 lib/calibre/calibre/devices/iliad/__init__.py
 lib/calibre/calibre/devices/iliad/driver.py
 lib/calibre/calibre/devices/interface.py
@@ -54,10 +64,15 @@
 lib/calibre/calibre/devices/jetbook/driver.py
 lib/calibre/calibre/devices/kindle/__init__.py
 lib/calibre/calibre/devices/kindle/driver.py
+lib/calibre/calibre/devices/kobo/__init__.py
+lib/calibre/calibre/devices/kobo/books.py
+lib/calibre/calibre/devices/kobo/driver.py
 lib/calibre/calibre/devices/libusb.py
-lib/calibre/calibre/devices/libusb1.py
 lib/calibre/calibre/devices/manager.py
 lib/calibre/calibre/devices/mime.py
+lib/calibre/calibre/devices/misc.py
+lib/calibre/calibre/devices/nokia/__init__.py
+lib/calibre/calibre/devices/nokia/driver.py
 lib/calibre/calibre/devices/nook/__init__.py
 lib/calibre/calibre/devices/nook/driver.py
 lib/calibre/calibre/devices/nuut2/__init__.py
@@ -69,11 +84,13 @@
 lib/calibre/calibre/devices/prs500/driver.py
 lib/calibre/calibre/devices/prs500/prstypes.py
 lib/calibre/calibre/devices/prs505/__init__.py
-lib/calibre/calibre/devices/prs505/books.py
 lib/calibre/calibre/devices/prs505/driver.py
-lib/calibre/calibre/devices/prs700/__init__.py
-lib/calibre/calibre/devices/prs700/driver.py
+lib/calibre/calibre/devices/prs505/sony_cache.py
 lib/calibre/calibre/devices/scanner.py
+lib/calibre/calibre/devices/sne/__init__.py
+lib/calibre/calibre/devices/sne/driver.py
+lib/calibre/calibre/devices/teclast/__init__.py
+lib/calibre/calibre/devices/teclast/driver.py
 lib/calibre/calibre/devices/usbms/__init__.py
 lib/calibre/calibre/devices/usbms/books.py
 lib/calibre/calibre/devices/usbms/cli.py
@@ -82,6 +99,10 @@
 lib/calibre/calibre/devices/usbms/driver.py
 lib/calibre/calibre/devices/usbobserver/test.py
 lib/calibre/calibre/ebooks/BeautifulSoup.py
+lib/calibre/calibre/ebooks/chm/__init__.py
+lib/calibre/calibre/ebooks/chm/input.py
+lib/calibre/calibre/ebooks/chm/metadata.py
+lib/calibre/calibre/ebooks/chm/reader.py
 lib/calibre/calibre/ebooks/__init__.py
 lib/calibre/calibre/ebooks/chardet/__init__.py
 lib/calibre/calibre/ebooks/chardet/big5freq.py
@@ -132,6 +153,11 @@
 lib/calibre/calibre/ebooks/epub/input.py
 lib/calibre/calibre/ebooks/epub/output.py
 lib/calibre/calibre/ebooks/epub/pages.py
+lib/calibre/calibre/ebooks/epub/fix/__init__.py
+lib/calibre/calibre/ebooks/epub/fix/container.py
+lib/calibre/calibre/ebooks/epub/fix/epubcheck.py
+lib/calibre/calibre/ebooks/epub/fix/main.py
+lib/calibre/calibre/ebooks/epub/fix/unmanifested.py
 lib/calibre/calibre/ebooks/fb2/__init__.py
 lib/calibre/calibre/ebooks/fb2/fb2ml.py
 lib/calibre/calibre/ebooks/fb2/input.py
@@ -178,7 +204,12 @@
 lib/calibre/calibre/ebooks/markdown/mdx_toc.py
 lib/calibre/calibre/ebooks/metadata/__init__.py
 lib/calibre/calibre/ebooks/metadata/amazon.py
+lib/calibre/calibre/ebooks/metadata/archive.py
+lib/calibre/calibre/ebooks/metadata/book/__init__.py
+lib/calibre/calibre/ebooks/metadata/book/base.py
 lib/calibre/calibre/ebooks/metadata/cli.py
+lib/calibre/calibre/ebooks/metadata/covers.py
+lib/calibre/calibre/ebooks/metadata/douban.py
 lib/calibre/calibre/ebooks/metadata/epub.py
 lib/calibre/calibre/ebooks/metadata/ereader.py
 lib/calibre/calibre/ebooks/metadata/fb2.py
@@ -193,7 +224,6 @@
 lib/calibre/calibre/ebooks/metadata/meta.py
 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/pdb.py
 lib/calibre/calibre/ebooks/metadata/pdf.py
@@ -219,13 +249,13 @@
 lib/calibre/calibre/ebooks/oeb/__init__.py
 lib/calibre/calibre/ebooks/oeb/base.py
 lib/calibre/calibre/ebooks/oeb/entitydefs.py
-lib/calibre/calibre/ebooks/oeb/factory.py
 lib/calibre/calibre/ebooks/oeb/iterator.py
 lib/calibre/calibre/ebooks/oeb/output.py
 lib/calibre/calibre/ebooks/oeb/profile.py
 lib/calibre/calibre/ebooks/oeb/reader.py
 lib/calibre/calibre/ebooks/oeb/stylizer.py
 lib/calibre/calibre/ebooks/oeb/transforms/__init__.py
+lib/calibre/calibre/ebooks/oeb/transforms/cover.py
 lib/calibre/calibre/ebooks/oeb/transforms/flatcss.py
 lib/calibre/calibre/ebooks/oeb/transforms/guide.py
 lib/calibre/calibre/ebooks/oeb/transforms/htmltoc.py
@@ -254,6 +284,8 @@
 lib/calibre/calibre/ebooks/pdb/palmdoc/__init__.py
 lib/calibre/calibre/ebooks/pdb/palmdoc/reader.py
 lib/calibre/calibre/ebooks/pdb/palmdoc/writer.py
+lib/calibre/calibre/ebooks/pdb/pdf/reader.py
+lib/calibre/calibre/ebooks/pdb/pdf/__init__.py
 lib/calibre/calibre/ebooks/pdb/ztxt/__init__.py
 lib/calibre/calibre/ebooks/pdb/ztxt/reader.py
 lib/calibre/calibre/ebooks/pdb/ztxt/writer.py
@@ -290,6 +322,7 @@
 lib/calibre/calibre/ebooks/rtf/__init__.py
 lib/calibre/calibre/ebooks/rtf/input.py
 lib/calibre/calibre/ebooks/rtf/output.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
@@ -304,7 +337,6 @@
 lib/calibre/calibre/ebooks/rtf2xml/configure_txt.py
 lib/calibre/calibre/ebooks/rtf2xml/convert_to_tags.py
 lib/calibre/calibre/ebooks/rtf2xml/copy.py
-lib/calibre/calibre/ebooks/rtf2xml/correct_unicode.py
 lib/calibre/calibre/ebooks/rtf2xml/default_encoding.py
 lib/calibre/calibre/ebooks/rtf2xml/delete_info.py
 lib/calibre/calibre/ebooks/rtf2xml/field_strings.py
@@ -355,7 +387,20 @@
 lib/calibre/calibre/ebooks/unidecode/unicodepoints.py
 lib/calibre/calibre/ebooks/unidecode/unidecoder.py
 lib/calibre/calibre/gui2/__init__.py
+lib/calibre/calibre/gui2/actions.py
+lib/calibre/calibre/gui2/add_wizard/__init__.py
+lib/calibre/calibre/gui2/add_wizard/scan_ui.py
+lib/calibre/calibre/gui2/add_wizard/welcome_ui.py
 lib/calibre/calibre/gui2/add.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_csv_xml.py
+lib/calibre/calibre/gui2/catalog/catalog_csv_xml_ui.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_tab_template_ui.py
 lib/calibre/calibre/gui2/convert/__init__.py
 lib/calibre/calibre/gui2/convert/bulk.py
 lib/calibre/calibre/gui2/convert/comic_input.py
@@ -407,6 +452,7 @@
 lib/calibre/calibre/gui2/convert/xpath_wizard.py
 lib/calibre/calibre/gui2/convert/xpath_wizard_ui.py
 lib/calibre/calibre/gui2/cover_flow.py
+lib/calibre/calibre/gui2/custom_column_widgets.py
 lib/calibre/calibre/gui2/device.py
 lib/calibre/calibre/gui2/device_drivers/__init__.py
 lib/calibre/calibre/gui2/device_drivers/configwidget.py
@@ -414,12 +460,35 @@
 lib/calibre/calibre/gui2/dialogs/__init__.py
 lib/calibre/calibre/gui2/dialogs/book_info.py
 lib/calibre/calibre/gui2/dialogs/book_info_ui.py
+lib/calibre/calibre/gui2/dialogs/catalog.py
+lib/calibre/calibre/gui2/dialogs/catalog_ui.py
+lib/calibre/calibre/gui2/dialogs/choose_library.py
+lib/calibre/calibre/gui2/dialogs/choose_library_ui.py
+lib/calibre/calibre/gui2/dialogs/comments_dialog.py
+lib/calibre/calibre/gui2/dialogs/comments_dialog_ui.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/edit_authors_dialog.py
+lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.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/select_formats.py
+lib/calibre/calibre/gui2/dialogs/tag_categories.py
+lib/calibre/calibre/gui2/dialogs/tag_categories_ui.py
+lib/calibre/calibre/gui2/dialogs/tag_list_editor.py
+lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py
 lib/calibre/calibre/gui2/dialogs/choose_format.py
 lib/calibre/calibre/gui2/dialogs/choose_format_ui.py
 lib/calibre/calibre/gui2/dialogs/comicconf.py
 lib/calibre/calibre/gui2/dialogs/comicconf_ui.py
 lib/calibre/calibre/gui2/dialogs/config/__init__.py
 lib/calibre/calibre/gui2/dialogs/config/add_save.py
+lib/calibre/calibre/gui2/dialogs/config/create_ct_column_ui.py
+lib/calibre/calibre/gui2/dialogs/config/create_custom_column.py
+lib/calibre/calibre/gui2/dialogs/config/create_custom_column_ui.py
+lib/calibre/calibre/gui2/dialogs/config/device_debug.py
+lib/calibre/calibre/gui2/dialogs/config/save_template.py
+lib/calibre/calibre/gui2/dialogs/config/save_template_ui.py
 lib/calibre/calibre/gui2/dialogs/config/add_save_ui.py
 lib/calibre/calibre/gui2/dialogs/config/config_ui.py
 lib/calibre/calibre/gui2/dialogs/config/history.py
@@ -451,8 +520,13 @@
 lib/calibre/calibre/gui2/dialogs/user_profiles.py
 lib/calibre/calibre/gui2/dialogs/user_profiles_ui.py
 lib/calibre/calibre/gui2/filename_pattern_ui.py
+lib/calibre/calibre/gui2/init.py
 lib/calibre/calibre/gui2/jobs.py
-lib/calibre/calibre/gui2/library.py
+lib/calibre/calibre/gui2/layout.py
+lib/calibre/calibre/gui2/library/__init__.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/lrf_renderer/__init__.py
 lib/calibre/calibre/gui2/lrf_renderer/bookview.py
 lib/calibre/calibre/gui2/lrf_renderer/config_ui.py
@@ -461,15 +535,16 @@
 lib/calibre/calibre/gui2/lrf_renderer/main_ui.py
 lib/calibre/calibre/gui2/lrf_renderer/text.py
 lib/calibre/calibre/gui2/main.py
-lib/calibre/calibre/gui2/main_ui.py
 lib/calibre/calibre/gui2/main_window.py
 lib/calibre/calibre/gui2/metadata.py
+lib/calibre/calibre/gui2/notify.py
 lib/calibre/calibre/gui2/progress_indicator/__init__.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/shortcuts_ui.py
-lib/calibre/calibre/gui2/status.py
 lib/calibre/calibre/gui2/tag_view.py
+lib/calibre/calibre/gui2/throbber.py
 lib/calibre/calibre/gui2/tools.py
 lib/calibre/calibre/gui2/ui.py
 lib/calibre/calibre/gui2/update.py
@@ -477,6 +552,7 @@
 lib/calibre/calibre/gui2/viewer/bookmarkmanager.py
 lib/calibre/calibre/gui2/viewer/bookmarkmanager_ui.py
 lib/calibre/calibre/gui2/viewer/config_ui.py
+lib/calibre/calibre/gui2/viewer/dictionary.py
 lib/calibre/calibre/gui2/viewer/documentview.py
 lib/calibre/calibre/gui2/viewer/keys.py
 lib/calibre/calibre/gui2/viewer/main.py
@@ -492,12 +568,29 @@
 lib/calibre/calibre/gui2/wizard/send_email_ui.py
 lib/calibre/calibre/gui2/wizard/stanza_ui.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/catalog.py
 lib/calibre/calibre/library/cli.py
+lib/calibre/calibre/library/comments.py
+lib/calibre/calibre/library/custom_columns.py
 lib/calibre/calibre/library/database.py
 lib/calibre/calibre/library/database2.py
+lib/calibre/calibre/library/db/__init__.py
+lib/calibre/calibre/library/db/base.py
+lib/calibre/calibre/library/field_metadata.py
 lib/calibre/calibre/library/move.py
 lib/calibre/calibre/library/save_to_disk.py
-lib/calibre/calibre/library/server.py
+lib/calibre/calibre/library/schema_upgrades.py
+lib/calibre/calibre/library/server/__init__.py
+lib/calibre/calibre/library/server/base.py
+lib/calibre/calibre/library/server/cache.py
+lib/calibre/calibre/library/server/content.py
+lib/calibre/calibre/library/server/main.py
+lib/calibre/calibre/library/server/mobile.py
+lib/calibre/calibre/library/server/opds.py
+lib/calibre/calibre/library/server/utils.py
+lib/calibre/calibre/library/server/xml.py
 lib/calibre/calibre/library/sqlite.py
 lib/calibre/calibre/library/test.py
 lib/calibre/calibre/libunrar.py
@@ -508,9 +601,10 @@
 lib/calibre/calibre/manual/custom.py
 lib/calibre/calibre/manual/epub.py
 lib/calibre/calibre/manual/qthelp.py
+lib/calibre/calibre/plugins/chm_extra.so
+lib/calibre/calibre/plugins/chmlib.so
 lib/calibre/calibre/plugins/cPalmdoc.so
 lib/calibre/calibre/plugins/fontconfig.so
-%%USB%%lib/calibre/calibre/plugins/libusb.so
 lib/calibre/calibre/plugins/lzx.so
 lib/calibre/calibre/plugins/msdes.so
 lib/calibre/calibre/plugins/pdfreflow.so
@@ -525,33 +619,23 @@
 lib/calibre/calibre/translations/__init__.py
 lib/calibre/calibre/translations/dynamic.py
 lib/calibre/calibre/translations/msgfmt.py
+lib/calibre/calibre/utils/bibtex.py
+lib/calibre/calibre/utils/chm/__init__.py
+lib/calibre/calibre/utils/chm/chm.py
+lib/calibre/calibre/utils/chm/chmlib.py
+lib/calibre/calibre/utils/date.py
+lib/calibre/calibre/utils/dictclient.py
+lib/calibre/calibre/utils/magick_draw.py
+lib/calibre/calibre/utils/network.py
+lib/calibre/calibre/utils/ordered_dict.py
 lib/calibre/calibre/utils/PythonMagickWand.py
+lib/calibre/calibre/utils/titlecase.py
 lib/calibre/calibre/utils/Zeroconf.py
 lib/calibre/calibre/utils/__init__.py
 lib/calibre/calibre/utils/complete.py
 lib/calibre/calibre/utils/config.py
 lib/calibre/calibre/utils/filenames.py
 lib/calibre/calibre/utils/fonts/__init__.py
-lib/calibre/calibre/utils/genshi/__init__.py
-lib/calibre/calibre/utils/genshi/builder.py
-lib/calibre/calibre/utils/genshi/core.py
-lib/calibre/calibre/utils/genshi/filters/__init__.py
-lib/calibre/calibre/utils/genshi/filters/html.py
-lib/calibre/calibre/utils/genshi/filters/i18n.py
-lib/calibre/calibre/utils/genshi/filters/transform.py
-lib/calibre/calibre/utils/genshi/input.py
-lib/calibre/calibre/utils/genshi/output.py
-lib/calibre/calibre/utils/genshi/path.py
-lib/calibre/calibre/utils/genshi/template/__init__.py
-lib/calibre/calibre/utils/genshi/template/base.py
-lib/calibre/calibre/utils/genshi/template/directives.py
-lib/calibre/calibre/utils/genshi/template/eval.py
-lib/calibre/calibre/utils/genshi/template/interpolation.py
-lib/calibre/calibre/utils/genshi/template/loader.py
-lib/calibre/calibre/utils/genshi/template/markup.py
-lib/calibre/calibre/utils/genshi/template/plugin.py
-lib/calibre/calibre/utils/genshi/template/text.py
-lib/calibre/calibre/utils/genshi/util.py
 lib/calibre/calibre/utils/help2man.py
 lib/calibre/calibre/utils/ipc/__init__.py
 lib/calibre/calibre/utils/ipc/job.py
@@ -624,49 +708,6 @@
 lib/calibre/cherrypy/process/wspbus.py
 lib/calibre/cherrypy/scaffold/__init__.py
 lib/calibre/cherrypy/wsgiserver/__init__.py
-lib/calibre/cssutils/__init__.py
-lib/calibre/cssutils/_fetch.py
-lib/calibre/cssutils/_fetchgae.py
-lib/calibre/cssutils/codec.py
-lib/calibre/cssutils/css/__init__.py
-lib/calibre/cssutils/css/csscharsetrule.py
-lib/calibre/cssutils/css/csscomment.py
-lib/calibre/cssutils/css/cssfontfacerule.py
-lib/calibre/cssutils/css/cssimportrule.py
-lib/calibre/cssutils/css/cssmediarule.py
-lib/calibre/cssutils/css/cssnamespacerule.py
-lib/calibre/cssutils/css/csspagerule.py
-lib/calibre/cssutils/css/cssproperties.py
-lib/calibre/cssutils/css/cssrule.py
-lib/calibre/cssutils/css/cssrulelist.py
-lib/calibre/cssutils/css/cssstyledeclaration.py
-lib/calibre/cssutils/css/cssstylerule.py
-lib/calibre/cssutils/css/cssstylesheet.py
-lib/calibre/cssutils/css/cssunknownrule.py
-lib/calibre/cssutils/css/cssvalue.py
-lib/calibre/cssutils/css/cssvariablesdeclaration.py
-lib/calibre/cssutils/css/cssvariablesrule.py
-lib/calibre/cssutils/css/property.py
-lib/calibre/cssutils/css/selector.py
-lib/calibre/cssutils/css/selectorlist.py
-lib/calibre/cssutils/css2productions.py
-lib/calibre/cssutils/cssproductions.py
-lib/calibre/cssutils/errorhandler.py
-lib/calibre/cssutils/helper.py
-lib/calibre/cssutils/parse.py
-lib/calibre/cssutils/prodparser.py
-lib/calibre/cssutils/profiles.py
-lib/calibre/cssutils/script.py
-lib/calibre/cssutils/serialize.py
-lib/calibre/cssutils/settings.py
-lib/calibre/cssutils/stylesheets/__init__.py
-lib/calibre/cssutils/stylesheets/medialist.py
-lib/calibre/cssutils/stylesheets/mediaquery.py
-lib/calibre/cssutils/stylesheets/stylesheet.py
-lib/calibre/cssutils/stylesheets/stylesheetlist.py
-lib/calibre/cssutils/tokenize2.py
-lib/calibre/cssutils/util.py
-lib/calibre/encutils/__init__.py
 lib/calibre/odf/__init__.py
 lib/calibre/odf/anim.py
 lib/calibre/odf/attrconverters.py
@@ -707,7 +748,17 @@
 lib/calibre/pyPdf/pdf.py
 lib/calibre/pyPdf/utils.py
 lib/calibre/pyPdf/xmp.py
+lib/calibre/routes/__init__.py
+lib/calibre/routes/base.py
+lib/calibre/routes/lru.py
+lib/calibre/routes/mapper.py
+lib/calibre/routes/middleware.py
+lib/calibre/routes/route.py
+lib/calibre/routes/util.py
 share/calibre/builtin_recipes.xml
+share/calibre/catalog/DefaultCover.jpg
+share/calibre/catalog/mastheadImage.gif
+share/calibre/catalog/stylesheet.css
 share/calibre/content_server/av.jpg
 share/calibre/content_server/bg_search_box.png
 share/calibre/content_server/btn_search_box.png
@@ -724,6 +775,7 @@
 share/calibre/content_server/loading.gif
 share/calibre/content_server/next.png
 share/calibre/content_server/previous.png
+share/calibre/default_tweaks.py
 share/calibre/ebook-convert-complete.pickle
 share/calibre/fonts/liberation/LiberationMono-Bold.ttf
 share/calibre/fonts/liberation/LiberationMono-BoldItalic.ttf
@@ -746,33 +798,50 @@
 share/calibre/images/arrow-up.svg
 share/calibre/images/auto_author_sort.svg
 share/calibre/images/back.svg
+share/calibre/images/blank.svg
 share/calibre/images/book.svg
 share/calibre/images/bookmarks.svg
 share/calibre/images/books_in_series.svg
+share/calibre/images/catalog.svg
 share/calibre/images/chapters.svg
 share/calibre/images/clear_left.svg
+share/calibre/images/column.svg
 share/calibre/images/config.svg
 share/calibre/images/convert.svg
 share/calibre/images/cover_flow.svg
 share/calibre/images/debug.svg
+share/calibre/images/default_cover.svg
+share/calibre/images/devices/folder.svg
+share/calibre/images/devices/ipad.png
+share/calibre/images/devices/italica.png
+share/calibre/images/devices/itunes.png
+share/calibre/images/devices/kindle.jpg
+share/calibre/images/devices/nook.jpg
 share/calibre/images/dialog_error.svg
 share/calibre/images/dialog_information.svg
+share/calibre/images/dialog_question.svg
 share/calibre/images/dialog_warning.svg
+share/calibre/images/dictionary.png
 share/calibre/images/document_open.svg
 share/calibre/images/donate.svg
+share/calibre/images/drawer.svg
 share/calibre/images/edit_input.svg
+share/calibre/images/edit_copy.svg
 share/calibre/images/eject.svg
 share/calibre/images/exec.svg
 share/calibre/images/font_size_larger.svg
 share/calibre/images/font_size_smaller.svg
 share/calibre/images/forward.svg
 share/calibre/images/gmail_logo.png
+share/calibre/images/help.svg
 share/calibre/images/jobs.svg
 share/calibre/images/library.png
 share/calibre/images/list_remove.svg
+share/calibre/images/lt.png
 share/calibre/images/lookfeel.svg
 share/calibre/images/mail.svg
 share/calibre/images/metadata.svg
+share/calibre/images/merge_books.svg
 share/calibre/images/mimetypes/bmp.svg
 share/calibre/images/mimetypes/computer.svg
 share/calibre/images/mimetypes/dir.svg
@@ -799,6 +868,7 @@
 share/calibre/images/news.svg
 share/calibre/images/news/24sata.png
 share/calibre/images/news/24sata_rs.png
+share/calibre/images/news/abc_py.png
 share/calibre/images/news/adventuregamers.png
 share/calibre/images/news/ambito.png
 share/calibre/images/news/amspec.png
@@ -919,7 +989,6 @@
 share/calibre/images/news/spiegel_int.png
 share/calibre/images/news/spiegelde.png
 share/calibre/images/news/stackoverflow.png
-share/calibre/images/news/starbulletin.png
 share/calibre/images/news/straitstimes.png
 share/calibre/images/news/sueddeutsche.png
 share/calibre/images/news/svd_se.png
@@ -952,7 +1021,94 @@
 share/calibre/images/news/wsj.png
 share/calibre/images/news/zdnet.png
 share/calibre/images/news/zeitde.png
+share/calibre/images/news/ad.png
+share/calibre/images/news/aif_ru.png
+share/calibre/images/news/akter.png
+share/calibre/images/news/alo_novine.png
+share/calibre/images/news/american_thinker.png
+share/calibre/images/news/berlingske_dk.png
+share/calibre/images/news/biggovernment.png
+share/calibre/images/news/bwmagazine.png
+share/calibre/images/news/chinadaily.png
+share/calibre/images/news/cnetnews.png
+share/calibre/images/news/columbusdispatch.png
+share/calibre/images/news/di.png
+share/calibre/images/news/diariovasco.png
+share/calibre/images/news/digitaljournal.png
+share/calibre/images/news/digitalspy_uk.png
+share/calibre/images/news/dilbert.png
+share/calibre/images/news/eclicto.png
+share/calibre/images/news/eksiazki.png
+share/calibre/images/news/elcomercio.png
+share/calibre/images/news/elpais_impreso.png
+share/calibre/images/news/elpais_semanal.png
+share/calibre/images/news/elsevier.png
+share/calibre/images/news/eluniversal.png
+share/calibre/images/news/eluniversal_ve.png
+share/calibre/images/news/emg_en.png
+share/calibre/images/news/emg_rs.recipe
+share/calibre/images/news/entrepeneur.png
+share/calibre/images/news/evz.ro.png
+share/calibre/images/news/foreignaffairs.png
+share/calibre/images/news/foxnews.png
+share/calibre/images/news/gamasutra_fa.png
+share/calibre/images/news/gamasutra_news.png
+share/calibre/images/news/gizmodo.png
+share/calibre/images/news/greensboro_news_and_record.png
+share/calibre/images/news/haaretz.png
+share/calibre/images/news/haaretz_en.png
+share/calibre/images/news/hotair.png
+share/calibre/images/news/houston_chronicle-2.png
+share/calibre/images/news/information_dk.png
+share/calibre/images/news/interia_fakty.png
+share/calibre/images/news/interia_sport.png
+share/calibre/images/news/ionline_pt.png
+share/calibre/images/news/izvestia.png
+share/calibre/images/news/joop.png
+share/calibre/images/news/jp_dk.png
+share/calibre/images/news/kamerabild.png
+share/calibre/images/news/kitsapun.png
+share/calibre/images/news/kommersant.png
+share/calibre/images/news/kurier.png
+share/calibre/images/news/ledevoir.png
+share/calibre/images/news/legitymizm.png
+share/calibre/images/news/lrb.png
+share/calibre/images/news/lrb_payed.png
+share/calibre/images/news/michalkiewicz.png
+share/calibre/images/news/michellemalkin_icon.png
+share/calibre/images/news/motherjones.png
+share/calibre/images/news/msnbc.png
+share/calibre/images/news/nationalreviewonline.png
+share/calibre/images/news/neowin.png
+share/calibre/images/news/newsstraitstimes.png
+share/calibre/images/news/nrc.nl.png
+share/calibre/images/news/nrcnext.png
+share/calibre/images/news/nursingtimes.png
+share/calibre/images/news/nypost.png
+share/calibre/images/news/observer.png
+share/calibre/images/news/oldnewthing.png
+share/calibre/images/news/ourdailybread.png
+share/calibre/images/news/politiken_dk.png
+share/calibre/images/news/praguemonitor.png
+share/calibre/images/news/propublica.png
+share/calibre/images/news/radikal_tr.png
+share/calibre/images/news/readitlater.png
+share/calibre/images/news/ria_ru.png
+share/calibre/images/news/sarajevo_x.png
+share/calibre/images/news/smh.png
+share/calibre/images/news/staradvertiser.png
+share/calibre/images/news/sueddeutschezeitung.png
+share/calibre/images/news/the_week_magazine_free.png
+share/calibre/images/news/theluminouslandscape.png
+share/calibre/images/news/thewest_au.png
+share/calibre/images/news/tidbits.png
+share/calibre/images/news/tulsaworld.png
+share/calibre/images/news/ultimahora.png
+share/calibre/images/news/virtualshackles.png
+share/calibre/images/news/wapo_cartoons.png
+share/calibre/images/news/wired_uk.png
 share/calibre/images/next.svg
+share/calibre/images/notify.png
 share/calibre/images/ok.svg
 share/calibre/images/page.svg
 share/calibre/images/plugins.svg
@@ -966,6 +1122,9 @@
 share/calibre/images/scheduler.svg
 share/calibre/images/sd.svg
 share/calibre/images/search.svg
+share/calibre/images/search_add_saved.svg
+share/calibre/images/search_copy_saved.svg
+share/calibre/images/search_delete_saved.svg
 share/calibre/images/series.svg
 share/calibre/images/star.png
 share/calibre/images/swap.svg
@@ -985,12 +1144,16 @@
 share/calibre/localization/locales/ar/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/ar/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/ar/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/ast/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/ast/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/bg/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/bg/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/bn/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/ca/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/ca/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/cs/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/cs/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/cs/LC_MESSAGES/qt.qm
 share/calibre/localization/locales/da/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/da/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/da/LC_MESSAGES/qt.qm
@@ -999,36 +1162,57 @@
 share/calibre/localization/locales/de/LC_MESSAGES/qt.qm
 share/calibre/localization/locales/el/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/el/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/en_AU/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/en_CA/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/en_GB/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/eo/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/eo/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/es/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/es/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/es/LC_MESSAGES/qt.qm
 share/calibre/localization/locales/eu/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/eu/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/fa/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/fa/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/fr/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/fr/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/fr/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/fi/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/fi/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/fo/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/gl/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/gl/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/he/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/he/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/he/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/hi/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/hi/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/hr/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/hr/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/hu/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/hu/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/id/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/id/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/it/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/it/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/ja/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/ja/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/ko/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/ko/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/lt/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/lt/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/lv/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/lv/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/ml/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/ms/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/ms/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/nb/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/nb/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/nds/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/nl/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/nl/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/oc/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/oc/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/pl/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/pl/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/pl/LC_MESSAGES/qt.qm
@@ -1048,13 +1232,24 @@
 share/calibre/localization/locales/sl/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/sl/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/sl/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/sq/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/sr/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/sr/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/sv/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/sv/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/sv/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/ta/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/ta/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/th/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/th/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/tr/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/tr/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/te/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/uk/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/uk/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/uk/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/vi/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/vi/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/yi/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/zh_CN/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/zh_CN/LC_MESSAGES/messages.mo
@@ -1066,6 +1261,7 @@
 share/calibre/localization/locales/zh_TW/LC_MESSAGES/qt.qm
 share/calibre/localization/stats.pickle
 share/calibre/metadata_sqlite.sql
+share/calibre/quick_start.epub
 share/calibre/recipes/24sata.recipe
 share/calibre/recipes/24sata_rs.recipe
 share/calibre/recipes/7dias.recipe
@@ -1176,7 +1372,6 @@
 share/calibre/recipes/hln.recipe
 share/calibre/recipes/hln_be.recipe
 share/calibre/recipes/hna.recipe
-share/calibre/recipes/honoluluadvertiser.recipe
 share/calibre/recipes/honvedelem.recipe
 share/calibre/recipes/hrt.recipe
 share/calibre/recipes/huffingtonpost.recipe
@@ -1304,7 +1499,6 @@
 share/calibre/recipes/sportsillustrated_columnists.recipe
 share/calibre/recipes/st_petersburg_times.recipe
 share/calibre/recipes/stackoverflow.recipe
-share/calibre/recipes/starbulletin.recipe
 share/calibre/recipes/straitstimes.recipe
 share/calibre/recipes/sueddeutsche.recipe
 share/calibre/recipes/svd_se.recipe
@@ -1361,14 +1555,279 @@
 share/calibre/recipes/zaobao.recipe
 share/calibre/recipes/zdnet.recipe
 share/calibre/recipes/zeitde.recipe
+share/calibre/recipes/Ansa.recipe
+share/calibre/recipes/ZIVE.sk.recipe
+share/calibre/recipes/abc_py.recipe
+share/calibre/recipes/ad.recipe
+share/calibre/recipes/adnkronos.recipe
+share/calibre/recipes/aftenposten.recipe
+share/calibre/recipes/agrogerila.recipe
+share/calibre/recipes/aif_ru.recipe
+share/calibre/recipes/akter.recipe
+share/calibre/recipes/alo_novine.recipe
+share/calibre/recipes/alternet.recipe
+share/calibre/recipes/american_thinker.recipe
+share/calibre/recipes/anchorage_daily.recipe
+share/calibre/recipes/apcom.recipe
+share/calibre/recipes/apod.recipe
+share/calibre/recipes/aprospect.recipe
+share/calibre/recipes/arbetaren.recipe
+share/calibre/recipes/asia_one.recipe
+share/calibre/recipes/auto.recipe
+share/calibre/recipes/auto_prove.recipe
+share/calibre/recipes/axxon_magazine.recipe
+share/calibre/recipes/bbc_chinese.recipe
+share/calibre/recipes/bbc_fast.recipe
+share/calibre/recipes/berlingske_dk.recipe
+share/calibre/recipes/big_oven.recipe
+share/calibre/recipes/biggovernment.recipe
+share/calibre/recipes/billorielly.recipe
+share/calibre/recipes/boston.com.recipe
+share/calibre/recipes/bwmagazine.recipe
+share/calibre/recipes/calgary_herald.recipe
+share/calibre/recipes/canardpc.recipe
+share/calibre/recipes/cbc_canada.recipe
+share/calibre/recipes/cetnixploitation.recipe
+share/calibre/recipes/china_economic_net.recipe
+share/calibre/recipes/china_press.recipe
+share/calibre/recipes/chinadaily.recipe
+share/calibre/recipes/chowk.recipe
+share/calibre/recipes/cio.recipe
+share/calibre/recipes/cjr.recipe
+share/calibre/recipes/clarion_ledger.recipe
+share/calibre/recipes/cnetnews.recipe
+share/calibre/recipes/columbusdispatch.recipe
+share/calibre/recipes/comics_com.recipe
+share/calibre/recipes/computer_active.recipe
+share/calibre/recipes/corriere_dello_sport.recipe
+share/calibre/recipes/courrier.recipe
+share/calibre/recipes/cynewslive.recipe
+share/calibre/recipes/cyprus_weekly.recipe
+share/calibre/recipes/dallas.recipe
+share/calibre/recipes/dani.recipe
+share/calibre/recipes/dawn.recipe
+share/calibre/recipes/denver_post.recipe
+share/calibre/recipes/di.recipe
+share/calibre/recipes/diario_cordoba.recipe
+share/calibre/recipes/diariovasco.recipe
+share/calibre/recipes/digital_arts.recipe
+share/calibre/recipes/digitaljournal.recipe
+share/calibre/recipes/digitalspy_uk.recipe
+share/calibre/recipes/dilbert.recipe
+share/calibre/recipes/dominion.recipe
+share/calibre/recipes/dosisdiarias.recipe
+share/calibre/recipes/drivelry.recipe
+share/calibre/recipes/eclicto.recipe
+share/calibre/recipes/editor_and_publisher.recipe
+share/calibre/recipes/edmonton_journal.recipe
+share/calibre/recipes/ekot.recipe
+share/calibre/recipes/eksiazki.recipe
+share/calibre/recipes/el_observador.recipe
+share/calibre/recipes/elcomercio.recipe
+share/calibre/recipes/elpais_impreso.recipe
+share/calibre/recipes/elpais_semanal.recipe
+share/calibre/recipes/elsevier.recipe
+share/calibre/recipes/eluniversal_ve.recipe
+share/calibre/recipes/eluniversalimpresa.recipe
+share/calibre/recipes/emg_en.recipe
+share/calibre/recipes/emg_rs.recipe
+share/calibre/recipes/entrepeneur.recipe
+share/calibre/recipes/epicurious.recipe
+share/calibre/recipes/evz.ro.recipe
+share/calibre/recipes/factcheck.recipe
+share/calibre/recipes/forbes_india.recipe
+share/calibre/recipes/foreign_policy.recipe
+share/calibre/recipes/foreignaffairs.recipe
+share/calibre/recipes/foxnews.recipe
+share/calibre/recipes/fr_online.recipe
+share/calibre/recipes/freenature.recipe
+share/calibre/recipes/fria.recipe
+share/calibre/recipes/fronda.recipe
+share/calibre/recipes/gamasutra_fa.recipe
+share/calibre/recipes/gamasutra_news.recipe
+share/calibre/recipes/gizmodo.recipe
+share/calibre/recipes/golem_de.recipe
+share/calibre/recipes/greader_uber.recipe
+share/calibre/recipes/greensboro_news_and_record.recipe
+share/calibre/recipes/haaretz_en.recipe
+share/calibre/recipes/hartford_courant.recipe
+share/calibre/recipes/hbr_blogs.recipe
+share/calibre/recipes/heraldo.recipe
+share/calibre/recipes/hindu_business_line.recipe
+share/calibre/recipes/hotair.recipe
+share/calibre/recipes/houston_chronicle.recipe
+share/calibre/recipes/ieeespectrum.recipe
+share/calibre/recipes/ifzm.recipe
+share/calibre/recipes/il_giornale.recipe
+share/calibre/recipes/il_messaggero.recipe
+share/calibre/recipes/iliteratura_cz.recipe
+share/calibre/recipes/ilsole24ore.recipe
+share/calibre/recipes/inc.recipe
+share/calibre/recipes/independent.recipe
+share/calibre/recipes/india_today.recipe
+share/calibre/recipes/indian_express.recipe
+share/calibre/recipes/infomotori.recipe
+share/calibre/recipes/information_dk.recipe
+share/calibre/recipes/interia_fakty.recipe
+share/calibre/recipes/interia_sport.recipe
+share/calibre/recipes/ionline_pt.recipe
+share/calibre/recipes/izvestia.recipe
+share/calibre/recipes/johm.recipe
+share/calibre/recipes/joop.recipe
+share/calibre/recipes/journalofaccountancy.recipe
+share/calibre/recipes/jp_dk.recipe
+share/calibre/recipes/jsonline.recipe
+share/calibre/recipes/kamerabild.recipe
+share/calibre/recipes/kathemerini.recipe
+share/calibre/recipes/kidney.recipe
+share/calibre/recipes/kitsapun.recipe
+share/calibre/recipes/kleinezeitung.recipe
+share/calibre/recipes/kommersant.recipe
+share/calibre/recipes/kukuburi.recipe
+share/calibre/recipes/kurier.recipe
+share/calibre/recipes/l_espresso.recipe
+share/calibre/recipes/la_gazzeta_dello_sport.recipe
+share/calibre/recipes/la_stampa.recipe
+share/calibre/recipes/las_vegas_review.recipe
+share/calibre/recipes/ledevoir.recipe
+share/calibre/recipes/legeartis.recipe
+share/calibre/recipes/leggo_it.recipe
+share/calibre/recipes/legitymizm.recipe
+share/calibre/recipes/lescienze.recipe
+share/calibre/recipes/libero.recipe
+share/calibre/recipes/living_digital.recipe
+share/calibre/recipes/london_free_press.recipe
+share/calibre/recipes/losservatoreromano_it.recipe
+share/calibre/recipes/lrb_payed.recipe
+share/calibre/recipes/mac_video.recipe
+share/calibre/recipes/mac_world.recipe
+share/calibre/recipes/mac_world_uk.recipe
+share/calibre/recipes/macleans.recipe
+share/calibre/recipes/maximum_pc.recipe
+share/calibre/recipes/metro_montreal.recipe
+share/calibre/recipes/michalkiewicz.recipe
+share/calibre/recipes/michellemalkin.recipe
+share/calibre/recipes/midday.recipe
+share/calibre/recipes/montreal_gazette.recipe
+share/calibre/recipes/motherjones.recipe
+share/calibre/recipes/msnbc.recipe
+share/calibre/recipes/nation_ke.recipe
+share/calibre/recipes/national_post.recipe
+share/calibre/recipes/nationalreviewonline.recipe
+share/calibre/recipes/nczas.recipe
+share/calibre/recipes/nejm.recipe
+share/calibre/recipes/neowin.recipe
+share/calibre/recipes/netzpolitik.recipe
+share/calibre/recipes/newsobs.recipe
+share/calibre/recipes/newsstraitstimes.recipe
+share/calibre/recipes/nortecastilla.recipe
+share/calibre/recipes/npr_music_blogs.recipe
+share/calibre/recipes/nrc.nl.recipe
+share/calibre/recipes/nu.recipe
+share/calibre/recipes/nursingtimes.recipe
+share/calibre/recipes/nymag.recipe
+share/calibre/recipes/nypost.recipe
+share/calibre/recipes/nytimesbook.recipe
+share/calibre/recipes/nzherald.recipe
+share/calibre/recipes/observer.recipe
+share/calibre/recipes/observer_gb.recipe
+share/calibre/recipes/oc_register.recipe
+share/calibre/recipes/oilprice.recipe
+share/calibre/recipes/oldnewthing.recipe
+share/calibre/recipes/onionavclub.recipe
+share/calibre/recipes/open_left.recipe
+share/calibre/recipes/orlando_sentinel.recipe
+share/calibre/recipes/ottawa_citizen.recipe
+share/calibre/recipes/pajama.recipe
+share/calibre/recipes/panorama.recipe
+share/calibre/recipes/pc_advisor.recipe
+share/calibre/recipes/pc_mag.recipe
+share/calibre/recipes/pc_quest_india.recipe
+share/calibre/recipes/pc_world.recipe
+share/calibre/recipes/people_daily.recipe
+share/calibre/recipes/people_us_mashup.recipe
+share/calibre/recipes/peterschiff.recipe
+share/calibre/recipes/pilot.recipe
+share/calibre/recipes/politifact.recipe
+share/calibre/recipes/politiken_dk.recipe
+share/calibre/recipes/praguemonitor.recipe
+share/calibre/recipes/pravda.recipe
+share/calibre/recipes/projo.recipe
+share/calibre/recipes/propublica.recipe
+share/calibre/recipes/psych.recipe
+share/calibre/recipes/punto_informatico.recipe
+share/calibre/recipes/queleer.recipe
+share/calibre/recipes/quotidiano.recipe
+share/calibre/recipes/radikal_tr.recipe
+share/calibre/recipes/readers_digest.recipe
+share/calibre/recipes/readitlater.recipe
+share/calibre/recipes/regina_leader_post.recipe
+share/calibre/recipes/reptantes.recipe
+share/calibre/recipes/ria_ru.recipe
+share/calibre/recipes/rte.recipe
+share/calibre/recipes/runa.recipe
+share/calibre/recipes/sarajevo_x.recipe
+share/calibre/recipes/saskatoon_star_phoenix.recipe
+share/calibre/recipes/scinexx.recipe
+share/calibre/recipes/seanhannity.recipe
+share/calibre/recipes/sfbg.recipe
+share/calibre/recipes/sg_hu.recipe
+share/calibre/recipes/singtao_daily.recipe
+share/calibre/recipes/slovo.recipe
+share/calibre/recipes/sme.recipe
+share/calibre/recipes/smith.recipe
+share/calibre/recipes/standardmedia_ke.recipe
+share/calibre/recipes/staradvertiser.recipe
+share/calibre/recipes/starwars.recipe
+share/calibre/recipes/statesman.recipe
+share/calibre/recipes/strategy-business.recipe
+share/calibre/recipes/sueddeutschezeitung.recipe
+share/calibre/recipes/tagesspiegel.recipe
+share/calibre/recipes/tanea.recipe
+share/calibre/recipes/taz.recipe
+share/calibre/recipes/tech_world.recipe
+share/calibre/recipes/technology_review.recipe
+share/calibre/recipes/thairath.recipe
+share/calibre/recipes/the_escapist.recipe
+share/calibre/recipes/the_nation_thai.recipe
+share/calibre/recipes/the_sun.recipe
+share/calibre/recipes/the_week_magazine_free.recipe
+share/calibre/recipes/thecultofghoul.recipe
+share/calibre/recipes/theluminouslandscape.recipe
+share/calibre/recipes/thenews.recipe
+share/calibre/recipes/theonlinephotographer.recipe
+share/calibre/recipes/thewest_au.recipe
+share/calibre/recipes/think_progress.recipe
+share/calibre/recipes/tidbits.recipe
+share/calibre/recipes/today_online.recipe
+share/calibre/recipes/toi.recipe
+share/calibre/recipes/trv.recipe
+share/calibre/recipes/tulsaworld.recipe
+share/calibre/recipes/tuttosport.recipe
+share/calibre/recipes/ultimahora.recipe
+share/calibre/recipes/vancouver_provice.recipe
+share/calibre/recipes/vancouver_sun.recipe
+share/calibre/recipes/vic_times.recipe
+share/calibre/recipes/virtualshackles.recipe
+share/calibre/recipes/waco_tribune.recipe
+share/calibre/recipes/wapo_cartoons.recipe
+share/calibre/recipes/wash_times.recipe
+share/calibre/recipes/watchingamerica.recipe
+share/calibre/recipes/windows_star.recipe
+share/calibre/recipes/winnipeg_sun.recipe
+share/calibre/recipes/winter_olympics.recipe
+share/calibre/recipes/wired_daily.recipe
+share/calibre/recipes/wired_uk.recipe
+share/calibre/recipes/wsj_free.recipe
+share/calibre/recipes/yementimes.recipe
 share/calibre/scripts.pickle
 share/calibre/templates/fb2.xsl
 share/calibre/templates/html.css
 share/calibre/templates/lrf.xsl
-share/calibre/templates/ncx.xml
-share/calibre/templates/opf.xml
 share/calibre/templates/rtf.xsl
+share/calibre/tracer.epub
 share/calibre/viewer/bookmarks.js
+share/calibre/viewer/images.js
 share/calibre/viewer/hyphenate/Hyphenator.js
 share/calibre/viewer/hyphenate/patterns/bn.js
 share/calibre/viewer/hyphenate/patterns/cs.js
@@ -1410,12 +1869,48 @@
 @dirrm share/calibre/localization/locales/zh_CN
 @dirrm share/calibre/localization/locales/yi/LC_MESSAGES
 @dirrm share/calibre/localization/locales/yi
+@dirrm share/calibre/localization/locales/vi/LC_MESSAGES
+@dirrm share/calibre/localization/locales/vi
 @dirrm share/calibre/localization/locales/uk/LC_MESSAGES
 @dirrm share/calibre/localization/locales/uk
 @dirrm share/calibre/localization/locales/te/LC_MESSAGES
 @dirrm share/calibre/localization/locales/te
+@dirrm share/calibre/localization/locales/lt/LC_MESSAGES
+@dirrm share/calibre/localization/locales/lt
+@dirrm share/calibre/localization/locales/tr/LC_MESSAGES
+@dirrm share/calibre/localization/locales/tr
+@dirrm share/calibre/localization/locales/ta/LC_MESSAGES
+@dirrm share/calibre/localization/locales/ta
+@dirrm share/calibre/localization/locales/th/LC_MESSAGES
+@dirrm share/calibre/localization/locales/th
+@dirrm share/calibre/localization/locales/hi/LC_MESSAGES
+@dirrm share/calibre/localization/locales/hi
+@dirrm share/calibre/localization/locales/bn/LC_MESSAGES
+@dirrm share/calibre/localization/locales/bn
+@dirrm share/calibre/localization/locales/id/LC_MESSAGES
+@dirrm share/calibre/localization/locales/id
+@dirrm share/calibre/localization/locales/ml/LC_MESSAGES
+@dirrm share/calibre/localization/locales/ml
+@dirrm share/calibre/localization/locales/fa/LC_MESSAGES
+@dirrm share/calibre/localization/locales/fa
+@dirrm share/calibre/localization/locales/fi/LC_MESSAGES
+@dirrm share/calibre/localization/locales/fi
+@dirrm share/calibre/localization/locales/fo/LC_MESSAGES
+@dirrm share/calibre/localization/locales/fo
+@dirrm share/calibre/localization/locales/oc/LC_MESSAGES
+@dirrm share/calibre/localization/locales/oc
+@dirrm share/calibre/localization/locales/ms/LC_MESSAGES
+@dirrm share/calibre/localization/locales/ms
+@dirrm share/calibre/localization/locales/eo/LC_MESSAGES
+@dirrm share/calibre/localization/locales/eo
+@dirrm share/calibre/localization/locales/ast/LC_MESSAGES
+@dirrm share/calibre/localization/locales/ast
 @dirrm share/calibre/localization/locales/sv/LC_MESSAGES
 @dirrm share/calibre/localization/locales/sv
+@dirrm share/calibre/localization/locales/sq/LC_MESSAGES
+@dirrm share/calibre/localization/locales/sq
+@dirrm share/calibre/localization/locales/sr/LC_MESSAGES
+@dirrm share/calibre/localization/locales/sr
 @dirrm share/calibre/localization/locales/sl/LC_MESSAGES
 @dirrm share/calibre/localization/locales/sl
 @dirrm share/calibre/localization/locales/sk/LC_MESSAGES
@@ -1460,6 +1955,10 @@
 @dirrm share/calibre/localization/locales/es
 @dirrm share/calibre/localization/locales/en_GB/LC_MESSAGES
 @dirrm share/calibre/localization/locales/en_GB
+@dirrm share/calibre/localization/locales/en_CA/LC_MESSAGES
+@dirrm share/calibre/localization/locales/en_CA
+@dirrm share/calibre/localization/locales/en_AU/LC_MESSAGES
+@dirrm share/calibre/localization/locales/en_AU
 @dirrm share/calibre/localization/locales/el/LC_MESSAGES
 @dirrm share/calibre/localization/locales/el
 @dirrm share/calibre/localization/locales/de/LC_MESSAGES
@@ -1480,18 +1979,16 @@
 @dirrm share/calibre/localization
 @dirrm share/calibre/images/news
 @dirrm share/calibre/images/mimetypes
+@dirrm share/calibre/images/devices
 @dirrm share/calibre/images
 @dirrm share/calibre/fonts/prs500
 @dirrm share/calibre/fonts/liberation
 @dirrm share/calibre/fonts
 @dirrm share/calibre/content_server
+@dirrm share/calibre/catalog
 @dirrm share/calibre
 @dirrm lib/calibre/pyPdf
 @dirrm lib/calibre/odf
-@dirrm lib/calibre/encutils
-@dirrm lib/calibre/cssutils/stylesheets
-@dirrm lib/calibre/cssutils/css
-@dirrm lib/calibre/cssutils
 @dirrm lib/calibre/cherrypy/wsgiserver
 @dirrm lib/calibre/cherrypy/scaffold
 @dirrm lib/calibre/cherrypy/process
@@ -1503,15 +2000,15 @@
 @dirrm lib/calibre/calibre/web
 @dirrm lib/calibre/calibre/utils/podofo
 @dirrm lib/calibre/calibre/utils/ipc
-@dirrm lib/calibre/calibre/utils/genshi/template
-@dirrm lib/calibre/calibre/utils/genshi/filters
-@dirrm lib/calibre/calibre/utils/genshi
 @dirrm lib/calibre/calibre/utils/fonts
+@dirrm lib/calibre/calibre/utils/chm
 @dirrm lib/calibre/calibre/utils
 @dirrm lib/calibre/calibre/translations
 @dirrm lib/calibre/calibre/trac
 @dirrm lib/calibre/calibre/plugins
 @dirrm lib/calibre/calibre/manual
+@dirrm lib/calibre/calibre/library/db
+@dirrm lib/calibre/calibre/library/server
 @dirrm lib/calibre/calibre/library
 @dirrm lib/calibre/calibre/gui2/wizard
 @dirrm lib/calibre/calibre/gui2/viewer
@@ -1521,6 +2018,9 @@
 @dirrm lib/calibre/calibre/gui2/dialogs
 @dirrm lib/calibre/calibre/gui2/device_drivers
 @dirrm lib/calibre/calibre/gui2/convert
+@dirrm lib/calibre/calibre/gui2/library
+@dirrm lib/calibre/calibre/gui2/catalog
+@dirrm lib/calibre/calibre/gui2/add_wizard
 @dirrm lib/calibre/calibre/gui2
 @dirrm lib/calibre/calibre/ebooks/unidecode
 @dirrm lib/calibre/calibre/ebooks/txt
@@ -1534,11 +2034,13 @@
 @dirrm lib/calibre/calibre/ebooks/pdb/ztxt
 @dirrm lib/calibre/calibre/ebooks/pdb/palmdoc
 @dirrm lib/calibre/calibre/ebooks/pdb/ereader
+@dirrm lib/calibre/calibre/ebooks/pdb/pdf
 @dirrm lib/calibre/calibre/ebooks/pdb
 @dirrm lib/calibre/calibre/ebooks/oeb/transforms
 @dirrm lib/calibre/calibre/ebooks/oeb
 @dirrm lib/calibre/calibre/ebooks/odt
 @dirrm lib/calibre/calibre/ebooks/mobi
+@dirrm lib/calibre/calibre/ebooks/metadata/book
 @dirrm lib/calibre/calibre/ebooks/metadata
 @dirrm lib/calibre/calibre/ebooks/markdown
 @dirrm lib/calibre/calibre/ebooks/lrf/pylrs
@@ -1550,32 +2052,43 @@
 @dirrm lib/calibre/calibre/ebooks/lit
 @dirrm lib/calibre/calibre/ebooks/html
 @dirrm lib/calibre/calibre/ebooks/fb2
+@dirrm lib/calibre/calibre/ebooks/epub/fix
 @dirrm lib/calibre/calibre/ebooks/epub
 @dirrm lib/calibre/calibre/ebooks/conversion
 @dirrm lib/calibre/calibre/ebooks/compression
 @dirrm lib/calibre/calibre/ebooks/comic
 @dirrm lib/calibre/calibre/ebooks/chardet
+@dirrm lib/calibre/calibre/ebooks/chm
 @dirrm lib/calibre/calibre/ebooks
 @dirrm lib/calibre/calibre/devices/usbobserver
 @dirrm lib/calibre/calibre/devices/usbms
-@dirrm lib/calibre/calibre/devices/prs700
+@dirrm lib/calibre/calibre/devices/teclast
+@dirrm lib/calibre/calibre/devices/sne
 @dirrm lib/calibre/calibre/devices/prs505
 @dirrm lib/calibre/calibre/devices/prs500/cli
 @dirrm lib/calibre/calibre/devices/prs500
 @dirrm lib/calibre/calibre/devices/nuut2
 @dirrm lib/calibre/calibre/devices/nook
+@dirrm lib/calibre/calibre/devices/nokia
+@dirrm lib/calibre/calibre/devices/kobo
 @dirrm lib/calibre/calibre/devices/kindle
 @dirrm lib/calibre/calibre/devices/jetbook
 @dirrm lib/calibre/calibre/devices/iriver
 @dirrm lib/calibre/calibre/devices/irexdr
 @dirrm lib/calibre/calibre/devices/iliad
+@dirrm lib/calibre/calibre/devices/hanvon
+@dirrm lib/calibre/calibre/devices/hanlin
+@dirrm lib/calibre/calibre/devices/folder_device
 @dirrm lib/calibre/calibre/devices/eslick
+@dirrm lib/calibre/calibre/devices/edge
 @dirrm lib/calibre/calibre/devices/eb600
-@dirrm lib/calibre/calibre/devices/cybookg3
+@dirrm lib/calibre/calibre/devices/cybook
 @dirrm lib/calibre/calibre/devices/blackberry
-@dirrm lib/calibre/calibre/devices/bebook
+@dirrm lib/calibre/calibre/devices/binatone
+@dirrm lib/calibre/calibre/devices/apple
 @dirrm lib/calibre/calibre/devices/android
 @dirrm lib/calibre/calibre/devices
 @dirrm lib/calibre/calibre/customize
 @dirrm lib/calibre/calibre
+@dirrm lib/calibre/routes
 @dirrm lib/calibre
Only in calibre: work
--- calibre.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



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