Update to 0.8.2 provided by Rhialto in PR 44868.

Changes since 0.6.x: many too many to list here.
Now comes with its own store.

13 files changed, 1591 insertions, 1088 deletions

diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index a8578630f10..476fdc2954a 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.19 2011/04/22 13:44:08 obache Exp $
+# $NetBSD: Makefile,v 1.20 2011/05/21 15:07:48 wiz Exp $
 #
 
-DISTNAME=	calibre-0.6.24
-PKGREVISION=	13
+DISTNAME=	calibre-0.8.2
 CATEGORIES=	misc
-MASTER_SITES=	http://calibre.kovidgoyal.net/downloads/
+MASTER_SITES=	http://status.calibre-ebook.com/dist/src/ \
+		http://calibre-ebook.googlecode.com/files/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://calibre.kovidgoyal.net/
+HOMEPAGE=	http://www.calibre-ebook.com/
 COMMENT=	E-book library management application
 LICENSE=	gnu-gpl-v3
 
@@ -16,404 +16,717 @@ DEPENDS+=	${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 DEPENDS+=	xdg-utils>=1.0.2:../../misc/xdg-utils
 DEPENDS+=	poppler-utils-[0-9]*:../../print/poppler-utils
 DEPENDS+=	${PYPKGPREFIX}-dns>=1.6.0:../../net/py-dns
-DEPENDS+=	${PYPKGPREFIX}-lxml>=2.1.5:../../textproc/py-lxml
+DEPENDS+=	${PYPKGPREFIX}-lxml>=2.2.1:../../textproc/py-lxml
 DEPENDS+=	${PYPKGPREFIX}-dateutil>=1.4.1:../../time/py-dateutil
 DEPENDS+=	${PYPKGPREFIX}-ClientForm-[0-9]*:../../www/py-ClientForm
 DEPENDS+=	${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup
 DEPENDS+=	${PYPKGPREFIX}-mechanize>=0.1.11:../../www/py-mechanize
+DEPENDS+=	${PYPKGPREFIX}-cssutils>=0.9.7:../../textproc/py-cssutils
 
-#PKG_DESTDIR_SUPPORT=	user-destdir
+PKG_DESTDIR_SUPPORT=	user-destdir
+SPECIAL_PERMS+=	bin/calibre-mount-helper ${SETUID_ROOT_PERMS}
 
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	pkg-config
-PYTHON_VERSIONS_ACCEPTED=	27 26
+PYTHON_VERSIONS_ACCEPTED=	27
 PYDISTUTILSPKG=	yes
 PYSETUPOPTARGS=	# empty
-PYSETUPINSTALLARGS=	--prefix=${PREFIX}
+PYSETUPINSTALLARGS=	--prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
 WRKSRC=		${WRKDIR}/calibre
 INSTALLATION_DIRS=	share/applications
 INSTALLATION_DIRS=	share/icons
 
-REPLACE_PYTHON=		resources/recipes/24sata.recipe
-REPLACE_PYTHON+=	resources/recipes/24sata_rs.recipe
-REPLACE_PYTHON+=	resources/recipes/7dias.recipe
-REPLACE_PYTHON+=	resources/recipes/accountancyage.recipe
-REPLACE_PYTHON+=	resources/recipes/adventuregamers.recipe
-REPLACE_PYTHON+=	resources/recipes/al_jazeera.recipe
-REPLACE_PYTHON+=	resources/recipes/ambito.recipe
-REPLACE_PYTHON+=	resources/recipes/amspec.recipe
-REPLACE_PYTHON+=	resources/recipes/ars_technica.recipe
-REPLACE_PYTHON+=	resources/recipes/atlantic.recipe
-REPLACE_PYTHON+=	resources/recipes/axxon_news.recipe
-REPLACE_PYTHON+=	resources/recipes/azstarnet.recipe
-REPLACE_PYTHON+=	resources/recipes/b92.recipe
-REPLACE_PYTHON+=	resources/recipes/bbc.recipe
-REPLACE_PYTHON+=	resources/recipes/bbcvietnamese.recipe
-REPLACE_PYTHON+=	resources/recipes/beta.recipe
-REPLACE_PYTHON+=	resources/recipes/beta_en.recipe
-REPLACE_PYTHON+=	resources/recipes/blic.recipe
-REPLACE_PYTHON+=	resources/recipes/borba.recipe
-REPLACE_PYTHON+=	resources/recipes/buenosaireseconomico.recipe
-REPLACE_PYTHON+=	resources/recipes/business_standard.recipe
-REPLACE_PYTHON+=	resources/recipes/business_week.recipe
-REPLACE_PYTHON+=	resources/recipes/businessworldin.recipe
-REPLACE_PYTHON+=	resources/recipes/chicago_breaking_news.recipe
-REPLACE_PYTHON+=	resources/recipes/cincinnati_enquirer.recipe
-REPLACE_PYTHON+=	resources/recipes/clarin.recipe
-REPLACE_PYTHON+=	resources/recipes/climate_progress.recipe
-REPLACE_PYTHON+=	resources/recipes/coding_horror.recipe
-REPLACE_PYTHON+=	resources/recipes/corriere_della_sera_en.recipe
-REPLACE_PYTHON+=	resources/recipes/corriere_della_sera_it.recipe
-REPLACE_PYTHON+=	resources/recipes/courrierinternational.recipe
-REPLACE_PYTHON+=	resources/recipes/craigslist.recipe
-REPLACE_PYTHON+=	resources/recipes/criticadigital.recipe
-REPLACE_PYTHON+=	resources/recipes/cubadebate.recipe
-REPLACE_PYTHON+=	resources/recipes/daily_telegraph.recipe
-REPLACE_PYTHON+=	resources/recipes/dailyreckoning.recipe
-REPLACE_PYTHON+=	resources/recipes/danas.recipe
-REPLACE_PYTHON+=	resources/recipes/degentenaar.recipe
-REPLACE_PYTHON+=	resources/recipes/demorgen_be.recipe
-REPLACE_PYTHON+=	resources/recipes/der_standard.recipe
-REPLACE_PYTHON+=	resources/recipes/diagonales.recipe
-REPLACE_PYTHON+=	resources/recipes/discover_magazine.recipe
-REPLACE_PYTHON+=	resources/recipes/dn_se.recipe
-REPLACE_PYTHON+=	resources/recipes/dnevni_avaz.recipe
-REPLACE_PYTHON+=	resources/recipes/dnevnik_cro.recipe
-REPLACE_PYTHON+=	resources/recipes/e_novine.recipe
-REPLACE_PYTHON+=	resources/recipes/ecogeek.recipe
-REPLACE_PYTHON+=	resources/recipes/economist.recipe
-REPLACE_PYTHON+=	resources/recipes/el_mercurio_chile.recipe
-REPLACE_PYTHON+=	resources/recipes/el_pais.recipe
-REPLACE_PYTHON+=	resources/recipes/el_universal.recipe
-REPLACE_PYTHON+=	resources/recipes/elargentino.recipe
-REPLACE_PYTHON+=	resources/recipes/elcronista.recipe
-REPLACE_PYTHON+=	resources/recipes/elmundo.recipe
-REPLACE_PYTHON+=	resources/recipes/elperiodico_catalan.recipe
-REPLACE_PYTHON+=	resources/recipes/elperiodico_spanish.recipe
-REPLACE_PYTHON+=	resources/recipes/eltiempo_hn.recipe
-REPLACE_PYTHON+=	resources/recipes/endgadget.recipe
-REPLACE_PYTHON+=	resources/recipes/espn.recipe
-REPLACE_PYTHON+=	resources/recipes/esquire.recipe
-REPLACE_PYTHON+=	resources/recipes/estadao.recipe
-REPLACE_PYTHON+=	resources/recipes/exiled.recipe
-REPLACE_PYTHON+=	resources/recipes/expansion_spanish.recipe
-REPLACE_PYTHON+=	resources/recipes/fastcompany.recipe
-REPLACE_PYTHON+=	resources/recipes/financial_times.recipe
-REPLACE_PYTHON+=	resources/recipes/fokkeensukke.recipe
-REPLACE_PYTHON+=	resources/recipes/freakonomics.recipe
-REPLACE_PYTHON+=	resources/recipes/fudzilla.recipe
-REPLACE_PYTHON+=	resources/recipes/glas_srpske.recipe
-REPLACE_PYTHON+=	resources/recipes/glasjavnosti.recipe
-REPLACE_PYTHON+=	resources/recipes/globe_and_mail.recipe
-REPLACE_PYTHON+=	resources/recipes/granma.recipe
-REPLACE_PYTHON+=	resources/recipes/guardian.recipe
-REPLACE_PYTHON+=	resources/recipes/gva_be.recipe
-REPLACE_PYTHON+=	resources/recipes/h1.recipe
-REPLACE_PYTHON+=	resources/recipes/h2.recipe
-REPLACE_PYTHON+=	resources/recipes/h3.recipe
-REPLACE_PYTHON+=	resources/recipes/harpers.recipe
-REPLACE_PYTHON+=	resources/recipes/harpers_full.recipe
-REPLACE_PYTHON+=	resources/recipes/hln.recipe
-REPLACE_PYTHON+=	resources/recipes/hln_be.recipe
-REPLACE_PYTHON+=	resources/recipes/honoluluadvertiser.recipe
-REPLACE_PYTHON+=	resources/recipes/honvedelem.recipe
-REPLACE_PYTHON+=	resources/recipes/hrt.recipe
-REPLACE_PYTHON+=	resources/recipes/huntechnet.recipe
-REPLACE_PYTHON+=	resources/recipes/ieco.recipe
-REPLACE_PYTHON+=	resources/recipes/infobae.recipe
-REPLACE_PYTHON+=	resources/recipes/infoworld.recipe
-REPLACE_PYTHON+=	resources/recipes/inquirer_net.recipe
-REPLACE_PYTHON+=	resources/recipes/instapaper.recipe
-REPLACE_PYTHON+=	resources/recipes/intelligencer.recipe
-REPLACE_PYTHON+=	resources/recipes/japan_times.recipe
-REPLACE_PYTHON+=	resources/recipes/javalobby.recipe
-REPLACE_PYTHON+=	resources/recipes/jb_online.recipe
-REPLACE_PYTHON+=	resources/recipes/joelonsoftware.recipe
-REPLACE_PYTHON+=	resources/recipes/jutarnji.recipe
-REPLACE_PYTHON+=	resources/recipes/juventudrebelde.recipe
-REPLACE_PYTHON+=	resources/recipes/juventudrebelde_english.recipe
-REPLACE_PYTHON+=	resources/recipes/kellog_faculty.recipe
-REPLACE_PYTHON+=	resources/recipes/kellog_insight.recipe
-REPLACE_PYTHON+=	resources/recipes/krstarica.recipe
-REPLACE_PYTHON+=	resources/recipes/krstarica_en.recipe
-REPLACE_PYTHON+=	resources/recipes/la_cuarta.recipe
-REPLACE_PYTHON+=	resources/recipes/la_segunda.recipe
-REPLACE_PYTHON+=	resources/recipes/la_tercera.recipe
-REPLACE_PYTHON+=	resources/recipes/lamujerdemivida.recipe
-REPLACE_PYTHON+=	resources/recipes/lanacion.recipe
-REPLACE_PYTHON+=	resources/recipes/lanacion_chile.recipe
-REPLACE_PYTHON+=	resources/recipes/laprensa.recipe
-REPLACE_PYTHON+=	resources/recipes/laprensa_hn.recipe
-REPLACE_PYTHON+=	resources/recipes/laprensa_ni.recipe
-REPLACE_PYTHON+=	resources/recipes/latimes.recipe
-REPLACE_PYTHON+=	resources/recipes/latribuna.recipe
-REPLACE_PYTHON+=	resources/recipes/lavanguardia.recipe
-REPLACE_PYTHON+=	resources/recipes/le_monde.recipe
-REPLACE_PYTHON+=	resources/recipes/le_temps.recipe
-REPLACE_PYTHON+=	resources/recipes/lemonde_dip.recipe
-REPLACE_PYTHON+=	resources/recipes/liberation.recipe
-REPLACE_PYTHON+=	resources/recipes/linux_magazine.recipe
-REPLACE_PYTHON+=	resources/recipes/livemint.recipe
-REPLACE_PYTHON+=	resources/recipes/lrb.recipe
-REPLACE_PYTHON+=	resources/recipes/lwn.recipe
-REPLACE_PYTHON+=	resources/recipes/marca.recipe
-REPLACE_PYTHON+=	resources/recipes/mediapart.recipe
-REPLACE_PYTHON+=	resources/recipes/miradasalsur.recipe
-REPLACE_PYTHON+=	resources/recipes/mondedurable.recipe
-REPLACE_PYTHON+=	resources/recipes/moneynews.recipe
-REPLACE_PYTHON+=	resources/recipes/monitor.recipe
-REPLACE_PYTHON+=	resources/recipes/moscow_times.recipe
-REPLACE_PYTHON+=	resources/recipes/msdnmag_en.recipe
-REPLACE_PYTHON+=	resources/recipes/nacional_cro.recipe
-REPLACE_PYTHON+=	resources/recipes/nakedcapitalism.recipe
-REPLACE_PYTHON+=	resources/recipes/new_scientist.recipe
-REPLACE_PYTHON+=	resources/recipes/new_york_review_of_books.recipe
-REPLACE_PYTHON+=	resources/recipes/new_york_review_of_books_no_sub.recipe
-REPLACE_PYTHON+=	resources/recipes/new_yorker.recipe
-REPLACE_PYTHON+=	resources/recipes/newsweek_argentina.recipe
-REPLACE_PYTHON+=	resources/recipes/nin.recipe
-REPLACE_PYTHON+=	resources/recipes/noaa.recipe
-REPLACE_PYTHON+=	resources/recipes/novosti.recipe
-REPLACE_PYTHON+=	resources/recipes/nspm.recipe
-REPLACE_PYTHON+=	resources/recipes/nspm_int.recipe
-REPLACE_PYTHON+=	resources/recipes/nytimes.recipe
-REPLACE_PYTHON+=	resources/recipes/nytimes_sub.recipe
-REPLACE_PYTHON+=	resources/recipes/nzz_ger.recipe
-REPLACE_PYTHON+=	resources/recipes/o_globo.recipe
-REPLACE_PYTHON+=	resources/recipes/ourdailybread.recipe
-REPLACE_PYTHON+=	resources/recipes/outlook_india.recipe
-REPLACE_PYTHON+=	resources/recipes/pagina12.recipe
-REPLACE_PYTHON+=	resources/recipes/pcworld_hu.recipe
-REPLACE_PYTHON+=	resources/recipes/pescanik.recipe
-REPLACE_PYTHON+=	resources/recipes/phd_comics.recipe
-REPLACE_PYTHON+=	resources/recipes/philly.recipe
-REPLACE_PYTHON+=	resources/recipes/pobjeda.recipe
-REPLACE_PYTHON+=	resources/recipes/politico.recipe
-REPLACE_PYTHON+=	resources/recipes/politika.recipe
-REPLACE_PYTHON+=	resources/recipes/portfolio.recipe
-REPLACE_PYTHON+=	resources/recipes/pressonline.recipe
-REPLACE_PYTHON+=	resources/recipes/republika.recipe
-REPLACE_PYTHON+=	resources/recipes/rga.recipe
-REPLACE_PYTHON+=	resources/recipes/rts.recipe
-REPLACE_PYTHON+=	resources/recipes/salon.recipe
-REPLACE_PYTHON+=	resources/recipes/san_fran_chronicle.recipe
-REPLACE_PYTHON+=	resources/recipes/sanjosemercurynews.recipe
-REPLACE_PYTHON+=	resources/recipes/science_aas.recipe
-REPLACE_PYTHON+=	resources/recipes/science_news.recipe
-REPLACE_PYTHON+=	resources/recipes/sciencedaily.recipe
-REPLACE_PYTHON+=	resources/recipes/scientific_american.recipe
-REPLACE_PYTHON+=	resources/recipes/scott_hanselman.recipe
-REPLACE_PYTHON+=	resources/recipes/seattle_times.recipe
-REPLACE_PYTHON+=	resources/recipes/serverside.recipe
-REPLACE_PYTHON+=	resources/recipes/slashdot.recipe
-REPLACE_PYTHON+=	resources/recipes/slate.recipe
-REPLACE_PYTHON+=	resources/recipes/smashing.recipe
-REPLACE_PYTHON+=	resources/recipes/smh.recipe
-REPLACE_PYTHON+=	resources/recipes/soldiers.recipe
-REPLACE_PYTHON+=	resources/recipes/spiegel_int.recipe
-REPLACE_PYTHON+=	resources/recipes/spiegelde.recipe
-REPLACE_PYTHON+=	resources/recipes/st_petersburg_times.recipe
-REPLACE_PYTHON+=	resources/recipes/stackoverflow.recipe
-REPLACE_PYTHON+=	resources/recipes/starbulletin.recipe
-REPLACE_PYTHON+=	resources/recipes/straitstimes.recipe
-REPLACE_PYTHON+=	resources/recipes/svd_se.recipe
-REPLACE_PYTHON+=	resources/recipes/tanjug.recipe
-REPLACE_PYTHON+=	resources/recipes/telegraph_uk.recipe
-REPLACE_PYTHON+=	resources/recipes/teleread.recipe
-REPLACE_PYTHON+=	resources/recipes/the_age.recipe
-REPLACE_PYTHON+=	resources/recipes/the_budget_fashionista.recipe
-REPLACE_PYTHON+=	resources/recipes/the_nation.recipe
-REPLACE_PYTHON+=	resources/recipes/the_oz.recipe
-REPLACE_PYTHON+=	resources/recipes/the_scotsman.recipe
-REPLACE_PYTHON+=	resources/recipes/thedgesingapore.recipe
-REPLACE_PYTHON+=	resources/recipes/theeconomictimes_india.recipe
-REPLACE_PYTHON+=	resources/recipes/themarketticker.recipe
-REPLACE_PYTHON+=	resources/recipes/theoldfoodie.recipe
-REPLACE_PYTHON+=	resources/recipes/theonion.recipe
-REPLACE_PYTHON+=	resources/recipes/thestar.recipe
-REPLACE_PYTHON+=	resources/recipes/tijd.recipe
-REPLACE_PYTHON+=	resources/recipes/time_magazine.recipe
-REPLACE_PYTHON+=	resources/recipes/times_online.recipe
-REPLACE_PYTHON+=	resources/recipes/tnxm.recipe
-REPLACE_PYTHON+=	resources/recipes/tomshardware.recipe
-REPLACE_PYTHON+=	resources/recipes/toronto_sun.recipe
-REPLACE_PYTHON+=	resources/recipes/trouw.recipe
-REPLACE_PYTHON+=	resources/recipes/tweakers.recipe
-REPLACE_PYTHON+=	resources/recipes/twitchfilms.recipe
-REPLACE_PYTHON+=	resources/recipes/uncrate.recipe
-REPLACE_PYTHON+=	resources/recipes/upi.recipe
-REPLACE_PYTHON+=	resources/recipes/usatoday.recipe
-REPLACE_PYTHON+=	resources/recipes/usnews.recipe
-REPLACE_PYTHON+=	resources/recipes/utne.recipe
-REPLACE_PYTHON+=	resources/recipes/variety.recipe
-REPLACE_PYTHON+=	resources/recipes/vecernji_list.recipe
-REPLACE_PYTHON+=	resources/recipes/veintitres.recipe
-REPLACE_PYTHON+=	resources/recipes/vijesti.recipe
-REPLACE_PYTHON+=	resources/recipes/vnexpress.recipe
-REPLACE_PYTHON+=	resources/recipes/volksrant.recipe
-REPLACE_PYTHON+=	resources/recipes/vreme.recipe
-REPLACE_PYTHON+=	resources/recipes/wikinews_en.recipe
-REPLACE_PYTHON+=	resources/recipes/wired.recipe
-REPLACE_PYTHON+=	resources/recipes/wsj.recipe
-REPLACE_PYTHON+=	resources/recipes/zaobao.recipe
-REPLACE_PYTHON+=	setup.py
-REPLACE_PYTHON+=	setup/__init__.py
-REPLACE_PYTHON+=	setup/build_environment.py
-REPLACE_PYTHON+=	setup/check.py
-REPLACE_PYTHON+=	setup/commands.py
-REPLACE_PYTHON+=	setup/extensions.py
-REPLACE_PYTHON+=	setup/gui.py
-REPLACE_PYTHON+=	setup/install.py
-REPLACE_PYTHON+=	setup/installer/__init__.py
-REPLACE_PYTHON+=	setup/installer/linux/__init__.py
-REPLACE_PYTHON+=	setup/installer/linux/freeze.py
-REPLACE_PYTHON+=	setup/installer/linux/freeze2.py
-REPLACE_PYTHON+=	setup/installer/osx/__init__.py
-REPLACE_PYTHON+=	setup/installer/osx/app/__init__.py
-REPLACE_PYTHON+=	setup/installer/osx/app/launcher.py
-REPLACE_PYTHON+=	setup/installer/osx/app/main.py
-REPLACE_PYTHON+=	setup/installer/osx/freeze.py
-REPLACE_PYTHON+=	setup/installer/windows/__init__.py
-REPLACE_PYTHON+=	setup/installer/windows/freeze.py
-REPLACE_PYTHON+=	setup/installer/windows/site.py
-REPLACE_PYTHON+=	setup/installer/windows/wix.py
-REPLACE_PYTHON+=	setup/publish.py
-REPLACE_PYTHON+=	setup/pygettext.py
-REPLACE_PYTHON+=	setup/pypi.py
-REPLACE_PYTHON+=	setup/resources.py
-REPLACE_PYTHON+=	setup/translations.py
-REPLACE_PYTHON+=	setup/upload.py
-REPLACE_PYTHON+=	src/calibre/debug.py
-REPLACE_PYTHON+=	src/calibre/devices/android/__init__.py
-REPLACE_PYTHON+=	src/calibre/devices/eslick/__init__.py
-REPLACE_PYTHON+=	src/calibre/devices/eslick/driver.py
-REPLACE_PYTHON+=	src/calibre/devices/iriver/__init__.py
-REPLACE_PYTHON+=	src/calibre/devices/iriver/driver.py
-REPLACE_PYTHON+=	src/calibre/ebooks/comic/__init__.py
-REPLACE_PYTHON+=	src/calibre/ebooks/compression/palmdoc.py
-REPLACE_PYTHON+=	src/calibre/ebooks/conversion/config.py
-REPLACE_PYTHON+=	src/calibre/ebooks/conversion/preprocess.py
-REPLACE_PYTHON+=	src/calibre/ebooks/epub/output.py
-REPLACE_PYTHON+=	src/calibre/ebooks/html/__init__.py
-REPLACE_PYTHON+=	src/calibre/ebooks/html/input.py
-REPLACE_PYTHON+=	src/calibre/ebooks/lit/input.py
-REPLACE_PYTHON+=	src/calibre/ebooks/lit/output.py
-REPLACE_PYTHON+=	src/calibre/ebooks/lrf/html/table_as_image.py
-REPLACE_PYTHON+=	src/calibre/ebooks/lrf/input.py
-REPLACE_PYTHON+=	src/calibre/ebooks/lrf/output.py
-REPLACE_PYTHON+=	src/calibre/ebooks/lrf/pylrs/pylrf.py
-REPLACE_PYTHON+=	src/calibre/ebooks/markdown/markdown.py
-REPLACE_PYTHON+=	src/calibre/ebooks/markdown/mdx_tables.py
-REPLACE_PYTHON+=	src/calibre/ebooks/metadata/__init__.py
-REPLACE_PYTHON+=	src/calibre/ebooks/metadata/amazon.py
-REPLACE_PYTHON+=	src/calibre/ebooks/metadata/epub.py
-REPLACE_PYTHON+=	src/calibre/ebooks/metadata/fb2.py
-REPLACE_PYTHON+=	src/calibre/ebooks/metadata/html.py
-REPLACE_PYTHON+=	src/calibre/ebooks/metadata/lrx.py
-REPLACE_PYTHON+=	src/calibre/ebooks/metadata/odt.py
-REPLACE_PYTHON+=	src/calibre/ebooks/metadata/opf2.py
-REPLACE_PYTHON+=	src/calibre/ebooks/metadata/rar.py
-REPLACE_PYTHON+=	src/calibre/ebooks/metadata/toc.py
-REPLACE_PYTHON+=	src/calibre/ebooks/metadata/worker.py
-REPLACE_PYTHON+=	src/calibre/ebooks/mobi/__init__.py
-REPLACE_PYTHON+=	src/calibre/ebooks/mobi/huffcdic.py
-REPLACE_PYTHON+=	src/calibre/ebooks/mobi/langcodes.py
-REPLACE_PYTHON+=	src/calibre/ebooks/mobi/output.py
-REPLACE_PYTHON+=	src/calibre/ebooks/odt/__init__.py
-REPLACE_PYTHON+=	src/calibre/ebooks/oeb/transforms/__init__.py
-REPLACE_PYTHON+=	src/calibre/ebooks/oeb/transforms/guide.py
-REPLACE_PYTHON+=	src/calibre/ebooks/oeb/transforms/jacket.py
-REPLACE_PYTHON+=	src/calibre/ebooks/oeb/transforms/linearize_tables.py
-REPLACE_PYTHON+=	src/calibre/ebooks/oeb/transforms/metadata.py
-REPLACE_PYTHON+=	src/calibre/ebooks/oeb/transforms/rescale.py
-REPLACE_PYTHON+=	src/calibre/ebooks/oeb/transforms/structure.py
-REPLACE_PYTHON+=	src/calibre/ebooks/pdf/__init__.py
-REPLACE_PYTHON+=	src/calibre/ebooks/pdf/reflow.py
-REPLACE_PYTHON+=	src/calibre/ebooks/rtf2xml/ParseRtf.py
-REPLACE_PYTHON+=	src/calibre/ebooks/rtf2xml/check_encoding.py
-REPLACE_PYTHON+=	src/calibre/ebooks/txt/__init__.py
-REPLACE_PYTHON+=	src/calibre/gui2/convert/__init__.py
-REPLACE_PYTHON+=	src/calibre/gui2/convert/comic_input.py
-REPLACE_PYTHON+=	src/calibre/gui2/convert/debug.py
-REPLACE_PYTHON+=	src/calibre/gui2/convert/epub_output.py
-REPLACE_PYTHON+=	src/calibre/gui2/convert/font_key.py
-REPLACE_PYTHON+=	src/calibre/gui2/convert/look_and_feel.py
-REPLACE_PYTHON+=	src/calibre/gui2/convert/lrf_output.py
-REPLACE_PYTHON+=	src/calibre/gui2/convert/metadata.py
-REPLACE_PYTHON+=	src/calibre/gui2/convert/mobi_output.py
-REPLACE_PYTHON+=	src/calibre/gui2/convert/page_setup.py
-REPLACE_PYTHON+=	src/calibre/gui2/convert/single.py
-REPLACE_PYTHON+=	src/calibre/gui2/convert/structure_detection.py
-REPLACE_PYTHON+=	src/calibre/gui2/convert/toc.py
-REPLACE_PYTHON+=	src/calibre/gui2/convert/xpath_wizard.py
-REPLACE_PYTHON+=	src/calibre/gui2/cover_flow.py
-REPLACE_PYTHON+=	src/calibre/gui2/dialogs/book_info.py
-REPLACE_PYTHON+=	src/calibre/gui2/dialogs/config/add_save.py
-REPLACE_PYTHON+=	src/calibre/gui2/dialogs/config/history.py
-REPLACE_PYTHON+=	src/calibre/gui2/dialogs/config/social.py
-REPLACE_PYTHON+=	src/calibre/gui2/dialogs/confirm_delete.py
-REPLACE_PYTHON+=	src/calibre/gui2/dialogs/progress.py
-REPLACE_PYTHON+=	src/calibre/gui2/jobs.py
-REPLACE_PYTHON+=	src/calibre/gui2/metadata.py
-REPLACE_PYTHON+=	src/calibre/gui2/search_box.py
-REPLACE_PYTHON+=	src/calibre/gui2/tag_view.py
-REPLACE_PYTHON+=	src/calibre/gui2/tools.py
-REPLACE_PYTHON+=	src/calibre/gui2/viewer/documentview.py
-REPLACE_PYTHON+=	src/calibre/gui2/viewer/printing.py
-REPLACE_PYTHON+=	src/calibre/gui2/widgets.py
-REPLACE_PYTHON+=	src/calibre/gui2/wizard/__init__.py
-REPLACE_PYTHON+=	src/calibre/gui2/wizard/send_email.py
-REPLACE_PYTHON+=	src/calibre/library/cli.py
-REPLACE_PYTHON+=	src/calibre/library/move.py
-REPLACE_PYTHON+=	src/calibre/library/save_to_disk.py
-REPLACE_PYTHON+=	src/calibre/library/server.py
-REPLACE_PYTHON+=	src/calibre/library/test.py
-REPLACE_PYTHON+=	src/calibre/libunzip.py
-REPLACE_PYTHON+=	src/calibre/manual/custom.py
-REPLACE_PYTHON+=	src/calibre/manual/epub.py
-REPLACE_PYTHON+=	src/calibre/trac/bzr_commit_plugin.py
-REPLACE_PYTHON+=	src/calibre/translations/msgfmt.py
-REPLACE_PYTHON+=	src/calibre/utils/__init__.py
-REPLACE_PYTHON+=	src/calibre/utils/complete.py
-REPLACE_PYTHON+=	src/calibre/utils/fonts/__init__.py
-REPLACE_PYTHON+=	src/calibre/utils/ipc/__init__.py
-REPLACE_PYTHON+=	src/calibre/utils/ipc/job.py
-REPLACE_PYTHON+=	src/calibre/utils/ipc/launch.py
-REPLACE_PYTHON+=	src/calibre/utils/ipc/server.py
-REPLACE_PYTHON+=	src/calibre/utils/ipc/worker.py
-REPLACE_PYTHON+=	src/calibre/utils/localization.py
-REPLACE_PYTHON+=	src/calibre/utils/osx_symlinks.py
-REPLACE_PYTHON+=	src/calibre/utils/pdftk.py
-REPLACE_PYTHON+=	src/calibre/utils/podofo/__init__.py
-REPLACE_PYTHON+=	src/calibre/utils/resources.py
-REPLACE_PYTHON+=	src/calibre/utils/search_query_parser.py
-REPLACE_PYTHON+=	src/calibre/utils/sftp.py
-REPLACE_PYTHON+=	src/calibre/utils/sigil.py
-REPLACE_PYTHON+=	src/calibre/web/feeds/__init__.py
-REPLACE_PYTHON+=	src/calibre/web/feeds/feedparser.py
-REPLACE_PYTHON+=	src/calibre/web/feeds/input.py
-REPLACE_PYTHON+=	src/calibre/web/feeds/recipes/__init__.py
-REPLACE_PYTHON+=	src/calibre/web/feeds/recipes/collection.py
-REPLACE_PYTHON+=	src/calibre/web/feeds/recipes/model.py
-REPLACE_PYTHON+=	src/calibre/web/feeds/templates.py
-REPLACE_PYTHON+=	src/calibre/web/fetch/simple.py
-REPLACE_PYTHON+=	src/cherrypy/_cpmodpy.py
-REPLACE_PYTHON+=	src/cherrypy/cherryd
-REPLACE_PYTHON+=	src/cssutils/__init__.py
-REPLACE_PYTHON+=	src/cssutils/codec.py
-REPLACE_PYTHON+=	src/cssutils/errorhandler.py
-REPLACE_PYTHON+=	src/cssutils/parse.py
-REPLACE_PYTHON+=	src/cssutils/serialize.py
-REPLACE_PYTHON+=	src/cssutils/tokenize2.py
-REPLACE_PYTHON+=	src/encutils/__init__.py
-REPLACE_PYTHON+=	src/odf/element.py
-REPLACE_PYTHON+=	src/odf/elementtypes.py
-REPLACE_PYTHON+=	src/odf/load.py
-REPLACE_PYTHON+=	src/odf/manifest.py
-REPLACE_PYTHON+=	src/odf/odf2xhtml.py
-REPLACE_PYTHON+=	src/odf/odfmanifest.py
-REPLACE_PYTHON+=	src/odf/thumbnail.py
-REPLACE_PYTHON+=	src/odf/userfield.py
+FIX_PYTHON+=	recipes/180.recipe
+FIX_PYTHON+=	recipes/24sata.recipe
+FIX_PYTHON+=	recipes/7dias.recipe
+FIX_PYTHON+=	recipes/7seri.recipe
+FIX_PYTHON+=	recipes/Ansa.recipe
+FIX_PYTHON+=	recipes/accountancyage.recipe
+FIX_PYTHON+=	recipes/adevarul.recipe
+FIX_PYTHON+=	recipes/adnkronos.recipe
+FIX_PYTHON+=	recipes/ajc.recipe
+FIX_PYTHON+=	recipes/ambito.recipe
+FIX_PYTHON+=	recipes/apcom.recipe
+FIX_PYTHON+=	recipes/arcamax.recipe
+FIX_PYTHON+=	recipes/asia_one.recipe
+FIX_PYTHON+=	recipes/atlantic.recipe
+FIX_PYTHON+=	recipes/auto.recipe
+FIX_PYTHON+=	recipes/auto_prove.recipe
+FIX_PYTHON+=	recipes/autobild.recipe
+FIX_PYTHON+=	recipes/avantaje.recipe
+FIX_PYTHON+=	recipes/aventurilapescuit.recipe
+FIX_PYTHON+=	recipes/axxon_news.recipe
+FIX_PYTHON+=	recipes/babyonline.recipe
+FIX_PYTHON+=	recipes/bbcvietnamese.recipe
+FIX_PYTHON+=	recipes/beta_en.recipe
+FIX_PYTHON+=	recipes/billorielly.recipe
+FIX_PYTHON+=	recipes/bitacora.recipe
+FIX_PYTHON+=	recipes/boortz.recipe
+FIX_PYTHON+=	recipes/borba.recipe
+FIX_PYTHON+=	recipes/brand_eins.recipe
+FIX_PYTHON+=	recipes/bucataras.recipe
+FIX_PYTHON+=	recipes/buenosaireseconomico.recipe
+FIX_PYTHON+=	recipes/business_week.recipe
+FIX_PYTHON+=	recipes/calgary_herald.recipe
+FIX_PYTHON+=	recipes/capital.recipe
+FIX_PYTHON+=	recipes/catavencu.recipe
+FIX_PYTHON+=	recipes/chicago_breaking_news.recipe
+FIX_PYTHON+=	recipes/chipro.recipe
+FIX_PYTHON+=	recipes/chr_mon.recipe
+FIX_PYTHON+=	recipes/cincinnati_enquirer.recipe
+FIX_PYTHON+=	recipes/cinebel_be.recipe
+FIX_PYTHON+=	recipes/cio.recipe
+FIX_PYTHON+=	recipes/climate_progress.recipe
+FIX_PYTHON+=	recipes/cnd.recipe
+FIX_PYTHON+=	recipes/coding_horror.recipe
+FIX_PYTHON+=	recipes/computer_active.recipe
+FIX_PYTHON+=	recipes/corriere_della_sera_en.recipe
+FIX_PYTHON+=	recipes/corriere_della_sera_it.recipe
+FIX_PYTHON+=	recipes/corriere_dello_sport.recipe
+FIX_PYTHON+=	recipes/cosmopolitan.recipe
+FIX_PYTHON+=	recipes/cotidianul.recipe
+FIX_PYTHON+=	recipes/courrierinternational.recipe
+FIX_PYTHON+=	recipes/craigslist.recipe
+FIX_PYTHON+=	recipes/credit_slips.recipe
+FIX_PYTHON+=	recipes/criticadigital.recipe
+FIX_PYTHON+=	recipes/csid.recipe
+FIX_PYTHON+=	recipes/curierulnational.recipe
+FIX_PYTHON+=	recipes/daily_telegraph.recipe
+FIX_PYTHON+=	recipes/dailyreckoning.recipe
+FIX_PYTHON+=	recipes/degentenaar.recipe
+FIX_PYTHON+=	recipes/deia.recipe
+FIX_PYTHON+=	recipes/demorgen_be.recipe
+FIX_PYTHON+=	recipes/der_spiegel.recipe
+FIX_PYTHON+=	recipes/der_standard.recipe
+FIX_PYTHON+=	recipes/descopera.recipe
+FIX_PYTHON+=	recipes/dhnet_be.recipe
+FIX_PYTHON+=	recipes/di.recipe
+FIX_PYTHON+=	recipes/diagonales.recipe
+FIX_PYTHON+=	recipes/diario_cordoba.recipe
+FIX_PYTHON+=	recipes/digital_arts.recipe
+FIX_PYTHON+=	recipes/dilemaveche.recipe
+FIX_PYTHON+=	recipes/discover_magazine.recipe
+FIX_PYTHON+=	recipes/divahair.recipe
+FIX_PYTHON+=	recipes/dn_se.recipe
+FIX_PYTHON+=	recipes/dnevni_avaz.recipe
+FIX_PYTHON+=	recipes/dnevnik_cro.recipe
+FIX_PYTHON+=	recipes/eclicto.recipe
+FIX_PYTHON+=	recipes/ecogeek.recipe
+FIX_PYTHON+=	recipes/economist.recipe
+FIX_PYTHON+=	recipes/ecuisine.recipe
+FIX_PYTHON+=	recipes/editor_and_publisher.recipe
+FIX_PYTHON+=	recipes/edmonton_journal.recipe
+FIX_PYTHON+=	recipes/egirl.recipe
+FIX_PYTHON+=	recipes/eksiazki.recipe
+FIX_PYTHON+=	recipes/el_correo.recipe
+FIX_PYTHON+=	recipes/el_observador.recipe
+FIX_PYTHON+=	recipes/el_pais.recipe
+FIX_PYTHON+=	recipes/el_pais_uy.recipe
+FIX_PYTHON+=	recipes/el_periodico.recipe
+FIX_PYTHON+=	recipes/el_publico.recipe
+FIX_PYTHON+=	recipes/elargentino.recipe
+FIX_PYTHON+=	recipes/elcronista.recipe
+FIX_PYTHON+=	recipes/ele.recipe
+FIX_PYTHON+=	recipes/elperiodico_catalan.recipe
+FIX_PYTHON+=	recipes/elperiodico_spanish.recipe
+FIX_PYTHON+=	recipes/eltiempo_hn.recipe
+FIX_PYTHON+=	recipes/endgadget.recipe
+FIX_PYTHON+=	recipes/epicurious.recipe
+FIX_PYTHON+=	recipes/epl_talk.recipe
+FIX_PYTHON+=	recipes/esenja.recipe
+FIX_PYTHON+=	recipes/espn.recipe
+FIX_PYTHON+=	recipes/evz.ro.recipe
+FIX_PYTHON+=	recipes/expansion_spanish.recipe
+FIX_PYTHON+=	recipes/fan_graphs.recipe
+FIX_PYTHON+=	recipes/fastcompany.recipe
+FIX_PYTHON+=	recipes/felicia.recipe
+FIX_PYTHON+=	recipes/fhmro.recipe
+FIX_PYTHON+=	recipes/financial_times.recipe
+FIX_PYTHON+=	recipes/financiarul.recipe
+FIX_PYTHON+=	recipes/fr_online.recipe
+FIX_PYTHON+=	recipes/frazpc.recipe
+FIX_PYTHON+=	recipes/freakonomics.recipe
+FIX_PYTHON+=	recipes/freeway.recipe
+FIX_PYTHON+=	recipes/fronda.recipe
+FIX_PYTHON+=	recipes/fudzilla.recipe
+FIX_PYTHON+=	recipes/gandul.recipe
+FIX_PYTHON+=	recipes/gazeta-prawna-calibre-v1.recipe
+FIX_PYTHON+=	recipes/gazeta_pomorska.recipe
+FIX_PYTHON+=	recipes/globe_and_mail.recipe
+FIX_PYTHON+=	recipes/go4it.recipe
+FIX_PYTHON+=	recipes/go_comics.recipe
+FIX_PYTHON+=	recipes/granma.recipe
+FIX_PYTHON+=	recipes/gsp.recipe
+FIX_PYTHON+=	recipes/guardian.recipe
+FIX_PYTHON+=	recipes/gva_be.recipe
+FIX_PYTHON+=	recipes/h2.recipe
+FIX_PYTHON+=	recipes/h3.recipe
+FIX_PYTHON+=	recipes/heraldo.recipe
+FIX_PYTHON+=	recipes/histmag.recipe
+FIX_PYTHON+=	recipes/historiaro.recipe
+FIX_PYTHON+=	recipes/hitro.recipe
+FIX_PYTHON+=	recipes/hln.recipe
+FIX_PYTHON+=	recipes/hln_be.recipe
+FIX_PYTHON+=	recipes/hola.recipe
+FIX_PYTHON+=	recipes/honvedelem.recipe
+FIX_PYTHON+=	recipes/hotcity.recipe
+FIX_PYTHON+=	recipes/hotnews.recipe
+FIX_PYTHON+=	recipes/houston_chronicle.recipe
+FIX_PYTHON+=	recipes/hoy.recipe
+FIX_PYTHON+=	recipes/hrt.recipe
+FIX_PYTHON+=	recipes/huntechnet.recipe
+FIX_PYTHON+=	recipes/ieco.recipe
+FIX_PYTHON+=	recipes/il_giornale.recipe
+FIX_PYTHON+=	recipes/il_messaggero.recipe
+FIX_PYTHON+=	recipes/imperatortravel.recipe
+FIX_PYTHON+=	recipes/infomotori.recipe
+FIX_PYTHON+=	recipes/infoworld.recipe
+FIX_PYTHON+=	recipes/inquirer_net.recipe
+FIX_PYTHON+=	recipes/intelligencer.recipe
+FIX_PYTHON+=	recipes/interia_fakty.recipe
+FIX_PYTHON+=	recipes/interia_sport.recipe
+FIX_PYTHON+=	recipes/intrefete.recipe
+FIX_PYTHON+=	recipes/jakarta_post.recipe
+FIX_PYTHON+=	recipes/japan_times.recipe
+FIX_PYTHON+=	recipes/javalobby.recipe
+FIX_PYTHON+=	recipes/jb_online.recipe
+FIX_PYTHON+=	recipes/joelonsoftware.recipe
+FIX_PYTHON+=	recipes/journalgazette.recipe
+FIX_PYTHON+=	recipes/jurnalulnational.recipe
+FIX_PYTHON+=	recipes/jutarnji.recipe
+FIX_PYTHON+=	recipes/juventudrebelde.recipe
+FIX_PYTHON+=	recipes/juventudrebelde_english.recipe
+FIX_PYTHON+=	recipes/kamikaze.recipe
+FIX_PYTHON+=	recipes/kellog_faculty.recipe
+FIX_PYTHON+=	recipes/kellog_insight.recipe
+FIX_PYTHON+=	recipes/kompas.recipe
+FIX_PYTHON+=	recipes/krstarica.recipe
+FIX_PYTHON+=	recipes/krstarica_en.recipe
+FIX_PYTHON+=	recipes/kudika.recipe
+FIX_PYTHON+=	recipes/kukuburi.recipe
+FIX_PYTHON+=	recipes/l_espresso.recipe
+FIX_PYTHON+=	recipes/la_cuarta.recipe
+FIX_PYTHON+=	recipes/la_diaria.recipe
+FIX_PYTHON+=	recipes/la_gazzeta_dello_sport.recipe
+FIX_PYTHON+=	recipes/la_republica.recipe
+FIX_PYTHON+=	recipes/la_stampa.recipe
+FIX_PYTHON+=	recipes/lalibre_be.recipe
+FIX_PYTHON+=	recipes/lameuse_be.recipe
+FIX_PYTHON+=	recipes/lamujerdemivida.recipe
+FIX_PYTHON+=	recipes/lanacion_chile.recipe
+FIX_PYTHON+=	recipes/laprensa.recipe
+FIX_PYTHON+=	recipes/laprensa_hn.recipe
+FIX_PYTHON+=	recipes/laprensa_ni.recipe
+FIX_PYTHON+=	recipes/latribuna.recipe
+FIX_PYTHON+=	recipes/lavanguardia.recipe
+FIX_PYTHON+=	recipes/lavenir_be.recipe
+FIX_PYTHON+=	recipes/le_temps.recipe
+FIX_PYTHON+=	recipes/legeartis.recipe
+FIX_PYTHON+=	recipes/leggo_it.recipe
+FIX_PYTHON+=	recipes/legitymizm.recipe
+FIX_PYTHON+=	recipes/lenta_ru.recipe
+FIX_PYTHON+=	recipes/lescienze.recipe
+FIX_PYTHON+=	recipes/lesoir_be.recipe
+FIX_PYTHON+=	recipes/liberation.recipe
+FIX_PYTHON+=	recipes/libero.recipe
+FIX_PYTHON+=	recipes/linux_magazine.recipe
+FIX_PYTHON+=	recipes/livemint.recipe
+FIX_PYTHON+=	recipes/lwn.recipe
+FIX_PYTHON+=	recipes/lwn_weekly.recipe
+FIX_PYTHON+=	recipes/mac_video.recipe
+FIX_PYTHON+=	recipes/mac_world.recipe
+FIX_PYTHON+=	recipes/mac_world_uk.recipe
+FIX_PYTHON+=	recipes/macleans.recipe
+FIX_PYTHON+=	recipes/malaysian_mirror.recipe
+FIX_PYTHON+=	recipes/marca.recipe
+FIX_PYTHON+=	recipes/mayra.recipe
+FIX_PYTHON+=	recipes/mediafax.recipe
+FIX_PYTHON+=	recipes/mediaindonesia.recipe
+FIX_PYTHON+=	recipes/medscape.recipe
+FIX_PYTHON+=	recipes/michalkiewicz.recipe
+FIX_PYTHON+=	recipes/milenio.recipe
+FIX_PYTHON+=	recipes/miradasalsur.recipe
+FIX_PYTHON+=	recipes/moldovaazi.recipe
+FIX_PYTHON+=	recipes/mondedurable.recipe
+FIX_PYTHON+=	recipes/monden.recipe
+FIX_PYTHON+=	recipes/moneynews.recipe
+FIX_PYTHON+=	recipes/moneyro.recipe
+FIX_PYTHON+=	recipes/monitor.recipe
+FIX_PYTHON+=	recipes/montevideo_com.recipe
+FIX_PYTHON+=	recipes/montreal_gazette.recipe
+FIX_PYTHON+=	recipes/msdnmag_en.recipe
+FIX_PYTHON+=	recipes/nacional_cro.recipe
+FIX_PYTHON+=	recipes/nakedcapitalism.recipe
+FIX_PYTHON+=	recipes/natgeo.recipe
+FIX_PYTHON+=	recipes/nationalgeoro.recipe
+FIX_PYTHON+=	recipes/new_york_review_of_books.recipe
+FIX_PYTHON+=	recipes/new_york_review_of_books_no_sub.recipe
+FIX_PYTHON+=	recipes/newsmoldova.recipe
+FIX_PYTHON+=	recipes/newsweek_argentina.recipe
+FIX_PYTHON+=	recipes/newsweek_polska.recipe
+FIX_PYTHON+=	recipes/njp.recipe
+FIX_PYTHON+=	recipes/noaa.recipe
+FIX_PYTHON+=	recipes/nortecastilla.recipe
+FIX_PYTHON+=	recipes/now_toronto.recipe
+FIX_PYTHON+=	recipes/nrc-nl-epub.recipe
+FIX_PYTHON+=	recipes/nymag.recipe
+FIX_PYTHON+=	recipes/nytimes.recipe
+FIX_PYTHON+=	recipes/nytimes_sports.recipe
+FIX_PYTHON+=	recipes/nytimes_sub.recipe
+FIX_PYTHON+=	recipes/nytimes_tech.recipe
+FIX_PYTHON+=	recipes/o_globo.recipe
+FIX_PYTHON+=	recipes/observa_digital.recipe
+FIX_PYTHON+=	recipes/observer_gb.recipe
+FIX_PYTHON+=	recipes/oc_register.recipe
+FIX_PYTHON+=	recipes/onemagazine.recipe
+FIX_PYTHON+=	recipes/onionavclub.recipe
+FIX_PYTHON+=	recipes/osnews_pl.recipe
+FIX_PYTHON+=	recipes/ottawa_citizen.recipe
+FIX_PYTHON+=	recipes/outlook_india.recipe
+FIX_PYTHON+=	recipes/panorama.recipe
+FIX_PYTHON+=	recipes/pc_advisor.recipe
+FIX_PYTHON+=	recipes/pc_lab.recipe
+FIX_PYTHON+=	recipes/pc_mag.recipe
+FIX_PYTHON+=	recipes/pc_world.recipe
+FIX_PYTHON+=	recipes/pcworld_hu.recipe
+FIX_PYTHON+=	recipes/pcworldro.recipe
+FIX_PYTHON+=	recipes/people_us_mashup.recipe
+FIX_PYTHON+=	recipes/phd_comics.recipe
+FIX_PYTHON+=	recipes/philly.recipe
+FIX_PYTHON+=	recipes/pobjeda.recipe
+FIX_PYTHON+=	recipes/politico.recipe
+FIX_PYTHON+=	recipes/polityka.recipe
+FIX_PYTHON+=	recipes/portfolio.recipe
+FIX_PYTHON+=	recipes/pressonline.recipe
+FIX_PYTHON+=	recipes/promotor.recipe
+FIX_PYTHON+=	recipes/prosport.recipe
+FIX_PYTHON+=	recipes/prostamerika.recipe
+FIX_PYTHON+=	recipes/protvmagazin.recipe
+FIX_PYTHON+=	recipes/psychologies.recipe
+FIX_PYTHON+=	recipes/publico.recipe
+FIX_PYTHON+=	recipes/publika.recipe
+FIX_PYTHON+=	recipes/punto_informatico.recipe
+FIX_PYTHON+=	recipes/quotidiano.recipe
+FIX_PYTHON+=	recipes/readers_digest.recipe
+FIX_PYTHON+=	recipes/realitatea.recipe
+FIX_PYTHON+=	recipes/red_aragon.recipe
+FIX_PYTHON+=	recipes/regina_leader_post.recipe
+FIX_PYTHON+=	recipes/replicavedetelor.recipe
+FIX_PYTHON+=	recipes/republika.recipe
+FIX_PYTHON+=	recipes/revista_bla.recipe
+FIX_PYTHON+=	recipes/rga.recipe
+FIX_PYTHON+=	recipes/rmf24_ESKN.recipe
+FIX_PYTHON+=	recipes/rmf24_fakty.recipe
+FIX_PYTHON+=	recipes/rmf24_opinie.recipe
+FIX_PYTHON+=	recipes/romanialibera.recipe
+FIX_PYTHON+=	recipes/rstones.recipe
+FIX_PYTHON+=	recipes/rts.recipe
+FIX_PYTHON+=	recipes/runa.recipe
+FIX_PYTHON+=	recipes/salon.recipe
+FIX_PYTHON+=	recipes/san_fran_chronicle.recipe
+FIX_PYTHON+=	recipes/sanjosemercurynews.recipe
+FIX_PYTHON+=	recipes/saskatoon_star_phoenix.recipe
+FIX_PYTHON+=	recipes/sb_nation.recipe
+FIX_PYTHON+=	recipes/science_aas.recipe
+FIX_PYTHON+=	recipes/science_based_medicine.recipe
+FIX_PYTHON+=	recipes/science_news.recipe
+FIX_PYTHON+=	recipes/science_news_recent_issues.recipe
+FIX_PYTHON+=	recipes/sciencedaily.recipe
+FIX_PYTHON+=	recipes/scientific_american.recipe
+FIX_PYTHON+=	recipes/scott_hanselman.recipe
+FIX_PYTHON+=	recipes/seanhannity.recipe
+FIX_PYTHON+=	recipes/seattle_times.recipe
+FIX_PYTHON+=	recipes/serverside.recipe
+FIX_PYTHON+=	recipes/sfin.recipe
+FIX_PYTHON+=	recipes/slashdot.recipe
+FIX_PYTHON+=	recipes/slate.recipe
+FIX_PYTHON+=	recipes/smashing.recipe
+FIX_PYTHON+=	recipes/socialdiva.recipe
+FIX_PYTHON+=	recipes/spiegel_int.recipe
+FIX_PYTHON+=	recipes/spiegelde.recipe
+FIX_PYTHON+=	recipes/st_petersburg_times.recipe
+FIX_PYTHON+=	recipes/stackoverflow.recipe
+FIX_PYTHON+=	recipes/standardmoney.recipe
+FIX_PYTHON+=	recipes/superbebe.recipe
+FIX_PYTHON+=	recipes/svd_se.recipe
+FIX_PYTHON+=	recipes/swiatkindle.recipe
+FIX_PYTHON+=	recipes/tabu.recipe
+FIX_PYTHON+=	recipes/tanjug.recipe
+FIX_PYTHON+=	recipes/taz.recipe
+FIX_PYTHON+=	recipes/tech_world.recipe
+FIX_PYTHON+=	recipes/teleread.recipe
+FIX_PYTHON+=	recipes/the_age.recipe
+FIX_PYTHON+=	recipes/the_budget_fashionista.recipe
+FIX_PYTHON+=	recipes/the_escapist.recipe
+FIX_PYTHON+=	recipes/the_h.recipe
+FIX_PYTHON+=	recipes/the_oz.recipe
+FIX_PYTHON+=	recipes/the_scotsman.recipe
+FIX_PYTHON+=	recipes/thedgesingapore.recipe
+FIX_PYTHON+=	recipes/themarketticker.recipe
+FIX_PYTHON+=	recipes/theoldfoodie.recipe
+FIX_PYTHON+=	recipes/thestar.recipe
+FIX_PYTHON+=	recipes/tijd.recipe
+FIX_PYTHON+=	recipes/time_magazine.recipe
+FIX_PYTHON+=	recipes/timesnewroman.recipe
+FIX_PYTHON+=	recipes/tnxm.recipe
+FIX_PYTHON+=	recipes/tomshardware.recipe
+FIX_PYTHON+=	recipes/toronto_sun.recipe
+FIX_PYTHON+=	recipes/trombon.recipe
+FIX_PYTHON+=	recipes/tuttosport.recipe
+FIX_PYTHON+=	recipes/tvmania.recipe
+FIX_PYTHON+=	recipes/tweakers.recipe
+FIX_PYTHON+=	recipes/twitchfilms.recipe
+FIX_PYTHON+=	recipes/tyzden.recipe
+FIX_PYTHON+=	recipes/uncrate.recipe
+FIX_PYTHON+=	recipes/unica.recipe
+FIX_PYTHON+=	recipes/upi.recipe
+FIX_PYTHON+=	recipes/usatoday.recipe
+FIX_PYTHON+=	recipes/usnews.recipe
+FIX_PYTHON+=	recipes/utne.recipe
+FIX_PYTHON+=	recipes/vancouver_provice.recipe
+FIX_PYTHON+=	recipes/vancouver_sun.recipe
+FIX_PYTHON+=	recipes/vecernji_list.recipe
+FIX_PYTHON+=	recipes/vedomosti.recipe
+FIX_PYTHON+=	recipes/veintitres.recipe
+FIX_PYTHON+=	recipes/vic_times.recipe
+FIX_PYTHON+=	recipes/viva.recipe
+FIX_PYTHON+=	recipes/vnexpress.recipe
+FIX_PYTHON+=	recipes/wallstreetro.recipe
+FIX_PYTHON+=	recipes/wash_times.recipe
+FIX_PYTHON+=	recipes/weblogs_sl.recipe
+FIX_PYTHON+=	recipes/wenxuecity-znjy.recipe
+FIX_PYTHON+=	recipes/wikinews_en.recipe
+FIX_PYTHON+=	recipes/windows_star.recipe
+FIX_PYTHON+=	recipes/winter_olympics.recipe
+FIX_PYTHON+=	recipes/wired_daily.recipe
+FIX_PYTHON+=	recipes/wprost.recipe
+FIX_PYTHON+=	recipes/wsj.recipe
+FIX_PYTHON+=	recipes/wsj_free.recipe
+FIX_PYTHON+=	recipes/wvhooligan.recipe
+FIX_PYTHON+=	recipes/zaobao.recipe
+FIX_PYTHON+=	recipes/zeitde_sub.recipe
+FIX_PYTHON+=	recipes/ziarulfinanciar.recipe
+FIX_PYTHON+=	recipes/ziuaveche.recipe
+FIX_PYTHON+=	resources/catalog/section_list_templates.py
+FIX_PYTHON+=	resources/default_tweaks.py
+FIX_PYTHON+=	setup.py
+FIX_PYTHON+=	setup/__init__.py
+FIX_PYTHON+=	setup/build_environment.py
+FIX_PYTHON+=	setup/check.py
+FIX_PYTHON+=	setup/commands.py
+FIX_PYTHON+=	setup/extensions.py
+FIX_PYTHON+=	setup/gui.py
+FIX_PYTHON+=	setup/installer/__init__.py
+FIX_PYTHON+=	setup/installer/linux/__init__.py
+FIX_PYTHON+=	setup/installer/linux/freeze.py
+FIX_PYTHON+=	setup/installer/linux/freeze2.py
+FIX_PYTHON+=	setup/installer/osx/__init__.py
+FIX_PYTHON+=	setup/installer/osx/app/__init__.py
+FIX_PYTHON+=	setup/installer/osx/app/main.py
+FIX_PYTHON+=	setup/installer/osx/freeze.py
+FIX_PYTHON+=	setup/installer/windows/__init__.py
+FIX_PYTHON+=	setup/installer/windows/freeze.py
+FIX_PYTHON+=	setup/installer/windows/site.py
+FIX_PYTHON+=	setup/installer/windows/wix.py
+FIX_PYTHON+=	setup/publish.py
+FIX_PYTHON+=	setup/pygettext.py
+FIX_PYTHON+=	setup/pypi.py
+FIX_PYTHON+=	setup/resources.py
+FIX_PYTHON+=	setup/server.py
+FIX_PYTHON+=	setup/translations.py
+FIX_PYTHON+=	setup/upload.py
+FIX_PYTHON+=	src/calibre/customize/zipplugin.py
+FIX_PYTHON+=	src/calibre/debug.py
+FIX_PYTHON+=	src/calibre/devices/android/__init__.py
+FIX_PYTHON+=	src/calibre/devices/eslick/__init__.py
+FIX_PYTHON+=	src/calibre/devices/eslick/driver.py
+FIX_PYTHON+=	src/calibre/devices/folder_device/__init__.py
+FIX_PYTHON+=	src/calibre/devices/iriver/__init__.py
+FIX_PYTHON+=	src/calibre/devices/iriver/driver.py
+FIX_PYTHON+=	src/calibre/devices/kobo/__init__.py
+FIX_PYTHON+=	src/calibre/devices/kobo/driver.py
+FIX_PYTHON+=	src/calibre/devices/misc.py
+FIX_PYTHON+=	src/calibre/devices/prs505/sony_cache.py
+FIX_PYTHON+=	src/calibre/devices/teclast/__init__.py
+FIX_PYTHON+=	src/calibre/devices/udisks.py
+FIX_PYTHON+=	src/calibre/ebooks/chm/__init__.py
+FIX_PYTHON+=	src/calibre/ebooks/chm/metadata.py
+FIX_PYTHON+=	src/calibre/ebooks/comic/__init__.py
+FIX_PYTHON+=	src/calibre/ebooks/compression/palmdoc.py
+FIX_PYTHON+=	src/calibre/ebooks/conversion/config.py
+FIX_PYTHON+=	src/calibre/ebooks/conversion/preprocess.py
+FIX_PYTHON+=	src/calibre/ebooks/conversion/utils.py
+FIX_PYTHON+=	src/calibre/ebooks/epub/fix/__init__.py
+FIX_PYTHON+=	src/calibre/ebooks/epub/fix/container.py
+FIX_PYTHON+=	src/calibre/ebooks/epub/fix/epubcheck.py
+FIX_PYTHON+=	src/calibre/ebooks/epub/fix/main.py
+FIX_PYTHON+=	src/calibre/ebooks/epub/fix/unmanifested.py
+FIX_PYTHON+=	src/calibre/ebooks/epub/output.py
+FIX_PYTHON+=	src/calibre/ebooks/epub/periodical.py
+FIX_PYTHON+=	src/calibre/ebooks/html/__init__.py
+FIX_PYTHON+=	src/calibre/ebooks/html/input.py
+FIX_PYTHON+=	src/calibre/ebooks/iterator/__init__.py
+FIX_PYTHON+=	src/calibre/ebooks/lit/input.py
+FIX_PYTHON+=	src/calibre/ebooks/lit/output.py
+FIX_PYTHON+=	src/calibre/ebooks/lrf/html/table_as_image.py
+FIX_PYTHON+=	src/calibre/ebooks/lrf/input.py
+FIX_PYTHON+=	src/calibre/ebooks/lrf/output.py
+FIX_PYTHON+=	src/calibre/ebooks/lrf/pylrs/pylrf.py
+FIX_PYTHON+=	src/calibre/ebooks/markdown/markdown.py
+FIX_PYTHON+=	src/calibre/ebooks/markdown/mdx_tables.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/__init__.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/archive.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/book/__init__.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/book/base.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/epub.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/fb2.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/html.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/kdl.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/lrx.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/opf2.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/rar.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/sources/__init__.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/sources/amazon.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/sources/base.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/sources/cli.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/sources/covers.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/sources/douban.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/sources/google.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/sources/identify.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/sources/isbndb.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/sources/openlibrary.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/sources/overdrive.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/sources/test.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/toc.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/worker.py
+FIX_PYTHON+=	src/calibre/ebooks/metadata/xisbn.py
+FIX_PYTHON+=	src/calibre/ebooks/mobi/__init__.py
+FIX_PYTHON+=	src/calibre/ebooks/mobi/debug.py
+FIX_PYTHON+=	src/calibre/ebooks/mobi/huffcdic.py
+FIX_PYTHON+=	src/calibre/ebooks/mobi/langcodes.py
+FIX_PYTHON+=	src/calibre/ebooks/mobi/output.py
+FIX_PYTHON+=	src/calibre/ebooks/odt/__init__.py
+FIX_PYTHON+=	src/calibre/ebooks/oeb/transforms/__init__.py
+FIX_PYTHON+=	src/calibre/ebooks/oeb/transforms/cover.py
+FIX_PYTHON+=	src/calibre/ebooks/oeb/transforms/filenames.py
+FIX_PYTHON+=	src/calibre/ebooks/oeb/transforms/guide.py
+FIX_PYTHON+=	src/calibre/ebooks/oeb/transforms/jacket.py
+FIX_PYTHON+=	src/calibre/ebooks/oeb/transforms/linearize_tables.py
+FIX_PYTHON+=	src/calibre/ebooks/oeb/transforms/metadata.py
+FIX_PYTHON+=	src/calibre/ebooks/oeb/transforms/page_margin.py
+FIX_PYTHON+=	src/calibre/ebooks/oeb/transforms/rescale.py
+FIX_PYTHON+=	src/calibre/ebooks/oeb/transforms/structure.py
+FIX_PYTHON+=	src/calibre/ebooks/pdf/__init__.py
+FIX_PYTHON+=	src/calibre/ebooks/pdf/reflow.py
+FIX_PYTHON+=	src/calibre/ebooks/rtf/preprocess.py
+FIX_PYTHON+=	src/calibre/ebooks/rtf2xml/ParseRtf.py
+FIX_PYTHON+=	src/calibre/ebooks/rtf2xml/check_encoding.py
+FIX_PYTHON+=	src/calibre/ebooks/snb/__init__.py
+FIX_PYTHON+=	src/calibre/ebooks/textile/functions.py
+FIX_PYTHON+=	src/calibre/ebooks/txt/__init__.py
+FIX_PYTHON+=	src/calibre/gui2/actions/__init__.py
+FIX_PYTHON+=	src/calibre/gui2/actions/add.py
+FIX_PYTHON+=	src/calibre/gui2/actions/add_to_library.py
+FIX_PYTHON+=	src/calibre/gui2/actions/annotate.py
+FIX_PYTHON+=	src/calibre/gui2/actions/catalog.py
+FIX_PYTHON+=	src/calibre/gui2/actions/choose_library.py
+FIX_PYTHON+=	src/calibre/gui2/actions/convert.py
+FIX_PYTHON+=	src/calibre/gui2/actions/copy_to_library.py
+FIX_PYTHON+=	src/calibre/gui2/actions/delete.py
+FIX_PYTHON+=	src/calibre/gui2/actions/device.py
+FIX_PYTHON+=	src/calibre/gui2/actions/edit_collections.py
+FIX_PYTHON+=	src/calibre/gui2/actions/edit_metadata.py
+FIX_PYTHON+=	src/calibre/gui2/actions/fetch_news.py
+FIX_PYTHON+=	src/calibre/gui2/actions/help.py
+FIX_PYTHON+=	src/calibre/gui2/actions/next_match.py
+FIX_PYTHON+=	src/calibre/gui2/actions/open.py
+FIX_PYTHON+=	src/calibre/gui2/actions/preferences.py
+FIX_PYTHON+=	src/calibre/gui2/actions/restart.py
+FIX_PYTHON+=	src/calibre/gui2/actions/save_to_disk.py
+FIX_PYTHON+=	src/calibre/gui2/actions/show_book_details.py
+FIX_PYTHON+=	src/calibre/gui2/actions/similar_books.py
+FIX_PYTHON+=	src/calibre/gui2/actions/tweak_epub.py
+FIX_PYTHON+=	src/calibre/gui2/actions/view.py
+FIX_PYTHON+=	src/calibre/gui2/add_wizard/__init__.py
+FIX_PYTHON+=	src/calibre/gui2/bars.py
+FIX_PYTHON+=	src/calibre/gui2/book_details.py
+FIX_PYTHON+=	src/calibre/gui2/catalog/catalog_bibtex.py
+FIX_PYTHON+=	src/calibre/gui2/catalog/catalog_csv_xml.py
+FIX_PYTHON+=	src/calibre/gui2/catalog/catalog_epub_mobi.py
+FIX_PYTHON+=	src/calibre/gui2/comments_editor.py
+FIX_PYTHON+=	src/calibre/gui2/complete.py
+FIX_PYTHON+=	src/calibre/gui2/convert/__init__.py
+FIX_PYTHON+=	src/calibre/gui2/convert/comic_input.py
+FIX_PYTHON+=	src/calibre/gui2/convert/debug.py
+FIX_PYTHON+=	src/calibre/gui2/convert/epub_output.py
+FIX_PYTHON+=	src/calibre/gui2/convert/font_key.py
+FIX_PYTHON+=	src/calibre/gui2/convert/look_and_feel.py
+FIX_PYTHON+=	src/calibre/gui2/convert/lrf_output.py
+FIX_PYTHON+=	src/calibre/gui2/convert/metadata.py
+FIX_PYTHON+=	src/calibre/gui2/convert/mobi_output.py
+FIX_PYTHON+=	src/calibre/gui2/convert/page_setup.py
+FIX_PYTHON+=	src/calibre/gui2/convert/single.py
+FIX_PYTHON+=	src/calibre/gui2/convert/structure_detection.py
+FIX_PYTHON+=	src/calibre/gui2/convert/toc.py
+FIX_PYTHON+=	src/calibre/gui2/convert/xpath_wizard.py
+FIX_PYTHON+=	src/calibre/gui2/cover_flow.py
+FIX_PYTHON+=	src/calibre/gui2/custom_column_widgets.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/add_empty_book.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/add_from_isbn.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/book_info.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/catalog.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/check_library.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/choose_library.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/choose_plugin_toolbars.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/comments_dialog.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/confirm_delete.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/confirm_delete_location.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/delete_matching_from_device.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/drm_error.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/edit_authors_dialog.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/message_box.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/progress.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/restore_library.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/select_formats.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/template_dialog.py
+FIX_PYTHON+=	src/calibre/gui2/dialogs/tweak_epub.py
+FIX_PYTHON+=	src/calibre/gui2/dnd.py
+FIX_PYTHON+=	src/calibre/gui2/email.py
+FIX_PYTHON+=	src/calibre/gui2/init.py
+FIX_PYTHON+=	src/calibre/gui2/jobs.py
+FIX_PYTHON+=	src/calibre/gui2/layout.py
+FIX_PYTHON+=	src/calibre/gui2/library/__init__.py
+FIX_PYTHON+=	src/calibre/gui2/library/delegates.py
+FIX_PYTHON+=	src/calibre/gui2/library/models.py
+FIX_PYTHON+=	src/calibre/gui2/library/views.py
+FIX_PYTHON+=	src/calibre/gui2/metadata/__init__.py
+FIX_PYTHON+=	src/calibre/gui2/metadata/basic_widgets.py
+FIX_PYTHON+=	src/calibre/gui2/metadata/bulk_download.py
+FIX_PYTHON+=	src/calibre/gui2/metadata/config.py
+FIX_PYTHON+=	src/calibre/gui2/metadata/single.py
+FIX_PYTHON+=	src/calibre/gui2/metadata/single_download.py
+FIX_PYTHON+=	src/calibre/gui2/notify.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/__init__.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/adding.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/behavior.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/columns.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/conversion.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/device_debug.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/device_user_defined.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/emailp.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/history.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/look_feel.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/main.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/metadata_sources.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/misc.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/plugboard.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/plugins.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/save_template.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/saving.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/search.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/sending.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/server.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/template_functions.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/toolbar.py
+FIX_PYTHON+=	src/calibre/gui2/preferences/tweaks.py
+FIX_PYTHON+=	src/calibre/gui2/progress_indicator/__init__.py
+FIX_PYTHON+=	src/calibre/gui2/search_box.py
+FIX_PYTHON+=	src/calibre/gui2/shortcuts.py
+FIX_PYTHON+=	src/calibre/gui2/tag_view.py
+FIX_PYTHON+=	src/calibre/gui2/threaded_jobs.py
+FIX_PYTHON+=	src/calibre/gui2/throbber.py
+FIX_PYTHON+=	src/calibre/gui2/tools.py
+FIX_PYTHON+=	src/calibre/gui2/ui.py
+FIX_PYTHON+=	src/calibre/gui2/viewer/dictionary.py
+FIX_PYTHON+=	src/calibre/gui2/viewer/documentview.py
+FIX_PYTHON+=	src/calibre/gui2/viewer/flip.py
+FIX_PYTHON+=	src/calibre/gui2/viewer/gestures.py
+FIX_PYTHON+=	src/calibre/gui2/viewer/keys.py
+FIX_PYTHON+=	src/calibre/gui2/viewer/printing.py
+FIX_PYTHON+=	src/calibre/gui2/widgets.py
+FIX_PYTHON+=	src/calibre/gui2/wizard/__init__.py
+FIX_PYTHON+=	src/calibre/gui2/wizard/send_email.py
+FIX_PYTHON+=	src/calibre/library/add_to_library.py
+FIX_PYTHON+=	src/calibre/library/caches.py
+FIX_PYTHON+=	src/calibre/library/check_library.py
+FIX_PYTHON+=	src/calibre/library/cli.py
+FIX_PYTHON+=	src/calibre/library/comments.py
+FIX_PYTHON+=	src/calibre/library/custom_columns.py
+FIX_PYTHON+=	src/calibre/library/move.py
+FIX_PYTHON+=	src/calibre/library/prefs.py
+FIX_PYTHON+=	src/calibre/library/restore.py
+FIX_PYTHON+=	src/calibre/library/save_to_disk.py
+FIX_PYTHON+=	src/calibre/library/schema_upgrades.py
+FIX_PYTHON+=	src/calibre/library/server/__init__.py
+FIX_PYTHON+=	src/calibre/library/server/base.py
+FIX_PYTHON+=	src/calibre/library/server/browse.py
+FIX_PYTHON+=	src/calibre/library/server/cache.py
+FIX_PYTHON+=	src/calibre/library/server/content.py
+FIX_PYTHON+=	src/calibre/library/server/main.py
+FIX_PYTHON+=	src/calibre/library/server/mobile.py
+FIX_PYTHON+=	src/calibre/library/server/opds.py
+FIX_PYTHON+=	src/calibre/library/server/utils.py
+FIX_PYTHON+=	src/calibre/library/server/xml.py
+FIX_PYTHON+=	src/calibre/library/test.py
+FIX_PYTHON+=	src/calibre/libunzip.py
+FIX_PYTHON+=	src/calibre/manual/custom.py
+FIX_PYTHON+=	src/calibre/manual/epub.py
+FIX_PYTHON+=	src/calibre/manual/plugin_examples/helloworld/__init__.py
+FIX_PYTHON+=	src/calibre/manual/plugin_examples/interface_demo/__init__.py
+FIX_PYTHON+=	src/calibre/manual/plugin_examples/interface_demo/config.py
+FIX_PYTHON+=	src/calibre/manual/plugin_examples/interface_demo/main.py
+FIX_PYTHON+=	src/calibre/manual/plugin_examples/interface_demo/ui.py
+FIX_PYTHON+=	src/calibre/trac/bzr_commit_plugin.py
+FIX_PYTHON+=	src/calibre/translations/msgfmt.py
+FIX_PYTHON+=	src/calibre/utils/__init__.py
+FIX_PYTHON+=	src/calibre/utils/browser.py
+FIX_PYTHON+=	src/calibre/utils/complete.py
+FIX_PYTHON+=	src/calibre/utils/config_base.py
+FIX_PYTHON+=	src/calibre/utils/date.py
+FIX_PYTHON+=	src/calibre/utils/fonts/__init__.py
+FIX_PYTHON+=	src/calibre/utils/html2text.py
+FIX_PYTHON+=	src/calibre/utils/icu.py
+FIX_PYTHON+=	src/calibre/utils/ipc/__init__.py
+FIX_PYTHON+=	src/calibre/utils/ipc/job.py
+FIX_PYTHON+=	src/calibre/utils/ipc/launch.py
+FIX_PYTHON+=	src/calibre/utils/ipc/server.py
+FIX_PYTHON+=	src/calibre/utils/ipc/worker.py
+FIX_PYTHON+=	src/calibre/utils/localization.py
+FIX_PYTHON+=	src/calibre/utils/magick/__init__.py
+FIX_PYTHON+=	src/calibre/utils/magick/draw.py
+FIX_PYTHON+=	src/calibre/utils/magick/generate.py
+FIX_PYTHON+=	src/calibre/utils/mem.py
+FIX_PYTHON+=	src/calibre/utils/network.py
+FIX_PYTHON+=	src/calibre/utils/ordered_dict.py
+FIX_PYTHON+=	src/calibre/utils/osx_symlinks.py
+FIX_PYTHON+=	src/calibre/utils/pdftk.py
+FIX_PYTHON+=	src/calibre/utils/podofo/__init__.py
+FIX_PYTHON+=	src/calibre/utils/pyconsole/__init__.py
+FIX_PYTHON+=	src/calibre/utils/pyconsole/console.py
+FIX_PYTHON+=	src/calibre/utils/pyconsole/controller.py
+FIX_PYTHON+=	src/calibre/utils/pyconsole/formatter.py
+FIX_PYTHON+=	src/calibre/utils/pyconsole/history.py
+FIX_PYTHON+=	src/calibre/utils/pyconsole/interpreter.py
+FIX_PYTHON+=	src/calibre/utils/pyconsole/main.py
+FIX_PYTHON+=	src/calibre/utils/recycle_bin.py
+FIX_PYTHON+=	src/calibre/utils/resources.py
+FIX_PYTHON+=	src/calibre/utils/search_query_parser.py
+FIX_PYTHON+=	src/calibre/utils/sftp.py
+FIX_PYTHON+=	src/calibre/utils/sigil.py
+FIX_PYTHON+=	src/calibre/utils/text2int.py
+FIX_PYTHON+=	src/calibre/utils/titlecase.py
+FIX_PYTHON+=	src/calibre/utils/wmf/__init__.py
+FIX_PYTHON+=	src/calibre/utils/wmf/parse.py
+FIX_PYTHON+=	src/calibre/web/feeds/__init__.py
+FIX_PYTHON+=	src/calibre/web/feeds/feedparser.py
+FIX_PYTHON+=	src/calibre/web/feeds/input.py
+FIX_PYTHON+=	src/calibre/web/feeds/recipes/__init__.py
+FIX_PYTHON+=	src/calibre/web/feeds/recipes/collection.py
+FIX_PYTHON+=	src/calibre/web/feeds/recipes/model.py
+FIX_PYTHON+=	src/calibre/web/feeds/templates.py
+FIX_PYTHON+=	src/calibre/web/fetch/simple.py
+FIX_PYTHON+=	src/cherrypy/cherryd
+FIX_PYTHON+=	src/templite/__init__.py
 
 SUBST_CLASSES+=		prefix
 SUBST_SED.prefix=	-e "s,^QMAKE =.*,QMAKE = '${PREFIX}/qt4/bin/qmake',"
@@ -422,10 +735,10 @@ SUBST_STAGE.prefix=	post-patch
 SUBST_FILES.prefix=	setup/build_environment.py
 
 SUBST_CLASSES+=		path
-SUBST_SED.path=		-e "s,^\#!/usr/bin/env python,\#!${PYTHONBIN},"
+SUBST_SED.path=		-e "s,\#! */usr/bin/env  *python[0-9.]*,\#!${PYTHONBIN},"
 SUBST_MESSAGE.path=	Fixing path to python.
 SUBST_STAGE.path=	post-patch
-SUBST_FILES.path=	setup/install.py
+SUBST_FILES.path=	setup/install.py ${FIX_PYTHON}
 
 MAKE_ENV+=		FC_INC_DIR=${BUILDLINK_PREFIX.fontconfig}/include/fontconfig
 MAKE_ENV+=		FC_LIB_DIR=${BUILDLINK_PREFIX.fontconfig}/lib
@@ -434,6 +747,8 @@ MAKE_ENV+=		PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib
 #MAKE_ENV+=		XDG_UTILS_DEBUG_LEVEL=100
 
 .include "../../lang/python/application.mk"
+.include "../../databases/sqlite3/buildlink3.mk"
+.include "../../devel/chmlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libusb+=	libusb>=0.1.12
 .include "../../devel/libusb/buildlink3.mk"
 .include "../../fonts/fontconfig/buildlink3.mk"
@@ -445,6 +760,9 @@ BUILDLINK_API_DEPENDS.libwmf+=	libwmf>=0.2.8
 .include "../../graphics/libwmf/buildlink3.mk"
 .include "../../lang/python/egg.mk"
 _PYSETUPTOOLSINSTALLARGS=	# empty
+# Get rid of --root=${DESTDIR}, use our own version from above instead.
+# because the setup.py is not the standard one and behaves differently.
+_PYSETUPINSTALLARGS=	${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS}
 #.include "../../lang/python/extension.mk"
 .include "../../print/podofo/buildlink3.mk"
 .include "../../print/poppler-includes/buildlink3.mk"
@@ -455,6 +773,7 @@ BUILDLINK_API_DEPENDS.poppler-qt4+=	poppler-qt4>=0.10.6
 BUILDLINK_API_DEPENDS.py-dbus+=	${PYPKGPREFIX}-dbus>=0.82.2
 .include "../../sysutils/py-dbus/buildlink3.mk"
 .include "../../textproc/py-elementtree/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
 .include "../../x11/py-sip/buildlink3.mk"
 BUILDLINK_API_DEPENDS.py-qt4+=	${PYPKGPREFIX}-qt4>=4.5.1
 .include "../../x11/py-qt4/buildlink3.mk"
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index c02acd7cc5a..b837f193ea5 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2010/02/25 14:30:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/05/21 15:07:48 wiz Exp $
+${PYSITELIB}/init_calibre.py
 bin/calibre
 bin/calibre-complete
 bin/calibre-customize
@@ -13,6 +14,7 @@ bin/ebook-convert
 bin/ebook-device
 bin/ebook-meta
 bin/ebook-viewer
+bin/epub-fix
 bin/fetch-ebook-metadata
 bin/librarything
 bin/lrf2lrs
@@ -28,22 +30,38 @@ lib/calibre/calibre/customize/builtins.py
 lib/calibre/calibre/customize/conversion.py
 lib/calibre/calibre/customize/profiles.py
 lib/calibre/calibre/customize/ui.py
+lib/calibre/calibre/customize/zipplugin.py
 lib/calibre/calibre/debug.py
 lib/calibre/calibre/devices/__init__.py
 lib/calibre/calibre/devices/android/__init__.py
 lib/calibre/calibre/devices/android/driver.py
-lib/calibre/calibre/devices/bebook/__init__.py
-lib/calibre/calibre/devices/bebook/driver.py
+lib/calibre/calibre/devices/apple/__init__.py
+lib/calibre/calibre/devices/apple/driver.py
+lib/calibre/calibre/devices/bambook/__init__.py
+lib/calibre/calibre/devices/bambook/driver.py
+lib/calibre/calibre/devices/bambook/libbambookcore.py
+lib/calibre/calibre/devices/binatone/__init__.py
+lib/calibre/calibre/devices/binatone/driver.py
 lib/calibre/calibre/devices/blackberry/__init__.py
 lib/calibre/calibre/devices/blackberry/driver.py
-lib/calibre/calibre/devices/cybookg3/__init__.py
-lib/calibre/calibre/devices/cybookg3/driver.py
-lib/calibre/calibre/devices/cybookg3/t2b.py
+lib/calibre/calibre/devices/boeye/__init__.py
+lib/calibre/calibre/devices/boeye/driver.py
+lib/calibre/calibre/devices/cybook/__init__.py
+lib/calibre/calibre/devices/cybook/driver.py
+lib/calibre/calibre/devices/cybook/t2b.py
 lib/calibre/calibre/devices/eb600/__init__.py
 lib/calibre/calibre/devices/eb600/driver.py
+lib/calibre/calibre/devices/edge/__init__.py
+lib/calibre/calibre/devices/edge/driver.py
 lib/calibre/calibre/devices/errors.py
 lib/calibre/calibre/devices/eslick/__init__.py
 lib/calibre/calibre/devices/eslick/driver.py
+lib/calibre/calibre/devices/folder_device/__init__.py
+lib/calibre/calibre/devices/folder_device/driver.py
+lib/calibre/calibre/devices/hanlin/__init__.py
+lib/calibre/calibre/devices/hanlin/driver.py
+lib/calibre/calibre/devices/hanvon/__init__.py
+lib/calibre/calibre/devices/hanvon/driver.py
 lib/calibre/calibre/devices/iliad/__init__.py
 lib/calibre/calibre/devices/iliad/driver.py
 lib/calibre/calibre/devices/interface.py
@@ -54,10 +72,20 @@ lib/calibre/calibre/devices/iriver/driver.py
 lib/calibre/calibre/devices/jetbook/__init__.py
 lib/calibre/calibre/devices/jetbook/driver.py
 lib/calibre/calibre/devices/kindle/__init__.py
+lib/calibre/calibre/devices/kindle/apnx.py
+lib/calibre/calibre/devices/kindle/bookmark.py
 lib/calibre/calibre/devices/kindle/driver.py
+lib/calibre/calibre/devices/kobo/__init__.py
+lib/calibre/calibre/devices/kobo/books.py
+lib/calibre/calibre/devices/kobo/driver.py
 lib/calibre/calibre/devices/libusb.py
 lib/calibre/calibre/devices/manager.py
 lib/calibre/calibre/devices/mime.py
+lib/calibre/calibre/devices/misc.py
+lib/calibre/calibre/devices/nokia/__init__.py
+lib/calibre/calibre/devices/nokia/driver.py
+lib/calibre/calibre/devices/nook/__init__.py
+lib/calibre/calibre/devices/nook/driver.py
 lib/calibre/calibre/devices/nuut2/__init__.py
 lib/calibre/calibre/devices/nuut2/driver.py
 lib/calibre/calibre/devices/prs500/__init__.py
@@ -67,11 +95,14 @@ lib/calibre/calibre/devices/prs500/cli/main.py
 lib/calibre/calibre/devices/prs500/driver.py
 lib/calibre/calibre/devices/prs500/prstypes.py
 lib/calibre/calibre/devices/prs505/__init__.py
-lib/calibre/calibre/devices/prs505/books.py
 lib/calibre/calibre/devices/prs505/driver.py
-lib/calibre/calibre/devices/prs700/__init__.py
-lib/calibre/calibre/devices/prs700/driver.py
+lib/calibre/calibre/devices/prs505/sony_cache.py
 lib/calibre/calibre/devices/scanner.py
+lib/calibre/calibre/devices/sne/__init__.py
+lib/calibre/calibre/devices/sne/driver.py
+lib/calibre/calibre/devices/teclast/__init__.py
+lib/calibre/calibre/devices/teclast/driver.py
+lib/calibre/calibre/devices/udisks.py
 lib/calibre/calibre/devices/usbms/__init__.py
 lib/calibre/calibre/devices/usbms/books.py
 lib/calibre/calibre/devices/usbms/cli.py
@@ -79,6 +110,8 @@ lib/calibre/calibre/devices/usbms/device.py
 lib/calibre/calibre/devices/usbms/deviceconfig.py
 lib/calibre/calibre/devices/usbms/driver.py
 lib/calibre/calibre/devices/usbobserver/test.py
+lib/calibre/calibre/devices/user_defined/__init__.py
+lib/calibre/calibre/devices/user_defined/driver.py
 lib/calibre/calibre/ebooks/BeautifulSoup.py
 lib/calibre/calibre/ebooks/__init__.py
 lib/calibre/calibre/ebooks/chardet/__init__.py
@@ -116,6 +149,10 @@ lib/calibre/calibre/ebooks/chardet/sbcsgroupprober.py
 lib/calibre/calibre/ebooks/chardet/sjisprober.py
 lib/calibre/calibre/ebooks/chardet/universaldetector.py
 lib/calibre/calibre/ebooks/chardet/utf8prober.py
+lib/calibre/calibre/ebooks/chm/__init__.py
+lib/calibre/calibre/ebooks/chm/input.py
+lib/calibre/calibre/ebooks/chm/metadata.py
+lib/calibre/calibre/ebooks/chm/reader.py
 lib/calibre/calibre/ebooks/comic/__init__.py
 lib/calibre/calibre/ebooks/comic/input.py
 lib/calibre/calibre/ebooks/compression/__init__.py
@@ -126,17 +163,31 @@ lib/calibre/calibre/ebooks/conversion/cli.py
 lib/calibre/calibre/ebooks/conversion/config.py
 lib/calibre/calibre/ebooks/conversion/plumber.py
 lib/calibre/calibre/ebooks/conversion/preprocess.py
+lib/calibre/calibre/ebooks/conversion/utils.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/input.py
 lib/calibre/calibre/ebooks/epub/output.py
 lib/calibre/calibre/ebooks/epub/pages.py
+lib/calibre/calibre/ebooks/epub/periodical.py
 lib/calibre/calibre/ebooks/fb2/__init__.py
 lib/calibre/calibre/ebooks/fb2/fb2ml.py
 lib/calibre/calibre/ebooks/fb2/input.py
 lib/calibre/calibre/ebooks/fb2/output.py
 lib/calibre/calibre/ebooks/html/__init__.py
 lib/calibre/calibre/ebooks/html/input.py
+lib/calibre/calibre/ebooks/html/meta.py
+lib/calibre/calibre/ebooks/html/output.py
+lib/calibre/calibre/ebooks/htmlz/__init__.py
+lib/calibre/calibre/ebooks/htmlz/input.py
+lib/calibre/calibre/ebooks/htmlz/oeb2html.py
+lib/calibre/calibre/ebooks/htmlz/output.py
 lib/calibre/calibre/ebooks/hyphenate.py
+lib/calibre/calibre/ebooks/iterator/__init__.py
 lib/calibre/calibre/ebooks/lit/__init__.py
 lib/calibre/calibre/ebooks/lit/from_any.py
 lib/calibre/calibre/ebooks/lit/input.py
@@ -175,36 +226,53 @@ lib/calibre/calibre/ebooks/markdown/mdx_footnotes.py
 lib/calibre/calibre/ebooks/markdown/mdx_tables.py
 lib/calibre/calibre/ebooks/markdown/mdx_toc.py
 lib/calibre/calibre/ebooks/metadata/__init__.py
-lib/calibre/calibre/ebooks/metadata/amazon.py
+lib/calibre/calibre/ebooks/metadata/archive.py
+lib/calibre/calibre/ebooks/metadata/book/__init__.py
+lib/calibre/calibre/ebooks/metadata/book/base.py
+lib/calibre/calibre/ebooks/metadata/book/json_codec.py
 lib/calibre/calibre/ebooks/metadata/cli.py
 lib/calibre/calibre/ebooks/metadata/epub.py
 lib/calibre/calibre/ebooks/metadata/ereader.py
+lib/calibre/calibre/ebooks/metadata/extz.py
 lib/calibre/calibre/ebooks/metadata/fb2.py
-lib/calibre/calibre/ebooks/metadata/fetch.py
-lib/calibre/calibre/ebooks/metadata/google_books.py
 lib/calibre/calibre/ebooks/metadata/html.py
 lib/calibre/calibre/ebooks/metadata/imp.py
-lib/calibre/calibre/ebooks/metadata/isbndb.py
+lib/calibre/calibre/ebooks/metadata/kdl.py
 lib/calibre/calibre/ebooks/metadata/library_thing.py
 lib/calibre/calibre/ebooks/metadata/lit.py
 lib/calibre/calibre/ebooks/metadata/lrx.py
 lib/calibre/calibre/ebooks/metadata/meta.py
 lib/calibre/calibre/ebooks/metadata/mobi.py
 lib/calibre/calibre/ebooks/metadata/odt.py
-lib/calibre/calibre/ebooks/metadata/opf.py
 lib/calibre/calibre/ebooks/metadata/opf2.py
 lib/calibre/calibre/ebooks/metadata/pdb.py
 lib/calibre/calibre/ebooks/metadata/pdf.py
+lib/calibre/calibre/ebooks/metadata/plucker.py
 lib/calibre/calibre/ebooks/metadata/pml.py
 lib/calibre/calibre/ebooks/metadata/rar.py
 lib/calibre/calibre/ebooks/metadata/rb.py
 lib/calibre/calibre/ebooks/metadata/rtf.py
+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/cli.py
+lib/calibre/calibre/ebooks/metadata/sources/covers.py
+lib/calibre/calibre/ebooks/metadata/sources/douban.py
+lib/calibre/calibre/ebooks/metadata/sources/google.py
+lib/calibre/calibre/ebooks/metadata/sources/identify.py
+lib/calibre/calibre/ebooks/metadata/sources/isbndb.py
+lib/calibre/calibre/ebooks/metadata/sources/openlibrary.py
+lib/calibre/calibre/ebooks/metadata/sources/overdrive.py
+lib/calibre/calibre/ebooks/metadata/sources/test.py
 lib/calibre/calibre/ebooks/metadata/toc.py
 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/zip.py
 lib/calibre/calibre/ebooks/mobi/__init__.py
+lib/calibre/calibre/ebooks/mobi/debug.py
 lib/calibre/calibre/ebooks/mobi/huffcdic.py
 lib/calibre/calibre/ebooks/mobi/input.py
 lib/calibre/calibre/ebooks/mobi/langcodes.py
@@ -217,13 +285,13 @@ lib/calibre/calibre/ebooks/odt/input.py
 lib/calibre/calibre/ebooks/oeb/__init__.py
 lib/calibre/calibre/ebooks/oeb/base.py
 lib/calibre/calibre/ebooks/oeb/entitydefs.py
-lib/calibre/calibre/ebooks/oeb/factory.py
 lib/calibre/calibre/ebooks/oeb/iterator.py
 lib/calibre/calibre/ebooks/oeb/output.py
-lib/calibre/calibre/ebooks/oeb/profile.py
 lib/calibre/calibre/ebooks/oeb/reader.py
 lib/calibre/calibre/ebooks/oeb/stylizer.py
 lib/calibre/calibre/ebooks/oeb/transforms/__init__.py
+lib/calibre/calibre/ebooks/oeb/transforms/cover.py
+lib/calibre/calibre/ebooks/oeb/transforms/filenames.py
 lib/calibre/calibre/ebooks/oeb/transforms/flatcss.py
 lib/calibre/calibre/ebooks/oeb/transforms/guide.py
 lib/calibre/calibre/ebooks/oeb/transforms/htmltoc.py
@@ -231,6 +299,7 @@ lib/calibre/calibre/ebooks/oeb/transforms/jacket.py
 lib/calibre/calibre/ebooks/oeb/transforms/linearize_tables.py
 lib/calibre/calibre/ebooks/oeb/transforms/manglecase.py
 lib/calibre/calibre/ebooks/oeb/transforms/metadata.py
+lib/calibre/calibre/ebooks/oeb/transforms/page_margin.py
 lib/calibre/calibre/ebooks/oeb/transforms/rasterize.py
 lib/calibre/calibre/ebooks/oeb/transforms/rescale.py
 lib/calibre/calibre/ebooks/oeb/transforms/split.py
@@ -252,6 +321,10 @@ lib/calibre/calibre/ebooks/pdb/output.py
 lib/calibre/calibre/ebooks/pdb/palmdoc/__init__.py
 lib/calibre/calibre/ebooks/pdb/palmdoc/reader.py
 lib/calibre/calibre/ebooks/pdb/palmdoc/writer.py
+lib/calibre/calibre/ebooks/pdb/pdf/__init__.py
+lib/calibre/calibre/ebooks/pdb/pdf/reader.py
+lib/calibre/calibre/ebooks/pdb/plucker/__init__.py
+lib/calibre/calibre/ebooks/pdb/plucker/reader.py
 lib/calibre/calibre/ebooks/pdb/ztxt/__init__.py
 lib/calibre/calibre/ebooks/pdb/ztxt/reader.py
 lib/calibre/calibre/ebooks/pdb/ztxt/writer.py
@@ -288,6 +361,7 @@ lib/calibre/calibre/ebooks/rb/writer.py
 lib/calibre/calibre/ebooks/rtf/__init__.py
 lib/calibre/calibre/ebooks/rtf/input.py
 lib/calibre/calibre/ebooks/rtf/output.py
+lib/calibre/calibre/ebooks/rtf/preprocess.py
 lib/calibre/calibre/ebooks/rtf/rtfml.py
 lib/calibre/calibre/ebooks/rtf2xml/ParseRtf.py
 lib/calibre/calibre/ebooks/rtf2xml/__init__.py
@@ -302,7 +376,6 @@ lib/calibre/calibre/ebooks/rtf2xml/combine_borders.py
 lib/calibre/calibre/ebooks/rtf2xml/configure_txt.py
 lib/calibre/calibre/ebooks/rtf2xml/convert_to_tags.py
 lib/calibre/calibre/ebooks/rtf2xml/copy.py
-lib/calibre/calibre/ebooks/rtf2xml/correct_unicode.py
 lib/calibre/calibre/ebooks/rtf2xml/default_encoding.py
 lib/calibre/calibre/ebooks/rtf2xml/delete_info.py
 lib/calibre/calibre/ebooks/rtf2xml/field_strings.py
@@ -340,20 +413,82 @@ lib/calibre/calibre/ebooks/rtf2xml/table.py
 lib/calibre/calibre/ebooks/rtf2xml/table_info.py
 lib/calibre/calibre/ebooks/rtf2xml/tokenize.py
 lib/calibre/calibre/ebooks/sgmllib.py
+lib/calibre/calibre/ebooks/snb/__init__.py
+lib/calibre/calibre/ebooks/snb/input.py
+lib/calibre/calibre/ebooks/snb/output.py
+lib/calibre/calibre/ebooks/snb/snbfile.py
+lib/calibre/calibre/ebooks/snb/snbml.py
 lib/calibre/calibre/ebooks/tcr/__init__.py
 lib/calibre/calibre/ebooks/tcr/input.py
 lib/calibre/calibre/ebooks/tcr/output.py
+lib/calibre/calibre/ebooks/textile/__init__.py
+lib/calibre/calibre/ebooks/textile/functions.py
 lib/calibre/calibre/ebooks/txt/__init__.py
 lib/calibre/calibre/ebooks/txt/input.py
+lib/calibre/calibre/ebooks/txt/markdownml.py
 lib/calibre/calibre/ebooks/txt/newlines.py
 lib/calibre/calibre/ebooks/txt/output.py
 lib/calibre/calibre/ebooks/txt/processor.py
+lib/calibre/calibre/ebooks/txt/textileml.py
 lib/calibre/calibre/ebooks/txt/txtml.py
-lib/calibre/calibre/ebooks/unidecode/__init__.py
-lib/calibre/calibre/ebooks/unidecode/unicodepoints.py
-lib/calibre/calibre/ebooks/unidecode/unidecoder.py
+lib/calibre/calibre/ebooks/txt/unsmarten.py
+lib/calibre/calibre/ebooks/unihandecode/__init__.py
+lib/calibre/calibre/ebooks/unihandecode/jacodepoints.py
+lib/calibre/calibre/ebooks/unihandecode/jadecoder.py
+lib/calibre/calibre/ebooks/unihandecode/krcodepoints.py
+lib/calibre/calibre/ebooks/unihandecode/krdecoder.py
+lib/calibre/calibre/ebooks/unihandecode/pykakasi/__init__.py
+lib/calibre/calibre/ebooks/unihandecode/pykakasi/h2a.py
+lib/calibre/calibre/ebooks/unihandecode/pykakasi/j2h.py
+lib/calibre/calibre/ebooks/unihandecode/pykakasi/jisyo.py
+lib/calibre/calibre/ebooks/unihandecode/pykakasi/k2a.py
+lib/calibre/calibre/ebooks/unihandecode/pykakasi/kakasi.py
+lib/calibre/calibre/ebooks/unihandecode/unicodepoints.py
+lib/calibre/calibre/ebooks/unihandecode/unidecoder.py
+lib/calibre/calibre/ebooks/unihandecode/vncodepoints.py
+lib/calibre/calibre/ebooks/unihandecode/vndecoder.py
+lib/calibre/calibre/ebooks/unihandecode/zhcodepoints.py
 lib/calibre/calibre/gui2/__init__.py
+lib/calibre/calibre/gui2/actions/__init__.py
+lib/calibre/calibre/gui2/actions/add.py
+lib/calibre/calibre/gui2/actions/add_to_library.py
+lib/calibre/calibre/gui2/actions/annotate.py
+lib/calibre/calibre/gui2/actions/catalog.py
+lib/calibre/calibre/gui2/actions/choose_library.py
+lib/calibre/calibre/gui2/actions/convert.py
+lib/calibre/calibre/gui2/actions/copy_to_library.py
+lib/calibre/calibre/gui2/actions/delete.py
+lib/calibre/calibre/gui2/actions/device.py
+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/next_match.py
+lib/calibre/calibre/gui2/actions/open.py
+lib/calibre/calibre/gui2/actions/preferences.py
+lib/calibre/calibre/gui2/actions/restart.py
+lib/calibre/calibre/gui2/actions/save_to_disk.py
+lib/calibre/calibre/gui2/actions/show_book_details.py
+lib/calibre/calibre/gui2/actions/similar_books.py
+lib/calibre/calibre/gui2/actions/store.py
+lib/calibre/calibre/gui2/actions/tweak_epub.py
+lib/calibre/calibre/gui2/actions/view.py
 lib/calibre/calibre/gui2/add.py
+lib/calibre/calibre/gui2/add_wizard/__init__.py
+lib/calibre/calibre/gui2/add_wizard/scan_ui.py
+lib/calibre/calibre/gui2/add_wizard/welcome_ui.py
+lib/calibre/calibre/gui2/bars.py
+lib/calibre/calibre/gui2/book_details.py
+lib/calibre/calibre/gui2/catalog/__init__.py
+lib/calibre/calibre/gui2/catalog/catalog_bibtex.py
+lib/calibre/calibre/gui2/catalog/catalog_bibtex_ui.py
+lib/calibre/calibre/gui2/catalog/catalog_csv_xml.py
+lib/calibre/calibre/gui2/catalog/catalog_csv_xml_ui.py
+lib/calibre/calibre/gui2/catalog/catalog_epub_mobi.py
+lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py
+lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py
+lib/calibre/calibre/gui2/comments_editor.py
+lib/calibre/calibre/gui2/complete.py
 lib/calibre/calibre/gui2/convert/__init__.py
 lib/calibre/calibre/gui2/convert/bulk.py
 lib/calibre/calibre/gui2/convert/comic_input.py
@@ -369,6 +504,10 @@ lib/calibre/calibre/gui2/convert/fb2_output_ui.py
 lib/calibre/calibre/gui2/convert/font_key.py
 lib/calibre/calibre/gui2/convert/font_key_ui.py
 lib/calibre/calibre/gui2/convert/gui_conversion.py
+lib/calibre/calibre/gui2/convert/heuristics.py
+lib/calibre/calibre/gui2/convert/heuristics_ui.py
+lib/calibre/calibre/gui2/convert/htmlz_output.py
+lib/calibre/calibre/gui2/convert/htmlz_output_ui.py
 lib/calibre/calibre/gui2/convert/look_and_feel.py
 lib/calibre/calibre/gui2/convert/look_and_feel_ui.py
 lib/calibre/calibre/gui2/convert/lrf_output.py
@@ -379,7 +518,6 @@ lib/calibre/calibre/gui2/convert/mobi_output.py
 lib/calibre/calibre/gui2/convert/mobi_output_ui.py
 lib/calibre/calibre/gui2/convert/page_setup.py
 lib/calibre/calibre/gui2/convert/page_setup_ui.py
-lib/calibre/calibre/gui2/convert/pdb_input.py
 lib/calibre/calibre/gui2/convert/pdb_input_ui.py
 lib/calibre/calibre/gui2/convert/pdb_output.py
 lib/calibre/calibre/gui2/convert/pdb_output_ui.py
@@ -387,12 +525,18 @@ lib/calibre/calibre/gui2/convert/pdf_input.py
 lib/calibre/calibre/gui2/convert/pdf_input_ui.py
 lib/calibre/calibre/gui2/convert/pdf_output.py
 lib/calibre/calibre/gui2/convert/pdf_output_ui.py
+lib/calibre/calibre/gui2/convert/pml_output.py
+lib/calibre/calibre/gui2/convert/pmlz_output_ui.py
 lib/calibre/calibre/gui2/convert/rb_output.py
 lib/calibre/calibre/gui2/convert/rb_output_ui.py
 lib/calibre/calibre/gui2/convert/regex_builder.py
 lib/calibre/calibre/gui2/convert/regex_builder_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
 lib/calibre/calibre/gui2/convert/single_ui.py
+lib/calibre/calibre/gui2/convert/snb_output.py
+lib/calibre/calibre/gui2/convert/snb_output_ui.py
 lib/calibre/calibre/gui2/convert/structure_detection.py
 lib/calibre/calibre/gui2/convert/structure_detection_ui.py
 lib/calibre/calibre/gui2/convert/toc.py
@@ -401,56 +545,91 @@ lib/calibre/calibre/gui2/convert/txt_input.py
 lib/calibre/calibre/gui2/convert/txt_input_ui.py
 lib/calibre/calibre/gui2/convert/txt_output.py
 lib/calibre/calibre/gui2/convert/txt_output_ui.py
+lib/calibre/calibre/gui2/convert/txtz_output.py
 lib/calibre/calibre/gui2/convert/xexp_edit_ui.py
 lib/calibre/calibre/gui2/convert/xpath_wizard.py
 lib/calibre/calibre/gui2/convert/xpath_wizard_ui.py
 lib/calibre/calibre/gui2/cover_flow.py
+lib/calibre/calibre/gui2/custom_column_widgets.py
 lib/calibre/calibre/gui2/device.py
 lib/calibre/calibre/gui2/device_drivers/__init__.py
 lib/calibre/calibre/gui2/device_drivers/configwidget.py
 lib/calibre/calibre/gui2/device_drivers/configwidget_ui.py
 lib/calibre/calibre/gui2/dialogs/__init__.py
+lib/calibre/calibre/gui2/dialogs/add_empty_book.py
+lib/calibre/calibre/gui2/dialogs/add_from_isbn.py
+lib/calibre/calibre/gui2/dialogs/add_from_isbn_ui.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
 lib/calibre/calibre/gui2/dialogs/choose_format.py
+lib/calibre/calibre/gui2/dialogs/choose_format_device.py
+lib/calibre/calibre/gui2/dialogs/choose_format_device_ui.py
 lib/calibre/calibre/gui2/dialogs/choose_format_ui.py
+lib/calibre/calibre/gui2/dialogs/choose_library.py
+lib/calibre/calibre/gui2/dialogs/choose_library_ui.py
+lib/calibre/calibre/gui2/dialogs/choose_plugin_toolbars.py
 lib/calibre/calibre/gui2/dialogs/comicconf.py
 lib/calibre/calibre/gui2/dialogs/comicconf_ui.py
-lib/calibre/calibre/gui2/dialogs/config/__init__.py
-lib/calibre/calibre/gui2/dialogs/config/add_save.py
-lib/calibre/calibre/gui2/dialogs/config/add_save_ui.py
-lib/calibre/calibre/gui2/dialogs/config/config_ui.py
-lib/calibre/calibre/gui2/dialogs/config/history.py
-lib/calibre/calibre/gui2/dialogs/config/social.py
+lib/calibre/calibre/gui2/dialogs/comments_dialog.py
+lib/calibre/calibre/gui2/dialogs/comments_dialog_ui.py
 lib/calibre/calibre/gui2/dialogs/confirm_delete.py
+lib/calibre/calibre/gui2/dialogs/confirm_delete_location.py
+lib/calibre/calibre/gui2/dialogs/confirm_delete_location_ui.py
 lib/calibre/calibre/gui2/dialogs/confirm_delete_ui.py
 lib/calibre/calibre/gui2/dialogs/conversion_error.py
 lib/calibre/calibre/gui2/dialogs/conversion_error_ui.py
-lib/calibre/calibre/gui2/dialogs/fetch_metadata.py
-lib/calibre/calibre/gui2/dialogs/fetch_metadata_ui.py
+lib/calibre/calibre/gui2/dialogs/delete_matching_from_device.py
+lib/calibre/calibre/gui2/dialogs/delete_matching_from_device_ui.py
+lib/calibre/calibre/gui2/dialogs/drm_error.py
+lib/calibre/calibre/gui2/dialogs/drm_error_ui.py
+lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py
+lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py
 lib/calibre/calibre/gui2/dialogs/job_view_ui.py
 lib/calibre/calibre/gui2/dialogs/jobs_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
 lib/calibre/calibre/gui2/dialogs/metadata_bulk_ui.py
-lib/calibre/calibre/gui2/dialogs/metadata_single.py
-lib/calibre/calibre/gui2/dialogs/metadata_single_ui.py
 lib/calibre/calibre/gui2/dialogs/password.py
 lib/calibre/calibre/gui2/dialogs/password_ui.py
 lib/calibre/calibre/gui2/dialogs/progress.py
 lib/calibre/calibre/gui2/dialogs/progress_ui.py
+lib/calibre/calibre/gui2/dialogs/restore_library.py
+lib/calibre/calibre/gui2/dialogs/saved_search_editor.py
+lib/calibre/calibre/gui2/dialogs/saved_search_editor_ui.py
 lib/calibre/calibre/gui2/dialogs/scheduler.py
 lib/calibre/calibre/gui2/dialogs/scheduler_ui.py
 lib/calibre/calibre/gui2/dialogs/search.py
 lib/calibre/calibre/gui2/dialogs/search_item_ui.py
 lib/calibre/calibre/gui2/dialogs/search_ui.py
+lib/calibre/calibre/gui2/dialogs/select_formats.py
+lib/calibre/calibre/gui2/dialogs/tag_categories.py
+lib/calibre/calibre/gui2/dialogs/tag_categories_ui.py
 lib/calibre/calibre/gui2/dialogs/tag_editor.py
 lib/calibre/calibre/gui2/dialogs/tag_editor_ui.py
+lib/calibre/calibre/gui2/dialogs/tag_list_editor.py
+lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py
+lib/calibre/calibre/gui2/dialogs/template_dialog.py
+lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py
 lib/calibre/calibre/gui2/dialogs/test_email_ui.py
+lib/calibre/calibre/gui2/dialogs/tweak_epub.py
+lib/calibre/calibre/gui2/dialogs/tweak_epub_ui.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/ebook_download.py
+lib/calibre/calibre/gui2/email.py
 lib/calibre/calibre/gui2/filename_pattern_ui.py
+lib/calibre/calibre/gui2/init.py
 lib/calibre/calibre/gui2/jobs.py
-lib/calibre/calibre/gui2/library.py
+lib/calibre/calibre/gui2/layout.py
+lib/calibre/calibre/gui2/library/__init__.py
+lib/calibre/calibre/gui2/library/delegates.py
+lib/calibre/calibre/gui2/library/models.py
+lib/calibre/calibre/gui2/library/views.py
 lib/calibre/calibre/gui2/lrf_renderer/__init__.py
 lib/calibre/calibre/gui2/lrf_renderer/bookview.py
 lib/calibre/calibre/gui2/lrf_renderer/config_ui.py
@@ -459,19 +638,130 @@ lib/calibre/calibre/gui2/lrf_renderer/main.py
 lib/calibre/calibre/gui2/lrf_renderer/main_ui.py
 lib/calibre/calibre/gui2/lrf_renderer/text.py
 lib/calibre/calibre/gui2/main.py
-lib/calibre/calibre/gui2/main_ui.py
 lib/calibre/calibre/gui2/main_window.py
-lib/calibre/calibre/gui2/metadata.py
+lib/calibre/calibre/gui2/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/single.py
+lib/calibre/calibre/gui2/metadata/single_download.py
+lib/calibre/calibre/gui2/notify.py
+lib/calibre/calibre/gui2/preferences/__init__.py
+lib/calibre/calibre/gui2/preferences/adding.py
+lib/calibre/calibre/gui2/preferences/adding_ui.py
+lib/calibre/calibre/gui2/preferences/behavior.py
+lib/calibre/calibre/gui2/preferences/behavior_ui.py
+lib/calibre/calibre/gui2/preferences/columns.py
+lib/calibre/calibre/gui2/preferences/columns_ui.py
+lib/calibre/calibre/gui2/preferences/conversion.py
+lib/calibre/calibre/gui2/preferences/conversion_ui.py
+lib/calibre/calibre/gui2/preferences/create_custom_column.py
+lib/calibre/calibre/gui2/preferences/create_custom_column_ui.py
+lib/calibre/calibre/gui2/preferences/custom_columns_ui.py
+lib/calibre/calibre/gui2/preferences/device_debug.py
+lib/calibre/calibre/gui2/preferences/device_user_defined.py
+lib/calibre/calibre/gui2/preferences/email_ui.py
+lib/calibre/calibre/gui2/preferences/emailp.py
+lib/calibre/calibre/gui2/preferences/history.py
+lib/calibre/calibre/gui2/preferences/look_feel.py
+lib/calibre/calibre/gui2/preferences/look_feel_ui.py
+lib/calibre/calibre/gui2/preferences/main.py
+lib/calibre/calibre/gui2/preferences/metadata_sources.py
+lib/calibre/calibre/gui2/preferences/metadata_sources_ui.py
+lib/calibre/calibre/gui2/preferences/misc.py
+lib/calibre/calibre/gui2/preferences/misc_ui.py
+lib/calibre/calibre/gui2/preferences/plugboard.py
+lib/calibre/calibre/gui2/preferences/plugboard_ui.py
+lib/calibre/calibre/gui2/preferences/plugins.py
+lib/calibre/calibre/gui2/preferences/plugins_ui.py
+lib/calibre/calibre/gui2/preferences/save_template.py
+lib/calibre/calibre/gui2/preferences/save_template_ui.py
+lib/calibre/calibre/gui2/preferences/saving.py
+lib/calibre/calibre/gui2/preferences/saving_ui.py
+lib/calibre/calibre/gui2/preferences/search.py
+lib/calibre/calibre/gui2/preferences/search_ui.py
+lib/calibre/calibre/gui2/preferences/sending.py
+lib/calibre/calibre/gui2/preferences/sending_ui.py
+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/toolbar.py
+lib/calibre/calibre/gui2/preferences/toolbar_ui.py
+lib/calibre/calibre/gui2/preferences/tweaks.py
+lib/calibre/calibre/gui2/preferences/tweaks_ui.py
+lib/calibre/calibre/gui2/progress_indicator/__init__.py
 lib/calibre/calibre/gui2/search_box.py
-lib/calibre/calibre/gui2/status.py
+lib/calibre/calibre/gui2/search_restriction_mixin.py
+lib/calibre/calibre/gui2/shortcuts.py
+lib/calibre/calibre/gui2/shortcuts_ui.py
+lib/calibre/calibre/gui2/store/__init__.py
+lib/calibre/calibre/gui2/store/amazon_de_plugin.py
+lib/calibre/calibre/gui2/store/amazon_plugin.py
+lib/calibre/calibre/gui2/store/amazon_uk_plugin.py
+lib/calibre/calibre/gui2/store/archive_org_plugin.py
+lib/calibre/calibre/gui2/store/baen_webscription_plugin.py
+lib/calibre/calibre/gui2/store/basic_config.py
+lib/calibre/calibre/gui2/store/basic_config_widget_ui.py
+lib/calibre/calibre/gui2/store/beam_ebooks_de_plugin.py
+lib/calibre/calibre/gui2/store/bewrite_plugin.py
+lib/calibre/calibre/gui2/store/bn_plugin.py
+lib/calibre/calibre/gui2/store/diesel_ebooks_plugin.py
+lib/calibre/calibre/gui2/store/ebooks_com_plugin.py
+lib/calibre/calibre/gui2/store/eharlequin_plugin.py
+lib/calibre/calibre/gui2/store/epubbuy_de_plugin.py
+lib/calibre/calibre/gui2/store/feedbooks_plugin.py
+lib/calibre/calibre/gui2/store/foyles_uk_plugin.py
+lib/calibre/calibre/gui2/store/gandalf_plugin.py
+lib/calibre/calibre/gui2/store/google_books_plugin.py
+lib/calibre/calibre/gui2/store/gutenberg_plugin.py
+lib/calibre/calibre/gui2/store/kobo_plugin.py
+lib/calibre/calibre/gui2/store/manybooks_plugin.py
+lib/calibre/calibre/gui2/store/mobileread/__init__.py
+lib/calibre/calibre/gui2/store/mobileread/cache_progress_dialog.py
+lib/calibre/calibre/gui2/store/mobileread/cache_progress_dialog_ui.py
+lib/calibre/calibre/gui2/store/mobileread/cache_update_thread.py
+lib/calibre/calibre/gui2/store/mobileread/mobileread_plugin.py
+lib/calibre/calibre/gui2/store/mobileread/models.py
+lib/calibre/calibre/gui2/store/mobileread/store_dialog.py
+lib/calibre/calibre/gui2/store/mobileread/store_dialog_ui.py
+lib/calibre/calibre/gui2/store/mobileread_store_dialog_ui.py
+lib/calibre/calibre/gui2/store/nexto_plugin.py
+lib/calibre/calibre/gui2/store/open_library_plugin.py
+lib/calibre/calibre/gui2/store/oreilly_plugin.py
+lib/calibre/calibre/gui2/store/pragmatic_bookshelf_plugin.py
+lib/calibre/calibre/gui2/store/search/__init__.py
+lib/calibre/calibre/gui2/store/search/adv_search_builder.py
+lib/calibre/calibre/gui2/store/search/adv_search_builder_ui.py
+lib/calibre/calibre/gui2/store/search/download_thread.py
+lib/calibre/calibre/gui2/store/search/models.py
+lib/calibre/calibre/gui2/store/search/results_view.py
+lib/calibre/calibre/gui2/store/search/search.py
+lib/calibre/calibre/gui2/store/search/search_ui.py
+lib/calibre/calibre/gui2/store/search_result.py
+lib/calibre/calibre/gui2/store/search_ui.py
+lib/calibre/calibre/gui2/store/smashwords_plugin.py
+lib/calibre/calibre/gui2/store/waterstones_uk_plugin.py
+lib/calibre/calibre/gui2/store/web_control.py
+lib/calibre/calibre/gui2/store/web_store_dialog.py
+lib/calibre/calibre/gui2/store/web_store_dialog_ui.py
+lib/calibre/calibre/gui2/store/weightless_books_plugin.py
+lib/calibre/calibre/gui2/store/wizards_tower_books_plugin.py
 lib/calibre/calibre/gui2/tag_view.py
+lib/calibre/calibre/gui2/threaded_jobs.py
+lib/calibre/calibre/gui2/throbber.py
 lib/calibre/calibre/gui2/tools.py
+lib/calibre/calibre/gui2/ui.py
 lib/calibre/calibre/gui2/update.py
 lib/calibre/calibre/gui2/viewer/__init__.py
 lib/calibre/calibre/gui2/viewer/bookmarkmanager.py
 lib/calibre/calibre/gui2/viewer/bookmarkmanager_ui.py
 lib/calibre/calibre/gui2/viewer/config_ui.py
+lib/calibre/calibre/gui2/viewer/dictionary.py
 lib/calibre/calibre/gui2/viewer/documentview.py
+lib/calibre/calibre/gui2/viewer/flip.py
+lib/calibre/calibre/gui2/viewer/gestures.py
+lib/calibre/calibre/gui2/viewer/keys.py
 lib/calibre/calibre/gui2/viewer/main.py
 lib/calibre/calibre/gui2/viewer/main_ui.py
 lib/calibre/calibre/gui2/viewer/printing.py
@@ -485,12 +775,31 @@ lib/calibre/calibre/gui2/wizard/send_email.py
 lib/calibre/calibre/gui2/wizard/send_email_ui.py
 lib/calibre/calibre/gui2/wizard/stanza_ui.py
 lib/calibre/calibre/library/__init__.py
+lib/calibre/calibre/library/add_to_library.py
+lib/calibre/calibre/library/caches.py
+lib/calibre/calibre/library/catalog.py
+lib/calibre/calibre/library/check_library.py
 lib/calibre/calibre/library/cli.py
+lib/calibre/calibre/library/comments.py
+lib/calibre/calibre/library/custom_columns.py
 lib/calibre/calibre/library/database.py
 lib/calibre/calibre/library/database2.py
+lib/calibre/calibre/library/field_metadata.py
 lib/calibre/calibre/library/move.py
+lib/calibre/calibre/library/prefs.py
+lib/calibre/calibre/library/restore.py
 lib/calibre/calibre/library/save_to_disk.py
-lib/calibre/calibre/library/server.py
+lib/calibre/calibre/library/schema_upgrades.py
+lib/calibre/calibre/library/server/__init__.py
+lib/calibre/calibre/library/server/base.py
+lib/calibre/calibre/library/server/browse.py
+lib/calibre/calibre/library/server/cache.py
+lib/calibre/calibre/library/server/content.py
+lib/calibre/calibre/library/server/main.py
+lib/calibre/calibre/library/server/mobile.py
+lib/calibre/calibre/library/server/opds.py
+lib/calibre/calibre/library/server/utils.py
+lib/calibre/calibre/library/server/xml.py
 lib/calibre/calibre/library/sqlite.py
 lib/calibre/calibre/library/test.py
 lib/calibre/calibre/libunrar.py
@@ -500,53 +809,54 @@ lib/calibre/calibre/linux.py
 lib/calibre/calibre/manual/conf.py
 lib/calibre/calibre/manual/custom.py
 lib/calibre/calibre/manual/epub.py
+lib/calibre/calibre/manual/plugin_examples/helloworld/__init__.py
+lib/calibre/calibre/manual/plugin_examples/interface_demo/__init__.py
+lib/calibre/calibre/manual/plugin_examples/interface_demo/config.py
+lib/calibre/calibre/manual/plugin_examples/interface_demo/main.py
+lib/calibre/calibre/manual/plugin_examples/interface_demo/ui.py
 lib/calibre/calibre/manual/qthelp.py
 lib/calibre/calibre/plugins/cPalmdoc.so
+lib/calibre/calibre/plugins/chm_extra.so
+lib/calibre/calibre/plugins/chmlib.so
 lib/calibre/calibre/plugins/fontconfig.so
+lib/calibre/calibre/plugins/icu.so
 lib/calibre/calibre/plugins/lzx.so
+lib/calibre/calibre/plugins/magick.so
 lib/calibre/calibre/plugins/msdes.so
 lib/calibre/calibre/plugins/pdfreflow.so
 lib/calibre/calibre/plugins/pictureflow.so
 lib/calibre/calibre/plugins/podofo.so
+lib/calibre/calibre/plugins/progress_indicator.so
+lib/calibre/calibre/plugins/speedup.so
+lib/calibre/calibre/plugins/sqlite_custom.so
 lib/calibre/calibre/ptempfile.py
 lib/calibre/calibre/startup.py
 lib/calibre/calibre/trac/__init__.py
 lib/calibre/calibre/trac/bzr_commit_plugin.py
-lib/calibre/calibre/trac/plugins/Changelog.py
-lib/calibre/calibre/trac/plugins/__init__.py
-lib/calibre/calibre/trac/plugins/download.py
 lib/calibre/calibre/trac/setup.py
 lib/calibre/calibre/translations/__init__.py
 lib/calibre/calibre/translations/dynamic.py
 lib/calibre/calibre/translations/msgfmt.py
-lib/calibre/calibre/utils/PythonMagickWand.py
 lib/calibre/calibre/utils/Zeroconf.py
 lib/calibre/calibre/utils/__init__.py
+lib/calibre/calibre/utils/bibtex.py
+lib/calibre/calibre/utils/browser.py
+lib/calibre/calibre/utils/chm/__init__.py
+lib/calibre/calibre/utils/chm/chm.py
+lib/calibre/calibre/utils/chm/chmlib.py
+lib/calibre/calibre/utils/cleantext.py
 lib/calibre/calibre/utils/complete.py
 lib/calibre/calibre/utils/config.py
+lib/calibre/calibre/utils/config_base.py
+lib/calibre/calibre/utils/date.py
+lib/calibre/calibre/utils/dictclient.py
 lib/calibre/calibre/utils/filenames.py
 lib/calibre/calibre/utils/fonts/__init__.py
-lib/calibre/calibre/utils/genshi/__init__.py
-lib/calibre/calibre/utils/genshi/builder.py
-lib/calibre/calibre/utils/genshi/core.py
-lib/calibre/calibre/utils/genshi/filters/__init__.py
-lib/calibre/calibre/utils/genshi/filters/html.py
-lib/calibre/calibre/utils/genshi/filters/i18n.py
-lib/calibre/calibre/utils/genshi/filters/transform.py
-lib/calibre/calibre/utils/genshi/input.py
-lib/calibre/calibre/utils/genshi/output.py
-lib/calibre/calibre/utils/genshi/path.py
-lib/calibre/calibre/utils/genshi/template/__init__.py
-lib/calibre/calibre/utils/genshi/template/base.py
-lib/calibre/calibre/utils/genshi/template/directives.py
-lib/calibre/calibre/utils/genshi/template/eval.py
-lib/calibre/calibre/utils/genshi/template/interpolation.py
-lib/calibre/calibre/utils/genshi/template/loader.py
-lib/calibre/calibre/utils/genshi/template/markup.py
-lib/calibre/calibre/utils/genshi/template/plugin.py
-lib/calibre/calibre/utils/genshi/template/text.py
-lib/calibre/calibre/utils/genshi/util.py
+lib/calibre/calibre/utils/formatter.py
+lib/calibre/calibre/utils/formatter_functions.py
 lib/calibre/calibre/utils/help2man.py
+lib/calibre/calibre/utils/html2text.py
+lib/calibre/calibre/utils/icu.py
 lib/calibre/calibre/utils/ipc/__init__.py
 lib/calibre/calibre/utils/ipc/job.py
 lib/calibre/calibre/utils/ipc/launch.py
@@ -555,20 +865,42 @@ lib/calibre/calibre/utils/ipc/worker.py
 lib/calibre/calibre/utils/localization.py
 lib/calibre/calibre/utils/lock.py
 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/mdns.py
+lib/calibre/calibre/utils/mem.py
+lib/calibre/calibre/utils/mreplace.py
+lib/calibre/calibre/utils/network.py
+lib/calibre/calibre/utils/ordered_dict.py
 lib/calibre/calibre/utils/osx_symlinks.py
 lib/calibre/calibre/utils/pdftk.py
 lib/calibre/calibre/utils/podofo/__init__.py
+lib/calibre/calibre/utils/pyconsole/__init__.py
+lib/calibre/calibre/utils/pyconsole/console.py
+lib/calibre/calibre/utils/pyconsole/controller.py
+lib/calibre/calibre/utils/pyconsole/formatter.py
+lib/calibre/calibre/utils/pyconsole/history.py
+lib/calibre/calibre/utils/pyconsole/interpreter.py
+lib/calibre/calibre/utils/pyconsole/main.py
 lib/calibre/calibre/utils/pyparsing.py
+lib/calibre/calibre/utils/recycle_bin.py
 lib/calibre/calibre/utils/resources.py
 lib/calibre/calibre/utils/rss_gen.py
 lib/calibre/calibre/utils/search_query_parser.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/terminfo.py
+lib/calibre/calibre/utils/text2int.py
 lib/calibre/calibre/utils/threadpool.py
+lib/calibre/calibre/utils/titlecase.py
 lib/calibre/calibre/utils/winshell.py
+lib/calibre/calibre/utils/wmf/__init__.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
@@ -618,49 +950,6 @@ lib/calibre/cherrypy/process/win32.py
 lib/calibre/cherrypy/process/wspbus.py
 lib/calibre/cherrypy/scaffold/__init__.py
 lib/calibre/cherrypy/wsgiserver/__init__.py
-lib/calibre/cssutils/__init__.py
-lib/calibre/cssutils/_fetch.py
-lib/calibre/cssutils/_fetchgae.py
-lib/calibre/cssutils/codec.py
-lib/calibre/cssutils/css/__init__.py
-lib/calibre/cssutils/css/csscharsetrule.py
-lib/calibre/cssutils/css/csscomment.py
-lib/calibre/cssutils/css/cssfontfacerule.py
-lib/calibre/cssutils/css/cssimportrule.py
-lib/calibre/cssutils/css/cssmediarule.py
-lib/calibre/cssutils/css/cssnamespacerule.py
-lib/calibre/cssutils/css/csspagerule.py
-lib/calibre/cssutils/css/cssproperties.py
-lib/calibre/cssutils/css/cssrule.py
-lib/calibre/cssutils/css/cssrulelist.py
-lib/calibre/cssutils/css/cssstyledeclaration.py
-lib/calibre/cssutils/css/cssstylerule.py
-lib/calibre/cssutils/css/cssstylesheet.py
-lib/calibre/cssutils/css/cssunknownrule.py
-lib/calibre/cssutils/css/cssvalue.py
-lib/calibre/cssutils/css/cssvariablesdeclaration.py
-lib/calibre/cssutils/css/cssvariablesrule.py
-lib/calibre/cssutils/css/property.py
-lib/calibre/cssutils/css/selector.py
-lib/calibre/cssutils/css/selectorlist.py
-lib/calibre/cssutils/css2productions.py
-lib/calibre/cssutils/cssproductions.py
-lib/calibre/cssutils/errorhandler.py
-lib/calibre/cssutils/helper.py
-lib/calibre/cssutils/parse.py
-lib/calibre/cssutils/prodparser.py
-lib/calibre/cssutils/profiles.py
-lib/calibre/cssutils/script.py
-lib/calibre/cssutils/serialize.py
-lib/calibre/cssutils/settings.py
-lib/calibre/cssutils/stylesheets/__init__.py
-lib/calibre/cssutils/stylesheets/medialist.py
-lib/calibre/cssutils/stylesheets/mediaquery.py
-lib/calibre/cssutils/stylesheets/stylesheet.py
-lib/calibre/cssutils/stylesheets/stylesheetlist.py
-lib/calibre/cssutils/tokenize2.py
-lib/calibre/cssutils/util.py
-lib/calibre/encutils/__init__.py
 lib/calibre/odf/__init__.py
 lib/calibre/odf/anim.py
 lib/calibre/odf/attrconverters.py
@@ -701,7 +990,14 @@ lib/calibre/pyPdf/generic.py
 lib/calibre/pyPdf/pdf.py
 lib/calibre/pyPdf/utils.py
 lib/calibre/pyPdf/xmp.py
-lib/udev/rules.d/95-calibre.rules
+lib/calibre/routes/__init__.py
+lib/calibre/routes/base.py
+lib/calibre/routes/lru.py
+lib/calibre/routes/mapper.py
+lib/calibre/routes/middleware.py
+lib/calibre/routes/route.py
+lib/calibre/routes/util.py
+lib/calibre/templite/__init__.py
 man/man1/calibre-customize.1
 man/man1/calibre-debug.1
 man/man1/calibre-server.1
@@ -709,6 +1005,7 @@ man/man1/calibre-smtp.1
 man/man1/calibredb.1
 man/man1/ebook-convert.1
 man/man1/ebook-meta.1
+man/man1/epub-fix.1
 man/man1/fetch-ebook-metadata.1
 man/man1/librarything.1
 man/man1/lrf2lrs.1
@@ -717,9 +1014,22 @@ man/man1/pdfmanipulate.1
 man/man1/web2disk.1
 share/bash_completion.d/calibre
 share/calibre/builtin_recipes.xml
+share/calibre/builtin_recipes.zip
+share/calibre/calibre-portable.bat
+share/calibre/catalog/DefaultCover.jpg
+share/calibre/catalog/mastheadImage.gif
+share/calibre/catalog/section_list_templates.py
+share/calibre/catalog/stylesheet.css
+share/calibre/catalog/template.xhtml
 share/calibre/content_server/av.jpg
 share/calibre/content_server/bg_search_box.png
+share/calibre/content_server/browse/browse.css
+share/calibre/content_server/browse/browse.html
+share/calibre/content_server/browse/browse.js
+share/calibre/content_server/browse/details.html
+share/calibre/content_server/browse/summary.html
 share/calibre/content_server/btn_search_box.png
+share/calibre/content_server/button-donate.png
 share/calibre/content_server/calibre.png
 share/calibre/content_server/calibre_banner.png
 share/calibre/content_server/date.js
@@ -728,11 +1038,37 @@ share/calibre/content_server/first.png
 share/calibre/content_server/gui.css
 share/calibre/content_server/gui.js
 share/calibre/content_server/index.html
+share/calibre/content_server/jquery.corner.js
 share/calibre/content_server/jquery.js
+share/calibre/content_server/jquery.multiselect.css
+share/calibre/content_server/jquery.multiselect.min.js
+share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_flat_75_aaaaaa_40x100.png
+share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_100_f5f0e5_1x400.png
+share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_25_cb842e_1x400.png
+share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_70_ede4d4_1x400.png
+share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_100_f4f0ec_1x100.png
+share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_65_fee4bd_1x100.png
+share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_75_f5f5b5_1x100.png
+share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_inset-soft_100_f4f0ec_1x100.png
+share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_c47a23_256x240.png
+share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_cb672b_256x240.png
+share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f08000_256x240.png
+share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f35f07_256x240.png
+share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_ff7519_256x240.png
+share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_ffffff_256x240.png
+share/calibre/content_server/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css
+share/calibre/content_server/jquery_ui/js/jquery-ui-1.8.5.custom.min.js
 share/calibre/content_server/last.png
 share/calibre/content_server/loading.gif
+share/calibre/content_server/logo.png
+share/calibre/content_server/mobile.css
 share/calibre/content_server/next.png
 share/calibre/content_server/previous.png
+share/calibre/content_server/read/monocle.js
+share/calibre/content_server/star-half.png
+share/calibre/content_server/star-off.png
+share/calibre/content_server/star-on.png
+share/calibre/default_tweaks.py
 share/calibre/ebook-convert-complete.pickle
 share/calibre/fonts/liberation/LiberationMono-Bold.ttf
 share/calibre/fonts/liberation/LiberationMono-BoldItalic.ttf
@@ -750,256 +1086,175 @@ 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.svg
-share/calibre/images/arrow-down.svg
-share/calibre/images/arrow-up.svg
-share/calibre/images/auto_author_sort.svg
-share/calibre/images/back.svg
-share/calibre/images/book.svg
-share/calibre/images/bookmarks.svg
-share/calibre/images/books_in_series.svg
-share/calibre/images/chapters.svg
-share/calibre/images/clear_left.svg
-share/calibre/images/config.svg
-share/calibre/images/convert.svg
-share/calibre/images/cover_flow.svg
-share/calibre/images/debug.svg
-share/calibre/images/dialog_error.svg
-share/calibre/images/dialog_information.svg
-share/calibre/images/dialog_warning.svg
-share/calibre/images/document_open.svg
-share/calibre/images/donate.svg
-share/calibre/images/edit_input.svg
-share/calibre/images/eject.svg
-share/calibre/images/exec.svg
-share/calibre/images/font_size_larger.svg
-share/calibre/images/font_size_smaller.svg
-share/calibre/images/forward.svg
+share/calibre/images/add_book.png
+share/calibre/images/arrow-down.png
+share/calibre/images/arrow-up.png
+share/calibre/images/auto_author_sort.png
+share/calibre/images/back.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/clear_left.png
+share/calibre/images/column.png
+share/calibre/images/config.png
+share/calibre/images/connect_share.png
+share/calibre/images/connect_share_on.png
+share/calibre/images/console.png
+share/calibre/images/convert.png
+share/calibre/images/cover_flow.png
+share/calibre/images/debug.png
+share/calibre/images/default_cover.png
+share/calibre/images/devices/bambook.png
+share/calibre/images/devices/folder.png
+share/calibre/images/devices/ipad.png
+share/calibre/images/devices/italica.png
+share/calibre/images/devices/itunes.png
+share/calibre/images/devices/kindle.jpg
+share/calibre/images/devices/nook.jpg
+share/calibre/images/dialog_error.png
+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/document-encrypt.png
+share/calibre/images/document_open.png
+share/calibre/images/donate.png
+share/calibre/images/drawer.png
+share/calibre/images/drm-locked.png
+share/calibre/images/drm-unlocked.png
+share/calibre/images/edit-clear.png
+share/calibre/images/edit-copy.png
+share/calibre/images/edit-cut.png
+share/calibre/images/edit-paste.png
+share/calibre/images/edit-redo.png
+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/exec.png
+share/calibre/images/font_size_larger.png
+share/calibre/images/font_size_smaller.png
+share/calibre/images/format-fill-color.png
+share/calibre/images/format-indent-less.png
+share/calibre/images/format-indent-more.png
+share/calibre/images/format-justify-center.png
+share/calibre/images/format-justify-fill.png
+share/calibre/images/format-justify-left.png
+share/calibre/images/format-justify-right.png
+share/calibre/images/format-list-ordered.png
+share/calibre/images/format-list-unordered.png
+share/calibre/images/format-text-bold.png
+share/calibre/images/format-text-color.png
+share/calibre/images/format-text-heading.png
+share/calibre/images/format-text-italic.png
+share/calibre/images/format-text-strikethrough.png
+share/calibre/images/format-text-subscript.png
+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/jobs-animated.mng
-share/calibre/images/jobs.svg
+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/identifiers.png
+share/calibre/images/insert-link.png
+share/calibre/images/jobs.png
 share/calibre/images/library.png
-share/calibre/images/list_remove.svg
-share/calibre/images/lookfeel.svg
-share/calibre/images/mail.svg
-share/calibre/images/metadata.svg
-share/calibre/images/mimetypes/bmp.svg
-share/calibre/images/mimetypes/computer.svg
-share/calibre/images/mimetypes/dir.svg
-share/calibre/images/mimetypes/epub.svg
-share/calibre/images/mimetypes/fb2.svg
-share/calibre/images/mimetypes/gif.svg
-share/calibre/images/mimetypes/html.svg
-share/calibre/images/mimetypes/jpeg.svg
-share/calibre/images/mimetypes/lit.svg
-share/calibre/images/mimetypes/lrf.svg
-share/calibre/images/mimetypes/lrx.svg
-share/calibre/images/mimetypes/mobi.svg
-share/calibre/images/mimetypes/pdf.svg
-share/calibre/images/mimetypes/png.svg
-share/calibre/images/mimetypes/rar.svg
-share/calibre/images/mimetypes/rtf.svg
-share/calibre/images/mimetypes/svg.svg
-share/calibre/images/mimetypes/txt.svg
-share/calibre/images/mimetypes/unknown.svg
-share/calibre/images/mimetypes/zero.svg
-share/calibre/images/mimetypes/zip.svg
-share/calibre/images/minus.svg
-share/calibre/images/network-server.svg
-share/calibre/images/news.svg
-share/calibre/images/news/24sata.png
-share/calibre/images/news/24sata_rs.png
-share/calibre/images/news/adventuregamers.png
-share/calibre/images/news/ambito.png
-share/calibre/images/news/amspec.png
-share/calibre/images/news/ars_technica.png
-share/calibre/images/news/atlantic.png
-share/calibre/images/news/axxon_news.png
-share/calibre/images/news/azstarnet.png
-share/calibre/images/news/b92.png
-share/calibre/images/news/barrons.png
-share/calibre/images/news/bbc.png
-share/calibre/images/news/beta.png
-share/calibre/images/news/beta_en.png
-share/calibre/images/news/blic.png
-share/calibre/images/news/borba.png
-share/calibre/images/news/business_standard.png
-share/calibre/images/news/businessworldin.png
-share/calibre/images/news/carta.png
-share/calibre/images/news/chicago_breaking_news.png
-share/calibre/images/news/chr_mon.png
-share/calibre/images/news/clarin.png
-share/calibre/images/news/cnn.png
-share/calibre/images/news/coding_horror.png
-share/calibre/images/news/corriere_della_sera_en.png
-share/calibre/images/news/corriere_della_sera_it.png
-share/calibre/images/news/criticadigital.png
-share/calibre/images/news/cubadebate.png
-share/calibre/images/news/dailyreckoning.png
-share/calibre/images/news/danas.png
-share/calibre/images/news/darknet.png
-share/calibre/images/news/der_standard.png
-share/calibre/images/news/diepresse.png
-share/calibre/images/news/dn_se.png
-share/calibre/images/news/dnevni_avaz.png
-share/calibre/images/news/e_novine.png
-share/calibre/images/news/economist.png
-share/calibre/images/news/el_mercurio_chile.png
-share/calibre/images/news/el_universal.png
-share/calibre/images/news/elargentino.png
-share/calibre/images/news/elcronista.png
-share/calibre/images/news/elektrolese.png
-share/calibre/images/news/elmundo.png
-share/calibre/images/news/elperiodico_catalan.png
-share/calibre/images/news/elperiodico_spanish.png
-share/calibre/images/news/eltiempo_hn.png
-share/calibre/images/news/endgadget.png
-share/calibre/images/news/espn.png
-share/calibre/images/news/esquire.png
-share/calibre/images/news/estadao.png
-share/calibre/images/news/expansion_spanish.png
-share/calibre/images/news/fastcompany.png
-share/calibre/images/news/faznet.png
-share/calibre/images/news/freakonomics.png
-share/calibre/images/news/ftd.png
-share/calibre/images/news/fudzilla.png
-share/calibre/images/news/glas_srpske.png
-share/calibre/images/news/glasjavnosti.png
-share/calibre/images/news/granma.png
-share/calibre/images/news/guardian.png
-share/calibre/images/news/gva_be.png
-share/calibre/images/news/heise.png
-share/calibre/images/news/hln.png
-share/calibre/images/news/hln_be.png
-share/calibre/images/news/hna.png
-share/calibre/images/news/hrt.png
-share/calibre/images/news/ieco.png
-share/calibre/images/news/infobae.png
-share/calibre/images/news/inquirer_net.png
-share/calibre/images/news/instapaper.png
-share/calibre/images/news/jb_online.png
-share/calibre/images/news/joelonsoftware.png
-share/calibre/images/news/jpost.png
-share/calibre/images/news/jutarnji.png
-share/calibre/images/news/krstarica.png
-share/calibre/images/news/krstarica_en.png
-share/calibre/images/news/la_cuarta.png
-share/calibre/images/news/la_tercera.png
-share/calibre/images/news/lanacion.png
-share/calibre/images/news/lanacion_chile.png
-share/calibre/images/news/laprensa_hn.png
-share/calibre/images/news/laprensa_ni.png
-share/calibre/images/news/latribuna.png
-share/calibre/images/news/le_monde.png
-share/calibre/images/news/lemonde_dip.png
-share/calibre/images/news/liberation.png
-share/calibre/images/news/linux_magazine.png
-share/calibre/images/news/linuxdevices.png
-share/calibre/images/news/livemint.png
-share/calibre/images/news/lwn.png
-share/calibre/images/news/miami_herald.png
-share/calibre/images/news/msdnmag_en.png
-share/calibre/images/news/nacional_cro.png
-share/calibre/images/news/nasa.png
-share/calibre/images/news/new_yorker.png
-share/calibre/images/news/newsweek.png
-share/calibre/images/news/noaa.png
-share/calibre/images/news/novosti.png
-share/calibre/images/news/nspm.png
-share/calibre/images/news/nspm_int.png
-share/calibre/images/news/nytimes.png
-share/calibre/images/news/nytimes_sub.png
-share/calibre/images/news/nzz_ger.png
-share/calibre/images/news/o_globo.png
-share/calibre/images/news/pagina12.png
-share/calibre/images/news/pescanik.png
-share/calibre/images/news/pobjeda.png
-share/calibre/images/news/politico.png
-share/calibre/images/news/politika.png
-share/calibre/images/news/portfolio.png
-share/calibre/images/news/pressonline.png
-share/calibre/images/news/rts.png
-share/calibre/images/news/sanjosemercurynews.png
-share/calibre/images/news/sciencedaily.png
-share/calibre/images/news/scott_hanselman.png
-share/calibre/images/news/seattle_times.png
-share/calibre/images/news/security_watch.png
-share/calibre/images/news/smashing.png
-share/calibre/images/news/soldiers.png
-share/calibre/images/news/spiegel_int.png
-share/calibre/images/news/spiegelde.png
-share/calibre/images/news/stackoverflow.png
-share/calibre/images/news/starbulletin.png
-share/calibre/images/news/straitstimes.png
-share/calibre/images/news/sueddeutsche.png
-share/calibre/images/news/svd_se.png
-share/calibre/images/news/tanjug.png
-share/calibre/images/news/telegraph_uk.png
-share/calibre/images/news/telepolis.png
-share/calibre/images/news/telepolis_artikel.png
-share/calibre/images/news/teleread.png
-share/calibre/images/news/the_oz.png
-share/calibre/images/news/theeconomictimes_india.png
-share/calibre/images/news/themarketticker.png
-share/calibre/images/news/theonion.png
-share/calibre/images/news/thestar.png
-share/calibre/images/news/tijd.png
-share/calibre/images/news/time_magazine.png
-share/calibre/images/news/times_online.png
-share/calibre/images/news/tomshardware.png
-share/calibre/images/news/tomshardware_de.png
-share/calibre/images/news/toronto_sun.png
-share/calibre/images/news/uncrate.png
-share/calibre/images/news/usnews.png
-share/calibre/images/news/utne.png
-share/calibre/images/news/variety.png
-share/calibre/images/news/vecernji_list.png
-share/calibre/images/news/vijesti.png
-share/calibre/images/news/vreme.png
-share/calibre/images/news/welt.png
-share/calibre/images/news/wikinews_en.png
-share/calibre/images/news/wired.png
-share/calibre/images/news/wsj.png
-share/calibre/images/news/zdnet.png
-share/calibre/images/news/zeitde.png
-share/calibre/images/next.svg
-share/calibre/images/ok.svg
-share/calibre/images/page.svg
-share/calibre/images/plugins.svg
-share/calibre/images/plus.svg
-share/calibre/images/previous.svg
-share/calibre/images/print-preview.svg
-share/calibre/images/print.svg
+share/calibre/images/list_remove.png
+share/calibre/images/lookfeel.png
+share/calibre/images/lt.png
+share/calibre/images/mail.png
+share/calibre/images/merge_books.png
+share/calibre/images/metadata.png
+share/calibre/images/mimetypes/bmp.png
+share/calibre/images/mimetypes/computer.png
+share/calibre/images/mimetypes/dir.png
+share/calibre/images/mimetypes/epub.png
+share/calibre/images/mimetypes/fb2.png
+share/calibre/images/mimetypes/gif.png
+share/calibre/images/mimetypes/html.png
+share/calibre/images/mimetypes/jpeg.png
+share/calibre/images/mimetypes/lit.png
+share/calibre/images/mimetypes/lrf.png
+share/calibre/images/mimetypes/lrx.png
+share/calibre/images/mimetypes/mobi.png
+share/calibre/images/mimetypes/odt.png
+share/calibre/images/mimetypes/pdf.png
+share/calibre/images/mimetypes/png.png
+share/calibre/images/mimetypes/rar.png
+share/calibre/images/mimetypes/rtf.png
+share/calibre/images/mimetypes/snb.png
+share/calibre/images/mimetypes/svg.png
+share/calibre/images/mimetypes/txt.png
+share/calibre/images/mimetypes/unknown.png
+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/network-server.png
+share/calibre/images/news.png
+share/calibre/images/next.png
+share/calibre/images/notify.png
+share/calibre/images/ok.png
+share/calibre/images/page.png
+share/calibre/images/plugboard.png
+share/calibre/images/plugins.png
+share/calibre/images/plus.png
+share/calibre/images/plusplus.png
+share/calibre/images/previous.png
+share/calibre/images/print-preview.png
+share/calibre/images/print.png
 share/calibre/images/publisher.png
-share/calibre/images/reader.svg
-share/calibre/images/save.svg
-share/calibre/images/scheduler.svg
-share/calibre/images/sd.svg
-share/calibre/images/search.svg
-share/calibre/images/series.svg
-share/calibre/images/star.png
-share/calibre/images/swap.svg
-share/calibre/images/sync.svg
-share/calibre/images/tags.svg
-share/calibre/images/trash.svg
-share/calibre/images/user_profile.svg
-share/calibre/images/view.svg
-share/calibre/images/viewer.svg
-share/calibre/images/welcome_wizard.svg
-share/calibre/images/window-close.svg
-share/calibre/images/wizard.svg
+share/calibre/images/rating.png
+share/calibre/images/reader.png
+share/calibre/images/save.png
+share/calibre/images/scheduler.png
+share/calibre/images/sd.png
+share/calibre/images/search.png
+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/store.png
+share/calibre/images/swap.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/trash.png
+share/calibre/images/trim.png
+share/calibre/images/user_profile.png
+share/calibre/images/view.png
+share/calibre/images/viewer.png
+share/calibre/images/welcome_wizard.png
+share/calibre/images/window-close.png
+share/calibre/images/wizard.png
+share/calibre/jacket/stylesheet.css
+share/calibre/jacket/template.xhtml
+share/calibre/jquery.simulate.js
 share/calibre/localization/iso639.pickle
 share/calibre/localization/locales/af/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/af/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/ar/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/ar/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/ar/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/ast/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/ast/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/bg/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/bg/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/bn/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/bs/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/bs/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/ca/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/ca/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/cs/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/cs/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/cs/LC_MESSAGES/qt.qm
 share/calibre/localization/locales/da/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/da/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/da/LC_MESSAGES/qt.qm
@@ -1008,34 +1263,65 @@ share/calibre/localization/locales/de/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/de/LC_MESSAGES/qt.qm
 share/calibre/localization/locales/el/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/el/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/en_AU/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/en_CA/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/en_GB/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/eo/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/eo/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/es/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/es/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/es/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/eu/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/eu/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/fa/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/fa/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/fi/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/fi/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/fo/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/fr/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/fr/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/fr/LC_MESSAGES/qt.qm
 share/calibre/localization/locales/gl/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/gl/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/gl/LC_MESSAGES/qt.qm
 share/calibre/localization/locales/he/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/he/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/he/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/hi/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/hi/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/hr/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/hr/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/hu/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/hu/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/hu/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/id/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/id/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/it/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/it/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/ja/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/ja/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/ja/LC_MESSAGES/qt.qm
 share/calibre/localization/locales/ko/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/ko/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/lt/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/lt/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/ltg/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/lv/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/lv/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/ml/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/mr/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/mr/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/ms/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/ms/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/nb/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/nb/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/nds/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/nl/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/nl/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/oc/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/oc/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/pa/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/pa/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/pl/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/pl/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/pl/LC_MESSAGES/qt.qm
@@ -1049,18 +1335,32 @@ share/calibre/localization/locales/ro/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/ru/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/ru/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/ru/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/sc/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/sk/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/sk/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/sk/LC_MESSAGES/qt.qm
 share/calibre/localization/locales/sl/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/sl/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/sl/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/sq/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/sr/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/sr/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/sv/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/sv/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/sv/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/ta/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/ta/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/te/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/th/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/th/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/tr/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/tr/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/uk/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/uk/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/uk/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/ur/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/vi/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/vi/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/yi/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/zh_CN/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/zh_CN/LC_MESSAGES/messages.mo
@@ -1070,320 +1370,63 @@ share/calibre/localization/locales/zh_HK/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/zh_TW/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/zh_TW/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/zh_TW/LC_MESSAGES/qt.qm
+share/calibre/localization/pykakasi/itaijidict2.pickle
+share/calibre/localization/pykakasi/kanadict2.pickle
+share/calibre/localization/pykakasi/kanwadict2.pickle
 share/calibre/localization/stats.pickle
 share/calibre/metadata_sqlite.sql
-share/calibre/recipes/24sata.recipe
-share/calibre/recipes/24sata_rs.recipe
-share/calibre/recipes/7dias.recipe
-share/calibre/recipes/accountancyage.recipe
-share/calibre/recipes/adventuregamers.recipe
-share/calibre/recipes/al_jazeera.recipe
-share/calibre/recipes/ambito.recipe
-share/calibre/recipes/amspec.recipe
-share/calibre/recipes/an_druma_mor.recipe
-share/calibre/recipes/ap.recipe
-share/calibre/recipes/ars_technica.recipe
-share/calibre/recipes/atlantic.recipe
-share/calibre/recipes/axxon_news.recipe
-share/calibre/recipes/azstarnet.recipe
-share/calibre/recipes/b92.recipe
-share/calibre/recipes/barrons.recipe
-share/calibre/recipes/bbc.recipe
-share/calibre/recipes/bbcvietnamese.recipe
-share/calibre/recipes/beta.recipe
-share/calibre/recipes/beta_en.recipe
-share/calibre/recipes/blic.recipe
-share/calibre/recipes/borba.recipe
-share/calibre/recipes/buenosaireseconomico.recipe
-share/calibre/recipes/business_standard.recipe
-share/calibre/recipes/business_week.recipe
-share/calibre/recipes/businessworldin.recipe
-share/calibre/recipes/carta.recipe
-share/calibre/recipes/chicago_breaking_news.recipe
-share/calibre/recipes/chicago_tribune.recipe
-share/calibre/recipes/chr_mon.recipe
-share/calibre/recipes/cincinnati_enquirer.recipe
-share/calibre/recipes/clarin.recipe
-share/calibre/recipes/climate_progress.recipe
-share/calibre/recipes/cnn.recipe
-share/calibre/recipes/coding_horror.recipe
-share/calibre/recipes/common_dreams.recipe
-share/calibre/recipes/corren2.recipe
-share/calibre/recipes/corriere_della_sera_en.recipe
-share/calibre/recipes/corriere_della_sera_it.recipe
-share/calibre/recipes/courrierinternational.recipe
-share/calibre/recipes/craigslist.recipe
-share/calibre/recipes/criticadigital.recipe
-share/calibre/recipes/cubadebate.recipe
-share/calibre/recipes/cyberpresse.recipe
-share/calibre/recipes/daily_mail.recipe
-share/calibre/recipes/daily_telegraph.recipe
-share/calibre/recipes/dailyreckoning.recipe
-share/calibre/recipes/danas.recipe
-share/calibre/recipes/darknet.recipe
-share/calibre/recipes/de_standaard.recipe
-share/calibre/recipes/degentenaar.recipe
-share/calibre/recipes/demorgen_be.recipe
-share/calibre/recipes/der_standard.recipe
-share/calibre/recipes/diagonales.recipe
-share/calibre/recipes/diepresse.recipe
-share/calibre/recipes/discover_magazine.recipe
-share/calibre/recipes/dn_se.recipe
-share/calibre/recipes/dna.recipe
-share/calibre/recipes/dnevni_avaz.recipe
-share/calibre/recipes/dnevnik_cro.recipe
-share/calibre/recipes/e_novine.recipe
-share/calibre/recipes/ecogeek.recipe
-share/calibre/recipes/economist.recipe
-share/calibre/recipes/el_mercurio_chile.recipe
-share/calibre/recipes/el_pais.recipe
-share/calibre/recipes/el_universal.recipe
-share/calibre/recipes/elargentino.recipe
-share/calibre/recipes/elcronista.recipe
-share/calibre/recipes/elektrolese.recipe
-share/calibre/recipes/elmundo.recipe
-share/calibre/recipes/elperiodico_catalan.recipe
-share/calibre/recipes/elperiodico_spanish.recipe
-share/calibre/recipes/eltiempo_hn.recipe
-share/calibre/recipes/endgadget.recipe
-share/calibre/recipes/espn.recipe
-share/calibre/recipes/esquire.recipe
-share/calibre/recipes/estadao.recipe
-share/calibre/recipes/exiled.recipe
-share/calibre/recipes/expansion_spanish.recipe
-share/calibre/recipes/fastcompany.recipe
-share/calibre/recipes/faznet.recipe
-share/calibre/recipes/financial_times.recipe
-share/calibre/recipes/fokkeensukke.recipe
-share/calibre/recipes/forbes.recipe
-share/calibre/recipes/freakonomics.recipe
-share/calibre/recipes/ftd.recipe
-share/calibre/recipes/fudzilla.recipe
-share/calibre/recipes/glas_srpske.recipe
-share/calibre/recipes/glasgow_herald.recipe
-share/calibre/recipes/glasjavnosti.recipe
-share/calibre/recipes/globe_and_mail.recipe
-share/calibre/recipes/granma.recipe
-share/calibre/recipes/greader.recipe
-share/calibre/recipes/guardian.recipe
-share/calibre/recipes/gva_be.recipe
-share/calibre/recipes/h1.recipe
-share/calibre/recipes/h2.recipe
-share/calibre/recipes/h3.recipe
-share/calibre/recipes/harpers.recipe
-share/calibre/recipes/harpers_full.recipe
-share/calibre/recipes/hbr.recipe
-share/calibre/recipes/heise.recipe
-share/calibre/recipes/hindu.recipe
-share/calibre/recipes/hln.recipe
-share/calibre/recipes/hln_be.recipe
-share/calibre/recipes/hna.recipe
-share/calibre/recipes/honoluluadvertiser.recipe
-share/calibre/recipes/honvedelem.recipe
-share/calibre/recipes/hrt.recipe
-share/calibre/recipes/huntechnet.recipe
-share/calibre/recipes/ieco.recipe
-share/calibre/recipes/iht.recipe
-share/calibre/recipes/index_hu.recipe
-share/calibre/recipes/indy_star.recipe
-share/calibre/recipes/infobae.recipe
-share/calibre/recipes/infoworld.recipe
-share/calibre/recipes/inquirer_net.recipe
-share/calibre/recipes/instapaper.recipe
-share/calibre/recipes/intelligencer.recipe
-share/calibre/recipes/irish_independent.recipe
-share/calibre/recipes/irish_times.recipe
-share/calibre/recipes/japan_times.recipe
-share/calibre/recipes/javalobby.recipe
-share/calibre/recipes/jb_online.recipe
-share/calibre/recipes/joelonsoftware.recipe
-share/calibre/recipes/jpost.recipe
-share/calibre/recipes/jutarnji.recipe
-share/calibre/recipes/juventudrebelde.recipe
-share/calibre/recipes/juventudrebelde_english.recipe
-share/calibre/recipes/kellog_faculty.recipe
-share/calibre/recipes/kellog_insight.recipe
-share/calibre/recipes/krstarica.recipe
-share/calibre/recipes/krstarica_en.recipe
-share/calibre/recipes/la_cuarta.recipe
-share/calibre/recipes/la_republica.recipe
-share/calibre/recipes/la_segunda.recipe
-share/calibre/recipes/la_tercera.recipe
-share/calibre/recipes/lamujerdemivida.recipe
-share/calibre/recipes/lanacion.recipe
-share/calibre/recipes/lanacion_chile.recipe
-share/calibre/recipes/laprensa.recipe
-share/calibre/recipes/laprensa_hn.recipe
-share/calibre/recipes/laprensa_ni.recipe
-share/calibre/recipes/latimes.recipe
-share/calibre/recipes/latribuna.recipe
-share/calibre/recipes/lavanguardia.recipe
-share/calibre/recipes/le_monde.recipe
-share/calibre/recipes/le_temps.recipe
-share/calibre/recipes/lemonde_dip.recipe
-share/calibre/recipes/liberation.recipe
-share/calibre/recipes/linux_magazine.recipe
-share/calibre/recipes/linuxdevices.recipe
-share/calibre/recipes/livemint.recipe
-share/calibre/recipes/lrb.recipe
-share/calibre/recipes/lwn.recipe
-share/calibre/recipes/marca.recipe
-share/calibre/recipes/mediapart.recipe
-share/calibre/recipes/miami_herald.recipe
-share/calibre/recipes/miradasalsur.recipe
-share/calibre/recipes/mondedurable.recipe
-share/calibre/recipes/moneynews.recipe
-share/calibre/recipes/monitor.recipe
-share/calibre/recipes/moscow_times.recipe
-share/calibre/recipes/msdnmag_en.recipe
-share/calibre/recipes/nacional_cro.recipe
-share/calibre/recipes/nakedcapitalism.recipe
-share/calibre/recipes/nasa.recipe
-share/calibre/recipes/new_scientist.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/news_times.recipe
-share/calibre/recipes/newsweek.recipe
-share/calibre/recipes/newsweek_argentina.recipe
-share/calibre/recipes/nin.recipe
-share/calibre/recipes/noaa.recipe
-share/calibre/recipes/novosti.recipe
-share/calibre/recipes/npr.recipe
-share/calibre/recipes/nspm.recipe
-share/calibre/recipes/nspm_int.recipe
-share/calibre/recipes/nytimes.recipe
-share/calibre/recipes/nytimes_sub.recipe
-share/calibre/recipes/nzz_ger.recipe
-share/calibre/recipes/o_globo.recipe
-share/calibre/recipes/ourdailybread.recipe
-share/calibre/recipes/outlook_india.recipe
-share/calibre/recipes/pagina12.recipe
-share/calibre/recipes/pcworld_hu.recipe
-share/calibre/recipes/pescanik.recipe
-share/calibre/recipes/phd_comics.recipe
-share/calibre/recipes/philly.recipe
-share/calibre/recipes/physics_today.recipe
-share/calibre/recipes/physics_world.recipe
-share/calibre/recipes/pobjeda.recipe
-share/calibre/recipes/politico.recipe
-share/calibre/recipes/politika.recipe
-share/calibre/recipes/portfolio.recipe
-share/calibre/recipes/pressonline.recipe
-share/calibre/recipes/publico.recipe
-share/calibre/recipes/republika.recipe
-share/calibre/recipes/reuters.recipe
-share/calibre/recipes/rga.recipe
-share/calibre/recipes/rts.recipe
-share/calibre/recipes/salon.recipe
-share/calibre/recipes/san_fran_chronicle.recipe
-share/calibre/recipes/sanjosemercurynews.recipe
-share/calibre/recipes/science_aas.recipe
-share/calibre/recipes/science_news.recipe
-share/calibre/recipes/sciencedaily.recipe
-share/calibre/recipes/scientific_american.recipe
-share/calibre/recipes/scott_hanselman.recipe
-share/calibre/recipes/seattle_times.recipe
-share/calibre/recipes/security_watch.recipe
-share/calibre/recipes/serverside.recipe
-share/calibre/recipes/shacknews.recipe
-share/calibre/recipes/slashdot.recipe
-share/calibre/recipes/slate.recipe
-share/calibre/recipes/smashing.recipe
-share/calibre/recipes/smh.recipe
-share/calibre/recipes/soldiers.recipe
-share/calibre/recipes/spiegel_int.recipe
-share/calibre/recipes/spiegelde.recipe
-share/calibre/recipes/st_petersburg_times.recipe
-share/calibre/recipes/stackoverflow.recipe
-share/calibre/recipes/starbulletin.recipe
-share/calibre/recipes/straitstimes.recipe
-share/calibre/recipes/sueddeutsche.recipe
-share/calibre/recipes/svd_se.recipe
-share/calibre/recipes/tanjug.recipe
-share/calibre/recipes/telegraph_uk.recipe
-share/calibre/recipes/telepolis.recipe
-share/calibre/recipes/telepolis_artikel.recipe
-share/calibre/recipes/teleread.recipe
-share/calibre/recipes/the_age.recipe
-share/calibre/recipes/the_budget_fashionista.recipe
-share/calibre/recipes/the_nation.recipe
-share/calibre/recipes/the_new_republic.recipe
-share/calibre/recipes/the_oz.recipe
-share/calibre/recipes/the_register.recipe
-share/calibre/recipes/the_scotsman.recipe
-share/calibre/recipes/thedgesingapore.recipe
-share/calibre/recipes/theeconomictimes_india.recipe
-share/calibre/recipes/themarketticker.recipe
-share/calibre/recipes/theoldfoodie.recipe
-share/calibre/recipes/theonion.recipe
-share/calibre/recipes/thestar.recipe
-share/calibre/recipes/tijd.recipe
-share/calibre/recipes/time_magazine.recipe
-share/calibre/recipes/times_online.recipe
-share/calibre/recipes/tnxm.recipe
-share/calibre/recipes/tomshardware.recipe
-share/calibre/recipes/tomshardware_de.recipe
-share/calibre/recipes/toronto_sun.recipe
-share/calibre/recipes/trouw.recipe
-share/calibre/recipes/tweakers.recipe
-share/calibre/recipes/twitchfilms.recipe
-share/calibre/recipes/uncrate.recipe
-share/calibre/recipes/upi.recipe
-share/calibre/recipes/usatoday.recipe
-share/calibre/recipes/usnews.recipe
-share/calibre/recipes/utne.recipe
-share/calibre/recipes/variety.recipe
-share/calibre/recipes/vecernji_list.recipe
-share/calibre/recipes/veintitres.recipe
-share/calibre/recipes/vijesti.recipe
-share/calibre/recipes/vnexpress.recipe
-share/calibre/recipes/volksrant.recipe
-share/calibre/recipes/vreme.recipe
-share/calibre/recipes/wash_post.recipe
-share/calibre/recipes/welt.recipe
-share/calibre/recipes/wikinews_en.recipe
-share/calibre/recipes/winsupersite.recipe
-share/calibre/recipes/wired.recipe
-share/calibre/recipes/woz_die.recipe
-share/calibre/recipes/wsj.recipe
-share/calibre/recipes/xkcd.recipe
-share/calibre/recipes/zaobao.recipe
-share/calibre/recipes/zdnet.recipe
-share/calibre/recipes/zeitde.recipe
+share/calibre/mime.types
+share/calibre/quick_start.epub
 share/calibre/scripts.pickle
+share/calibre/template-functions.json
+share/calibre/templates/book_details.css
 share/calibre/templates/fb2.xsl
 share/calibre/templates/html.css
+share/calibre/templates/html_export_default.css
+share/calibre/templates/html_export_default.tmpl
+share/calibre/templates/html_export_default_index.tmpl
 share/calibre/templates/lrf.xsl
-share/calibre/templates/ncx.xml
-share/calibre/templates/opf.xml
 share/calibre/templates/rtf.xsl
+share/calibre/tracer.epub
 share/calibre/viewer/bookmarks.js
 share/calibre/viewer/hyphenate/Hyphenator.js
+share/calibre/viewer/hyphenate/patterns/be.js
 share/calibre/viewer/hyphenate/patterns/bn.js
 share/calibre/viewer/hyphenate/patterns/cs.js
 share/calibre/viewer/hyphenate/patterns/da.js
 share/calibre/viewer/hyphenate/patterns/de.js
-share/calibre/viewer/hyphenate/patterns/en.js
+share/calibre/viewer/hyphenate/patterns/el-monoton.js
+share/calibre/viewer/hyphenate/patterns/el-polyton.js
+share/calibre/viewer/hyphenate/patterns/en-gb.js
+share/calibre/viewer/hyphenate/patterns/en-us.js
 share/calibre/viewer/hyphenate/patterns/es.js
 share/calibre/viewer/hyphenate/patterns/fi.js
 share/calibre/viewer/hyphenate/patterns/fr.js
+share/calibre/viewer/hyphenate/patterns/grc.js
 share/calibre/viewer/hyphenate/patterns/gu.js
 share/calibre/viewer/hyphenate/patterns/hi.js
 share/calibre/viewer/hyphenate/patterns/hu.js
+share/calibre/viewer/hyphenate/patterns/hy.js
 share/calibre/viewer/hyphenate/patterns/it.js
 share/calibre/viewer/hyphenate/patterns/kn.js
+share/calibre/viewer/hyphenate/patterns/la.js
+share/calibre/viewer/hyphenate/patterns/lt.js
+share/calibre/viewer/hyphenate/patterns/lv.js
 share/calibre/viewer/hyphenate/patterns/ml.js
 share/calibre/viewer/hyphenate/patterns/nl.js
+share/calibre/viewer/hyphenate/patterns/no-nb.js
 share/calibre/viewer/hyphenate/patterns/or.js
 share/calibre/viewer/hyphenate/patterns/pa.js
 share/calibre/viewer/hyphenate/patterns/pl.js
 share/calibre/viewer/hyphenate/patterns/pt.js
 share/calibre/viewer/hyphenate/patterns/ru.js
+share/calibre/viewer/hyphenate/patterns/sl.js
 share/calibre/viewer/hyphenate/patterns/sv.js
 share/calibre/viewer/hyphenate/patterns/ta.js
 share/calibre/viewer/hyphenate/patterns/te.js
+share/calibre/viewer/hyphenate/patterns/tr.js
 share/calibre/viewer/hyphenate/patterns/uk.js
 share/calibre/viewer/hyphenation.js
+share/calibre/viewer/images.js
 share/calibre/viewer/jquery_scrollTo.js
 share/calibre/viewer/referencing.js
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 0cc8094fe75..8ed0c73b0c6 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,8 +1,13 @@
-$NetBSD: distinfo,v 1.3 2011/04/12 21:48:01 wiz Exp $
+$NetBSD: distinfo,v 1.4 2011/05/21 15:07:48 wiz Exp $
 
-SHA1 (calibre-0.6.24.tar.gz) = 8484746cb058d7719225b02a843d29bd7626ffa0
-RMD160 (calibre-0.6.24.tar.gz) = a7833156b635bfd14842b055e3b44debe64e4752
-Size (calibre-0.6.24.tar.gz) = 10953557 bytes
-SHA1 (patch-aa) = cf794f388d8193c3384f7f36208bef606c14dc6d
-SHA1 (patch-ac) = da8fedb745ebb29ea7df0a5b7a642384273ae324
-SHA1 (patch-src_calibre_ebooks_pdf_images.cpp) = 31deac71af1f8d6f04978df26104ccd91229950c
+SHA1 (calibre-0.8.2.tar.gz) = 4e5a19b063aa3f8a7af3fcbdd6c4bad5cfb28ca0
+RMD160 (calibre-0.8.2.tar.gz) = 05ef243ee65405f3243c74cd444278411b949b7c
+Size (calibre-0.8.2.tar.gz) = 28195417 bytes
+SHA1 (patch-setup_____init____.py) = 6ffa50a3a6e5d433da1f40de59d9306fe5b7c0fb
+SHA1 (patch-setup_extensions.py) = 6c2e584e6293bea1f160bc3361251785218a54d3
+SHA1 (patch-setup_install.py) = 254490c558a62a6130767c808cf732ad0b6e22ae
+SHA1 (patch-src_calibre_____init____.py) = a37dacbc90bc8333362c876100732ceef9c08173
+SHA1 (patch-src_calibre_constants.py) = 288c5346a63dba967473b31a3b637d6cfa67b5cd
+SHA1 (patch-src_calibre_ebooks_pdf_images.cpp) = 950f0302f3c387fb9b4ee41cd96d7c5103b7ad45
+SHA1 (patch-src_calibre_linux.py) = bb9ae0099faf84a73ccbc0a876ff340d5be82963
+SHA1 (patch-src_calibre_utils_help2man.py) = d53a0522082793a7cd94fd97589c39bf24803bf7
diff --git a/misc/calibre/patches/patch-aa b/misc/calibre/patches/patch-aa
deleted file mode 100644
index 395ee132a4b..00000000000
--- a/misc/calibre/patches/patch-aa
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2009/11/18 17:41:20 wiz Exp $
-
---- src/calibre/linux.py.orig	2009-09-28 23:23:41.000000000 +0000
-+++ src/calibre/linux.py
-@@ -184,7 +184,7 @@ class PostInstall:
-             if os.path.exists(bc):
-                 f = os.path.join(bc, 'calibre')
-             else:
--                f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')
-+                f = os.path.join(self.opts.staging_root, 'share/bash_completion.d/calibre')
-             if not os.path.exists(os.path.dirname(f)):
-                 os.makedirs(os.path.dirname(f))
-             self.manifest.append(f)
-@@ -319,7 +319,7 @@ class PostInstall:
-     def install_man_pages(self):
-         try:
-             from calibre.utils.help2man import create_man_page
--            manpath = os.path.join(self.opts.staging_sharedir, 'man/man1')
-+            manpath = os.path.join(self.opts.staging_root, 'man/man1')
-             if not os.path.exists(manpath):
-                 os.makedirs(manpath)
-             self.info('Installing MAN pages...')
-@@ -332,7 +332,7 @@ class PostInstall:
-                     continue
-                 parser = parser()
-                 raw = create_man_page(prog, parser)
--                manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
-+                manfile = os.path.join(manpath, prog+'.1')
-                 self.info('\tInstalling MAN page for', prog)
-                 open(manfile, 'wb').write(raw)
-                 self.manifest.append(manfile)
diff --git a/misc/calibre/patches/patch-ac b/misc/calibre/patches/patch-ac
deleted file mode 100644
index 4a45f4e8a63..00000000000
--- a/misc/calibre/patches/patch-ac
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/11/18 17:41:20 wiz Exp $
-
---- src/calibre/utils/help2man.py.orig	2009-09-28 23:23:41.000000000 +0000
-+++ src/calibre/utils/help2man.py
-@@ -3,7 +3,7 @@ __license__ = 'GPL 3'
- __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
- __docformat__ = 'restructuredtext en'
- 
--import time, bz2
-+import time
- 
- from calibre.constants import __version__, __appname__, __author__
- 
-@@ -57,6 +57,6 @@ def create_man_page(prog, parser):
-     lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for
-             x in lines]
- 
--    return  bz2.compress((u'\n'.join(lines)).encode('utf-8'))
-+    return  (u'\n'.join(lines)).encode('utf-8')
- 
- 
diff --git a/misc/calibre/patches/patch-setup_____init____.py b/misc/calibre/patches/patch-setup_____init____.py
new file mode 100644
index 00000000000..a3eb9f9c37e
--- /dev/null
+++ b/misc/calibre/patches/patch-setup_____init____.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-setup_____init____.py,v 1.1 2011/05/21 15:07:48 wiz Exp $
+
+--- setup/__init__.py.orig	2011-05-20 14:41:31.000000000 +0000
++++ setup/__init__.py
+@@ -12,7 +12,9 @@ is64bit = platform.architecture()[0] == 
+ iswindows = re.search('win(32|64)', sys.platform)
+ isosx = 'darwin' in sys.platform
+ isfreebsd = 'freebsd' in sys.platform
+-islinux = not isosx and not iswindows and not isfreebsd
++isnetbsd = 'netbsd' in sys.platform
++isbsd = isnetbsd or isfreebsd
++islinux = not isosx and not iswindows and not isbsd
+ SRC = os.path.abspath('src')
+ sys.path.insert(0, SRC)
+ sys.resources_location = os.path.join(os.path.dirname(SRC), 'resources')
diff --git a/misc/calibre/patches/patch-setup_extensions.py b/misc/calibre/patches/patch-setup_extensions.py
new file mode 100644
index 00000000000..a419c3c5dd7
--- /dev/null
+++ b/misc/calibre/patches/patch-setup_extensions.py
@@ -0,0 +1,31 @@
+$NetBSD: patch-setup_extensions.py,v 1.1 2011/05/21 15:07:48 wiz Exp $
+
+--- setup/extensions.py.orig	2011-05-20 14:36:29.000000000 +0000
++++ setup/extensions.py
+@@ -11,7 +11,7 @@ from distutils import sysconfig
+ 
+ from PyQt4.pyqtconfig import QtGuiModuleMakefile
+ 
+-from setup import Command, islinux, isfreebsd, isosx, SRC, iswindows
++from setup import Command, islinux, isfreebsd, isbsd, isosx, SRC, iswindows
+ from setup.build_environment import fc_inc, fc_lib, chmlib_inc_dirs, \
+         fc_error, poppler_libs, poppler_lib_dirs, poppler_inc_dirs, podofo_inc, \
+         podofo_lib, podofo_error, poppler_error, pyqt, OSX_SDK, NMAKE, \
+@@ -21,7 +21,7 @@ from setup.build_environment import fc_i
+         jpg_lib_dirs, chmlib_lib_dirs, sqlite_inc_dirs, icu_inc_dirs, \
+         icu_lib_dirs
+ MT
+-isunix = islinux or isosx or isfreebsd
++isunix = islinux or isosx or isbsd
+ 
+ make = 'make' if isunix else NMAKE
+ 
+@@ -205,7 +205,7 @@ if islinux:
+     ldflags.append('-lpython'+sysconfig.get_python_version())
+ 
+ 
+-if isfreebsd:
++if isbsd:
+     cflags.append('-pthread')
+     ldflags.append('-shared')
+     cflags.append('-I'+sysconfig.get_python_inc())
diff --git a/misc/calibre/patches/patch-setup_install.py b/misc/calibre/patches/patch-setup_install.py
new file mode 100644
index 00000000000..ff05547f5cb
--- /dev/null
+++ b/misc/calibre/patches/patch-setup_install.py
@@ -0,0 +1,40 @@
+$NetBSD: patch-setup_install.py,v 1.1 2011/05/21 15:07:48 wiz Exp $
+
+--- setup/install.py.orig	2011-05-20 13:49:07.000000000 +0000
++++ setup/install.py
+@@ -8,7 +8,7 @@ __docformat__ = 'restructuredtext en'
+ 
+ import sys, os, textwrap, subprocess, shutil, tempfile, atexit, stat, shlex
+ 
+-from setup import Command, islinux, isfreebsd, basenames, modules, functions, \
++from setup import Command, islinux, isfreebsd, isbsd, basenames, modules, functions, \
+         __appname__, __version__
+ 
+ HEADER = '''\
+@@ -116,7 +116,7 @@ class Develop(Command):
+ 
+ 
+     def pre_sub_commands(self, opts):
+-        if not (islinux or isfreebsd):
++        if not (islinux or isbsd):
+             self.info('\nSetting up a source based development environment is only '
+                     'supported on linux. On other platforms, see the User Manual'
+                     ' for help with setting up a development environment.')
+@@ -156,7 +156,7 @@ class Develop(Command):
+             self.warn('Failed to compile mount helper. Auto mounting of',
+                 ' devices will not work')
+ 
+-        if not isfreebsd and os.geteuid() != 0:
++        if not isbsd and os.geteuid() != 0:
+             return self.warn('Must be run as root to compile mount helper. Auto '
+                     'mounting of devices will not work.')
+         src = os.path.join(self.SRC, 'calibre', 'devices', 'linux_mount_helper.c')
+@@ -168,7 +168,7 @@ class Develop(Command):
+         ret = p.wait()
+         if ret != 0:
+             return warn()
+-        if not isfreebsd:
++        if not isbsd:
+             os.chown(dest, 0, 0)
+             os.chmod(dest, stat.S_ISUID|stat.S_ISGID|stat.S_IRUSR|stat.S_IWUSR|\
+                     stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH)
diff --git a/misc/calibre/patches/patch-src_calibre_____init____.py b/misc/calibre/patches/patch-src_calibre_____init____.py
new file mode 100644
index 00000000000..b09cec24529
--- /dev/null
+++ b/misc/calibre/patches/patch-src_calibre_____init____.py
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_calibre_____init____.py,v 1.1 2011/05/21 15:07:48 wiz Exp $
+
+--- src/calibre/__init__.py.orig	2011-05-13 17:49:55.000000000 +0000
++++ src/calibre/__init__.py
+@@ -13,6 +13,7 @@ warnings.simplefilter('ignore', Deprecat
+ 
+ 
+ from calibre.constants import (iswindows, isosx, islinux, isfreebsd, isfrozen,
++			      isnetbsd, isbsd,
+                               preferred_encoding, __appname__, __version__, __author__,
+                               win32event, win32api, winerror, fcntl,
+                               filesystem_encoding, plugins, config_dir)
diff --git a/misc/calibre/patches/patch-src_calibre_constants.py b/misc/calibre/patches/patch-src_calibre_constants.py
new file mode 100644
index 00000000000..94407a50542
--- /dev/null
+++ b/misc/calibre/patches/patch-src_calibre_constants.py
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_calibre_constants.py,v 1.1 2011/05/21 15:07:48 wiz Exp $
+
+--- src/calibre/constants.py.orig	2011-05-13 17:49:55.000000000 +0000
++++ src/calibre/constants.py
+@@ -27,7 +27,9 @@ iswindows = 'win32' in _plat or 'win64' 
+ isosx     = 'darwin' in _plat
+ isnewosx  = isosx and getattr(sys, 'new_app_bundle', False)
+ isfreebsd = 'freebsd' in _plat
+-islinux   = not(iswindows or isosx or isfreebsd)
++isnetbsd = 'netbsd' in _plat
++isbsd = isfreebsd or isnetbsd
++islinux   = not(iswindows or isosx or isbsd)
+ isfrozen  = hasattr(sys, 'frozen')
+ isunix = isosx or islinux
+ 
diff --git a/misc/calibre/patches/patch-src_calibre_ebooks_pdf_images.cpp b/misc/calibre/patches/patch-src_calibre_ebooks_pdf_images.cpp
index f079da4f136..0c28d265e5b 100644
--- a/misc/calibre/patches/patch-src_calibre_ebooks_pdf_images.cpp
+++ b/misc/calibre/patches/patch-src_calibre_ebooks_pdf_images.cpp
@@ -1,23 +1,12 @@
-$NetBSD: patch-src_calibre_ebooks_pdf_images.cpp,v 1.1 2011/04/12 21:48:01 wiz Exp $
+$NetBSD: patch-src_calibre_ebooks_pdf_images.cpp,v 1.2 2011/05/21 15:07:48 wiz Exp $
 
-Fix build with png-1.5.
-
---- src/calibre/ebooks/pdf/images.cpp.orig	2009-11-16 19:41:31.000000000 +0000
+--- src/calibre/ebooks/pdf/images.cpp.orig	2011-04-08 17:20:30.000000000 +0000
 +++ src/calibre/ebooks/pdf/images.cpp
-@@ -6,6 +6,7 @@
- #include <math.h>
- #include <iostream>
- #include <wand/MagickWand.h>
-+#include <zlib.h>
+@@ -16,6 +16,7 @@
  
  #include "images.h"
  #include "utils.h"
-@@ -294,7 +295,7 @@ void PNGWriter::write_splash_bitmap(Spla
++#include "zlib.h"
  
- void calibre_png_mem_write(png_structp png_ptr, png_bytep data, png_size_t length) {
-     if (!png_ptr || length < 1) return;
--    vector<char> *buf = static_cast< vector<char>* >(png_ptr->io_ptr);
-+    vector<char> *buf = static_cast< vector<char>* >(png_get_io_ptr(png_ptr));
-     buf->reserve(buf->capacity() + length); 
-     do {
-         buf->push_back(static_cast<char>(*data));
+ #ifdef _WIN32
+ inline double round(double x) { return (x-floor(x))>0.5 ? ceil(x) : floor(x); }
diff --git a/misc/calibre/patches/patch-src_calibre_linux.py b/misc/calibre/patches/patch-src_calibre_linux.py
new file mode 100644
index 00000000000..8b1aeec4f49
--- /dev/null
+++ b/misc/calibre/patches/patch-src_calibre_linux.py
@@ -0,0 +1,64 @@
+$NetBSD: patch-src_calibre_linux.py,v 1.1 2011/05/21 15:07:48 wiz Exp $
+
+--- src/calibre/linux.py.orig	2011-05-13 17:49:55.000000000 +0000
++++ src/calibre/linux.py
+@@ -7,7 +7,7 @@ import sys, os, cPickle, textwrap, stat,
+ from subprocess import check_call
+ 
+ from calibre import  __appname__, prints, guess_type
+-from calibre.constants import islinux, isfreebsd
++from calibre.constants import islinux, isfreebsd, isnetbsd, isbsd
+ from calibre.customize.ui import all_input_formats
+ from calibre.ptempfile import TemporaryDirectory
+ from calibre import CurrentDir
+@@ -136,17 +136,17 @@ class PostInstall:
+         self.icon_resources = []
+         self.menu_resources = []
+         self.mime_resources = []
+-        if islinux or isfreebsd:
++        if islinux or isbsd:
+             self.setup_completion()
+         self.install_man_pages()
+-        if islinux or isfreebsd:
++        if islinux or isbsd:
+             self.setup_desktop_integration()
+         self.create_uninstaller()
+ 
+         from calibre.utils.config import config_dir
+         if os.path.exists(config_dir):
+             os.chdir(config_dir)
+-            if islinux or isfreebsd:
++            if islinux or isbsd:
+                 for f in os.listdir('.'):
+                     if os.stat(f).st_uid == 0:
+                         import shutil
+@@ -196,7 +196,10 @@ class PostInstall:
+             if os.path.exists(bc):
+                 f = os.path.join(bc, 'calibre')
+             else:
+-                f = os.path.join(self.opts.staging_etc, 'bash_completion.d/calibre')
++		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')
+             if not os.path.exists(os.path.dirname(f)):
+                 os.makedirs(os.path.dirname(f))
+             self.manifest.append(f)
+@@ -300,7 +303,7 @@ class PostInstall:
+     def install_man_pages(self): # {{{
+         try:
+             from calibre.utils.help2man import create_man_page
+-            if isfreebsd:
++            if isbsd:
+                 manpath = os.path.join(self.opts.staging_root, 'man/man1')
+             else:
+                 manpath = os.path.join(self.opts.staging_sharedir, 'man/man1')
+@@ -316,7 +319,7 @@ class PostInstall:
+                     continue
+                 parser = parser()
+                 raw = create_man_page(prog, parser)
+-                if isfreebsd:
++                if isbsd:
+                     manfile = os.path.join(manpath, prog+'.1')
+                 else:
+                     manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
diff --git a/misc/calibre/patches/patch-src_calibre_utils_help2man.py b/misc/calibre/patches/patch-src_calibre_utils_help2man.py
new file mode 100644
index 00000000000..650ad93adea
--- /dev/null
+++ b/misc/calibre/patches/patch-src_calibre_utils_help2man.py
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_calibre_utils_help2man.py,v 1.1 2011/05/21 15:07:48 wiz Exp $
+
+--- src/calibre/utils/help2man.py.orig	2011-04-08 17:20:30.000000000 +0000
++++ src/calibre/utils/help2man.py
+@@ -4,7 +4,7 @@ __copyright__ = '2009, Kovid Goyal <kovi
+ __docformat__ = 'restructuredtext en'
+ 
+ import time, bz2
+-from calibre.constants import isfreebsd
++from calibre.constants import isbsd
+ 
+ from calibre.constants import __version__, __appname__, __author__
+ 
+@@ -58,7 +58,7 @@ def create_man_page(prog, parser):
+     lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for
+             x in lines]
+ 
+-    if not isfreebsd:
++    if not isbsd:
+         return  bz2.compress((u'\n'.join(lines)).encode('utf-8'))
+     else:
+         return  (u'\n'.join(lines)).encode('utf-8')