Update to 1.31, provided by Rhialto in PR 48723 and wip.

Changes: too many to mention; 1.5 years of very active development.

5 files changed, 527 insertions, 105 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 9f5cd2d9a66..010c0bb7ac3 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.68 2014/04/10 06:21:29 obache Exp $
+# $NetBSD: Makefile,v 1.69 2014/04/16 17:22:30 wiz Exp $
 
-DISTNAME=	calibre-0.9.7
-PKGREVISION=	18
+DISTNAME=	calibre-1.31.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=calibre/}
 EXTRACT_SUFX=	.tar.xz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.calibre-ebook.com/
@@ -26,9 +26,20 @@ DEPENDS+=	${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
 DEPENDS+=	${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib
 DEPENDS+=	${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet
 DEPENDS+=	${PYPKGPREFIX}-netifaces-[0-9]*:../../net/py-netifaces
+DEPENDS+=	${PYPKGPREFIX}-apsw-[0-9]*:../../databases/py-apsw
 
 PYTHON_VERSIONED_DEPENDENCIES=	dateutil dns
 
+# We also need the distfile for qt4-libs to extract some private header files
+# If QTVERSION changes, the distinfo file needs to be updated too.
+QTVERSION=	4.8.5	# from ../../x11/qt4/Makefile.common
+# Including that file to avoid hardcoding the version number won't work,
+# since it will occur in the distinfo anyway.
+QTNAME=		qt-everywhere-opensource-src-${QTVERSION}
+DISTFILES+=	${QTNAME}.tar.gz
+MASTER_SITES+=	http://releases.qt-project.org/qt4/source/
+EXTRACT_USING=  bsdtar
+
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config pax
 PYTHON_VERSIONS_ACCEPTED=	27
@@ -42,10 +53,10 @@ INSTALLATION_DIRS=	share/applications
 INSTALLATION_DIRS=	share/icons
 INSTALLATION_DIRS=	share/calibre/recipes
 
+FIX_PYTHON_PATHS+=	*.py
 FIX_PYTHON_PATHS+=	recipes/*.recipe
-FIX_PYTHON_PATHS+=	resources/catalog/*.py
 FIX_PYTHON_PATHS+=	resources/*.py
-FIX_PYTHON_PATHS+=	*.py
+FIX_PYTHON_PATHS+=	resources/catalog/*.py
 FIX_PYTHON_PATHS+=	setup/*.py
 FIX_PYTHON_PATHS+=	setup/installer/*.py
 FIX_PYTHON_PATHS+=	setup/installer/linux/*.py
@@ -60,10 +71,16 @@ FIX_PYTHON_PATHS+=	src/calibre/devices/*.py
 FIX_PYTHON_PATHS+=	src/calibre/devices/android/*.py
 FIX_PYTHON_PATHS+=	src/calibre/devices/eslick/*.py
 FIX_PYTHON_PATHS+=	src/calibre/devices/folder_device/*.py
+FIX_PYTHON_PATHS+=	src/calibre/devices/idevice/*.py
 FIX_PYTHON_PATHS+=	src/calibre/devices/iriver/*.py
 FIX_PYTHON_PATHS+=	src/calibre/devices/kobo/*.py
+FIX_PYTHON_PATHS+=	src/calibre/devices/mtp/*.py
+FIX_PYTHON_PATHS+=	src/calibre/devices/mtp/unix/*.py
+FIX_PYTHON_PATHS+=	src/calibre/devices/mtp/unix/upstream/*.py
+FIX_PYTHON_PATHS+=	src/calibre/devices/mtp/windows/*.py
 FIX_PYTHON_PATHS+=	src/calibre/devices/prs505/*.py
 FIX_PYTHON_PATHS+=	src/calibre/devices/prst1/*.py
+FIX_PYTHON_PATHS+=	src/calibre/devices/smart_device_app/*.py
 FIX_PYTHON_PATHS+=	src/calibre/devices/teclast/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/chm/*.py
@@ -72,19 +89,19 @@ FIX_PYTHON_PATHS+=	src/calibre/ebooks/compression/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/conversion/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/conversion/plugins/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/djvu/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/epub/fix/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/docx/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/docx/writer/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/epub/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/fb2/__init__.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/html/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/iterator/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/lit/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/lrf/html/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/lrf/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/lrf/html/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/lrf/pylrs/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/markdown/extensions/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/metadata/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/metadata/book/*.py
-FIX_PYTHON_PATHS+=	src/calibre/ebooks/metadata/book/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/metadata/sources/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/mobi/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/mobi/debug/*.py
@@ -95,10 +112,16 @@ FIX_PYTHON_PATHS+=	src/calibre/ebooks/odt/__init__.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/display/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/display/test-cfi/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/iterator/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/polish/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/polish/check/*.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/polish/tests/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/oeb/transforms/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/pdb/haodoo/__init__.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/pdf/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/pdf/__init__.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/pdf/reflow.py
+FIX_PYTHON_PATHS+=	src/calibre/ebooks/pdf/render/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/readability/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/rtf/*.py
 FIX_PYTHON_PATHS+=	src/calibre/ebooks/rtf2xml/*.py
@@ -110,35 +133,44 @@ FIX_PYTHON_PATHS+=	src/calibre/gui2/actions/*.py
 FIX_PYTHON_PATHS+=	src/calibre/gui2/add_wizard/*.py
 FIX_PYTHON_PATHS+=	src/calibre/gui2/catalog/*.py
 FIX_PYTHON_PATHS+=	src/calibre/gui2/convert/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/device_drivers/*.py
 FIX_PYTHON_PATHS+=	src/calibre/gui2/dialogs/*.py
 FIX_PYTHON_PATHS+=	src/calibre/gui2/library/*.py
 FIX_PYTHON_PATHS+=	src/calibre/gui2/metadata/*.py
 FIX_PYTHON_PATHS+=	src/calibre/gui2/preferences/*.py
 FIX_PYTHON_PATHS+=	src/calibre/gui2/progress_indicator/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/store/loader.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/store/stores/*.py
 FIX_PYTHON_PATHS+=	src/calibre/gui2/tag_browser/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/toc/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/tweak_book/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/tweak_book/diff/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/tweak_book/editor/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/tweak_book/editor/smart/*.py
+FIX_PYTHON_PATHS+=	src/calibre/gui2/tweak_book/editor/syntax/*.py
 FIX_PYTHON_PATHS+=	src/calibre/gui2/viewer/*.py
 FIX_PYTHON_PATHS+=	src/calibre/gui2/wizard/*.py
 FIX_PYTHON_PATHS+=	src/calibre/library/*.py
 FIX_PYTHON_PATHS+=	src/calibre/library/catalogs/*.py
 FIX_PYTHON_PATHS+=	src/calibre/library/server/*.py
-FIX_PYTHON_PATHS+=	src/calibre/manual/*.py
-FIX_PYTHON_PATHS+=	src/calibre/manual/plugin_examples/helloworld/*.py
-FIX_PYTHON_PATHS+=	src/calibre/manual/plugin_examples/interface_demo/*.py
-FIX_PYTHON_PATHS+=	src/calibre/trac/*.py
 FIX_PYTHON_PATHS+=	src/calibre/translations/*.py
 FIX_PYTHON_PATHS+=	src/calibre/utils/*.py
 FIX_PYTHON_PATHS+=	src/calibre/utils/fonts/*.py
+FIX_PYTHON_PATHS+=	src/calibre/utils/fonts/sfnt/*.py
+FIX_PYTHON_PATHS+=	src/calibre/utils/fonts/sfnt/cff/*.py
+FIX_PYTHON_PATHS+=	src/calibre/utils/fonts/woff/__init__.py
 FIX_PYTHON_PATHS+=	src/calibre/utils/ipc/*.py
 FIX_PYTHON_PATHS+=	src/calibre/utils/magick/*.py
 FIX_PYTHON_PATHS+=	src/calibre/utils/podofo/*.py
 FIX_PYTHON_PATHS+=	src/calibre/utils/pyconsole/*.py
+FIX_PYTHON_PATHS+=	src/calibre/utils/spell/__init__.py
 FIX_PYTHON_PATHS+=	src/calibre/utils/wmf/*.py
 FIX_PYTHON_PATHS+=	src/calibre/web/feeds/*.py
 FIX_PYTHON_PATHS+=	src/calibre/web/feeds/recipes/*.py
 FIX_PYTHON_PATHS+=	src/calibre/web/fetch/*.py
 FIX_PYTHON_PATHS+=	src/calibre/web/jsbrowser/*.py
+FIX_PYTHON_PATHS+=	src/qtcurve/test_rendering.py
 FIX_PYTHON_PATHS+=	src/templite/*.py
-
 SUBST_CLASSES+=		prefix
 SUBST_SED.prefix=	-e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt4/bin/qmake',"
 SUBST_MESSAGE.prefix=	Fixing path to QMAKE
@@ -171,10 +203,24 @@ MAKE_ENV+=		PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib
 pre-configure:
 	cd ${WRKSRC} && rm -rf src/cherrypy src/pyPdf src/html5lib src/chardet
 
+# Turn off x bits on non-executable files.
+post-extract:
+	find  ${WRKSRC}/src/calibre/devices ${WRKSRC}/src/calibre/ebooks ${WRKSRC}/src/calibre/web -name '*.py' -exec chmod a-x \{} \;
+	find  ${WRKSRC}/resources/images/mimetypes  -name '*.png' -exec chmod a-x \{} \;
+	chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py
+	chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py
+
+# Get access to (some of) the Qt4 private header files (for qt_hack).
+post-wrapper:
+	cd ${WRKDIR}/.buildlink/qt4/include/QtGui && \
+	    ln -s ../../../../${QTNAME}/include/QtGui/private .
+	cd ${WRKDIR}/.buildlink/qt4/include/QtCore && \
+	    ln -s ../../../../${QTNAME}/include/QtCore/private .
+
 post-install:
 	cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \
 	    ${DESTDIR}${PREFIX}/share/calibre/recipes
-	cd ${WRKSRC} && pax -wr -pma Changelog* README \
+	cd ${WRKSRC} && pax -wr -pma Changelog* README.md \
 	    COPYRIGHT INSTALL LICENSE.* \
 	    ${DESTDIR}${PREFIX}/share/doc/calibre
 
@@ -215,6 +261,6 @@ BUILDLINK_API_DEPENDS.py-qt4+=	${PYPKGPREFIX}-qt4>=4.7.0
 .include "../../x11/py-qt4/buildlink3.mk"
 BUILDLINK_API_DEPENDS.qt4-tools+=	qt4-tools>=4.7.0
 .include "../../x11/qt4-tools/buildlink3.mk"
-BUILDLINK_API_DEPENDS.qt4-qdbus+=	qt4-tools>=4.7.0
+BUILDLINK_API_DEPENDS.qt4-qdbus+=	qt4-qdbus>=4.7.0
 .include "../../x11/qt4-qdbus/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index 2e062cbf770..b7f52272087 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,18 +1,18 @@
-@comment $NetBSD: PLIST,v 1.15 2012/11/26 14:02:49 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.16 2014/04/16 17:22:30 wiz Exp $
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
 bin/calibre-debug
-bin/calibre-mount-helper
 bin/calibre-parallel
 bin/calibre-server
 bin/calibre-smtp
 bin/calibredb
 bin/ebook-convert
 bin/ebook-device
+bin/ebook-edit
 bin/ebook-meta
+bin/ebook-polish
 bin/ebook-viewer
-bin/epub-fix
 bin/fetch-ebook-metadata
 bin/lrf2lrs
 bin/lrfviewer
@@ -28,18 +28,35 @@ lib/calibre/calibre/customize/profiles.py
 lib/calibre/calibre/customize/ui.py
 lib/calibre/calibre/customize/zipplugin.py
 lib/calibre/calibre/db/__init__.py
+lib/calibre/calibre/db/adding.py
 lib/calibre/calibre/db/backend.py
+lib/calibre/calibre/db/backup.py
 lib/calibre/calibre/db/cache.py
+lib/calibre/calibre/db/categories.py
+lib/calibre/calibre/db/delete_service.py
 lib/calibre/calibre/db/errors.py
 lib/calibre/calibre/db/fields.py
 lib/calibre/calibre/db/lazy.py
+lib/calibre/calibre/db/legacy.py
 lib/calibre/calibre/db/locking.py
+lib/calibre/calibre/db/restore.py
 lib/calibre/calibre/db/schema_upgrades.py
+lib/calibre/calibre/db/search.py
 lib/calibre/calibre/db/tables.py
 lib/calibre/calibre/db/tests/__init__.py
+lib/calibre/calibre/db/tests/add_remove.py
 lib/calibre/calibre/db/tests/base.py
+lib/calibre/calibre/db/tests/filesystem.py
+lib/calibre/calibre/db/tests/legacy.py
+lib/calibre/calibre/db/tests/locking.py
+lib/calibre/calibre/db/tests/main.py
+lib/calibre/calibre/db/tests/profiling.py
 lib/calibre/calibre/db/tests/reading.py
+lib/calibre/calibre/db/tests/utils.py
+lib/calibre/calibre/db/tests/writing.py
+lib/calibre/calibre/db/utils.py
 lib/calibre/calibre/db/view.py
+lib/calibre/calibre/db/write.py
 lib/calibre/calibre/debug.py
 lib/calibre/calibre/devices/__init__.py
 lib/calibre/calibre/devices/android/__init__.py
@@ -60,6 +77,7 @@ lib/calibre/calibre/devices/cli.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/cybook/t4b.py
 lib/calibre/calibre/devices/eb600/__init__.py
 lib/calibre/calibre/devices/eb600/driver.py
 lib/calibre/calibre/devices/edge/__init__.py
@@ -73,6 +91,9 @@ 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/idevice/__init__.py
+lib/calibre/calibre/devices/idevice/libimobiledevice.py
+lib/calibre/calibre/devices/idevice/parse_xml.py
 lib/calibre/calibre/devices/iliad/__init__.py
 lib/calibre/calibre/devices/iliad/driver.py
 lib/calibre/calibre/devices/interface.py
@@ -102,6 +123,7 @@ lib/calibre/calibre/devices/mtp/filesystem_cache.py
 lib/calibre/calibre/devices/mtp/test.py
 lib/calibre/calibre/devices/mtp/unix/__init__.py
 lib/calibre/calibre/devices/mtp/unix/driver.py
+lib/calibre/calibre/devices/mtp/unix/sysfs.py
 lib/calibre/calibre/devices/mtp/unix/upstream/update.py
 lib/calibre/calibre/devices/mtp/windows/__init__.py
 lib/calibre/calibre/devices/mtp/windows/driver.py
@@ -148,6 +170,7 @@ lib/calibre/calibre/ebooks/comic/input.py
 lib/calibre/calibre/ebooks/compression/__init__.py
 lib/calibre/calibre/ebooks/compression/palmdoc.py
 lib/calibre/calibre/ebooks/compression/tcr.py
+lib/calibre/calibre/ebooks/constants.py
 lib/calibre/calibre/ebooks/conversion/__init__.py
 lib/calibre/calibre/ebooks/conversion/cli.py
 lib/calibre/calibre/ebooks/conversion/config.py
@@ -156,6 +179,7 @@ lib/calibre/calibre/ebooks/conversion/plugins/azw4_input.py
 lib/calibre/calibre/ebooks/conversion/plugins/chm_input.py
 lib/calibre/calibre/ebooks/conversion/plugins/comic_input.py
 lib/calibre/calibre/ebooks/conversion/plugins/djvu_input.py
+lib/calibre/calibre/ebooks/conversion/plugins/docx_input.py
 lib/calibre/calibre/ebooks/conversion/plugins/epub_input.py
 lib/calibre/calibre/ebooks/conversion/plugins/epub_output.py
 lib/calibre/calibre/ebooks/conversion/plugins/fb2_input.py
@@ -195,12 +219,29 @@ lib/calibre/calibre/ebooks/conversion/utils.py
 lib/calibre/calibre/ebooks/djvu/__init__.py
 lib/calibre/calibre/ebooks/djvu/djvu.py
 lib/calibre/calibre/ebooks/djvu/djvubzzdec.py
+lib/calibre/calibre/ebooks/docx/__init__.py
+lib/calibre/calibre/ebooks/docx/block_styles.py
+lib/calibre/calibre/ebooks/docx/char_styles.py
+lib/calibre/calibre/ebooks/docx/cleanup.py
+lib/calibre/calibre/ebooks/docx/container.py
+lib/calibre/calibre/ebooks/docx/dump.py
+lib/calibre/calibre/ebooks/docx/fields.py
+lib/calibre/calibre/ebooks/docx/fonts.py
+lib/calibre/calibre/ebooks/docx/footnotes.py
+lib/calibre/calibre/ebooks/docx/images.py
+lib/calibre/calibre/ebooks/docx/index.py
+lib/calibre/calibre/ebooks/docx/lcid.py
+lib/calibre/calibre/ebooks/docx/names.py
+lib/calibre/calibre/ebooks/docx/numbering.py
+lib/calibre/calibre/ebooks/docx/settings.py
+lib/calibre/calibre/ebooks/docx/styles.py
+lib/calibre/calibre/ebooks/docx/tables.py
+lib/calibre/calibre/ebooks/docx/theme.py
+lib/calibre/calibre/ebooks/docx/to_html.py
+lib/calibre/calibre/ebooks/docx/toc.py
+lib/calibre/calibre/ebooks/docx/writer/__init__.py
+lib/calibre/calibre/ebooks/docx/writer/container.py
 lib/calibre/calibre/ebooks/epub/__init__.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/epub/pages.py
 lib/calibre/calibre/ebooks/epub/periodical.py
 lib/calibre/calibre/ebooks/fb2/__init__.py
@@ -209,6 +250,7 @@ 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
@@ -223,7 +265,7 @@ lib/calibre/calibre/ebooks/lit/mssha1.py
 lib/calibre/calibre/ebooks/lit/reader.py
 lib/calibre/calibre/ebooks/lit/writer.py
 lib/calibre/calibre/ebooks/lrf/__init__.py
-lib/calibre/calibre/ebooks/lrf/fonts/__init__.py
+lib/calibre/calibre/ebooks/lrf/fonts.py
 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
@@ -243,12 +285,14 @@ lib/calibre/calibre/ebooks/lrf/pylrs/pylrfopt.py
 lib/calibre/calibre/ebooks/lrf/pylrs/pylrs.py
 lib/calibre/calibre/ebooks/lrf/tags.py
 lib/calibre/calibre/ebooks/markdown/__init__.py
+lib/calibre/calibre/ebooks/markdown/__main__.py
+lib/calibre/calibre/ebooks/markdown/__version__.py
 lib/calibre/calibre/ebooks/markdown/blockparser.py
 lib/calibre/calibre/ebooks/markdown/blockprocessors.py
-lib/calibre/calibre/ebooks/markdown/commandline.py
-lib/calibre/calibre/ebooks/markdown/etree_loader.py
 lib/calibre/calibre/ebooks/markdown/extensions/__init__.py
 lib/calibre/calibre/ebooks/markdown/extensions/abbr.py
+lib/calibre/calibre/ebooks/markdown/extensions/admonition.py
+lib/calibre/calibre/ebooks/markdown/extensions/attr_list.py
 lib/calibre/calibre/ebooks/markdown/extensions/codehilite.py
 lib/calibre/calibre/ebooks/markdown/extensions/def_list.py
 lib/calibre/calibre/ebooks/markdown/extensions/extra.py
@@ -256,22 +300,26 @@ lib/calibre/calibre/ebooks/markdown/extensions/fenced_code.py
 lib/calibre/calibre/ebooks/markdown/extensions/footnotes.py
 lib/calibre/calibre/ebooks/markdown/extensions/headerid.py
 lib/calibre/calibre/ebooks/markdown/extensions/meta.py
-lib/calibre/calibre/ebooks/markdown/extensions/rss.py
+lib/calibre/calibre/ebooks/markdown/extensions/nl2br.py
+lib/calibre/calibre/ebooks/markdown/extensions/sane_lists.py
+lib/calibre/calibre/ebooks/markdown/extensions/smart_strong.py
 lib/calibre/calibre/ebooks/markdown/extensions/tables.py
 lib/calibre/calibre/ebooks/markdown/extensions/toc.py
 lib/calibre/calibre/ebooks/markdown/extensions/wikilinks.py
-lib/calibre/calibre/ebooks/markdown/html4.py
 lib/calibre/calibre/ebooks/markdown/inlinepatterns.py
-lib/calibre/calibre/ebooks/markdown/markdown.py
 lib/calibre/calibre/ebooks/markdown/odict.py
 lib/calibre/calibre/ebooks/markdown/postprocessors.py
 lib/calibre/calibre/ebooks/markdown/preprocessors.py
+lib/calibre/calibre/ebooks/markdown/serializers.py
 lib/calibre/calibre/ebooks/markdown/treeprocessors.py
+lib/calibre/calibre/ebooks/markdown/util.py
 lib/calibre/calibre/ebooks/metadata/__init__.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/book/formatter.py
 lib/calibre/calibre/ebooks/metadata/book/json_codec.py
+lib/calibre/calibre/ebooks/metadata/book/render.py
 lib/calibre/calibre/ebooks/metadata/cli.py
 lib/calibre/calibre/ebooks/metadata/docx.py
 lib/calibre/calibre/ebooks/metadata/epub.py
@@ -300,15 +348,19 @@ lib/calibre/calibre/ebooks/metadata/snb.py
 lib/calibre/calibre/ebooks/metadata/sources/__init__.py
 lib/calibre/calibre/ebooks/metadata/sources/amazon.py
 lib/calibre/calibre/ebooks/metadata/sources/base.py
+lib/calibre/calibre/ebooks/metadata/sources/big_book_search.py
 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/identify.py
 lib/calibre/calibre/ebooks/metadata/sources/isbndb.py
 lib/calibre/calibre/ebooks/metadata/sources/openlibrary.py
 lib/calibre/calibre/ebooks/metadata/sources/overdrive.py
 lib/calibre/calibre/ebooks/metadata/sources/ozon.py
+lib/calibre/calibre/ebooks/metadata/sources/prefs.py
 lib/calibre/calibre/ebooks/metadata/sources/test.py
 lib/calibre/calibre/ebooks/metadata/sources/worker.py
 lib/calibre/calibre/ebooks/metadata/toc.py
@@ -316,6 +368,7 @@ lib/calibre/calibre/ebooks/metadata/topaz.py
 lib/calibre/calibre/ebooks/metadata/txt.py
 lib/calibre/calibre/ebooks/metadata/worker.py
 lib/calibre/calibre/ebooks/metadata/xisbn.py
+lib/calibre/calibre/ebooks/metadata/xmp.py
 lib/calibre/calibre/ebooks/metadata/zip.py
 lib/calibre/calibre/ebooks/mobi/__init__.py
 lib/calibre/calibre/ebooks/mobi/debug/__init__.py
@@ -363,11 +416,45 @@ lib/calibre/calibre/ebooks/oeb/iterator/book.py
 lib/calibre/calibre/ebooks/oeb/iterator/bookmarks.py
 lib/calibre/calibre/ebooks/oeb/iterator/extract_fonts.py
 lib/calibre/calibre/ebooks/oeb/iterator/spine.py
+lib/calibre/calibre/ebooks/oeb/normalize_css.py
 lib/calibre/calibre/ebooks/oeb/parse_utils.py
+lib/calibre/calibre/ebooks/oeb/polish/__init__.py
+lib/calibre/calibre/ebooks/oeb/polish/check/__init__.py
+lib/calibre/calibre/ebooks/oeb/polish/check/base.py
+lib/calibre/calibre/ebooks/oeb/polish/check/fonts.py
+lib/calibre/calibre/ebooks/oeb/polish/check/images.py
+lib/calibre/calibre/ebooks/oeb/polish/check/links.py
+lib/calibre/calibre/ebooks/oeb/polish/check/main.py
+lib/calibre/calibre/ebooks/oeb/polish/check/opf.py
+lib/calibre/calibre/ebooks/oeb/polish/check/parsing.py
+lib/calibre/calibre/ebooks/oeb/polish/container.py
+lib/calibre/calibre/ebooks/oeb/polish/cover.py
+lib/calibre/calibre/ebooks/oeb/polish/create.py
+lib/calibre/calibre/ebooks/oeb/polish/css.py
+lib/calibre/calibre/ebooks/oeb/polish/embed.py
+lib/calibre/calibre/ebooks/oeb/polish/errors.py
+lib/calibre/calibre/ebooks/oeb/polish/import_book.py
+lib/calibre/calibre/ebooks/oeb/polish/jacket.py
+lib/calibre/calibre/ebooks/oeb/polish/main.py
+lib/calibre/calibre/ebooks/oeb/polish/opf.py
+lib/calibre/calibre/ebooks/oeb/polish/parsing.py
+lib/calibre/calibre/ebooks/oeb/polish/pretty.py
+lib/calibre/calibre/ebooks/oeb/polish/replace.py
+lib/calibre/calibre/ebooks/oeb/polish/split.py
+lib/calibre/calibre/ebooks/oeb/polish/stats.py
+lib/calibre/calibre/ebooks/oeb/polish/subset.py
+lib/calibre/calibre/ebooks/oeb/polish/tests/__init__.py
+lib/calibre/calibre/ebooks/oeb/polish/tests/base.py
+lib/calibre/calibre/ebooks/oeb/polish/tests/container.py
+lib/calibre/calibre/ebooks/oeb/polish/tests/main.py
+lib/calibre/calibre/ebooks/oeb/polish/tests/parsing.py
+lib/calibre/calibre/ebooks/oeb/polish/toc.py
+lib/calibre/calibre/ebooks/oeb/polish/utils.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/embed_fonts.py
 lib/calibre/calibre/ebooks/oeb/transforms/filenames.py
 lib/calibre/calibre/ebooks/oeb/transforms/flatcss.py
 lib/calibre/calibre/ebooks/oeb/transforms/guide.py
@@ -413,6 +500,17 @@ lib/calibre/calibre/ebooks/pdf/outline_writer.py
 lib/calibre/calibre/ebooks/pdf/pageoptions.py
 lib/calibre/calibre/ebooks/pdf/pdftohtml.py
 lib/calibre/calibre/ebooks/pdf/reflow.py
+lib/calibre/calibre/ebooks/pdf/render/__init__.py
+lib/calibre/calibre/ebooks/pdf/render/common.py
+lib/calibre/calibre/ebooks/pdf/render/engine.py
+lib/calibre/calibre/ebooks/pdf/render/fonts.py
+lib/calibre/calibre/ebooks/pdf/render/from_html.py
+lib/calibre/calibre/ebooks/pdf/render/gradients.py
+lib/calibre/calibre/ebooks/pdf/render/graphics.py
+lib/calibre/calibre/ebooks/pdf/render/links.py
+lib/calibre/calibre/ebooks/pdf/render/serialize.py
+lib/calibre/calibre/ebooks/pdf/render/test.py
+lib/calibre/calibre/ebooks/pdf/render/toc.py
 lib/calibre/calibre/ebooks/pdf/writer.py
 lib/calibre/calibre/ebooks/pml/__init__.py
 lib/calibre/calibre/ebooks/pml/pmlconverter.py
@@ -525,9 +623,12 @@ lib/calibre/calibre/gui2/actions/edit_collections.py
 lib/calibre/calibre/gui2/actions/edit_metadata.py
 lib/calibre/calibre/gui2/actions/fetch_news.py
 lib/calibre/calibre/gui2/actions/help.py
+lib/calibre/calibre/gui2/actions/mark_books.py
+lib/calibre/calibre/gui2/actions/match_books.py
 lib/calibre/calibre/gui2/actions/next_match.py
 lib/calibre/calibre/gui2/actions/open.py
 lib/calibre/calibre/gui2/actions/plugin_updates.py
+lib/calibre/calibre/gui2/actions/polish.py
 lib/calibre/calibre/gui2/actions/preferences.py
 lib/calibre/calibre/gui2/actions/random.py
 lib/calibre/calibre/gui2/actions/restart.py
@@ -535,8 +636,11 @@ lib/calibre/calibre/gui2/actions/save_to_disk.py
 lib/calibre/calibre/gui2/actions/show_book_details.py
 lib/calibre/calibre/gui2/actions/show_quickview.py
 lib/calibre/calibre/gui2/actions/similar_books.py
+lib/calibre/calibre/gui2/actions/sort.py
 lib/calibre/calibre/gui2/actions/store.py
+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_wizard/__init__.py
@@ -564,8 +668,9 @@ 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/debug_ui.py
-lib/calibre/calibre/gui2/convert/djvu_input.py
 lib/calibre/calibre/gui2/convert/djvu_input_ui.py
+lib/calibre/calibre/gui2/convert/docx_input.py
+lib/calibre/calibre/gui2/convert/docx_input_ui.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
@@ -601,6 +706,8 @@ 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/regex_builder_ui.py
+lib/calibre/calibre/gui2/convert/rtf_input.py
+lib/calibre/calibre/gui2/convert/rtf_input_ui.py
 lib/calibre/calibre/gui2/convert/search_and_replace.py
 lib/calibre/calibre/gui2/convert/search_and_replace_ui.py
 lib/calibre/calibre/gui2/convert/single.py
@@ -631,8 +738,8 @@ 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/add_from_isbn_ui.py
+lib/calibre/calibre/gui2/dialogs/authors_edit.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/check_library.py
@@ -659,10 +766,13 @@ lib/calibre/calibre/gui2/dialogs/device_category_editor.py
 lib/calibre/calibre/gui2/dialogs/device_category_editor_ui.py
 lib/calibre/calibre/gui2/dialogs/drm_error.py
 lib/calibre/calibre/gui2/dialogs/drm_error_ui.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/job_view_ui.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/message_box.py
 lib/calibre/calibre/gui2/dialogs/message_box_ui.py
 lib/calibre/calibre/gui2/dialogs/metadata_bulk.py
@@ -695,20 +805,23 @@ lib/calibre/calibre/gui2/dialogs/template_dialog.py
 lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py
 lib/calibre/calibre/gui2/dialogs/template_line_editor.py
 lib/calibre/calibre/gui2/dialogs/test_email_ui.py
+lib/calibre/calibre/gui2/dialogs/trim_image.py
 lib/calibre/calibre/gui2/dialogs/user_profiles.py
 lib/calibre/calibre/gui2/dialogs/user_profiles_ui.py
 lib/calibre/calibre/gui2/dnd.py
-lib/calibre/calibre/gui2/duplicates.py
 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/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/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
@@ -725,6 +838,8 @@ 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/notify.py
@@ -770,6 +885,7 @@ lib/calibre/calibre/gui2/preferences/server.py
 lib/calibre/calibre/gui2/preferences/server_ui.py
 lib/calibre/calibre/gui2/preferences/template_functions.py
 lib/calibre/calibre/gui2/preferences/template_functions_ui.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/tweaks.py
@@ -796,6 +912,7 @@ 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/store.py
+lib/calibre/calibre/gui2/store/loader.py
 lib/calibre/calibre/gui2/store/opensearch_store.py
 lib/calibre/calibre/gui2/store/search/__init__.py
 lib/calibre/calibre/gui2/store/search/adv_search_builder.py
@@ -807,6 +924,8 @@ 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/stores/__init__.py
+lib/calibre/calibre/gui2/store/stores/allegro_plugin.py
+lib/calibre/calibre/gui2/store/stores/amazon_ca_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_de_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_es_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py
@@ -815,26 +934,23 @@ lib/calibre/calibre/gui2/store/stores/amazon_plugin.py
 lib/calibre/calibre/gui2/store/stores/amazon_uk_plugin.py
 lib/calibre/calibre/gui2/store/stores/archive_org_plugin.py
 lib/calibre/calibre/gui2/store/stores/baen_webscription_plugin.py
-lib/calibre/calibre/gui2/store/stores/bewrite_plugin.py
+lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
 lib/calibre/calibre/gui2/store/stores/biblio_plugin.py
 lib/calibre/calibre/gui2/store/stores/bn_plugin.py
-lib/calibre/calibre/gui2/store/stores/bookoteka_plugin.py
+lib/calibre/calibre/gui2/store/stores/cdp_plugin.py
 lib/calibre/calibre/gui2/store/stores/chitanka_plugin.py
-lib/calibre/calibre/gui2/store/stores/diesel_ebooks_plugin.py
 lib/calibre/calibre/gui2/store/stores/ebook_nl_plugin.py
 lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py
 lib/calibre/calibre/gui2/store/stores/ebooks_com_plugin.py
 lib/calibre/calibre/gui2/store/stores/ebooksgratuits_plugin.py
 lib/calibre/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py
-lib/calibre/calibre/gui2/store/stores/eharlequin_plugin.py
 lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py
 lib/calibre/calibre/gui2/store/stores/empik_plugin.py
-lib/calibre/calibre/gui2/store/stores/escapemagazine_plugin.py
 lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py
-lib/calibre/calibre/gui2/store/stores/foyles_uk_plugin.py
 lib/calibre/calibre/gui2/store/stores/google_books_plugin.py
 lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py
 lib/calibre/calibre/gui2/store/stores/kobo_plugin.py
+lib/calibre/calibre/gui2/store/stores/koobe_plugin.py
 lib/calibre/calibre/gui2/store/stores/legimi_plugin.py
 lib/calibre/calibre/gui2/store/stores/libri_de_plugin.py
 lib/calibre/calibre/gui2/store/stores/litres_plugin.py
@@ -851,20 +967,22 @@ 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/nexto_plugin.py
+lib/calibre/calibre/gui2/store/stores/nook_uk_plugin.py
 lib/calibre/calibre/gui2/store/stores/open_books_plugin.py
 lib/calibre/calibre/gui2/store/stores/ozon_ru_plugin.py
 lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py
 lib/calibre/calibre/gui2/store/stores/publio_plugin.py
 lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py
 lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py
+lib/calibre/calibre/gui2/store/stores/sony_au_plugin.py
 lib/calibre/calibre/gui2/store/stores/sony_plugin.py
 lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py
 lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py
 lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py
 lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugin.py
 lib/calibre/calibre/gui2/store/stores/woblink_plugin.py
+lib/calibre/calibre/gui2/store/stores/wolnelektury_plugin.py
 lib/calibre/calibre/gui2/store/stores/xinxii_plugin.py
-lib/calibre/calibre/gui2/store/stores/zixo_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
@@ -874,7 +992,43 @@ lib/calibre/calibre/gui2/tag_browser/ui.py
 lib/calibre/calibre/gui2/tag_browser/view.py
 lib/calibre/calibre/gui2/threaded_jobs.py
 lib/calibre/calibre/gui2/throbber.py
+lib/calibre/calibre/gui2/toc/__init__.py
+lib/calibre/calibre/gui2/toc/location.py
+lib/calibre/calibre/gui2/toc/main.py
 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/diff/__init__.py
+lib/calibre/calibre/gui2/tweak_book/diff/highlight.py
+lib/calibre/calibre/gui2/tweak_book/diff/main.py
+lib/calibre/calibre/gui2/tweak_book/diff/view.py
+lib/calibre/calibre/gui2/tweak_book/editor/__init__.py
+lib/calibre/calibre/gui2/tweak_book/editor/canvas.py
+lib/calibre/calibre/gui2/tweak_book/editor/image.py
+lib/calibre/calibre/gui2/tweak_book/editor/insert_resource.py
+lib/calibre/calibre/gui2/tweak_book/editor/smart/__init__.py
+lib/calibre/calibre/gui2/tweak_book/editor/smart/html.py
+lib/calibre/calibre/gui2/tweak_book/editor/syntax/__init__.py
+lib/calibre/calibre/gui2/tweak_book/editor/syntax/base.py
+lib/calibre/calibre/gui2/tweak_book/editor/syntax/css.py
+lib/calibre/calibre/gui2/tweak_book/editor/syntax/html.py
+lib/calibre/calibre/gui2/tweak_book/editor/text.py
+lib/calibre/calibre/gui2/tweak_book/editor/themes.py
+lib/calibre/calibre/gui2/tweak_book/editor/widget.py
+lib/calibre/calibre/gui2/tweak_book/file_list.py
+lib/calibre/calibre/gui2/tweak_book/job.py
+lib/calibre/calibre/gui2/tweak_book/main.py
+lib/calibre/calibre/gui2/tweak_book/preferences.py
+lib/calibre/calibre/gui2/tweak_book/preview.py
+lib/calibre/calibre/gui2/tweak_book/save.py
+lib/calibre/calibre/gui2/tweak_book/search.py
+lib/calibre/calibre/gui2/tweak_book/templates.py
+lib/calibre/calibre/gui2/tweak_book/toc.py
+lib/calibre/calibre/gui2/tweak_book/ui.py
+lib/calibre/calibre/gui2/tweak_book/undo.py
+lib/calibre/calibre/gui2/tweak_book/widgets.py
 lib/calibre/calibre/gui2/ui.py
 lib/calibre/calibre/gui2/update.py
 lib/calibre/calibre/gui2/viewer/__init__.py
@@ -885,7 +1039,9 @@ 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/flip.py
+lib/calibre/calibre/gui2/viewer/gestures.py
 lib/calibre/calibre/gui2/viewer/image_popup.py
+lib/calibre/calibre/gui2/viewer/inspector.py
 lib/calibre/calibre/gui2/viewer/javascript.py
 lib/calibre/calibre/gui2/viewer/keys.py
 lib/calibre/calibre/gui2/viewer/main.py
@@ -895,6 +1051,7 @@ lib/calibre/calibre/gui2/viewer/printing.py
 lib/calibre/calibre/gui2/viewer/table_popup.py
 lib/calibre/calibre/gui2/viewer/toc.py
 lib/calibre/calibre/gui2/widgets.py
+lib/calibre/calibre/gui2/widgets2.py
 lib/calibre/calibre/gui2/wizard/__init__.py
 lib/calibre/calibre/gui2/wizard/device_ui.py
 lib/calibre/calibre/gui2/wizard/finish_ui.py
@@ -938,35 +1095,41 @@ 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
 lib/calibre/calibre/libunzip.py
 lib/calibre/calibre/libwand.py
 lib/calibre/calibre/linux.py
+lib/calibre/calibre/plugins/_patiencediff_c.so
+lib/calibre/calibre/plugins/_regex.so
+lib/calibre/calibre/plugins/bzzdec.so
 lib/calibre/calibre/plugins/cPalmdoc.so
 lib/calibre/calibre/plugins/calibre_style.so
 lib/calibre/calibre/plugins/chm_extra.so
 lib/calibre/calibre/plugins/chmlib.so
 lib/calibre/calibre/plugins/freetype.so
+lib/calibre/calibre/plugins/hunspell.so
 lib/calibre/calibre/plugins/icu.so
 lib/calibre/calibre/plugins/lzx.so
 lib/calibre/calibre/plugins/magick.so
+lib/calibre/calibre/plugins/matcher.so
 lib/calibre/calibre/plugins/msdes.so
 lib/calibre/calibre/plugins/pictureflow.so
 lib/calibre/calibre/plugins/podofo.so
 lib/calibre/calibre/plugins/progress_indicator.so
+lib/calibre/calibre/plugins/qt_hack.so
 lib/calibre/calibre/plugins/speedup.so
 lib/calibre/calibre/plugins/sqlite_custom.so
+lib/calibre/calibre/plugins/unrar.so
 lib/calibre/calibre/plugins/woff.so
 lib/calibre/calibre/ptempfile.py
+lib/calibre/calibre/rpdb.py
 lib/calibre/calibre/startup.py
 lib/calibre/calibre/test_build.py
-lib/calibre/calibre/trac/__init__.py
-lib/calibre/calibre/trac/bzr_commit_plugin.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
 lib/calibre/calibre/utils/browser.py
 lib/calibre/calibre/utils/chm/__init__.py
@@ -978,6 +1141,7 @@ lib/calibre/calibre/utils/config.py
 lib/calibre/calibre/utils/config_base.py
 lib/calibre/calibre/utils/date.py
 lib/calibre/calibre/utils/dictclient.py
+lib/calibre/calibre/utils/file_associations.py
 lib/calibre/calibre/utils/filenames.py
 lib/calibre/calibre/utils/fonts/__init__.py
 lib/calibre/calibre/utils/fonts/free_type.py
@@ -999,6 +1163,7 @@ lib/calibre/calibre/utils/fonts/sfnt/head.py
 lib/calibre/calibre/utils/fonts/sfnt/kern.py
 lib/calibre/calibre/utils/fonts/sfnt/loca.py
 lib/calibre/calibre/utils/fonts/sfnt/maxp.py
+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
@@ -1006,8 +1171,10 @@ lib/calibre/calibre/utils/fonts/woff/__init__.py
 lib/calibre/calibre/utils/formatter.py
 lib/calibre/calibre/utils/formatter_functions.py
 lib/calibre/calibre/utils/html2text.py
-lib/calibre/calibre/utils/html5_entities.py
+lib/calibre/calibre/utils/https.py
 lib/calibre/calibre/utils/icu.py
+lib/calibre/calibre/utils/icu_test.py
+lib/calibre/calibre/utils/imghdr.py
 lib/calibre/calibre/utils/ipc/__init__.py
 lib/calibre/calibre/utils/ipc/job.py
 lib/calibre/calibre/utils/ipc/launch.py
@@ -1024,8 +1191,10 @@ lib/calibre/calibre/utils/logging.py
 lib/calibre/calibre/utils/magick/__init__.py
 lib/calibre/calibre/utils/magick/draw.py
 lib/calibre/calibre/utils/magick/generate.py
+lib/calibre/calibre/utils/matcher.py
 lib/calibre/calibre/utils/mdns.py
 lib/calibre/calibre/utils/mem.py
+lib/calibre/calibre/utils/monotonic.py
 lib/calibre/calibre/utils/mreplace.py
 lib/calibre/calibre/utils/network.py
 lib/calibre/calibre/utils/opensearch/__init__.py
@@ -1050,30 +1219,34 @@ lib/calibre/calibre/utils/rss_gen.py
 lib/calibre/calibre/utils/search_query_parser.py
 lib/calibre/calibre/utils/serve_coffee.py
 lib/calibre/calibre/utils/sftp.py
-lib/calibre/calibre/utils/sigil.py
 lib/calibre/calibre/utils/smartypants.py
 lib/calibre/calibre/utils/smtp.py
 lib/calibre/calibre/utils/smtplib.py
+lib/calibre/calibre/utils/socket_inheritance.py
 lib/calibre/calibre/utils/soupparser.py
+lib/calibre/calibre/utils/spell/__init__.py
 lib/calibre/calibre/utils/terminal.py
 lib/calibre/calibre/utils/text2int.py
 lib/calibre/calibre/utils/threadpool.py
 lib/calibre/calibre/utils/titlecase.py
+lib/calibre/calibre/utils/unrar.py
 lib/calibre/calibre/utils/unsmarten.py
-lib/calibre/calibre/utils/winshell.py
 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/zipfile.py
 lib/calibre/calibre/web/__init__.py
 lib/calibre/calibre/web/feeds/__init__.py
 lib/calibre/calibre/web/feeds/feedparser.py
+lib/calibre/calibre/web/feeds/jsnews.py
 lib/calibre/calibre/web/feeds/news.py
 lib/calibre/calibre/web/feeds/recipes/__init__.py
 lib/calibre/calibre/web/feeds/recipes/collection.py
 lib/calibre/calibre/web/feeds/recipes/model.py
 lib/calibre/calibre/web/feeds/templates.py
 lib/calibre/calibre/web/fetch/__init__.py
+lib/calibre/calibre/web/fetch/javascript.py
 lib/calibre/calibre/web/fetch/simple.py
 lib/calibre/calibre/web/jsbrowser/__init__.py
 lib/calibre/calibre/web/jsbrowser/browser.py
@@ -1115,6 +1288,8 @@ lib/calibre/odf/thumbnail.py
 lib/calibre/odf/userfield.py
 lib/calibre/odf/xforms.py
 lib/calibre/qtcurve/test_rendering.py
+lib/calibre/regex/__init__.py
+lib/calibre/regex/_regex_core.py
 lib/calibre/routes/__init__.py
 lib/calibre/routes/base.py
 lib/calibre/routes/lru.py
@@ -1122,14 +1297,18 @@ lib/calibre/routes/mapper.py
 lib/calibre/routes/middleware.py
 lib/calibre/routes/route.py
 lib/calibre/routes/util.py
+lib/calibre/six.py
 lib/calibre/templite/__init__.py
 ${PYSITELIB}/init_calibre.py
+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.d/calibre
 share/calibre/builtin_recipes.xml
 share/calibre/builtin_recipes.zip
+share/calibre/calibre-ebook-root-CA.crt
+share/calibre/calibre-mimetypes.xml
 share/calibre/calibre-portable.bat
 share/calibre/calibre-portable.sh
 share/calibre/catalog/DefaultCover.jpg
@@ -1201,22 +1380,23 @@ share/calibre/fonts/liberation/LiberationSerif-Bold.ttf
 share/calibre/fonts/liberation/LiberationSerif-BoldItalic.ttf
 share/calibre/fonts/liberation/LiberationSerif-Italic.ttf
 share/calibre/fonts/liberation/LiberationSerif-Regular.ttf
-share/calibre/fonts/prs500/tt0003m_.ttf
-share/calibre/fonts/prs500/tt0011m_.ttf
-share/calibre/fonts/prs500/tt0419m_.ttf
 share/calibre/images.qrc
 share/calibre/images/add_book.png
 share/calibre/images/arrow-down.png
 share/calibre/images/arrow-up.png
+share/calibre/images/auto-reload.png
 share/calibre/images/auto_author_sort.png
 share/calibre/images/back.png
+share/calibre/images/beautify.png
 share/calibre/images/blank.png
 share/calibre/images/book.png
 share/calibre/images/bookmarks.png
 share/calibre/images/books_in_series.png
 share/calibre/images/catalog.png
 share/calibre/images/chapters.png
+share/calibre/images/character-set.png
 share/calibre/images/clear_left.png
+share/calibre/images/code.png
 share/calibre/images/column.png
 share/calibre/images/config.png
 share/calibre/images/connect_share.png
@@ -1241,7 +1421,9 @@ share/calibre/images/dialog_information.png
 share/calibre/images/dialog_question.png
 share/calibre/images/dialog_warning.png
 share/calibre/images/dictionary.png
+share/calibre/images/diff.png
 share/calibre/images/document-encrypt.png
+share/calibre/images/document-new.png
 share/calibre/images/document_open.png
 share/calibre/images/donate.png
 share/calibre/images/dot_green.png
@@ -1258,7 +1440,9 @@ share/calibre/images/edit-select-all.png
 share/calibre/images/edit-undo.png
 share/calibre/images/edit_input.png
 share/calibre/images/eject.png
+share/calibre/images/embed-fonts.png
 share/calibre/images/exec.png
+share/calibre/images/filter.png
 share/calibre/images/font.png
 share/calibre/images/font_size_larger.png
 share/calibre/images/font_size_smaller.png
@@ -1281,11 +1465,14 @@ share/calibre/images/format-text-superscript.png
 share/calibre/images/format-text-underline.png
 share/calibre/images/forward.png
 share/calibre/images/gmail_logo.png
+share/calibre/images/grid.png
 share/calibre/images/help.png
 share/calibre/images/heuristics.png
 share/calibre/images/highlight_only_off.png
 share/calibre/images/highlight_only_on.png
 share/calibre/images/hotmail.png
+share/calibre/images/html-fix.png
+share/calibre/images/icon_choose.png
 share/calibre/images/identifiers.png
 share/calibre/images/insert-link.png
 share/calibre/images/jobs.png
@@ -1296,11 +1483,15 @@ share/calibre/images/list_remove.png
 share/calibre/images/lookfeel.png
 share/calibre/images/lt.png
 share/calibre/images/mail.png
+share/calibre/images/marked.png
+share/calibre/images/merge.png
 share/calibre/images/merge_books.png
 share/calibre/images/metadata.png
 share/calibre/images/mimetypes/azw2.png
 share/calibre/images/mimetypes/azw3.png
 share/calibre/images/mimetypes/bmp.png
+share/calibre/images/mimetypes/cbr.png
+share/calibre/images/mimetypes/cbz.png
 share/calibre/images/mimetypes/computer.png
 share/calibre/images/mimetypes/dir.png
 share/calibre/images/mimetypes/djvu.png
@@ -1329,6 +1520,7 @@ share/calibre/images/mimetypes/zero.png
 share/calibre/images/mimetypes/zip.png
 share/calibre/images/minus.png
 share/calibre/images/minusminus.png
+share/calibre/images/modified.png
 share/calibre/images/network-server.png
 share/calibre/images/news.png
 share/calibre/images/next.png
@@ -1352,6 +1544,7 @@ share/calibre/images/plugins/plugin_upgrade_ok.png
 share/calibre/images/plugins/plugin_upgrade_valid.png
 share/calibre/images/plus.png
 share/calibre/images/plusplus.png
+share/calibre/images/polish.png
 share/calibre/images/previous.png
 share/calibre/images/print-preview.png
 share/calibre/images/print.png
@@ -1359,6 +1552,7 @@ share/calibre/images/publisher.png
 share/calibre/images/random.png
 share/calibre/images/rating.png
 share/calibre/images/reader.png
+share/calibre/images/resize.png
 share/calibre/images/rotate-right.png
 share/calibre/images/save.png
 share/calibre/images/scheduler.png
@@ -1369,16 +1563,28 @@ share/calibre/images/search_add_saved.png
 share/calibre/images/search_copy_saved.png
 share/calibre/images/search_delete_saved.png
 share/calibre/images/series.png
+share/calibre/images/smarten-punctuation.png
 share/calibre/images/store.png
+share/calibre/images/subset-fonts.png
 share/calibre/images/swap.png
+share/calibre/images/sync-right.png
 share/calibre/images/sync.png
 share/calibre/images/tags.png
 share/calibre/images/tb_folder.png
 share/calibre/images/template_funcs.png
+share/calibre/images/textures/dark_cloth.png
+share/calibre/images/textures/dark_wood.png
+share/calibre/images/textures/grey_wash_wall.png
+share/calibre/images/textures/light_wood.png
+share/calibre/images/textures/subtle_wood.png
+share/calibre/images/toc.png
 share/calibre/images/trash.png
 share/calibre/images/trim.png
+share/calibre/images/tweak.png
+share/calibre/images/unpack-book.png
 share/calibre/images/user_profile.png
 share/calibre/images/view-image.png
+share/calibre/images/view-refresh.png
 share/calibre/images/view.png
 share/calibre/images/viewer.png
 share/calibre/images/welcome_wizard.png
@@ -1387,6 +1593,7 @@ share/calibre/images/wizard.png
 share/calibre/jacket/stylesheet.css
 share/calibre/jacket/template.xhtml
 share/calibre/jquery.simulate.js
+share/calibre/localization/iso3166.pickle
 share/calibre/localization/iso639.pickle
 share/calibre/localization/locales.zip
 share/calibre/localization/pykakasi/itaijidict2.pickle
@@ -1396,6 +1603,7 @@ share/calibre/localization/stats.pickle
 share/calibre/metadata_sqlite.sql
 share/calibre/mime.types
 share/calibre/quick_start.epub
+share/calibre/recipes/10minutos.recipe
 share/calibre/recipes/180.recipe
 share/calibre/recipes/20_minutos.recipe
 share/calibre/recipes/20minutes.recipe
@@ -1414,6 +1622,7 @@ share/calibre/recipes/abc_es.recipe
 share/calibre/recipes/abc_py.recipe
 share/calibre/recipes/accountancyage.recipe
 share/calibre/recipes/acim_bilim_dergisi.recipe
+share/calibre/recipes/acrimed.recipe
 share/calibre/recipes/ad.recipe
 share/calibre/recipes/adevarul.recipe
 share/calibre/recipes/adnkronos.recipe
@@ -1434,9 +1643,11 @@ share/calibre/recipes/al_ahram.recipe
 share/calibre/recipes/al_jazeera.recipe
 share/calibre/recipes/al_masry_al_youm.recipe
 share/calibre/recipes/albert_mohler.recipe
+share/calibre/recipes/alejakomiksu_com.recipe
 share/calibre/recipes/alo_novine.recipe
 share/calibre/recipes/alt_om_herning.recipe
 share/calibre/recipes/alternet.recipe
+share/calibre/recipes/am730.recipe
 share/calibre/recipes/ambito.recipe
 share/calibre/recipes/ambito_financiero.recipe
 share/calibre/recipes/american_thinker.recipe
@@ -1450,7 +1661,9 @@ share/calibre/recipes/antyweb.recipe
 share/calibre/recipes/ap.recipe
 share/calibre/recipes/apcom.recipe
 share/calibre/recipes/apod.recipe
+share/calibre/recipes/app_funds.recipe
 share/calibre/recipes/apple_daily.recipe
+share/calibre/recipes/applefobia.recipe
 share/calibre/recipes/aprospect.recipe
 share/calibre/recipes/ara_info.recipe
 share/calibre/recipes/arabian_business.recipe
@@ -1458,12 +1671,16 @@ share/calibre/recipes/arbetaren.recipe
 share/calibre/recipes/arcadia.recipe
 share/calibre/recipes/arcamax.recipe
 share/calibre/recipes/archeowiesci.recipe
+share/calibre/recipes/argnoticias.recipe
 share/calibre/recipes/arizona_republic.recipe
 share/calibre/recipes/army_times.recipe
+share/calibre/recipes/arret_sur_images.recipe
 share/calibre/recipes/ars_technica.recipe
+share/calibre/recipes/asco_de_vida.recipe
 share/calibre/recipes/asia_one.recipe
 share/calibre/recipes/asianreviewofbooks.recipe
 share/calibre/recipes/astro_news_pl.recipe
+share/calibre/recipes/astroflesz.recipe
 share/calibre/recipes/astronomia_pl.recipe
 share/calibre/recipes/athens_news.recipe
 share/calibre/recipes/atlantic.recipe
@@ -1484,6 +1701,8 @@ share/calibre/recipes/b365realitatea.recipe
 share/calibre/recipes/b92.recipe
 share/calibre/recipes/ba_herald.recipe
 share/calibre/recipes/babyonline.recipe
+share/calibre/recipes/bachormagazyn.recipe
+share/calibre/recipes/badania_net.recipe
 share/calibre/recipes/balkaninsight.recipe
 share/calibre/recipes/baltimore_sun.recipe
 share/calibre/recipes/banat_news.recipe
@@ -1518,11 +1737,15 @@ share/calibre/recipes/bild_de.recipe
 share/calibre/recipes/billorielly.recipe
 share/calibre/recipes/biolog_pl.recipe
 share/calibre/recipes/birgun_gazetesi.recipe
+share/calibre/recipes/birmingham_evening_mail.recipe
 share/calibre/recipes/birmingham_post.recipe
 share/calibre/recipes/bitacora.recipe
+share/calibre/recipes/biweekly.recipe
 share/calibre/recipes/biz_portal.recipe
 share/calibre/recipes/blesk.recipe
 share/calibre/recipes/blic.recipe
+share/calibre/recipes/blind_buch_de.recipe
+share/calibre/recipes/blog_biszopa.recipe
 share/calibre/recipes/blog_da_cidadania.recipe
 share/calibre/recipes/blognexto.recipe
 share/calibre/recipes/blues.recipe
@@ -1547,6 +1770,7 @@ share/calibre/recipes/businessworldin.recipe
 share/calibre/recipes/bwmagazine.recipe
 share/calibre/recipes/bwmagazine2.recipe
 share/calibre/recipes/cacm.recipe
+share/calibre/recipes/cafcaf_dergisi.recipe
 share/calibre/recipes/caijing.recipe
 share/calibre/recipes/calcalist.recipe
 share/calibre/recipes/calgary_herald.recipe
@@ -1557,6 +1781,7 @@ share/calibre/recipes/capes_n_babes.recipe
 share/calibre/recipes/capital.recipe
 share/calibre/recipes/capital_de.recipe
 share/calibre/recipes/capital_gr.recipe
+share/calibre/recipes/caravan_magazine.recipe
 share/calibre/recipes/caros_amigos.recipe
 share/calibre/recipes/carta.recipe
 share/calibre/recipes/carta_capital.recipe
@@ -1568,6 +1793,7 @@ share/calibre/recipes/cato.recipe
 share/calibre/recipes/cbc_canada.recipe
 share/calibre/recipes/cbn.recipe
 share/calibre/recipes/cd_action.recipe
+share/calibre/recipes/cdrinfo_pl.recipe
 share/calibre/recipes/ceska_pozice.recipe
 share/calibre/recipes/ceske_noviny.recipe
 share/calibre/recipes/cesky_rozhlas_6.recipe
@@ -1608,14 +1834,16 @@ share/calibre/recipes/cnetjapan_release.recipe
 share/calibre/recipes/cnetnews.recipe
 share/calibre/recipes/cnn.recipe
 share/calibre/recipes/coding_horror.recipe
+share/calibre/recipes/colta.recipe
 share/calibre/recipes/columbusdispatch.recipe
-share/calibre/recipes/comics_com.recipe
 share/calibre/recipes/common_dreams.recipe
 share/calibre/recipes/computer_active.recipe
+share/calibre/recipes/computer_woche.recipe
 share/calibre/recipes/computerworld_pl.recipe
 share/calibre/recipes/conowego_pl.recipe
 share/calibre/recipes/consortium_news.recipe
 share/calibre/recipes/consumerist.recipe
+share/calibre/recipes/contemporary_argentine_writers.recipe
 share/calibre/recipes/corren2.recipe
 share/calibre/recipes/corriere_della_sera_en.recipe
 share/calibre/recipes/corriere_della_sera_it.recipe
@@ -1640,7 +1868,9 @@ share/calibre/recipes/cvecezla.recipe
 share/calibre/recipes/cyberpresse.recipe
 share/calibre/recipes/cynewslive.recipe
 share/calibre/recipes/cyprus_weekly.recipe
+share/calibre/recipes/czas_gentlemanow.recipe
 share/calibre/recipes/dagens_industri.recipe
+share/calibre/recipes/daily_express.recipe
 share/calibre/recipes/daily_mail.recipe
 share/calibre/recipes/daily_mirror.recipe
 share/calibre/recipes/daily_telegraph.recipe
@@ -1659,11 +1889,14 @@ share/calibre/recipes/daytona_beach.recipe
 share/calibre/recipes/dbb.recipe
 share/calibre/recipes/de_standaard.recipe
 share/calibre/recipes/deadspin.recipe
+share/calibre/recipes/deccan_herald.recipe
 share/calibre/recipes/defensenews.recipe
 share/calibre/recipes/degentenaar.recipe
 share/calibre/recipes/deia.recipe
 share/calibre/recipes/delco_times.recipe
 share/calibre/recipes/demagog.cz.recipe
+share/calibre/recipes/democracy_journal.recipe
+share/calibre/recipes/democracy_now.recipe
 share/calibre/recipes/demorgen_be.recipe
 share/calibre/recipes/den_of_geek.recipe
 share/calibre/recipes/denik.cz.recipe
@@ -1689,8 +1922,12 @@ share/calibre/recipes/di.recipe
 share/calibre/recipes/diagonal.recipe
 share/calibre/recipes/diagonales.recipe
 share/calibre/recipes/diario_cordoba.recipe
+share/calibre/recipes/diario_de_noticias.recipe
+share/calibre/recipes/diario_el_pueblo.recipe
+share/calibre/recipes/diario_extra.recipe
 share/calibre/recipes/diario_ibiza.recipe
 share/calibre/recipes/diario_la_republica.recipe
+share/calibre/recipes/diario_salto.recipe
 share/calibre/recipes/diario_sport.recipe
 share/calibre/recipes/diariovasco.recipe
 share/calibre/recipes/diepresse.recipe
@@ -1700,7 +1937,9 @@ share/calibre/recipes/digitalspy_uk.recipe
 share/calibre/recipes/digizone.recipe
 share/calibre/recipes/dilbert.recipe
 share/calibre/recipes/dilemaveche.recipe
+share/calibre/recipes/dingoo_a320.recipe
 share/calibre/recipes/discover_magazine.recipe
+share/calibre/recipes/disinformatico.recipe
 share/calibre/recipes/divahair.recipe
 share/calibre/recipes/dn_se.recipe
 share/calibre/recipes/dna.recipe
@@ -1708,6 +1947,7 @@ share/calibre/recipes/dnevni_avaz.recipe
 share/calibre/recipes/dnevnik.recipe
 share/calibre/recipes/dnevnik_cro.recipe
 share/calibre/recipes/dnevnik_mk.recipe
+share/calibre/recipes/dobanevinosti.recipe
 share/calibre/recipes/dobreprogamy.recipe
 share/calibre/recipes/doghousediaries.recipe
 share/calibre/recipes/dominion.recipe
@@ -1721,18 +1961,29 @@ share/calibre/recipes/drytooling_pl.recipe
 share/calibre/recipes/dunya_bizim.recipe
 share/calibre/recipes/dunya_bulteni.recipe
 share/calibre/recipes/dvhn.recipe
+share/calibre/recipes/dwutygodnik.recipe
+share/calibre/recipes/dzial_zagraniczny.recipe
 share/calibre/recipes/dzieje_pl.recipe
+share/calibre/recipes/dziennik_baltycki.recipe
+share/calibre/recipes/dziennik_lodzki.recipe
 share/calibre/recipes/dziennik_pl.recipe
 share/calibre/recipes/dziennik_polski.recipe
+share/calibre/recipes/dziennik_wschodni.recipe
+share/calibre/recipes/dziennik_zachodni.recipe
 share/calibre/recipes/e_novine.recipe
+share/calibre/recipes/echo_dnia.recipe
+share/calibre/recipes/echo_moskvy.recipe
 share/calibre/recipes/echo_online.recipe
 share/calibre/recipes/eclicto.recipe
+share/calibre/recipes/eclipseonline.recipe
 share/calibre/recipes/ecogeek.recipe
+share/calibre/recipes/economia.recipe
 share/calibre/recipes/economico.recipe
 share/calibre/recipes/economist.recipe
 share/calibre/recipes/economist_free.recipe
 share/calibre/recipes/ecotrend.recipe
 share/calibre/recipes/ecuisine.recipe
+share/calibre/recipes/edebistan.recipe
 share/calibre/recipes/edge_conversations.recipe
 share/calibre/recipes/editor_and_publisher.recipe
 share/calibre/recipes/editoriali.recipe
@@ -1741,14 +1992,17 @@ share/calibre/recipes/egirl.recipe
 share/calibre/recipes/eioba.recipe
 share/calibre/recipes/ekantipur.recipe
 share/calibre/recipes/ekathemerini.recipe
+share/calibre/recipes/ekologia_pl.recipe
 share/calibre/recipes/ekot.recipe
 share/calibre/recipes/eksiazki.recipe
 share/calibre/recipes/ekundelek_pl.recipe
 share/calibre/recipes/el_colombiano.recipe
 share/calibre/recipes/el_correo.recipe
 share/calibre/recipes/el_cultural.recipe
+share/calibre/recipes/el_diplo.recipe
 share/calibre/recipes/el_espectador.recipe
 share/calibre/recipes/el_faro.recipe
+share/calibre/recipes/el_malpensante.recipe
 share/calibre/recipes/el_mercurio_chile.recipe
 share/calibre/recipes/el_mostrador.recipe
 share/calibre/recipes/el_mundo_co.recipe
@@ -1775,6 +2029,8 @@ share/calibre/recipes/elperiodico_catalan.recipe
 share/calibre/recipes/elperiodico_spanish.recipe
 share/calibre/recipes/elsevier.recipe
 share/calibre/recipes/eltiempo_hn.recipe
+share/calibre/recipes/eltribuno_jujuy_impreso.recipe
+share/calibre/recipes/eltribuno_salta_impreso.recipe
 share/calibre/recipes/eluniversal_ve.recipe
 share/calibre/recipes/eluniversalimpresa.recipe
 share/calibre/recipes/eluniverso_ec.recipe
@@ -1787,8 +2043,11 @@ share/calibre/recipes/endgadget_ja.recipe
 share/calibre/recipes/entrepeneur.recipe
 share/calibre/recipes/epicurious.recipe
 share/calibre/recipes/epl_talk.recipe
+share/calibre/recipes/equipped.recipe
 share/calibre/recipes/escrevinhador.recipe
 share/calibre/recipes/esenja.recipe
+share/calibre/recipes/esensja_(rss).recipe
+share/calibre/recipes/eso_pl.recipe
 share/calibre/recipes/espn.recipe
 share/calibre/recipes/esquire.recipe
 share/calibre/recipes/estadao.recipe
@@ -1811,13 +2070,16 @@ share/calibre/recipes/fan_graphs.recipe
 share/calibre/recipes/fastcompany.recipe
 share/calibre/recipes/faznet.recipe
 share/calibre/recipes/fc_knudde.recipe
+share/calibre/recipes/fdb_pl.recipe
 share/calibre/recipes/fe_india.recipe
 share/calibre/recipes/felicia.recipe
 share/calibre/recipes/fhm_uk.recipe
 share/calibre/recipes/fhmro.recipe
+share/calibre/recipes/film_org_pl.recipe
 share/calibre/recipes/film_web.recipe
 share/calibre/recipes/financial_times.recipe
 share/calibre/recipes/financial_times_uk.recipe
+share/calibre/recipes/financial_times_us.recipe
 share/calibre/recipes/financialsense.recipe
 share/calibre/recipes/financiarul.recipe
 share/calibre/recipes/financieele_dagblad.recipe
@@ -1834,10 +2096,12 @@ share/calibre/recipes/folhadesaopaulo.recipe
 share/calibre/recipes/folhadesaopaulo_sub.recipe
 share/calibre/recipes/forbes.recipe
 share/calibre/recipes/forbes_india.recipe
+share/calibre/recipes/forbes_pl.recipe
 share/calibre/recipes/foreign_policy.recipe
 share/calibre/recipes/foreignaffairs.recipe
 share/calibre/recipes/formulaas.recipe
 share/calibre/recipes/forsal.recipe
+share/calibre/recipes/fortune_magazine.recipe
 share/calibre/recipes/fotoblogia_pl.recipe
 share/calibre/recipes/foxnews.recipe
 share/calibre/recipes/fr_online.recipe
@@ -1854,45 +2118,56 @@ share/calibre/recipes/fstream.recipe
 share/calibre/recipes/ftd.recipe
 share/calibre/recipes/fudzilla.recipe
 share/calibre/recipes/futurismic.recipe
+share/calibre/recipes/galaxys_edge.recipe
 share/calibre/recipes/galicia_confidential.recipe
 share/calibre/recipes/gamasutra_fa.recipe
 share/calibre/recipes/gamasutra_news.recipe
+share/calibre/recipes/gamekult.recipe
 share/calibre/recipes/gameplay_pl.recipe
 share/calibre/recipes/gamespot.recipe
 share/calibre/recipes/gandul.recipe
 share/calibre/recipes/gawker.recipe
 share/calibre/recipes/gazeta-prawna-calibre-v1.recipe
+share/calibre/recipes/gazeta_krakowska.recipe
+share/calibre/recipes/gazeta_lubuska.recipe
+share/calibre/recipes/gazeta_pl_bydgoszcz.recipe
 share/calibre/recipes/gazeta_pl_krakow.recipe
 share/calibre/recipes/gazeta_pl_szczecin.recipe
 share/calibre/recipes/gazeta_pl_warszawa.recipe
 share/calibre/recipes/gazeta_pomorska.recipe
+share/calibre/recipes/gazeta_wroclawska.recipe
+share/calibre/recipes/gazeta_wspolczesna.recipe
 share/calibre/recipes/gazeta_wyborcza.recipe
+share/calibre/recipes/gcn.recipe
 share/calibre/recipes/geek_poke.recipe
+share/calibre/recipes/geopolityka.recipe
 share/calibre/recipes/german_gov.recipe
+share/calibre/recipes/gezgin_dergi.recipe
 share/calibre/recipes/gildia_pl.recipe
-share/calibre/recipes/givemesomethingtoread.recipe
 share/calibre/recipes/gizmodo.recipe
 share/calibre/recipes/glamour.recipe
 share/calibre/recipes/glas_srpske.recipe
 share/calibre/recipes/glasgow_herald.recipe
 share/calibre/recipes/glasjavnosti.recipe
+share/calibre/recipes/glenn_greenwald.recipe
 share/calibre/recipes/glennbeck.recipe
 share/calibre/recipes/globaltimes.recipe
 share/calibre/recipes/globe_and_mail.recipe
 share/calibre/recipes/globes_co_il.recipe
+share/calibre/recipes/glos_wielkopolski.recipe
 share/calibre/recipes/go4it.recipe
 share/calibre/recipes/go_comics.recipe
 share/calibre/recipes/goal.recipe
+share/calibre/recipes/gofin_pl.recipe
 share/calibre/recipes/golem_de.recipe
 share/calibre/recipes/good_house_keeping.recipe
 share/calibre/recipes/good_to_know.recipe
 share/calibre/recipes/googlemobileblog.recipe
+share/calibre/recipes/gosc_full.recipe
 share/calibre/recipes/gosc_niedzielny.recipe
 share/calibre/recipes/gram_pl.recipe
 share/calibre/recipes/granma.recipe
 share/calibre/recipes/grantland.recipe
-share/calibre/recipes/greader.recipe
-share/calibre/recipes/greader_uber.recipe
 share/calibre/recipes/greensboro_news_and_record.recipe
 share/calibre/recipes/grid_to.recipe
 share/calibre/recipes/grrm.recipe
@@ -1920,6 +2195,7 @@ share/calibre/recipes/hannoversche_zeitung.recipe
 share/calibre/recipes/harpers.recipe
 share/calibre/recipes/harpers_full.recipe
 share/calibre/recipes/hartford_courant.recipe
+share/calibre/recipes/hatalska.recipe
 share/calibre/recipes/hawaii.recipe
 share/calibre/recipes/hbr.recipe
 share/calibre/recipes/hbr_blogs.recipe
@@ -1930,7 +2206,6 @@ share/calibre/recipes/heise_open.recipe
 share/calibre/recipes/helsingin_sanomat.recipe
 share/calibre/recipes/heraldo.recipe
 share/calibre/recipes/heritage_foundation.recipe
-share/calibre/recipes/high_country_blogs.recipe
 share/calibre/recipes/high_country_news.recipe
 share/calibre/recipes/hindu.recipe
 share/calibre/recipes/hindu_business_line.recipe
@@ -1945,6 +2220,7 @@ share/calibre/recipes/hitro.recipe
 share/calibre/recipes/hln.recipe
 share/calibre/recipes/hln_be.recipe
 share/calibre/recipes/hna.recipe
+share/calibre/recipes/hnonline.recipe
 share/calibre/recipes/hola.recipe
 share/calibre/recipes/homopedia_pl.recipe
 share/calibre/recipes/hotair.recipe
@@ -1972,7 +2248,9 @@ share/calibre/recipes/ihned.cz.recipe
 share/calibre/recipes/ihned.recipe
 share/calibre/recipes/iht.recipe
 share/calibre/recipes/iktibas.recipe
+share/calibre/recipes/il_cambiamento.recipe
 share/calibre/recipes/il_fatto.recipe
+share/calibre/recipes/il_foglio.recipe
 share/calibre/recipes/il_giornale.recipe
 share/calibre/recipes/il_messaggero.recipe
 share/calibre/recipes/iliteratura_cz.recipe
@@ -1994,7 +2272,9 @@ share/calibre/recipes/informacje_usa.recipe
 share/calibre/recipes/information_dk.recipe
 share/calibre/recipes/infoworld.recipe
 share/calibre/recipes/infra_pl.recipe
+share/calibre/recipes/inopressa.recipe
 share/calibre/recipes/inquirer_net.recipe
+share/calibre/recipes/insan_okur.recipe
 share/calibre/recipes/insider.recipe
 share/calibre/recipes/instapaper.recipe
 share/calibre/recipes/intelligencer.recipe
@@ -2007,6 +2287,7 @@ share/calibre/recipes/ionline_pt.recipe
 share/calibre/recipes/iprofesional.recipe
 share/calibre/recipes/irish_independent.recipe
 share/calibre/recipes/irish_times.recipe
+share/calibre/recipes/ittechblog.recipe
 share/calibre/recipes/ivanamilakovic.recipe
 share/calibre/recipes/izdiham.com.recipe
 share/calibre/recipes/izvestia.recipe
@@ -2017,13 +2298,16 @@ share/calibre/recipes/japaa.recipe
 share/calibre/recipes/japan_news.recipe
 share/calibre/recipes/japan_times.recipe
 share/calibre/recipes/javalobby.recipe
+share/calibre/recipes/jazzpress.recipe
 share/calibre/recipes/jb_online.recipe
 share/calibre/recipes/jbpress.recipe
+share/calibre/recipes/jeuxvideo.recipe
 share/calibre/recipes/jezebel.recipe
 share/calibre/recipes/jijinews.recipe
 share/calibre/recipes/joelonsoftware.recipe
 share/calibre/recipes/johm.recipe
 share/calibre/recipes/joop.recipe
+share/calibre/recipes/jot_down.recipe
 share/calibre/recipes/journalgazette.recipe
 share/calibre/recipes/journalofaccountancy.recipe
 share/calibre/recipes/jp_dk.recipe
@@ -2049,6 +2333,7 @@ share/calibre/recipes/kitsapun.recipe
 share/calibre/recipes/kleinezeitung.recipe
 share/calibre/recipes/klip_me.recipe
 share/calibre/recipes/klubknjige.recipe
+share/calibre/recipes/km_blog.recipe
 share/calibre/recipes/komchadluek.recipe
 share/calibre/recipes/kommersant.recipe
 share/calibre/recipes/kompas.recipe
@@ -2060,6 +2345,7 @@ share/calibre/recipes/korea_herald.recipe
 share/calibre/recipes/korespondent.recipe
 share/calibre/recipes/kosmonauta_pl.recipe
 share/calibre/recipes/kotaku.recipe
+share/calibre/recipes/kp.recipe
 share/calibre/recipes/kresy_pl.recipe
 share/calibre/recipes/krstarica.recipe
 share/calibre/recipes/krstarica_en.recipe
@@ -2069,12 +2355,18 @@ share/calibre/recipes/kudika.recipe
 share/calibre/recipes/kudy_z_nudy.recipe
 share/calibre/recipes/kukuburi.recipe
 share/calibre/recipes/kurier.recipe
+share/calibre/recipes/kurier_galicyjski.recipe
+share/calibre/recipes/kurier_lubelski.recipe
+share/calibre/recipes/kurier_poranny.recipe
+share/calibre/recipes/kurier_szczecinski.recipe
+share/calibre/recipes/kyungyhang.recipe
 share/calibre/recipes/l_espresso.recipe
 share/calibre/recipes/la_cuarta.recipe
 share/calibre/recipes/la_diaria.recipe
 share/calibre/recipes/la_gazetta_del_mezzogiorno.recipe
 share/calibre/recipes/la_gazzeta_dello_sport.recipe
 share/calibre/recipes/la_jornada.recipe
+share/calibre/recipes/la_nacion_cr.recipe
 share/calibre/recipes/la_nueva.recipe
 share/calibre/recipes/la_pausa_caffe.recipe
 share/calibre/recipes/la_razon_bo.recipe
@@ -2085,7 +2377,9 @@ share/calibre/recipes/la_stampa.recipe
 share/calibre/recipes/la_tercera.recipe
 share/calibre/recipes/la_tribuna.recipe
 share/calibre/recipes/la_voce.recipe
+share/calibre/recipes/lacapital.recipe
 share/calibre/recipes/lalibre_be.recipe
+share/calibre/recipes/lamebook.recipe
 share/calibre/recipes/lameuse_be.recipe
 share/calibre/recipes/lamujerdemivida.recipe
 share/calibre/recipes/lanacion.recipe
@@ -2098,9 +2392,12 @@ share/calibre/recipes/latimes.recipe
 share/calibre/recipes/latribuna.recipe
 share/calibre/recipes/lavanguardia.recipe
 share/calibre/recipes/lavenir_be.recipe
+share/calibre/recipes/le_gorafi.recipe
 share/calibre/recipes/le_journal.recipe
 share/calibre/recipes/le_monde.recipe
+share/calibre/recipes/le_monde_diplomatique_fr.recipe
 share/calibre/recipes/le_monde_sub.recipe
+share/calibre/recipes/le_nouvel_observateur.recipe
 share/calibre/recipes/le_temps.recipe
 share/calibre/recipes/ledevoir.recipe
 share/calibre/recipes/leduc.recipe
@@ -2113,26 +2410,31 @@ share/calibre/recipes/lemonde_dip.recipe
 share/calibre/recipes/lenta_ru.recipe
 share/calibre/recipes/lepoint.recipe
 share/calibre/recipes/lequipe.recipe
+share/calibre/recipes/les_echos.recipe
 share/calibre/recipes/lescienze.recipe
 share/calibre/recipes/lesoir_be.recipe
 share/calibre/recipes/letsgetcritical.recipe
 share/calibre/recipes/levante.recipe
 share/calibre/recipes/lexpress.recipe
+share/calibre/recipes/libartes.recipe
 share/calibre/recipes/liberation.recipe
-share/calibre/recipes/liberation_sub.recipe
 share/calibre/recipes/liberatorio_politico.recipe
 share/calibre/recipes/libero.recipe
+share/calibre/recipes/libertad_digital.recipe
 share/calibre/recipes/liberty_times.recipe
 share/calibre/recipes/lidovky.recipe
 share/calibre/recipes/lifehacker.recipe
+share/calibre/recipes/lifehacker_pl.recipe
+share/calibre/recipes/lightspeed_magazine.recipe
 share/calibre/recipes/limes.recipe
 share/calibre/recipes/linux_journal.recipe
 share/calibre/recipes/linux_magazine.recipe
 share/calibre/recipes/linuxdevices.recipe
+share/calibre/recipes/linuxportal_pl.recipe
 share/calibre/recipes/list_apart.recipe
 share/calibre/recipes/livemint.recipe
-share/calibre/recipes/living_digital.recipe
 share/calibre/recipes/living_stones.recipe
+share/calibre/recipes/loksatta.recipe
 share/calibre/recipes/lomza.recipe
 share/calibre/recipes/london_free_press.recipe
 share/calibre/recipes/los_tiempos_bo.recipe
@@ -2140,8 +2442,10 @@ share/calibre/recipes/losandes.recipe
 share/calibre/recipes/losservatoreromano_it.recipe
 share/calibre/recipes/lrb.recipe
 share/calibre/recipes/lrb_payed.recipe
+share/calibre/recipes/ludwig_mises.recipe
 share/calibre/recipes/luns_a_venres.recipe
 share/calibre/recipes/lupa.recipe
+share/calibre/recipes/lvivs_ks_ghazieta.recipe
 share/calibre/recipes/lwn.recipe
 share/calibre/recipes/lwn_weekly.recipe
 share/calibre/recipes/mac_video.recipe
@@ -2149,6 +2453,8 @@ share/calibre/recipes/mac_world.recipe
 share/calibre/recipes/mac_world_uk.recipe
 share/calibre/recipes/macity.recipe
 share/calibre/recipes/macleans.recipe
+share/calibre/recipes/magazyn_consido.recipe
+share/calibre/recipes/maharashtra_times.recipe
 share/calibre/recipes/mail_and_guardian.recipe
 share/calibre/recipes/mainichi.recipe
 share/calibre/recipes/mainichi_en.recipe
@@ -2167,6 +2473,7 @@ share/calibre/recipes/max_planck.recipe
 share/calibre/recipes/maximum_pc.recipe
 share/calibre/recipes/mayra.recipe
 share/calibre/recipes/mdj.recipe
+share/calibre/recipes/media2.recipe
 share/calibre/recipes/mediafax.recipe
 share/calibre/recipes/mediaindonesia.recipe
 share/calibre/recipes/mediapart.recipe
@@ -2184,8 +2491,6 @@ share/calibre/recipes/metropol_tv.recipe
 share/calibre/recipes/miami_herald.recipe
 share/calibre/recipes/michalkiewicz.recipe
 share/calibre/recipes/michellemalkin.recipe
-share/calibre/recipes/microwave_and_rf.recipe
-share/calibre/recipes/midday.recipe
 share/calibre/recipes/milenio.recipe
 share/calibre/recipes/military_times.recipe
 share/calibre/recipes/ming_pao.recipe
@@ -2194,8 +2499,11 @@ share/calibre/recipes/ming_pao_vancouver.recipe
 share/calibre/recipes/miradasalsur.recipe
 share/calibre/recipes/mlody_technik_pl.recipe
 share/calibre/recipes/mmc_rtv.recipe
+share/calibre/recipes/mobile_bulgaria.recipe
 share/calibre/recipes/mobilenations.recipe
+share/calibre/recipes/mobilna.recipe
 share/calibre/recipes/modoros.recipe
+share/calibre/recipes/mojegotowanie.recipe
 share/calibre/recipes/moldovaazi.recipe
 share/calibre/recipes/monbiot.recipe
 share/calibre/recipes/mondedurable.recipe
@@ -2207,6 +2515,7 @@ share/calibre/recipes/moneyro.recipe
 share/calibre/recipes/monitor.recipe
 share/calibre/recipes/montevideo_com.recipe
 share/calibre/recipes/montreal_gazette.recipe
+share/calibre/recipes/more_intelligent_life.recipe
 share/calibre/recipes/moscow_times.recipe
 share/calibre/recipes/motherjones.recipe
 share/calibre/recipes/msdnmag_en.recipe
@@ -2219,7 +2528,9 @@ share/calibre/recipes/nachdenkseiten.recipe
 share/calibre/recipes/nacional_cro.recipe
 share/calibre/recipes/nacionred.recipe
 share/calibre/recipes/nadacni_fond_proti_korupci.recipe
+share/calibre/recipes/najwyzszy_czas.recipe
 share/calibre/recipes/nakedcapitalism.recipe
+share/calibre/recipes/nanfengchuang.recipe
 share/calibre/recipes/nasa.recipe
 share/calibre/recipes/naszdziennik.recipe
 share/calibre/recipes/natemat_pl.recipe
@@ -2235,6 +2546,8 @@ share/calibre/recipes/nationalgeographic.recipe
 share/calibre/recipes/nationalgeographicjp.recipe
 share/calibre/recipes/nationalgeoro.recipe
 share/calibre/recipes/nationalreviewonline.recipe
+share/calibre/recipes/nauka_w_polsce.recipe
+share/calibre/recipes/navegalo.recipe
 share/calibre/recipes/navy_times.recipe
 share/calibre/recipes/nbonline.recipe
 share/calibre/recipes/ncrnext.recipe
@@ -2242,6 +2555,7 @@ share/calibre/recipes/nejm.recipe
 share/calibre/recipes/neowin.recipe
 share/calibre/recipes/nepszabadsag.recipe
 share/calibre/recipes/netzpolitik.recipe
+share/calibre/recipes/neu_osnabrucker_zeitung.recipe
 share/calibre/recipes/neviditelny_pes.recipe
 share/calibre/recipes/new_london_day.recipe
 share/calibre/recipes/new_scientist.recipe
@@ -2249,6 +2563,7 @@ share/calibre/recipes/new_statesman.recipe
 share/calibre/recipes/new_york_review_of_books.recipe
 share/calibre/recipes/new_york_review_of_books_no_sub.recipe
 share/calibre/recipes/new_yorker.recipe
+share/calibre/recipes/news24.recipe
 share/calibre/recipes/news_busters.recipe
 share/calibre/recipes/news_times.recipe
 share/calibre/recipes/newsbeast.recipe
@@ -2258,6 +2573,7 @@ share/calibre/recipes/newsstraitstimes.recipe
 share/calibre/recipes/newsweek.recipe
 share/calibre/recipes/newsweek_argentina.recipe
 share/calibre/recipes/newsweek_polska.recipe
+share/calibre/recipes/nezavisne_novine.recipe
 share/calibre/recipes/ngz.recipe
 share/calibre/recipes/niebezpiecznik.recipe
 share/calibre/recipes/nightflier.recipe
@@ -2291,20 +2607,25 @@ share/calibre/recipes/novistandard.recipe
 share/calibre/recipes/novosti.recipe
 share/calibre/recipes/now_toronto.recipe
 share/calibre/recipes/nowa_fantastyka.recipe
+share/calibre/recipes/nowiny_rybnik.recipe
 share/calibre/recipes/nowy_ekran.recipe
+share/calibre/recipes/nowy_obywatel.recipe
 share/calibre/recipes/noz.recipe
 share/calibre/recipes/npr.recipe
 share/calibre/recipes/npr_music_blogs.recipe
 share/calibre/recipes/nrc-nl-epub.recipe
 share/calibre/recipes/nrc.nl.recipe
 share/calibre/recipes/nrc_handelsblad.recipe
+share/calibre/recipes/nrc_next.recipe
 share/calibre/recipes/nsfw_corp.recipe
 share/calibre/recipes/nspm.recipe
 share/calibre/recipes/nspm_int.recipe
+share/calibre/recipes/nto.recipe
 share/calibre/recipes/ntv_spor.recipe
 share/calibre/recipes/ntv_tr.recipe
 share/calibre/recipes/nu.recipe
 share/calibre/recipes/nursingtimes.recipe
+share/calibre/recipes/nuus24.recipe
 share/calibre/recipes/nymag.recipe
 share/calibre/recipes/nypost.recipe
 share/calibre/recipes/nytimes.recipe
@@ -2324,6 +2645,7 @@ share/calibre/recipes/observer.recipe
 share/calibre/recipes/observer_gb.recipe
 share/calibre/recipes/oc_register.recipe
 share/calibre/recipes/oclab_pl.recipe
+share/calibre/recipes/odkrywcy_pl.recipe
 share/calibre/recipes/office_space.recipe
 share/calibre/recipes/oilprice.recipe
 share/calibre/recipes/oldnewthing.recipe
@@ -2333,6 +2655,7 @@ share/calibre/recipes/onemagazine.recipe
 share/calibre/recipes/onionavclub.recipe
 share/calibre/recipes/open_left.recipe
 share/calibre/recipes/opinion_bo.recipe
+share/calibre/recipes/optyczne_pl.recipe
 share/calibre/recipes/oregonian.recipe
 share/calibre/recipes/oreilly_premium.recipe
 share/calibre/recipes/oriental_daily.recipe
@@ -2340,10 +2663,15 @@ share/calibre/recipes/origo_hu.recipe
 share/calibre/recipes/orlando_sentinel.recipe
 share/calibre/recipes/orsai.recipe
 share/calibre/recipes/osnews_pl.recipe
+share/calibre/recipes/osw.recipe
+share/calibre/recipes/osworld_pl.recipe
 share/calibre/recipes/ottawa_citizen.recipe
 share/calibre/recipes/ourdailybread.recipe
 share/calibre/recipes/outlook_india.recipe
+share/calibre/recipes/outside_magazine.recipe
 share/calibre/recipes/overclock_pl.recipe
+share/calibre/recipes/oxford_mail.recipe
+share/calibre/recipes/padreydecano.recipe
 share/calibre/recipes/pagina12.recipe
 share/calibre/recipes/pagina_12_print_ed.recipe
 share/calibre/recipes/pajama.recipe
@@ -2359,7 +2687,6 @@ share/calibre/recipes/pc_centre_pl.recipe
 share/calibre/recipes/pc_foster.recipe
 share/calibre/recipes/pc_lab.recipe
 share/calibre/recipes/pc_mag.recipe
-share/calibre/recipes/pc_quest_india.recipe
 share/calibre/recipes/pc_world.recipe
 share/calibre/recipes/pcworld_hu.recipe
 share/calibre/recipes/pcworldro.recipe
@@ -2375,14 +2702,18 @@ share/calibre/recipes/philippino_star_ngayon.recipe
 share/calibre/recipes/phillosophy_now.recipe
 share/calibre/recipes/philly.recipe
 share/calibre/recipes/phoronix.recipe
+share/calibre/recipes/phys_org.recipe
 share/calibre/recipes/physics_today.recipe
 share/calibre/recipes/physics_world.recipe
+share/calibre/recipes/picoboard_pl.recipe
 share/calibre/recipes/pilot.recipe
 share/calibre/recipes/piratska_strana.recipe
 share/calibre/recipes/piratske_noviny.recipe
 share/calibre/recipes/planet_kde.recipe
 share/calibre/recipes/plus_info.recipe
+share/calibre/recipes/pnn.recipe
 share/calibre/recipes/pobjeda.recipe
+share/calibre/recipes/poche.recipe
 share/calibre/recipes/podnikatel.recipe
 share/calibre/recipes/politico.recipe
 share/calibre/recipes/politifact.recipe
@@ -2391,23 +2722,29 @@ share/calibre/recipes/politiken_dk.recipe
 share/calibre/recipes/polityka.recipe
 share/calibre/recipes/polizeipress_de.recipe
 share/calibre/recipes/polska_times.recipe
+share/calibre/recipes/polter_pl.recipe
 share/calibre/recipes/popscience.recipe
+share/calibre/recipes/poradnia_pwn.recipe
 share/calibre/recipes/portafolio.recipe
 share/calibre/recipes/portfolio.recipe
 share/calibre/recipes/portfolio_hu.recipe
 share/calibre/recipes/portfolio_hu_hu.recipe
 share/calibre/recipes/post_today.recipe
 share/calibre/recipes/poughkeepsie_journal.recipe
+share/calibre/recipes/ppe_pl.recipe
 share/calibre/recipes/praguemonitor.recipe
 share/calibre/recipes/pravda.recipe
 share/calibre/recipes/pravda_en.recipe
 share/calibre/recipes/pravda_it.recipe
 share/calibre/recipes/pravda_por.recipe
+share/calibre/recipes/pravda_rs.recipe
 share/calibre/recipes/pravda_ru.recipe
 share/calibre/recipes/pravo.recipe
 share/calibre/recipes/prawica_net.recipe
+share/calibre/recipes/presseurop.recipe
 share/calibre/recipes/pressonline.recipe
 share/calibre/recipes/pressthink.recipe
+share/calibre/recipes/private_eye.recipe
 share/calibre/recipes/pro_linux_de.recipe
 share/calibre/recipes/pro_physik.recipe
 share/calibre/recipes/projo.recipe
@@ -2449,11 +2786,13 @@ share/calibre/recipes/replicavedetelor.recipe
 share/calibre/recipes/reptantes.recipe
 share/calibre/recipes/republica.recipe
 share/calibre/recipes/republika.recipe
+share/calibre/recipes/res_publica.recipe
 share/calibre/recipes/respekt.recipe
 share/calibre/recipes/resurgence.recipe
 share/calibre/recipes/reuters.recipe
 share/calibre/recipes/reuters_ja.recipe
 share/calibre/recipes/revista_bla.recipe
+share/calibre/recipes/revista_cromos.recipe
 share/calibre/recipes/revista_muy.recipe
 share/calibre/recipes/revista_piaui.recipe
 share/calibre/recipes/revista_semana.recipe
@@ -2473,6 +2812,7 @@ share/calibre/recipes/roger_ebert_blog.recipe
 share/calibre/recipes/rollingstone.recipe
 share/calibre/recipes/romanialibera.recipe
 share/calibre/recipes/root.recipe
+share/calibre/recipes/rossijkaja_gazeta.recipe
 share/calibre/recipes/rstones.recipe
 share/calibre/recipes/rte.recipe
 share/calibre/recipes/rtnews.recipe
@@ -2486,10 +2826,14 @@ share/calibre/recipes/rynek_kolejowy.recipe
 share/calibre/recipes/rynek_zdrowia.recipe
 share/calibre/recipes/rzeczpospolita.recipe
 share/calibre/recipes/sabah.recipe
+share/calibre/recipes/sabit_fikir.recipe
+share/calibre/recipes/sage_news.recipe
+share/calibre/recipes/sage_news_opinion.recipe
 share/calibre/recipes/salon.recipe
 share/calibre/recipes/salonica_press_news.recipe
 share/calibre/recipes/samanyolu_haber.recipe
 share/calibre/recipes/samanyolu_teknoloji.recipe
+share/calibre/recipes/samcik_blox.recipe
 share/calibre/recipes/san_fran_chronicle.recipe
 share/calibre/recipes/sanjosemercurynews.recipe
 share/calibre/recipes/sarajevo_x.recipe
@@ -2498,6 +2842,7 @@ share/calibre/recipes/satira.recipe
 share/calibre/recipes/satkurier.recipe
 share/calibre/recipes/satmagazine.recipe
 share/calibre/recipes/sb_nation.recipe
+share/calibre/recipes/schattenblick.recipe
 share/calibre/recipes/science_aas.recipe
 share/calibre/recipes/science_based_medicine.recipe
 share/calibre/recipes/science_news.recipe
@@ -2511,7 +2856,9 @@ share/calibre/recipes/scprint.recipe
 share/calibre/recipes/seanhannity.recipe
 share/calibre/recipes/seattle_times.recipe
 share/calibre/recipes/security_watch.recipe
+share/calibre/recipes/sekurak_pl.recipe
 share/calibre/recipes/serverside.recipe
+share/calibre/recipes/seventh_guard.recipe
 share/calibre/recipes/sfbg.recipe
 share/calibre/recipes/sfin.recipe
 share/calibre/recipes/sg_hu.recipe
@@ -2545,11 +2892,14 @@ share/calibre/recipes/sol_haber.recipe
 share/calibre/recipes/soldiers.recipe
 share/calibre/recipes/something_awful.recipe
 share/calibre/recipes/southernstar.recipe
+share/calibre/recipes/spectator_magazine.recipe
 share/calibre/recipes/spektrum.recipe
 share/calibre/recipes/spiders_web_pl.recipe
 share/calibre/recipes/spiegel_int.recipe
 share/calibre/recipes/spiegelde.recipe
 share/calibre/recipes/spin_magazine.recipe
+share/calibre/recipes/sport_pl.recipe
+share/calibre/recipes/sportowefakty.recipe
 share/calibre/recipes/sportsillustrated.recipe
 share/calibre/recipes/sportsillustrated_columnists.recipe
 share/calibre/recipes/st_louis_post_dispatch.recipe
@@ -2589,6 +2939,7 @@ share/calibre/recipes/tanea.recipe
 share/calibre/recipes/tanjug.recipe
 share/calibre/recipes/tanuki.recipe
 share/calibre/recipes/tasfiye_dergisi.recipe
+share/calibre/recipes/tawernarpg_pl.recipe
 share/calibre/recipes/taz.recipe
 share/calibre/recipes/taz_rss.recipe
 share/calibre/recipes/tech_economy.recipe
@@ -2614,8 +2965,9 @@ share/calibre/recipes/the_budget_fashionista.recipe
 share/calibre/recipes/the_clinic_online.recipe
 share/calibre/recipes/the_daily_news_egypt.recipe
 share/calibre/recipes/the_escapist.recipe
+share/calibre/recipes/the_feature.recipe
 share/calibre/recipes/the_freeman.recipe
-share/calibre/recipes/the_h.recipe
+share/calibre/recipes/the_friday_times.recipe
 share/calibre/recipes/the_journal.recipe
 share/calibre/recipes/the_manila_bulletin.recipe
 share/calibre/recipes/the_manila_times.recipe
@@ -2652,9 +3004,12 @@ share/calibre/recipes/tijd.recipe
 share/calibre/recipes/tijolaco.recipe
 share/calibre/recipes/tillsonburg.recipe
 share/calibre/recipes/time_magazine.recipe
+share/calibre/recipes/time_turk.recipe
 share/calibre/recipes/times_of_malta.recipe
 share/calibre/recipes/times_online.recipe
 share/calibre/recipes/timesnewroman.recipe
+share/calibre/recipes/titanic_de.recipe
+share/calibre/recipes/tjournal.recipe
 share/calibre/recipes/tmz.recipe
 share/calibre/recipes/tnxm.recipe
 share/calibre/recipes/today_online.recipe
@@ -2669,15 +3024,18 @@ share/calibre/recipes/toyokeizai.recipe
 share/calibre/recipes/tpm_uk.recipe
 share/calibre/recipes/tr.recipe
 share/calibre/recipes/tri_city_herald.recipe
+share/calibre/recipes/trojmiasto_pl.recipe
 share/calibre/recipes/trombon.recipe
 share/calibre/recipes/trouw.recipe
 share/calibre/recipes/trv.recipe
+share/calibre/recipes/trystero.recipe
 share/calibre/recipes/tsn.recipe
 share/calibre/recipes/tulsaworld.recipe
 share/calibre/recipes/tuttojove.recipe
 share/calibre/recipes/tuttosport.recipe
 share/calibre/recipes/tvmania.recipe
 share/calibre/recipes/tvn24.recipe
+share/calibre/recipes/tvp_info.recipe
 share/calibre/recipes/tvxs.recipe
 share/calibre/recipes/tweakers.recipe
 share/calibre/recipes/tweakers_net.recipe
@@ -2686,17 +3044,21 @@ share/calibre/recipes/twtfb.recipe
 share/calibre/recipes/tyden.cz.recipe
 share/calibre/recipes/tyzden.recipe
 share/calibre/recipes/ubuntu_pl.recipe
+share/calibre/recipes/ubuntu_pomoc_org.recipe
+share/calibre/recipes/ukraiyns_kii_tizhdien.recipe
 share/calibre/recipes/ultimahora.recipe
 share/calibre/recipes/uncrate.recipe
 share/calibre/recipes/unica.recipe
 share/calibre/recipes/uninohimitu.recipe
 share/calibre/recipes/united_daily.recipe
+share/calibre/recipes/universe_today.recipe
+share/calibre/recipes/unoticias.recipe
+share/calibre/recipes/unperiodico.recipe
 share/calibre/recipes/upi.recipe
 share/calibre/recipes/usatoday.recipe
 share/calibre/recipes/usnews.recipe
 share/calibre/recipes/utne.recipe
 share/calibre/recipes/utrinski.recipe
-share/calibre/recipes/vancouver_provice.recipe
 share/calibre/recipes/vancouver_province.recipe
 share/calibre/recipes/vancouver_sun.recipe
 share/calibre/recipes/vanityfair.recipe
@@ -2705,8 +3067,10 @@ share/calibre/recipes/vecernji_list.recipe
 share/calibre/recipes/vedomosti.recipe
 share/calibre/recipes/veintitres.recipe
 share/calibre/recipes/version2.recipe
+share/calibre/recipes/vfr_magazine.recipe
 share/calibre/recipes/vic_times.recipe
 share/calibre/recipes/vice_magazine.recipe
+share/calibre/recipes/vice_magazine_de.recipe
 share/calibre/recipes/vignette.recipe
 share/calibre/recipes/vijesti.recipe
 share/calibre/recipes/villagevoice.recipe
@@ -2715,6 +3079,7 @@ share/calibre/recipes/virtualshackles.recipe
 share/calibre/recipes/vitalia.recipe
 share/calibre/recipes/viva.recipe
 share/calibre/recipes/vnexpress.recipe
+share/calibre/recipes/voice_of_america.recipe
 share/calibre/recipes/volksrant.recipe
 share/calibre/recipes/vreme.recipe
 share/calibre/recipes/vrijnederland.recipe
@@ -2728,9 +3093,11 @@ share/calibre/recipes/wash_post.recipe
 share/calibre/recipes/wash_times.recipe
 share/calibre/recipes/watchingamerica.recipe
 share/calibre/recipes/weblogs_sl.recipe
+share/calibre/recipes/websecurity_pl.recipe
 share/calibre/recipes/welt.recipe
 share/calibre/recipes/welt_der_physik.recipe
 share/calibre/recipes/wenxuecity-znjy.recipe
+share/calibre/recipes/what_if.recipe
 share/calibre/recipes/wichita_eagle.recipe
 share/calibre/recipes/wikinews_en.recipe
 share/calibre/recipes/windows_star.recipe
@@ -2743,23 +3110,27 @@ share/calibre/recipes/wired.recipe
 share/calibre/recipes/wired_daily.recipe
 share/calibre/recipes/wired_it.recipe
 share/calibre/recipes/wired_uk.recipe
+share/calibre/recipes/wirtscafts_woche.recipe
 share/calibre/recipes/wirtualnemedia_pl.recipe
 share/calibre/recipes/wnp.recipe
+share/calibre/recipes/wolne_media.recipe
 share/calibre/recipes/words_without_borders.recipe
 share/calibre/recipes/workers_world.recipe
 share/calibre/recipes/worldcrunch.recipe
 share/calibre/recipes/wow.recipe
 share/calibre/recipes/woz_die.recipe
 share/calibre/recipes/wprost.recipe
+share/calibre/recipes/wprost_rss.recipe
 share/calibre/recipes/wsj.recipe
 share/calibre/recipes/wsj_free.recipe
 share/calibre/recipes/wvhooligan.recipe
-share/calibre/recipes/wyborcza_duzy_format.recipe
+share/calibre/recipes/wysokie_obcasy.recipe
 share/calibre/recipes/xkcd.recipe
 share/calibre/recipes/xpatloop.recipe
 share/calibre/recipes/yagmur_dergisi.recipe
 share/calibre/recipes/yahoo_news.recipe
 share/calibre/recipes/yakima_herald.recipe
+share/calibre/recipes/yalansavar.recipe
 share/calibre/recipes/yazihane.recipe
 share/calibre/recipes/yementimes.recipe
 share/calibre/recipes/yeni_umit_dergisi.recipe
@@ -2769,6 +3140,8 @@ share/calibre/recipes/yomiuri.recipe
 share/calibre/recipes/yomiuri_world.recipe
 share/calibre/recipes/zaman.recipe
 share/calibre/recipes/zaobao.recipe
+share/calibre/recipes/zaufana_trzecia_strona.recipe
+share/calibre/recipes/zaxid_net.recipe
 share/calibre/recipes/zdnet.fr.recipe
 share/calibre/recipes/zdnet.recipe
 share/calibre/recipes/zeitde.recipe
@@ -2777,7 +3150,9 @@ share/calibre/recipes/zerocalcare.recipe
 share/calibre/recipes/zerohedge.recipe
 share/calibre/recipes/ziarulfinanciar.recipe
 share/calibre/recipes/ziuaveche.recipe
+share/calibre/recipes/znadplanszy_pl.recipe
 share/calibre/recipes/zougla.recipe
+share/calibre/recipes/zycie_warszawy.recipe
 share/calibre/scripts.pickle
 share/calibre/template-functions.json
 share/calibre/templates/book_details.css
@@ -2993,8 +3368,8 @@ share/doc/calibre/Changelog.old.yaml
 share/doc/calibre/Changelog.yaml
 share/doc/calibre/INSTALL
 share/doc/calibre/LICENSE.rtf
-share/doc/calibre/README
-share/mime/packages/calibre.xml
+share/doc/calibre/README.md
+share/pixmaps/calibre-ebook-edit.png
 share/pixmaps/calibre-gui.png
 share/pixmaps/calibre-lrf.png
 share/pixmaps/calibre-viewer.png
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index c9223db0a3c..4698370703b 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,7 +1,10 @@
-$NetBSD: distinfo,v 1.14 2012/11/26 14:02:50 ryoon Exp $
+$NetBSD: distinfo,v 1.15 2014/04/16 17:22:30 wiz Exp $
 
-SHA1 (calibre-0.9.7.tar.xz) = cdc09d54924b4108e8137685082893e628dd7e40
-RMD160 (calibre-0.9.7.tar.xz) = 44480946e6bec7b05b3aa10c5189a4e14225255a
-Size (calibre-0.9.7.tar.xz) = 27408848 bytes
-SHA1 (patch-setup_extensions.py) = aa8ee237a80b4da8dea03af950a7ac4caed9e51a
-SHA1 (patch-src_calibre_linux_py) = 6780e90eff604c66ef3213d638cf917d34f3c1fd
+SHA1 (calibre-1.31.0.tar.xz) = 36854aded8fb67a7d8a529ce84ed7a56341c4591
+RMD160 (calibre-1.31.0.tar.xz) = 127193d6abc5b6d62d9b316416191ebb96bc7063
+Size (calibre-1.31.0.tar.xz) = 33189956 bytes
+SHA1 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 745f9ebf091696c0d5403ce691dc28c039d77b9e
+RMD160 (qt-everywhere-opensource-src-4.8.5.tar.gz) = 1e7bb099d5d1cda0b663cebe207c846c8d04750d
+Size (qt-everywhere-opensource-src-4.8.5.tar.gz) = 241491467 bytes
+SHA1 (patch-setup_extensions.py) = 285ab1aff5b0d5f7c0a016f68e705d312a120d65
+SHA1 (patch-src_calibre_linux.py) = 06e953e3a437ae76783d80bf0986bbbece991431
diff --git a/misc/calibre/patches/patch-setup_extensions.py b/misc/calibre/patches/patch-setup_extensions.py
index 2fd6ba717cb..b16912cd8ee 100644
--- a/misc/calibre/patches/patch-setup_extensions.py
+++ b/misc/calibre/patches/patch-setup_extensions.py
@@ -1,8 +1,10 @@
-$NetBSD: patch-setup_extensions.py,v 1.3 2012/09/19 15:38:27 ryoon Exp $
+$NetBSD: patch-setup_extensions.py,v 1.4 2014/04/16 17:22:30 wiz Exp $
 
---- setup/extensions.py.orig	2012-09-19 15:19:07.000000000 +0000
+Correct directory name.
+
+--- setup/extensions.py.orig	2014-04-04 02:33:40.000000000 +0000
 +++ setup/extensions.py
-@@ -483,7 +483,7 @@ class Build(Command):
+@@ -567,7 +567,7 @@ class Build(Command):
              self.check_call(qmc + ['qtcurve.pro'])
              self.check_call([make]+([] if iswindows else ['-j%d'%(cpu_count()
                  or 1)]))
@@ -10,4 +12,4 @@ $NetBSD: patch-setup_extensions.py,v 1.3 2012/09/19 15:38:27 ryoon Exp $
 +            src = (glob.glob('.libs/*.so') + glob.glob('release/*.dll') +
                      glob.glob('*.dylib'))
              ext = 'pyd' if iswindows else 'so'
-             shutil.copy2(src[0], self.j(dest, 'calibre_style.'+ext))
+             if not os.path.exists(dest):
diff --git a/misc/calibre/patches/patch-src_calibre_linux_py b/misc/calibre/patches/patch-src_calibre_linux.py
index a58047bfc44..892b482e69f 100644
--- a/misc/calibre/patches/patch-src_calibre_linux_py
+++ b/misc/calibre/patches/patch-src_calibre_linux.py
@@ -1,11 +1,15 @@
-$NetBSD: patch-src_calibre_linux_py,v 1.4 2012/11/26 14:02:50 ryoon Exp $
+$NetBSD: patch-src_calibre_linux.py,v 1.3 2014/04/16 17:22:30 wiz Exp $
 
 Lifted from ArchLinux, saves mime and desktop files on disk
 instead of trying to add them directly.
 
---- src/calibre/linux.py.orig	2012-11-23 03:36:53.000000000 +0000
+See https://www.archlinux.org/packages/community/x86_64/calibre/ ->
+https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/calibre ->
+https://projects.archlinux.org/svntogit/community.git/plain/trunk/desktop_integration.patch?h=packages/calibre
+
+--- src/calibre/linux.py.orig	2014-04-04 02:33:40.000000000 +0000
 +++ src/calibre/linux.py
-@@ -179,19 +179,6 @@ class PostInstall:
+@@ -495,18 +495,6 @@ class PostInstall:
              self.setup_completion()
          if islinux or isbsd:
              self.setup_desktop_integration()
@@ -21,20 +25,19 @@ instead of trying to add them directly.
 -                        shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f)
 -                if os.stat(config_dir).st_uid == 0:
 -                    os.rmdir(config_dir)
--
+ 
          if warn is None and self.warnings:
-             self.info('There were %d warnings'%len(self.warnings))
-             for args, kwargs in self.warnings:
-@@ -237,7 +224,7 @@ class PostInstall:
+             self.info('\n\nThere were %d warnings\n'%len(self.warnings))
+@@ -564,7 +552,7 @@ class PostInstall:
                  if isnetbsd:
                      f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
                  else:
 -                    f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')
-+                    f = os.path.join(self.opts.staging_root, 'usr/share/bash-completion/completions/calibre')
++                    f = os.path.join(self.opts.staging_root, 'usr/share/bash_completion.d/calibre')
              if not os.path.exists(os.path.dirname(f)):
                  os.makedirs(os.path.dirname(f))
-             self.manifest.append(f)
-@@ -357,63 +344,39 @@ class PostInstall:
+             bash_comp_dest, zsh_comp_dest = f, None
+@@ -713,56 +701,39 @@ class PostInstall:
  
              with TemporaryDirectory() as tdir, CurrentDir(tdir), \
                                  PreserveMIMEDefaults():
@@ -58,15 +61,19 @@ instead of trying to add them directly.
 -                self.icon_resources.append(('mimetypes', 'application-x-mobi8-ebook', '128'))
 -                render_img('lt.png', 'calibre-gui.png', width=256, height=256)
 -                cc('xdg-icon-resource install --noupdate --size 256 calibre-gui.png calibre-gui', shell=True)
--                self.icon_resources.append(('apps', 'calibre-gui', '128'))
--                render_img('viewer.png', 'calibre-viewer.png')
--                cc('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
--                self.icon_resources.append(('apps', 'calibre-viewer', '128'))
+-                self.icon_resources.append(('apps', 'calibre-gui', '256'))
+-                render_img('viewer.png', 'calibre-viewer.png', width=256, height=256)
+-                cc('xdg-icon-resource install --size 256 calibre-viewer.png calibre-viewer', shell=True)
+-                self.icon_resources.append(('apps', 'calibre-viewer', '256'))
+-                render_img('tweak.png', 'calibre-ebook-edit.png', width=256, height=256)
+-                cc('xdg-icon-resource install --size 256 calibre-ebook-edit.png calibre-ebook-edit', shell=True)
 +                dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
 +                os.mkdir(dir)
 +                render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
 +                render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
 +                render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
++                render_img('tweak.png', os.path.join(dir, 'calibre-ebook-edit.png'))
+                 self.icon_resources.append(('apps', 'calibre-ebook-edit', '256'))
  
                  mimetypes = set([])
                  for x in all_input_formats():
@@ -78,37 +85,26 @@ instead of trying to add them directly.
                  def write_mimetypes(f):
                      f.write('MimeType=%s;\n'%';'.join(mimetypes))
  
+                 from calibre.ebooks.oeb.polish.main import SUPPORTED
 -                f = open('calibre-lrfviewer.desktop', 'wb')
 +                dir = os.path.join(self.opts.staging_sharedir,'../applications')
 +                os.mkdir(dir)
 +                f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
++                
                  f.write(VIEWER)
                  f.close()
 -                f = open('calibre-ebook-viewer.desktop', 'wb')
 +                f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
                  f.write(EVIEWER)
                  write_mimetypes(f)
+-                f = open('calibre-ebook-edit.desktop', 'wb')
++                f = open(os.path.join(dir, 'calibre-ebook-edit.desktop'), 'wb')
+                 f.write(ETWEAK)
+                 mt = [guess_type('a.' + x.lower())[0] for x in SUPPORTED]
+                 f.write('MimeType=%s;\n'%';'.join(mt))
                  f.close()
 -                f = open('calibre-gui.desktop', 'wb')
 +                f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
                  f.write(GUI)
                  write_mimetypes(f)
                  f.close()
--                des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
--                        'calibre-ebook-viewer.desktop')
--                for x in des:
--                    cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
--                    cc(' '.join(cmd), shell=True)
--                    self.menu_resources.append(x)
--                cc(['xdg-desktop-menu', 'forceupdate'])
--                f = open('calibre-mimetypes.xml', 'wb')
-+                dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
-+                os.makedirs(dir)
-+                f = open(os.path.join(dir, 'calibre.xml'), 'wb')
-                 f.write(MIME)
-                 f.close()
--                self.mime_resources.append('calibre-mimetypes.xml')
--                cc('xdg-mime install ./calibre-mimetypes.xml', shell=True)
-         except Exception:
-             if self.opts.fatal_errors:
-                 raise