summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorgls <gls@pkgsrc.org>2011-10-27 20:40:02 +0000
committergls <gls@pkgsrc.org>2011-10-27 20:40:02 +0000
commit22cd2e968225757169c7d4d3dc66b45a349cd9be (patch)
treefb5fcfe3754e9074cf7cf0220c24b2c1bb664586 /misc
parent145cb5c278dc7c55ab9d10dd177a9187073b7005 (diff)
downloadpkgsrc-22cd2e968225757169c7d4d3dc66b45a349cd9be.tar.gz
Update misc/calibre to 0.8.24.
Based on PR pkg/45493 from Rhialto. Additional cleanup by myself. pkgsrc changes: - Fix interpreter paths - Set LICENSE - Rely on pkgsrc py-cherrypy and py-pdf instead of the ones bundled within Calibre tarball. - Properly install .desktop and mimetypes - Install all recipes. - Install additional documentation Upstream changes: our package was 22 versions behind. Many, many, many new features, bug fixes and drivers to support new ebooks readers. Complete changelog is installed in ${PREFIX}/share/doc/calibre.
Diffstat (limited to 'misc')
-rw-r--r--misc/calibre/Makefile144
-rw-r--r--misc/calibre/PLIST1504
-rw-r--r--misc/calibre/distinfo16
-rw-r--r--misc/calibre/patches/patch-src_calibre_linux_py111
4 files changed, 1512 insertions, 263 deletions
diff --git a/misc/calibre/Makefile b/misc/calibre/Makefile
index 75d17c73e05..9aa2da91064 100644
--- a/misc/calibre/Makefile
+++ b/misc/calibre/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.22 2011/10/22 15:00:21 ryoon Exp $
+# $NetBSD: Makefile,v 1.23 2011/10/27 20:40:02 gls Exp $
#
-DISTNAME= calibre-0.8.2
-PKGREVISION= 2
+DISTNAME= calibre-0.8.24
CATEGORIES= misc
MASTER_SITES= http://status.calibre-ebook.com/dist/src/ \
http://calibre-ebook.googlecode.com/files/
@@ -23,19 +22,24 @@ 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
+# Let's depend on the ones we have in pkgsrc instead of the bundled ones.
+DEPENDS+= ${PYPKGPREFIX}-Pdf-[0-9]*:../../print/py-Pdf
+DEPENDS+= ${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy
PKG_DESTDIR_SUPPORT= user-destdir
SPECIAL_PERMS+= bin/calibre-mount-helper ${SETUID_ROOT_PERMS}
USE_LANGUAGES= c c++
-USE_TOOLS+= pkg-config
+USE_TOOLS+= pkg-config pax
PYTHON_VERSIONS_ACCEPTED= 27
PYDISTUTILSPKG= yes
PYSETUPOPTARGS= # empty
PYSETUPINSTALLARGS= --prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
WRKSRC= ${WRKDIR}/calibre
+
INSTALLATION_DIRS= share/applications
INSTALLATION_DIRS= share/icons
+INSTALLATION_DIRS= share/calibre/recipes
FIX_PYTHON+= recipes/180.recipe
FIX_PYTHON+= recipes/24sata.recipe
@@ -46,7 +50,6 @@ 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
@@ -66,8 +69,6 @@ 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
@@ -89,7 +90,6 @@ 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
@@ -105,15 +105,16 @@ 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/dnevnik_mk.recipe
FIX_PYTHON+= recipes/eclicto.recipe
FIX_PYTHON+= recipes/ecogeek.recipe
FIX_PYTHON+= recipes/economist.recipe
+FIX_PYTHON+= recipes/economist_free.recipe
FIX_PYTHON+= recipes/ecuisine.recipe
FIX_PYTHON+= recipes/editor_and_publisher.recipe
FIX_PYTHON+= recipes/edmonton_journal.recipe
@@ -126,7 +127,6 @@ 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
@@ -142,7 +142,6 @@ 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
@@ -156,12 +155,14 @@ 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/gosc_niedzielny.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/hackernews.recipe
FIX_PYTHON+= recipes/heraldo.recipe
FIX_PYTHON+= recipes/histmag.recipe
FIX_PYTHON+= recipes/historiaro.recipe
@@ -169,13 +170,11 @@ 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
@@ -188,14 +187,12 @@ 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
@@ -209,7 +206,6 @@ 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
@@ -239,7 +235,6 @@ 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
@@ -284,6 +279,7 @@ 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/pagina_12_print_ed.recipe
FIX_PYTHON+= recipes/panorama.recipe
FIX_PYTHON+= recipes/pc_advisor.recipe
FIX_PYTHON+= recipes/pc_lab.recipe
@@ -293,7 +289,7 @@ 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/plus_info.recipe
FIX_PYTHON+= recipes/pobjeda.recipe
FIX_PYTHON+= recipes/politico.recipe
FIX_PYTHON+= recipes/polityka.recipe
@@ -322,7 +318,6 @@ 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
@@ -343,11 +338,11 @@ 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/stiintasitehnica.recipe
FIX_PYTHON+= recipes/superbebe.recipe
FIX_PYTHON+= recipes/svd_se.recipe
FIX_PYTHON+= recipes/swiatkindle.recipe
@@ -376,7 +371,6 @@ 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
@@ -384,6 +378,7 @@ FIX_PYTHON+= recipes/upi.recipe
FIX_PYTHON+= recipes/usatoday.recipe
FIX_PYTHON+= recipes/usnews.recipe
FIX_PYTHON+= recipes/utne.recipe
+FIX_PYTHON+= recipes/utrinski.recipe
FIX_PYTHON+= recipes/vancouver_provice.recipe
FIX_PYTHON+= recipes/vancouver_sun.recipe
FIX_PYTHON+= recipes/vecernji_list.recipe
@@ -417,6 +412,7 @@ FIX_PYTHON+= setup/check.py
FIX_PYTHON+= setup/commands.py
FIX_PYTHON+= setup/extensions.py
FIX_PYTHON+= setup/gui.py
+FIX_PYTHON+= setup/install.py
FIX_PYTHON+= setup/installer/__init__.py
FIX_PYTHON+= setup/installer/linux/__init__.py
FIX_PYTHON+= setup/installer/linux/freeze.py
@@ -430,13 +426,24 @@ 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/db/__init__.py
+FIX_PYTHON+= src/calibre/db/backend.py
+FIX_PYTHON+= src/calibre/db/cache.py
+FIX_PYTHON+= src/calibre/db/errors.py
+FIX_PYTHON+= src/calibre/db/fields.py
+FIX_PYTHON+= src/calibre/db/locking.py
+FIX_PYTHON+= src/calibre/db/schema_upgrades.py
+FIX_PYTHON+= src/calibre/db/tables.py
+FIX_PYTHON+= src/calibre/db/tests/__init__.py
+FIX_PYTHON+= src/calibre/db/tests/base.py
+FIX_PYTHON+= src/calibre/db/tests/reading.py
+FIX_PYTHON+= src/calibre/db/view.py
FIX_PYTHON+= src/calibre/debug.py
FIX_PYTHON+= src/calibre/devices/android/__init__.py
FIX_PYTHON+= src/calibre/devices/eslick/__init__.py
@@ -448,6 +455,8 @@ 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/prst1/__init__.py
+FIX_PYTHON+= src/calibre/devices/prst1/driver.py
FIX_PYTHON+= src/calibre/devices/teclast/__init__.py
FIX_PYTHON+= src/calibre/devices/udisks.py
FIX_PYTHON+= src/calibre/ebooks/chm/__init__.py
@@ -457,6 +466,9 @@ 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/djvu/__init__.py
+FIX_PYTHON+= src/calibre/ebooks/djvu/djvu.py
+FIX_PYTHON+= src/calibre/ebooks/djvu/djvubzzdec.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
@@ -466,6 +478,7 @@ 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/html/to_zip.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
@@ -473,8 +486,11 @@ 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/markdown/extensions/def_list.py
+FIX_PYTHON+= src/calibre/ebooks/markdown/extensions/extra.py
+FIX_PYTHON+= src/calibre/ebooks/markdown/extensions/fenced_code.py
+FIX_PYTHON+= src/calibre/ebooks/markdown/extensions/tables.py
+FIX_PYTHON+= src/calibre/ebooks/markdown/extensions/wikilinks.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
@@ -506,6 +522,11 @@ 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/mobi/utils.py
+FIX_PYTHON+= src/calibre/ebooks/mobi/writer2/__init__.py
+FIX_PYTHON+= src/calibre/ebooks/mobi/writer2/indexer.py
+FIX_PYTHON+= src/calibre/ebooks/mobi/writer2/main.py
+FIX_PYTHON+= src/calibre/ebooks/mobi/writer2/serializer.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
@@ -519,6 +540,7 @@ 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/readability/readability.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
@@ -541,10 +563,13 @@ 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/plugin_updates.py
FIX_PYTHON+= src/calibre/gui2/actions/preferences.py
+FIX_PYTHON+= src/calibre/gui2/actions/random.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/show_quickview.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
@@ -586,15 +611,20 @@ 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/plugin_updater.py
FIX_PYTHON+= src/calibre/gui2/dialogs/progress.py
+FIX_PYTHON+= src/calibre/gui2/dialogs/quickview.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/template_line_editor.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/keyboard.py
+FIX_PYTHON+= src/calibre/gui2/languages.py
FIX_PYTHON+= src/calibre/gui2/layout.py
FIX_PYTHON+= src/calibre/gui2/library/__init__.py
FIX_PYTHON+= src/calibre/gui2/library/delegates.py
@@ -610,12 +640,14 @@ 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/coloring.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/keyboard.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
@@ -633,7 +665,10 @@ 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/tag_browser/__init__.py
+FIX_PYTHON+= src/calibre/gui2/tag_browser/model.py
+FIX_PYTHON+= src/calibre/gui2/tag_browser/ui.py
+FIX_PYTHON+= src/calibre/gui2/tag_browser/view.py
FIX_PYTHON+= src/calibre/gui2/threaded_jobs.py
FIX_PYTHON+= src/calibre/gui2/throbber.py
FIX_PYTHON+= src/calibre/gui2/tools.py
@@ -651,6 +686,7 @@ 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/coloring.py
FIX_PYTHON+= src/calibre/library/comments.py
FIX_PYTHON+= src/calibre/library/custom_columns.py
FIX_PYTHON+= src/calibre/library/move.py
@@ -659,6 +695,7 @@ 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/ajax.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
@@ -677,6 +714,8 @@ 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/manual/template_ref_generate.py
+FIX_PYTHON+= src/calibre/test_build.py
FIX_PYTHON+= src/calibre/trac/bzr_commit_plugin.py
FIX_PYTHON+= src/calibre/translations/msgfmt.py
FIX_PYTHON+= src/calibre/utils/__init__.py
@@ -690,6 +729,7 @@ 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/proxy.py
FIX_PYTHON+= src/calibre/utils/ipc/server.py
FIX_PYTHON+= src/calibre/utils/ipc/worker.py
FIX_PYTHON+= src/calibre/utils/localization.py
@@ -726,7 +766,11 @@ 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/calibre/web/jsbrowser/__init__.py
+FIX_PYTHON+= src/calibre/web/jsbrowser/browser.py
+FIX_PYTHON+= src/calibre/web/jsbrowser/forms.py
+FIX_PYTHON+= src/calibre/web/jsbrowser/login.py
+FIX_PYTHON+= src/calibre/web/jsbrowser/test.py
FIX_PYTHON+= src/templite/__init__.py
SUBST_CLASSES+= prefix
@@ -735,25 +779,58 @@ SUBST_MESSAGE.prefix= Fixing path to QMAKE
SUBST_STAGE.prefix= post-patch
SUBST_FILES.prefix= setup/build_environment.py
+# This is a real mess
+# This one is for /usr/bin/env python (or even /usr/bin/env Python)
+# XXX There are probably more efficient ways to creat the FIX_PYTHON list.
SUBST_CLASSES+= path
-SUBST_SED.path= -e "s,\#! */usr/bin/env *python[0-9.]*,\#!${PYTHONBIN},"
+SUBST_SED.path= -e "s,\#! */usr/bin/env *[Pp]ython[0-9.]*,\#!${PYTHONBIN},"
SUBST_MESSAGE.path= Fixing path to python.
SUBST_STAGE.path= post-patch
SUBST_FILES.path= setup/install.py ${FIX_PYTHON}
+# These ones are for replacing python[0-9*] with PYTHONBIN
+REPLACE_PYTHON+= recipes/animal_politico.recipe
+REPLACE_PYTHON+= recipes/kompiutierra.recipe
+REPLACE_PYTHON+= recipes/trouw.recipe
+REPLACE_PYTHON+= src/calibre/ebooks/markdown/extensions/codehilite.py
+REPLACE_PYTHON+= src/calibre/ebooks/markdown/extensions/headerid.py
+REPLACE_PYTHON+= src/calibre/ebooks/markdown/extensions/meta.py
+REPLACE_PYTHON+= src/calibre/ebooks/metadata/odt.py
+REPLACE_PYTHON+= src/calibre/utils/smartypants.py
+REPLACE_PYTHON+= src/calibre/utils/wordcount.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
+
MAKE_ENV+= FC_INC_DIR=${BUILDLINK_PREFIX.fontconfig}/include/fontconfig
MAKE_ENV+= FC_LIB_DIR=${BUILDLINK_PREFIX.fontconfig}/lib
MAKE_ENV+= PODOFO_INC_DIR=${BUILDLINK_PREFIX.podofo}/include/podofo
MAKE_ENV+= PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib
#MAKE_ENV+= XDG_UTILS_DEBUG_LEVEL=100
+# Let's depend on the ones we have in pkgsrc instead of the bundled ones.
+pre-configure:
+ cd ${WRKSRC} && rm -rf src/cherrypy src/pyPdf
+
+post-install:
+ cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \
+ ${DESTDIR}${PREFIX}/share/calibre/recipes
+ cd ${WRKSRC} && pax -wr -pma Changelog* README \
+ COPYRIGHT INSTALL LICENSE.* \
+ ${DESTDIR}${PREFIX}/share/doc/calibre
+
.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"
-BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=6.3.5
+BUILDLINK_API_DEPENDS.ImageMagick+= ImageMagick>=6.5.9
.include "../../graphics/ImageMagick/buildlink3.mk"
BUILDLINK_API_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.6
.include "../../graphics/py-imaging/buildlink3.mk"
@@ -766,18 +843,21 @@ _PYSETUPTOOLSINSTALLARGS= # empty
_PYSETUPINSTALLARGS= ${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS}
#.include "../../lang/python/extension.mk"
.include "../../print/podofo/buildlink3.mk"
+# ??? BUILDLINK_API_DEPENDS.podofo+= podofo>=0.8.2
.include "../../print/poppler-includes/buildlink3.mk"
.include "../../print/poppler/buildlink3.mk"
-BUILDLINK_API_DEPENDS.poppler-qt4+= poppler-qt4>=0.10.6
+BUILDLINK_API_DEPENDS.poppler-qt4+= poppler-qt4>=0.12.0
.include "../../print/poppler-qt4/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../sysutils/hal/buildlink3.mk"
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 "../../databases/shared-mime-info/mimedb.mk"
+.include "../../textproc/py-elementtree/buildlink3.mk"
.include "../../x11/py-sip/buildlink3.mk"
-BUILDLINK_API_DEPENDS.py-qt4+= ${PYPKGPREFIX}-qt4>=4.5.1
+BUILDLINK_API_DEPENDS.py-qt4+= ${PYPKGPREFIX}-qt4>=4.7.0
.include "../../x11/py-qt4/buildlink3.mk"
-BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.5.1
+BUILDLINK_API_DEPENDS.qt4-tools+= qt4-tools>=4.7.0
.include "../../x11/qt4-tools/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/calibre/PLIST b/misc/calibre/PLIST
index b837f193ea5..c4b67394564 100644
--- a/misc/calibre/PLIST
+++ b/misc/calibre/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2011/05/21 15:07:48 wiz Exp $
-${PYSITELIB}/init_calibre.py
+@comment $NetBSD: PLIST,v 1.6 2011/10/27 20:40:02 gls Exp $
bin/calibre
bin/calibre-complete
bin/calibre-customize
@@ -8,7 +7,6 @@ bin/calibre-mount-helper
bin/calibre-parallel
bin/calibre-server
bin/calibre-smtp
-bin/calibre-uninstall
bin/calibredb
bin/ebook-convert
bin/ebook-device
@@ -16,7 +14,6 @@ bin/ebook-meta
bin/ebook-viewer
bin/epub-fix
bin/fetch-ebook-metadata
-bin/librarything
bin/lrf2lrs
bin/lrfviewer
bin/lrs2lrf
@@ -31,6 +28,18 @@ 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/db/__init__.py
+lib/calibre/calibre/db/backend.py
+lib/calibre/calibre/db/cache.py
+lib/calibre/calibre/db/errors.py
+lib/calibre/calibre/db/fields.py
+lib/calibre/calibre/db/locking.py
+lib/calibre/calibre/db/schema_upgrades.py
+lib/calibre/calibre/db/tables.py
+lib/calibre/calibre/db/tests/__init__.py
+lib/calibre/calibre/db/tests/base.py
+lib/calibre/calibre/db/tests/reading.py
+lib/calibre/calibre/db/view.py
lib/calibre/calibre/debug.py
lib/calibre/calibre/devices/__init__.py
lib/calibre/calibre/devices/android/__init__.py
@@ -76,6 +85,7 @@ 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/bookmark.py
lib/calibre/calibre/devices/kobo/books.py
lib/calibre/calibre/devices/kobo/driver.py
lib/calibre/calibre/devices/libusb.py
@@ -97,6 +107,8 @@ lib/calibre/calibre/devices/prs500/prstypes.py
lib/calibre/calibre/devices/prs505/__init__.py
lib/calibre/calibre/devices/prs505/driver.py
lib/calibre/calibre/devices/prs505/sony_cache.py
+lib/calibre/calibre/devices/prst1/__init__.py
+lib/calibre/calibre/devices/prst1/driver.py
lib/calibre/calibre/devices/scanner.py
lib/calibre/calibre/devices/sne/__init__.py
lib/calibre/calibre/devices/sne/driver.py
@@ -114,6 +126,9 @@ 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/azw4/__init__.py
+lib/calibre/calibre/ebooks/azw4/input.py
+lib/calibre/calibre/ebooks/azw4/reader.py
lib/calibre/calibre/ebooks/chardet/__init__.py
lib/calibre/calibre/ebooks/chardet/big5freq.py
lib/calibre/calibre/ebooks/chardet/big5prober.py
@@ -164,6 +179,11 @@ 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/cssselect.py
+lib/calibre/calibre/ebooks/djvu/__init__.py
+lib/calibre/calibre/ebooks/djvu/djvu.py
+lib/calibre/calibre/ebooks/djvu/djvubzzdec.py
+lib/calibre/calibre/ebooks/djvu/input.py
lib/calibre/calibre/ebooks/epub/__init__.py
lib/calibre/calibre/ebooks/epub/fix/__init__.py
lib/calibre/calibre/ebooks/epub/fix/container.py
@@ -182,6 +202,7 @@ lib/calibre/calibre/ebooks/html/__init__.py
lib/calibre/calibre/ebooks/html/input.py
lib/calibre/calibre/ebooks/html/meta.py
lib/calibre/calibre/ebooks/html/output.py
+lib/calibre/calibre/ebooks/html/to_zip.py
lib/calibre/calibre/ebooks/htmlz/__init__.py
lib/calibre/calibre/ebooks/htmlz/input.py
lib/calibre/calibre/ebooks/htmlz/oeb2html.py
@@ -221,10 +242,30 @@ lib/calibre/calibre/ebooks/lrf/pylrs/pylrfopt.py
lib/calibre/calibre/ebooks/lrf/pylrs/pylrs.py
lib/calibre/calibre/ebooks/lrf/tags.py
lib/calibre/calibre/ebooks/markdown/__init__.py
+lib/calibre/calibre/ebooks/markdown/blockparser.py
+lib/calibre/calibre/ebooks/markdown/blockprocessors.py
+lib/calibre/calibre/ebooks/markdown/commandline.py
+lib/calibre/calibre/ebooks/markdown/etree_loader.py
+lib/calibre/calibre/ebooks/markdown/extensions/__init__.py
+lib/calibre/calibre/ebooks/markdown/extensions/abbr.py
+lib/calibre/calibre/ebooks/markdown/extensions/codehilite.py
+lib/calibre/calibre/ebooks/markdown/extensions/def_list.py
+lib/calibre/calibre/ebooks/markdown/extensions/extra.py
+lib/calibre/calibre/ebooks/markdown/extensions/fenced_code.py
+lib/calibre/calibre/ebooks/markdown/extensions/footnotes.py
+lib/calibre/calibre/ebooks/markdown/extensions/headerid.py
+lib/calibre/calibre/ebooks/markdown/extensions/meta.py
+lib/calibre/calibre/ebooks/markdown/extensions/rss.py
+lib/calibre/calibre/ebooks/markdown/extensions/tables.py
+lib/calibre/calibre/ebooks/markdown/extensions/toc.py
+lib/calibre/calibre/ebooks/markdown/extensions/wikilinks.py
+lib/calibre/calibre/ebooks/markdown/html4.py
+lib/calibre/calibre/ebooks/markdown/inlinepatterns.py
lib/calibre/calibre/ebooks/markdown/markdown.py
-lib/calibre/calibre/ebooks/markdown/mdx_footnotes.py
-lib/calibre/calibre/ebooks/markdown/mdx_tables.py
-lib/calibre/calibre/ebooks/markdown/mdx_toc.py
+lib/calibre/calibre/ebooks/markdown/odict.py
+lib/calibre/calibre/ebooks/markdown/postprocessors.py
+lib/calibre/calibre/ebooks/markdown/preprocessors.py
+lib/calibre/calibre/ebooks/markdown/treeprocessors.py
lib/calibre/calibre/ebooks/metadata/__init__.py
lib/calibre/calibre/ebooks/metadata/archive.py
lib/calibre/calibre/ebooks/metadata/book/__init__.py
@@ -264,6 +305,7 @@ lib/calibre/calibre/ebooks/metadata/sources/identify.py
lib/calibre/calibre/ebooks/metadata/sources/isbndb.py
lib/calibre/calibre/ebooks/metadata/sources/openlibrary.py
lib/calibre/calibre/ebooks/metadata/sources/overdrive.py
+lib/calibre/calibre/ebooks/metadata/sources/ozon.py
lib/calibre/calibre/ebooks/metadata/sources/test.py
lib/calibre/calibre/ebooks/metadata/toc.py
lib/calibre/calibre/ebooks/metadata/topaz.py
@@ -279,7 +321,12 @@ lib/calibre/calibre/ebooks/mobi/langcodes.py
lib/calibre/calibre/ebooks/mobi/mobiml.py
lib/calibre/calibre/ebooks/mobi/output.py
lib/calibre/calibre/ebooks/mobi/reader.py
+lib/calibre/calibre/ebooks/mobi/utils.py
lib/calibre/calibre/ebooks/mobi/writer.py
+lib/calibre/calibre/ebooks/mobi/writer2/__init__.py
+lib/calibre/calibre/ebooks/mobi/writer2/indexer.py
+lib/calibre/calibre/ebooks/mobi/writer2/main.py
+lib/calibre/calibre/ebooks/mobi/writer2/serializer.py
lib/calibre/calibre/ebooks/odt/__init__.py
lib/calibre/calibre/ebooks/odt/input.py
lib/calibre/calibre/ebooks/oeb/__init__.py
@@ -305,6 +352,7 @@ lib/calibre/calibre/ebooks/oeb/transforms/rescale.py
lib/calibre/calibre/ebooks/oeb/transforms/split.py
lib/calibre/calibre/ebooks/oeb/transforms/structure.py
lib/calibre/calibre/ebooks/oeb/transforms/trimmanifest.py
+lib/calibre/calibre/ebooks/oeb/transforms/unsmarten.py
lib/calibre/calibre/ebooks/oeb/writer.py
lib/calibre/calibre/ebooks/pdb/__init__.py
lib/calibre/calibre/ebooks/pdb/ereader/__init__.py
@@ -358,6 +406,11 @@ lib/calibre/calibre/ebooks/rb/output.py
lib/calibre/calibre/ebooks/rb/rbml.py
lib/calibre/calibre/ebooks/rb/reader.py
lib/calibre/calibre/ebooks/rb/writer.py
+lib/calibre/calibre/ebooks/readability/__init__.py
+lib/calibre/calibre/ebooks/readability/cleaners.py
+lib/calibre/calibre/ebooks/readability/debug.py
+lib/calibre/calibre/ebooks/readability/htmls.py
+lib/calibre/calibre/ebooks/readability/readability.py
lib/calibre/calibre/ebooks/rtf/__init__.py
lib/calibre/calibre/ebooks/rtf/input.py
lib/calibre/calibre/ebooks/rtf/output.py
@@ -423,6 +476,7 @@ 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/textile/unsmarten.py
lib/calibre/calibre/ebooks/txt/__init__.py
lib/calibre/calibre/ebooks/txt/input.py
lib/calibre/calibre/ebooks/txt/markdownml.py
@@ -431,7 +485,6 @@ 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/txt/unsmarten.py
lib/calibre/calibre/ebooks/unihandecode/__init__.py
lib/calibre/calibre/ebooks/unihandecode/jacodepoints.py
lib/calibre/calibre/ebooks/unihandecode/jadecoder.py
@@ -465,10 +518,13 @@ 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/plugin_updates.py
lib/calibre/calibre/gui2/actions/preferences.py
+lib/calibre/calibre/gui2/actions/random.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/show_quickview.py
lib/calibre/calibre/gui2/actions/similar_books.py
lib/calibre/calibre/gui2/actions/store.py
lib/calibre/calibre/gui2/actions/tweak_epub.py
@@ -495,6 +551,8 @@ lib/calibre/calibre/gui2/convert/comic_input.py
lib/calibre/calibre/gui2/convert/comic_input_ui.py
lib/calibre/calibre/gui2/convert/debug.py
lib/calibre/calibre/gui2/convert/debug_ui.py
+lib/calibre/calibre/gui2/convert/djvu_input.py
+lib/calibre/calibre/gui2/convert/djvu_input_ui.py
lib/calibre/calibre/gui2/convert/epub_output.py
lib/calibre/calibre/gui2/convert/epub_output_ui.py
lib/calibre/calibre/gui2/convert/fb2_input.py
@@ -583,6 +641,8 @@ lib/calibre/calibre/gui2/dialogs/conversion_error.py
lib/calibre/calibre/gui2/dialogs/conversion_error_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/device_category_editor.py
+lib/calibre/calibre/gui2/dialogs/device_category_editor_ui.py
lib/calibre/calibre/gui2/dialogs/drm_error.py
lib/calibre/calibre/gui2/dialogs/drm_error_ui.py
lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py
@@ -595,8 +655,11 @@ lib/calibre/calibre/gui2/dialogs/metadata_bulk.py
lib/calibre/calibre/gui2/dialogs/metadata_bulk_ui.py
lib/calibre/calibre/gui2/dialogs/password.py
lib/calibre/calibre/gui2/dialogs/password_ui.py
+lib/calibre/calibre/gui2/dialogs/plugin_updater.py
lib/calibre/calibre/gui2/dialogs/progress.py
lib/calibre/calibre/gui2/dialogs/progress_ui.py
+lib/calibre/calibre/gui2/dialogs/quickview.py
+lib/calibre/calibre/gui2/dialogs/quickview_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
@@ -614,6 +677,7 @@ 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/template_line_editor.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
@@ -625,6 +689,8 @@ 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/keyboard.py
+lib/calibre/calibre/gui2/languages.py
lib/calibre/calibre/gui2/layout.py
lib/calibre/calibre/gui2/library/__init__.py
lib/calibre/calibre/gui2/library/delegates.py
@@ -651,6 +717,7 @@ 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/coloring.py
lib/calibre/calibre/gui2/preferences/columns.py
lib/calibre/calibre/gui2/preferences/columns_ui.py
lib/calibre/calibre/gui2/preferences/conversion.py
@@ -663,6 +730,7 @@ 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/keyboard.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
@@ -696,40 +764,24 @@ 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/config/__init__.py
+lib/calibre/calibre/gui2/store/config/chooser/__init__.py
+lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder.py
+lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder_ui.py
+lib/calibre/calibre/gui2/store/config/chooser/chooser_dialog.py
+lib/calibre/calibre/gui2/store/config/chooser/chooser_widget.py
+lib/calibre/calibre/gui2/store/config/chooser/chooser_widget_ui.py
+lib/calibre/calibre/gui2/store/config/chooser/models.py
+lib/calibre/calibre/gui2/store/config/chooser/results_view.py
+lib/calibre/calibre/gui2/store/config/search/__init__.py
+lib/calibre/calibre/gui2/store/config/search/search_widget.py
+lib/calibre/calibre/gui2/store/config/search/search_widget_ui.py
+lib/calibre/calibre/gui2/store/config/search_widget_ui.py
+lib/calibre/calibre/gui2/store/config/store.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/opensearch_store.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
@@ -740,14 +792,66 @@ 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/stores/__init__.py
+lib/calibre/calibre/gui2/store/stores/amazon_de_plugin.py
+lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py
+lib/calibre/calibre/gui2/store/stores/amazon_plugin.py
+lib/calibre/calibre/gui2/store/stores/amazon_uk_plugin.py
+lib/calibre/calibre/gui2/store/stores/archive_org_plugin.py
+lib/calibre/calibre/gui2/store/stores/baen_webscription_plugin.py
+lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
+lib/calibre/calibre/gui2/store/stores/bewrite_plugin.py
+lib/calibre/calibre/gui2/store/stores/bn_plugin.py
+lib/calibre/calibre/gui2/store/stores/bookoteka_plugin.py
+lib/calibre/calibre/gui2/store/stores/chitanka_plugin.py
+lib/calibre/calibre/gui2/store/stores/diesel_ebooks_plugin.py
+lib/calibre/calibre/gui2/store/stores/ebook_nl_plugin.py
+lib/calibre/calibre/gui2/store/stores/ebooks_com_plugin.py
+lib/calibre/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py
+lib/calibre/calibre/gui2/store/stores/eharlequin_plugin.py
+lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py
+lib/calibre/calibre/gui2/store/stores/escapemagazine_plugin.py
+lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py
+lib/calibre/calibre/gui2/store/stores/foyles_uk_plugin.py
+lib/calibre/calibre/gui2/store/stores/gandalf_plugin.py
+lib/calibre/calibre/gui2/store/stores/google_books_plugin.py
+lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py
+lib/calibre/calibre/gui2/store/stores/kobo_plugin.py
+lib/calibre/calibre/gui2/store/stores/legimi_plugin.py
+lib/calibre/calibre/gui2/store/stores/libri_de_plugin.py
+lib/calibre/calibre/gui2/store/stores/manybooks_plugin.py
+lib/calibre/calibre/gui2/store/stores/mobileread/__init__.py
+lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder.py
+lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder_ui.py
+lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog.py
+lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog_ui.py
+lib/calibre/calibre/gui2/store/stores/mobileread/cache_update_thread.py
+lib/calibre/calibre/gui2/store/stores/mobileread/mobileread_plugin.py
+lib/calibre/calibre/gui2/store/stores/mobileread/models.py
+lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog.py
+lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog_ui.py
+lib/calibre/calibre/gui2/store/stores/nexto_plugin.py
+lib/calibre/calibre/gui2/store/stores/open_books_plugin.py
+lib/calibre/calibre/gui2/store/stores/oreilly_plugin.py
+lib/calibre/calibre/gui2/store/stores/ozon_ru_plugin.py
+lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py
+lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py
+lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py
+lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py
+lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py
+lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py
+lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugin.py
+lib/calibre/calibre/gui2/store/stores/wizards_tower_books_plugin.py
+lib/calibre/calibre/gui2/store/stores/woblink_plugin.py
+lib/calibre/calibre/gui2/store/stores/xinxii_plugin.py
+lib/calibre/calibre/gui2/store/stores/zixo_plugin.py
lib/calibre/calibre/gui2/store/web_control.py
lib/calibre/calibre/gui2/store/web_store_dialog.py
lib/calibre/calibre/gui2/store/web_store_dialog_ui.py
-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/tag_browser/__init__.py
+lib/calibre/calibre/gui2/tag_browser/model.py
+lib/calibre/calibre/gui2/tag_browser/ui.py
+lib/calibre/calibre/gui2/tag_browser/view.py
lib/calibre/calibre/gui2/threaded_jobs.py
lib/calibre/calibre/gui2/throbber.py
lib/calibre/calibre/gui2/tools.py
@@ -780,6 +884,7 @@ 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/coloring.py
lib/calibre/calibre/library/comments.py
lib/calibre/calibre/library/custom_columns.py
lib/calibre/calibre/library/database.py
@@ -791,6 +896,7 @@ lib/calibre/calibre/library/restore.py
lib/calibre/calibre/library/save_to_disk.py
lib/calibre/calibre/library/schema_upgrades.py
lib/calibre/calibre/library/server/__init__.py
+lib/calibre/calibre/library/server/ajax.py
lib/calibre/calibre/library/server/base.py
lib/calibre/calibre/library/server/browse.py
lib/calibre/calibre/library/server/cache.py
@@ -815,6 +921,7 @@ 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/manual/template_ref_generate.py
lib/calibre/calibre/plugins/cPalmdoc.so
lib/calibre/calibre/plugins/chm_extra.so
lib/calibre/calibre/plugins/chmlib.so
@@ -831,6 +938,7 @@ 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/test_build.py
lib/calibre/calibre/trac/__init__.py
lib/calibre/calibre/trac/bzr_commit_plugin.py
lib/calibre/calibre/trac/setup.py
@@ -860,6 +968,7 @@ 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
+lib/calibre/calibre/utils/ipc/proxy.py
lib/calibre/calibre/utils/ipc/server.py
lib/calibre/calibre/utils/ipc/worker.py
lib/calibre/calibre/utils/localization.py
@@ -872,6 +981,10 @@ 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/opensearch/__init__.py
+lib/calibre/calibre/utils/opensearch/description.py
+lib/calibre/calibre/utils/opensearch/query.py
+lib/calibre/calibre/utils/opensearch/url.py
lib/calibre/calibre/utils/ordered_dict.py
lib/calibre/calibre/utils/osx_symlinks.py
lib/calibre/calibre/utils/pdftk.py
@@ -897,6 +1010,7 @@ 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/unsmarten.py
lib/calibre/calibre/utils/winshell.py
lib/calibre/calibre/utils/wmf/__init__.py
lib/calibre/calibre/utils/wmf/parse.py
@@ -913,43 +1027,11 @@ lib/calibre/calibre/web/feeds/recipes/model.py
lib/calibre/calibre/web/feeds/templates.py
lib/calibre/calibre/web/fetch/__init__.py
lib/calibre/calibre/web/fetch/simple.py
-lib/calibre/cherrypy/__init__.py
-lib/calibre/cherrypy/_cpcgifs.py
-lib/calibre/cherrypy/_cpchecker.py
-lib/calibre/cherrypy/_cpconfig.py
-lib/calibre/cherrypy/_cpdispatch.py
-lib/calibre/cherrypy/_cperror.py
-lib/calibre/cherrypy/_cplogging.py
-lib/calibre/cherrypy/_cpmodpy.py
-lib/calibre/cherrypy/_cprequest.py
-lib/calibre/cherrypy/_cpserver.py
-lib/calibre/cherrypy/_cpthreadinglocal.py
-lib/calibre/cherrypy/_cptools.py
-lib/calibre/cherrypy/_cptree.py
-lib/calibre/cherrypy/_cpwsgi.py
-lib/calibre/cherrypy/_cpwsgi_server.py
-lib/calibre/cherrypy/lib/__init__.py
-lib/calibre/cherrypy/lib/auth.py
-lib/calibre/cherrypy/lib/caching.py
-lib/calibre/cherrypy/lib/covercp.py
-lib/calibre/cherrypy/lib/cptools.py
-lib/calibre/cherrypy/lib/encoding.py
-lib/calibre/cherrypy/lib/http.py
-lib/calibre/cherrypy/lib/httpauth.py
-lib/calibre/cherrypy/lib/profiler.py
-lib/calibre/cherrypy/lib/safemime.py
-lib/calibre/cherrypy/lib/sessions.py
-lib/calibre/cherrypy/lib/static.py
-lib/calibre/cherrypy/lib/tidy.py
-lib/calibre/cherrypy/lib/wsgiapp.py
-lib/calibre/cherrypy/lib/xmlrpc.py
-lib/calibre/cherrypy/process/__init__.py
-lib/calibre/cherrypy/process/plugins.py
-lib/calibre/cherrypy/process/servers.py
-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/calibre/web/jsbrowser/__init__.py
+lib/calibre/calibre/web/jsbrowser/browser.py
+lib/calibre/calibre/web/jsbrowser/forms.py
+lib/calibre/calibre/web/jsbrowser/login.py
+lib/calibre/calibre/web/jsbrowser/test.py
lib/calibre/odf/__init__.py
lib/calibre/odf/anim.py
lib/calibre/odf/attrconverters.py
@@ -984,12 +1066,6 @@ lib/calibre/odf/text.py
lib/calibre/odf/thumbnail.py
lib/calibre/odf/userfield.py
lib/calibre/odf/xforms.py
-lib/calibre/pyPdf/__init__.py
-lib/calibre/pyPdf/filters.py
-lib/calibre/pyPdf/generic.py
-lib/calibre/pyPdf/pdf.py
-lib/calibre/pyPdf/utils.py
-lib/calibre/pyPdf/xmp.py
lib/calibre/routes/__init__.py
lib/calibre/routes/base.py
lib/calibre/routes/lru.py
@@ -998,6 +1074,7 @@ lib/calibre/routes/middleware.py
lib/calibre/routes/route.py
lib/calibre/routes/util.py
lib/calibre/templite/__init__.py
+${PYSITELIB}/init_calibre.py
man/man1/calibre-customize.1
man/man1/calibre-debug.1
man/man1/calibre-server.1
@@ -1007,11 +1084,13 @@ 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
man/man1/lrs2lrf.1
man/man1/pdfmanipulate.1
man/man1/web2disk.1
+share/applications/calibre-ebook-viewer.desktop
+share/applications/calibre-gui.desktop
+share/applications/calibre-lrfviewer.desktop
share/bash_completion.d/calibre
share/calibre/builtin_recipes.xml
share/calibre/builtin_recipes.zip
@@ -1065,6 +1144,7 @@ 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/stacktrace.js
share/calibre/content_server/star-half.png
share/calibre/content_server/star-off.png
share/calibre/content_server/star-on.png
@@ -1108,6 +1188,7 @@ 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/boox.jpg
share/calibre/images/devices/folder.png
share/calibre/images/devices/ipad.png
share/calibre/images/devices/italica.png
@@ -1164,6 +1245,8 @@ share/calibre/images/hotmail.png
share/calibre/images/identifiers.png
share/calibre/images/insert-link.png
share/calibre/images/jobs.png
+share/calibre/images/keyboard-prefs.png
+share/calibre/images/languages.png
share/calibre/images/library.png
share/calibre/images/list_remove.png
share/calibre/images/lookfeel.png
@@ -1174,6 +1257,7 @@ 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/djvu.png
share/calibre/images/mimetypes/epub.png
share/calibre/images/mimetypes/fb2.png
share/calibre/images/mimetypes/gif.png
@@ -1192,6 +1276,7 @@ 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/xps.png
share/calibre/images/mimetypes/zero.png
share/calibre/images/mimetypes/zip.png
share/calibre/images/minus.png
@@ -1204,12 +1289,26 @@ share/calibre/images/ok.png
share/calibre/images/page.png
share/calibre/images/plugboard.png
share/calibre/images/plugins.png
+share/calibre/images/plugins/mobileread.png
+share/calibre/images/plugins/plugin_deprecated.png
+share/calibre/images/plugins/plugin_disabled_invalid.png
+share/calibre/images/plugins/plugin_disabled_ok.png
+share/calibre/images/plugins/plugin_disabled_valid.png
+share/calibre/images/plugins/plugin_new.png
+share/calibre/images/plugins/plugin_new_invalid.png
+share/calibre/images/plugins/plugin_new_valid.png
+share/calibre/images/plugins/plugin_updater.png
+share/calibre/images/plugins/plugin_updater_updates.png
+share/calibre/images/plugins/plugin_upgrade_invalid.png
+share/calibre/images/plugins/plugin_upgrade_ok.png
+share/calibre/images/plugins/plugin_upgrade_valid.png
share/calibre/images/plus.png
share/calibre/images/plusplus.png
share/calibre/images/previous.png
share/calibre/images/print-preview.png
share/calibre/images/print.png
share/calibre/images/publisher.png
+share/calibre/images/random.png
share/calibre/images/rating.png
share/calibre/images/reader.png
share/calibre/images/save.png
@@ -1238,138 +1337,7 @@ 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
-share/calibre/localization/locales/de/LC_MESSAGES/iso639.mo
-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
-share/calibre/localization/locales/pt/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/pt/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/pt/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/pt_BR/LC_MESSAGES/iso639.mo
-share/calibre/localization/locales/pt_BR/LC_MESSAGES/messages.mo
-share/calibre/localization/locales/ro/LC_MESSAGES/iso639.mo
-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
-share/calibre/localization/locales/zh_CN/LC_MESSAGES/qt.qm
-share/calibre/localization/locales/zh_HK/LC_MESSAGES/iso639.mo
-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/locales.zip
share/calibre/localization/pykakasi/itaijidict2.pickle
share/calibre/localization/pykakasi/kanadict2.pickle
share/calibre/localization/pykakasi/kanwadict2.pickle
@@ -1377,6 +1345,1092 @@ share/calibre/localization/stats.pickle
share/calibre/metadata_sqlite.sql
share/calibre/mime.types
share/calibre/quick_start.epub
+share/calibre/recipes/180.recipe
+share/calibre/recipes/20_minutos.recipe
+share/calibre/recipes/20minutes.recipe
+share/calibre/recipes/20minutos.recipe
+share/calibre/recipes/24sata.recipe
+share/calibre/recipes/24sata_rs.recipe
+share/calibre/recipes/7dias.recipe
+share/calibre/recipes/7seri.recipe
+share/calibre/recipes/Ansa.recipe
+share/calibre/recipes/DrawAndCook.recipe
+share/calibre/recipes/ZIVE.sk.recipe
+share/calibre/recipes/aachener_nachrichten.recipe
+share/calibre/recipes/abc.recipe
+share/calibre/recipes/abc_au.recipe
+share/calibre/recipes/abc_es.recipe
+share/calibre/recipes/abc_py.recipe
+share/calibre/recipes/accountancyage.recipe
+share/calibre/recipes/ad.recipe
+share/calibre/recipes/adevarul.recipe
+share/calibre/recipes/adnkronos.recipe
+share/calibre/recipes/adventure_zone_pl.recipe
+share/calibre/recipes/adventuregamers.recipe
+share/calibre/recipes/aftenposten.recipe
+share/calibre/recipes/agrogerila.recipe
+share/calibre/recipes/aif_ru.recipe
+share/calibre/recipes/ajc.recipe
+share/calibre/recipes/ajiajin.recipe
+share/calibre/recipes/aksiyon_derigisi.recipe
+share/calibre/recipes/akter.recipe
+share/calibre/recipes/al_ahram.recipe
+share/calibre/recipes/al_jazeera.recipe
+share/calibre/recipes/alo_novine.recipe
+share/calibre/recipes/alt_om_herning.recipe
+share/calibre/recipes/alternet.recipe
+share/calibre/recipes/ambito.recipe
+share/calibre/recipes/ambito_financiero.recipe
+share/calibre/recipes/american_thinker.recipe
+share/calibre/recipes/amspec.recipe
+share/calibre/recipes/an_druma_mor.recipe
+share/calibre/recipes/anandtech.recipe
+share/calibre/recipes/anchorage_daily.recipe
+share/calibre/recipes/android_com_pl.recipe
+share/calibre/recipes/animal_politico.recipe
+share/calibre/recipes/ap.recipe
+share/calibre/recipes/apcom.recipe
+share/calibre/recipes/apod.recipe
+share/calibre/recipes/apple_daily.recipe
+share/calibre/recipes/aprospect.recipe
+share/calibre/recipes/arabian_business.recipe
+share/calibre/recipes/arbetaren.recipe
+share/calibre/recipes/arcamax.recipe
+share/calibre/recipes/archeowiesci.recipe
+share/calibre/recipes/arizona_republic.recipe
+share/calibre/recipes/ars_technica.recipe
+share/calibre/recipes/asia_one.recipe
+share/calibre/recipes/astro_news_pl.recipe
+share/calibre/recipes/astronomia_pl.recipe
+share/calibre/recipes/athens_news.recipe
+share/calibre/recipes/atlantic.recipe
+share/calibre/recipes/auto.recipe
+share/calibre/recipes/auto_blog.recipe
+share/calibre/recipes/auto_prove.recipe
+share/calibre/recipes/autobild.recipe
+share/calibre/recipes/automatiseringgids.recipe
+share/calibre/recipes/avantaje.recipe
+share/calibre/recipes/aventurilapescuit.recipe
+share/calibre/recipes/avto-magazin.recipe
+share/calibre/recipes/axxon_magazine.recipe
+share/calibre/recipes/axxon_news.recipe
+share/calibre/recipes/azstarnet.recipe
+share/calibre/recipes/b92.recipe
+share/calibre/recipes/babyonline.recipe
+share/calibre/recipes/balkaninsight.recipe
+share/calibre/recipes/baltimore_sun.recipe
+share/calibre/recipes/bangkok_biz.recipe
+share/calibre/recipes/bangkokpost.recipe
+share/calibre/recipes/barrons.recipe
+share/calibre/recipes/bash_org_pl.recipe
+share/calibre/recipes/bay_citizen.recipe
+share/calibre/recipes/bbc.recipe
+share/calibre/recipes/bbc_chinese.recipe
+share/calibre/recipes/bbc_es.recipe
+share/calibre/recipes/bbc_fast.recipe
+share/calibre/recipes/bbc_sport.recipe
+share/calibre/recipes/bbcvietnamese.recipe
+share/calibre/recipes/benchmark_pl.recipe
+share/calibre/recipes/berliner_zeitung.recipe
+share/calibre/recipes/berlingske_dk.recipe
+share/calibre/recipes/beta.recipe
+share/calibre/recipes/beta_en.recipe
+share/calibre/recipes/big_oven.recipe
+share/calibre/recipes/big_picture.recipe
+share/calibre/recipes/biggovernment.recipe
+share/calibre/recipes/bighollywood.recipe
+share/calibre/recipes/bild_de.recipe
+share/calibre/recipes/billorielly.recipe
+share/calibre/recipes/bitacora.recipe
+share/calibre/recipes/biz_portal.recipe
+share/calibre/recipes/blic.recipe
+share/calibre/recipes/blog_da_cidadania.recipe
+share/calibre/recipes/boortz.recipe
+share/calibre/recipes/borba.recipe
+share/calibre/recipes/borse_online.recipe
+share/calibre/recipes/boston.com.recipe
+share/calibre/recipes/brand_eins.recipe
+share/calibre/recipes/brasil_de_fato.recipe
+share/calibre/recipes/brigitte_de.recipe
+share/calibre/recipes/bucataras.recipe
+share/calibre/recipes/buckmasters.recipe
+share/calibre/recipes/buenosaireseconomico.recipe
+share/calibre/recipes/buffalo_news.recipe
+share/calibre/recipes/bugun_gazetesi.recipe
+share/calibre/recipes/business_insider.recipe
+share/calibre/recipes/business_spectator.recipe
+share/calibre/recipes/business_standard.recipe
+share/calibre/recipes/business_week.recipe
+share/calibre/recipes/businessworldin.recipe
+share/calibre/recipes/bwmagazine.recipe
+share/calibre/recipes/cacm.recipe
+share/calibre/recipes/caijing.recipe
+share/calibre/recipes/calcalist.recipe
+share/calibre/recipes/calgary_herald.recipe
+share/calibre/recipes/calibre_blog.recipe
+share/calibre/recipes/canardpc.recipe
+share/calibre/recipes/capes_n_babes.recipe
+share/calibre/recipes/capital.recipe
+share/calibre/recipes/capital_de.recipe
+share/calibre/recipes/caros_amigos.recipe
+share/calibre/recipes/carta.recipe
+share/calibre/recipes/carta_capital.recipe
+share/calibre/recipes/catavencu.recipe
+share/calibre/recipes/catholic_news_agency.recipe
+share/calibre/recipes/cbc_canada.recipe
+share/calibre/recipes/cbn.recipe
+share/calibre/recipes/cd_action.recipe
+share/calibre/recipes/cetnixploitation.recipe
+share/calibre/recipes/cgm_pl.recipe
+share/calibre/recipes/chicago_breaking_news.recipe
+share/calibre/recipes/chicago_tribune.recipe
+share/calibre/recipes/china_economic_net.recipe
+share/calibre/recipes/china_post.recipe
+share/calibre/recipes/china_press.recipe
+share/calibre/recipes/china_times.recipe
+share/calibre/recipes/chinadaily.recipe
+share/calibre/recipes/chipro.recipe
+share/calibre/recipes/chouchoublog.recipe
+share/calibre/recipes/chowk.recipe
+share/calibre/recipes/chr_mon.recipe
+share/calibre/recipes/christian_post.recipe
+share/calibre/recipes/cicero.recipe
+share/calibre/recipes/cincinnati_enquirer.recipe
+share/calibre/recipes/cinco_dias.recipe
+share/calibre/recipes/cinebel_be.recipe
+share/calibre/recipes/cio.recipe
+share/calibre/recipes/cio_magazine.recipe
+share/calibre/recipes/cjr.recipe
+share/calibre/recipes/clarin.recipe
+share/calibre/recipes/clarion_ledger.recipe
+share/calibre/recipes/clic_rbs.recipe
+share/calibre/recipes/climate_progress.recipe
+share/calibre/recipes/cm_journal.recipe
+share/calibre/recipes/cnd.recipe
+share/calibre/recipes/cnetjapan.recipe
+share/calibre/recipes/cnetjapan_digital.recipe
+share/calibre/recipes/cnetjapan_release.recipe
+share/calibre/recipes/cnetnews.recipe
+share/calibre/recipes/cnn.recipe
+share/calibre/recipes/coding_horror.recipe
+share/calibre/recipes/columbusdispatch.recipe
+share/calibre/recipes/comics_com.recipe
+share/calibre/recipes/common_dreams.recipe
+share/calibre/recipes/computer_active.recipe
+share/calibre/recipes/consumerist.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/corriere_dello_sport.recipe
+share/calibre/recipes/cosmopolitan.recipe
+share/calibre/recipes/cosmopolitan_de.recipe
+share/calibre/recipes/cotidianul.recipe
+share/calibre/recipes/counterpunch.recipe
+share/calibre/recipes/courrier.recipe
+share/calibre/recipes/courrierinternational.recipe
+share/calibre/recipes/cracked_com.recipe
+share/calibre/recipes/craigslist.recipe
+share/calibre/recipes/credit_slips.recipe
+share/calibre/recipes/csid.recipe
+share/calibre/recipes/cubadebate.recipe
+share/calibre/recipes/curierulnational.recipe
+share/calibre/recipes/cvecezla.recipe
+share/calibre/recipes/cyberpresse.recipe
+share/calibre/recipes/cynewslive.recipe
+share/calibre/recipes/cyprus_weekly.recipe
+share/calibre/recipes/dagens_industri.recipe
+share/calibre/recipes/daily_mail.recipe
+share/calibre/recipes/daily_mirror.recipe
+share/calibre/recipes/daily_telegraph.recipe
+share/calibre/recipes/dailyreckoning.recipe
+share/calibre/recipes/dailytportal.recipe
+share/calibre/recipes/dallas.recipe
+share/calibre/recipes/danas.recipe
+share/calibre/recipes/dani.recipe
+share/calibre/recipes/dark_horizons.recipe
+share/calibre/recipes/darknet.recipe
+share/calibre/recipes/daum_net.recipe
+share/calibre/recipes/dawn.recipe
+share/calibre/recipes/daytona_beach.recipe
+share/calibre/recipes/dbb.recipe
+share/calibre/recipes/de_standaard.recipe
+share/calibre/recipes/deadspin.recipe
+share/calibre/recipes/defensenews.recipe
+share/calibre/recipes/degentenaar.recipe
+share/calibre/recipes/deia.recipe
+share/calibre/recipes/demorgen_be.recipe
+share/calibre/recipes/den_of_geek.recipe
+share/calibre/recipes/denver_post.recipe
+share/calibre/recipes/der_spiegel.recipe
+share/calibre/recipes/der_standard.recipe
+share/calibre/recipes/deredactie.recipe
+share/calibre/recipes/descopera.recipe
+share/calibre/recipes/detroit_news.recipe
+share/calibre/recipes/deutsche_welle_bs.recipe
+share/calibre/recipes/deutsche_welle_en.recipe
+share/calibre/recipes/deutsche_welle_es.recipe
+share/calibre/recipes/deutsche_welle_hr.recipe
+share/calibre/recipes/deutsche_welle_pt.recipe
+share/calibre/recipes/deutsche_welle_sr.recipe
+share/calibre/recipes/developpez.recipe
+share/calibre/recipes/dhnet_be.recipe
+share/calibre/recipes/di.recipe
+share/calibre/recipes/diagonales.recipe
+share/calibre/recipes/diario_cordoba.recipe
+share/calibre/recipes/diario_ibiza.recipe
+share/calibre/recipes/diario_la_republica.recipe
+share/calibre/recipes/diario_sport.recipe
+share/calibre/recipes/diariovasco.recipe
+share/calibre/recipes/diepresse.recipe
+share/calibre/recipes/digital_arts.recipe
+share/calibre/recipes/digitaljournal.recipe
+share/calibre/recipes/digitalspy_uk.recipe
+share/calibre/recipes/digizone.recipe
+share/calibre/recipes/dilbert.recipe
+share/calibre/recipes/dilemaveche.recipe
+share/calibre/recipes/discover_magazine.recipe
+share/calibre/recipes/divahair.recipe
+share/calibre/recipes/dn_se.recipe
+share/calibre/recipes/dna.recipe
+share/calibre/recipes/dnevni_avaz.recipe
+share/calibre/recipes/dnevnik.recipe
+share/calibre/recipes/dnevnik_cro.recipe
+share/calibre/recipes/dnevnik_mk.recipe
+share/calibre/recipes/dobreprogamy.recipe
+share/calibre/recipes/dominion.recipe
+share/calibre/recipes/dosisdiarias.recipe
+share/calibre/recipes/dotpod.recipe
+share/calibre/recipes/down_to_earth.recipe
+share/calibre/recipes/dr_dk.recipe
+share/calibre/recipes/drivelry.recipe
+share/calibre/recipes/dvhn.recipe
+share/calibre/recipes/dzieje_pl.recipe
+share/calibre/recipes/e_novine.recipe
+share/calibre/recipes/eclicto.recipe
+share/calibre/recipes/ecogeek.recipe
+share/calibre/recipes/economist.recipe
+share/calibre/recipes/economist_free.recipe
+share/calibre/recipes/ecotrend.recipe
+share/calibre/recipes/ecuisine.recipe
+share/calibre/recipes/editor_and_publisher.recipe
+share/calibre/recipes/edmonton_journal.recipe
+share/calibre/recipes/egirl.recipe
+share/calibre/recipes/eioba.recipe
+share/calibre/recipes/ekantipur.recipe
+share/calibre/recipes/ekathemerini.recipe
+share/calibre/recipes/ekot.recipe
+share/calibre/recipes/eksiazki.recipe
+share/calibre/recipes/el_colombiano.recipe
+share/calibre/recipes/el_correo.recipe
+share/calibre/recipes/el_cultural.recipe
+share/calibre/recipes/el_espectador.recipe
+share/calibre/recipes/el_faro.recipe
+share/calibre/recipes/el_mercurio_chile.recipe
+share/calibre/recipes/el_mostrador.recipe
+share/calibre/recipes/el_mundo_co.recipe
+share/calibre/recipes/el_observador.recipe
+share/calibre/recipes/el_pais.recipe
+share/calibre/recipes/el_pais_babelia.recipe
+share/calibre/recipes/el_pais_uy.recipe
+share/calibre/recipes/el_periodico.recipe
+share/calibre/recipes/el_publico.recipe
+share/calibre/recipes/el_tiempo.recipe
+share/calibre/recipes/el_universal.recipe
+share/calibre/recipes/elargentino.recipe
+share/calibre/recipes/elclubdelebook.recipe
+share/calibre/recipes/elcomercio.recipe
+share/calibre/recipes/elcronista.recipe
+share/calibre/recipes/ele.recipe
+share/calibre/recipes/elektroda_pl.recipe
+share/calibre/recipes/elmundo.recipe
+share/calibre/recipes/elpais_impreso.recipe
+share/calibre/recipes/elpais_semanal.recipe
+share/calibre/recipes/elperiodico_catalan.recipe
+share/calibre/recipes/elperiodico_spanish.recipe
+share/calibre/recipes/elsevier.recipe
+share/calibre/recipes/eltiempo_hn.recipe
+share/calibre/recipes/eluniversal_ve.recipe
+share/calibre/recipes/eluniversalimpresa.recipe
+share/calibre/recipes/eluniverso_ec.recipe
+share/calibre/recipes/emg_en.recipe
+share/calibre/recipes/emg_rs.recipe
+share/calibre/recipes/endgadget.recipe
+share/calibre/recipes/endgadget_ja.recipe
+share/calibre/recipes/entrepeneur.recipe
+share/calibre/recipes/epicurious.recipe
+share/calibre/recipes/epl_talk.recipe
+share/calibre/recipes/escrevinhador.recipe
+share/calibre/recipes/esenja.recipe
+share/calibre/recipes/espn.recipe
+share/calibre/recipes/esquire.recipe
+share/calibre/recipes/estadao.recipe
+share/calibre/recipes/eu_commission.recipe
+share/calibre/recipes/europa_press.recipe
+share/calibre/recipes/europasur.recipe
+share/calibre/recipes/european_voice.recipe
+share/calibre/recipes/evangelizo.recipe
+share/calibre/recipes/everett_herald.recipe
+share/calibre/recipes/evz.ro.recipe
+share/calibre/recipes/exiled.recipe
+share/calibre/recipes/expansion_spanish.recipe
+share/calibre/recipes/explosm.recipe
+share/calibre/recipes/express_de.recipe
+share/calibre/recipes/f_secure.recipe
+share/calibre/recipes/factcheck.recipe
+share/calibre/recipes/fairbanks_daily.recipe
+share/calibre/recipes/fan_graphs.recipe
+share/calibre/recipes/fastcompany.recipe
+share/calibre/recipes/faznet.recipe
+share/calibre/recipes/fe_india.recipe
+share/calibre/recipes/felicia.recipe
+share/calibre/recipes/fhmro.recipe
+share/calibre/recipes/film_web.recipe
+share/calibre/recipes/financial_times.recipe
+share/calibre/recipes/financial_times_uk.recipe
+share/calibre/recipes/financialsense.recipe
+share/calibre/recipes/financiarul.recipe
+share/calibre/recipes/financieele_dagblad.recipe
+share/calibre/recipes/fleshbot.recipe
+share/calibre/recipes/flickr.recipe
+share/calibre/recipes/flickr_es.recipe
+share/calibre/recipes/fluter_de.recipe
+share/calibre/recipes/focus_de.recipe
+share/calibre/recipes/focus_pl.recipe
+share/calibre/recipes/fokkeensukke.recipe
+share/calibre/recipes/folhadesaopaulo.recipe
+share/calibre/recipes/folhadesaopaulo_sub.recipe
+share/calibre/recipes/forbes.recipe
+share/calibre/recipes/forbes_india.recipe
+share/calibre/recipes/foreign_policy.recipe
+share/calibre/recipes/foreignaffairs.recipe
+share/calibre/recipes/foxnews.recipe
+share/calibre/recipes/fr_online.recipe
+share/calibre/recipes/frandroid.recipe
+share/calibre/recipes/frankfurter_rundschau.recipe
+share/calibre/recipes/frazpc.recipe
+share/calibre/recipes/freakonomics.recipe
+share/calibre/recipes/freenature.recipe
+share/calibre/recipes/freeway.recipe
+share/calibre/recipes/fria.recipe
+share/calibre/recipes/fronda.recipe
+share/calibre/recipes/frontlineonnet.recipe
+share/calibre/recipes/fstream.recipe
+share/calibre/recipes/ftd.recipe
+share/calibre/recipes/fudzilla.recipe
+share/calibre/recipes/futurismic.recipe
+share/calibre/recipes/galicia_confidential.recipe
+share/calibre/recipes/gamasutra_fa.recipe
+share/calibre/recipes/gamasutra_news.recipe
+share/calibre/recipes/gamespot.recipe
+share/calibre/recipes/gandul.recipe
+share/calibre/recipes/gawker.recipe
+share/calibre/recipes/gazeta-prawna-calibre-v1.recipe
+share/calibre/recipes/gazeta_pomorska.recipe
+share/calibre/recipes/gazeta_wyborcza.recipe
+share/calibre/recipes/geek_poke.recipe
+share/calibre/recipes/german_gov.recipe
+share/calibre/recipes/gildia_pl.recipe
+share/calibre/recipes/gizmodo.recipe
+share/calibre/recipes/glamour.recipe
+share/calibre/recipes/glas_srpske.recipe
+share/calibre/recipes/glasgow_herald.recipe
+share/calibre/recipes/glasjavnosti.recipe
+share/calibre/recipes/glennbeck.recipe
+share/calibre/recipes/globaltimes.recipe
+share/calibre/recipes/globe_and_mail.recipe
+share/calibre/recipes/globes_co_il.recipe
+share/calibre/recipes/go4it.recipe
+share/calibre/recipes/go_comics.recipe
+share/calibre/recipes/golem_de.recipe
+share/calibre/recipes/good_house_keeping.recipe
+share/calibre/recipes/good_to_know.recipe
+share/calibre/recipes/googlemobileblog.recipe
+share/calibre/recipes/gosc_niedzielny.recipe
+share/calibre/recipes/gram_pl.recipe
+share/calibre/recipes/granma.recipe
+share/calibre/recipes/greader.recipe
+share/calibre/recipes/greader_uber.recipe
+share/calibre/recipes/greenlinux_pl.recipe
+share/calibre/recipes/greensboro_news_and_record.recipe
+share/calibre/recipes/grrm.recipe
+share/calibre/recipes/gry_online_pl.recipe
+share/calibre/recipes/gsp.recipe
+share/calibre/recipes/guardian.recipe
+share/calibre/recipes/gulfnews.recipe
+share/calibre/recipes/gulli.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/h7_tumspor.recipe
+share/calibre/recipes/haaretz_en.recipe
+share/calibre/recipes/haber7.recipe
+share/calibre/recipes/hackernews.recipe
+share/calibre/recipes/hallo_assen.recipe
+share/calibre/recipes/handelsblatt.recipe
+share/calibre/recipes/hankyoreh.recipe
+share/calibre/recipes/hankyoreh21.recipe
+share/calibre/recipes/hannoversche_zeitung.recipe
+share/calibre/recipes/harpers.recipe
+share/calibre/recipes/harpers_full.recipe
+share/calibre/recipes/hartford_courant.recipe
+share/calibre/recipes/hawaii.recipe
+share/calibre/recipes/hbr.recipe
+share/calibre/recipes/hbr_blogs.recipe
+share/calibre/recipes/heise.recipe
+share/calibre/recipes/heise_online.recipe
+share/calibre/recipes/heise_open.recipe
+share/calibre/recipes/helsingin_sanomat.recipe
+share/calibre/recipes/heraldo.recipe
+share/calibre/recipes/hindu.recipe
+share/calibre/recipes/hindu_business_line.recipe
+share/calibre/recipes/hindustan_times.recipe
+share/calibre/recipes/hira.recipe
+share/calibre/recipes/histmag.recipe
+share/calibre/recipes/historia_pl.recipe
+share/calibre/recipes/historiaro.recipe
+share/calibre/recipes/hitro.recipe
+share/calibre/recipes/hln.recipe
+share/calibre/recipes/hln_be.recipe
+share/calibre/recipes/hna.recipe
+share/calibre/recipes/hola.recipe
+share/calibre/recipes/hotair.recipe
+share/calibre/recipes/hotcity.recipe
+share/calibre/recipes/hotnews.recipe
+share/calibre/recipes/houston_chronicle.recipe
+share/calibre/recipes/howtogeek.recipe
+share/calibre/recipes/hoy.recipe
+share/calibre/recipes/hrt.recipe
+share/calibre/recipes/huffingtonpost.recipe
+share/calibre/recipes/hvg.recipe
+share/calibre/recipes/ibm_smarter_planet.recipe
+share/calibre/recipes/idg_now.recipe
+share/calibre/recipes/idg_se.recipe
+share/calibre/recipes/idnes.recipe
+share/calibre/recipes/ieco.recipe
+share/calibre/recipes/ieeespectrum.recipe
+share/calibre/recipes/ifzm.recipe
+share/calibre/recipes/ihned.recipe
+share/calibre/recipes/iht.recipe
+share/calibre/recipes/il_fatto.recipe
+share/calibre/recipes/il_giornale.recipe
+share/calibre/recipes/il_messaggero.recipe
+share/calibre/recipes/iliteratura_cz.recipe
+share/calibre/recipes/ilsole24ore.recipe
+share/calibre/recipes/imperatortravel.recipe
+share/calibre/recipes/impulse_de.recipe
+share/calibre/recipes/inc.recipe
+share/calibre/recipes/independent.recipe
+share/calibre/recipes/index_hu.recipe
+share/calibre/recipes/india_today.recipe
+share/calibre/recipes/indian_express.recipe
+share/calibre/recipes/indy_star.recipe
+share/calibre/recipes/infobae.recipe
+share/calibre/recipes/infomotori.recipe
+share/calibre/recipes/information_dk.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/interia_fakty.recipe
+share/calibre/recipes/interia_sport.recipe
+share/calibre/recipes/intrefete.recipe
+share/calibre/recipes/io9.recipe
+share/calibre/recipes/ionline_pt.recipe
+share/calibre/recipes/iprofesional.recipe
+share/calibre/recipes/irish_independent.recipe
+share/calibre/recipes/irish_times.recipe
+share/calibre/recipes/izvestia.recipe
+share/calibre/recipes/jakarta_post.recipe
+share/calibre/recipes/jalopnik.recipe
+share/calibre/recipes/japan_times.recipe
+share/calibre/recipes/javalobby.recipe
+share/calibre/recipes/jb_online.recipe
+share/calibre/recipes/jbpress.recipe
+share/calibre/recipes/jezebel.recipe
+share/calibre/recipes/jijinews.recipe
+share/calibre/recipes/joelonsoftware.recipe
+share/calibre/recipes/johm.recipe
+share/calibre/recipes/joop.recipe
+share/calibre/recipes/journalgazette.recipe
+share/calibre/recipes/journalofaccountancy.recipe
+share/calibre/recipes/jp_dk.recipe
+share/calibre/recipes/jpost.recipe
+share/calibre/recipes/jpost_fr.recipe
+share/calibre/recipes/jsonline.recipe
+share/calibre/recipes/jurnalulnational.recipe
+share/calibre/recipes/jutarnji.recipe
+share/calibre/recipes/juventudrebelde.recipe
+share/calibre/recipes/juventudrebelde_english.recipe
+share/calibre/recipes/kahokushinpo.recipe
+share/calibre/recipes/kamerabild.recipe
+share/calibre/recipes/kamikaze.recipe
+share/calibre/recipes/karlsruhe.recipe
+share/calibre/recipes/kath_net.recipe
+share/calibre/recipes/kathemerini.recipe
+share/calibre/recipes/kellog_faculty.recipe
+share/calibre/recipes/kellog_insight.recipe
+share/calibre/recipes/kidney.recipe
+share/calibre/recipes/kitsapun.recipe
+share/calibre/recipes/kleinezeitung.recipe
+share/calibre/recipes/komchadluek.recipe
+share/calibre/recipes/kommersant.recipe
+share/calibre/recipes/kompas.recipe
+share/calibre/recipes/kompiutierra.recipe
+share/calibre/recipes/konflikty_zbrojne.recipe
+share/calibre/recipes/kopalniawiedzy.recipe
+share/calibre/recipes/korben.recipe
+share/calibre/recipes/korea_herald.recipe
+share/calibre/recipes/korespondent.recipe
+share/calibre/recipes/kotaku.recipe
+share/calibre/recipes/krstarica.recipe
+share/calibre/recipes/krstarica_en.recipe
+share/calibre/recipes/ksiazka_pl.recipe
+share/calibre/recipes/kstar.recipe
+share/calibre/recipes/kudika.recipe
+share/calibre/recipes/kukuburi.recipe
+share/calibre/recipes/kurier.recipe
+share/calibre/recipes/l_espresso.recipe
+share/calibre/recipes/la_cuarta.recipe
+share/calibre/recipes/la_diaria.recipe
+share/calibre/recipes/la_gazzeta_dello_sport.recipe
+share/calibre/recipes/la_jornada.recipe
+share/calibre/recipes/la_nueva.recipe
+share/calibre/recipes/la_razon_bo.recipe
+share/calibre/recipes/la_republica.recipe
+share/calibre/recipes/la_rioja.recipe
+share/calibre/recipes/la_segunda.recipe
+share/calibre/recipes/la_stampa.recipe
+share/calibre/recipes/la_tercera.recipe
+share/calibre/recipes/la_tribuna.recipe
+share/calibre/recipes/lalibre_be.recipe
+share/calibre/recipes/lameuse_be.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/las_vegas_review.recipe
+share/calibre/recipes/latimes.recipe
+share/calibre/recipes/latribuna.recipe
+share/calibre/recipes/lavanguardia.recipe
+share/calibre/recipes/lavenir_be.recipe
+share/calibre/recipes/le_journal.recipe
+share/calibre/recipes/le_monde.recipe
+share/calibre/recipes/le_temps.recipe
+share/calibre/recipes/ledevoir.recipe
+share/calibre/recipes/leduc.recipe
+share/calibre/recipes/legeartis.recipe
+share/calibre/recipes/leggo_it.recipe
+share/calibre/recipes/legitymizm.recipe
+share/calibre/recipes/leipzer_volkszeitung.recipe
+share/calibre/recipes/lemonde_dip.recipe
+share/calibre/recipes/lenta_ru.recipe
+share/calibre/recipes/lepoint.recipe
+share/calibre/recipes/lescienze.recipe
+share/calibre/recipes/lesoir_be.recipe
+share/calibre/recipes/levante.recipe
+share/calibre/recipes/lexpress.recipe
+share/calibre/recipes/liberation.recipe
+share/calibre/recipes/libero.recipe
+share/calibre/recipes/liberty_times.recipe
+share/calibre/recipes/lifehacker.recipe
+share/calibre/recipes/linux_magazine.recipe
+share/calibre/recipes/linuxdevices.recipe
+share/calibre/recipes/livemint.recipe
+share/calibre/recipes/living_digital.recipe
+share/calibre/recipes/lomza.recipe
+share/calibre/recipes/london_free_press.recipe
+share/calibre/recipes/los_tiempos_bo.recipe
+share/calibre/recipes/losandes.recipe
+share/calibre/recipes/losservatoreromano_it.recipe
+share/calibre/recipes/lrb.recipe
+share/calibre/recipes/lrb_payed.recipe
+share/calibre/recipes/luns_a_venres.recipe
+share/calibre/recipes/lupa.recipe
+share/calibre/recipes/lwn.recipe
+share/calibre/recipes/lwn_weekly.recipe
+share/calibre/recipes/mac_video.recipe
+share/calibre/recipes/mac_world.recipe
+share/calibre/recipes/mac_world_uk.recipe
+share/calibre/recipes/macleans.recipe
+share/calibre/recipes/mail_and_guardian.recipe
+share/calibre/recipes/mainichi.recipe
+share/calibre/recipes/mainichi_it_news.recipe
+share/calibre/recipes/malaysian_mirror.recipe
+share/calibre/recipes/marca.recipe
+share/calibre/recipes/marctv.recipe
+share/calibre/recipes/matichon.recipe
+share/calibre/recipes/max_planck.recipe
+share/calibre/recipes/maximum_pc.recipe
+share/calibre/recipes/mayra.recipe
+share/calibre/recipes/mdj.recipe
+share/calibre/recipes/mediafax.recipe
+share/calibre/recipes/mediaindonesia.recipe
+share/calibre/recipes/mediapart.recipe
+share/calibre/recipes/medscape.recipe
+share/calibre/recipes/menorca.recipe
+share/calibre/recipes/mens_health.recipe
+share/calibre/recipes/merco_press.recipe
+share/calibre/recipes/mesec.recipe
+share/calibre/recipes/metro_montreal.recipe
+share/calibre/recipes/metro_news_nl.recipe
+share/calibre/recipes/metro_uk.recipe
+share/calibre/recipes/miami_herald.recipe
+share/calibre/recipes/michalkiewicz.recipe
+share/calibre/recipes/michellemalkin.recipe
+share/calibre/recipes/midday.recipe
+share/calibre/recipes/milenio.recipe
+share/calibre/recipes/ming_pao.recipe
+share/calibre/recipes/ming_pao_toronto.recipe
+share/calibre/recipes/ming_pao_vancouver.recipe
+share/calibre/recipes/miradasalsur.recipe
+share/calibre/recipes/mmc_rtv.recipe
+share/calibre/recipes/modoros.recipe
+share/calibre/recipes/moldovaazi.recipe
+share/calibre/recipes/mondedurable.recipe
+share/calibre/recipes/monden.recipe
+share/calibre/recipes/moneycontrol.recipe
+share/calibre/recipes/moneynews.recipe
+share/calibre/recipes/moneyro.recipe
+share/calibre/recipes/monitor.recipe
+share/calibre/recipes/montevideo_com.recipe
+share/calibre/recipes/montreal_gazette.recipe
+share/calibre/recipes/moscow_times.recipe
+share/calibre/recipes/motherjones.recipe
+share/calibre/recipes/msdnmag_en.recipe
+share/calibre/recipes/msnbc.recipe
+share/calibre/recipes/msnsankei.recipe
+share/calibre/recipes/nacional_cro.recipe
+share/calibre/recipes/nacionred.recipe
+share/calibre/recipes/naczytniki.recipe
+share/calibre/recipes/nakedcapitalism.recipe
+share/calibre/recipes/nasa.recipe
+share/calibre/recipes/natgeo.recipe
+share/calibre/recipes/nation_ke.recipe
+share/calibre/recipes/national_geographic_de.recipe
+share/calibre/recipes/national_geographic_pl.recipe
+share/calibre/recipes/national_post.recipe
+share/calibre/recipes/nationalgeographic.recipe
+share/calibre/recipes/nationalgeographicjp.recipe
+share/calibre/recipes/nationalgeoro.recipe
+share/calibre/recipes/nationalreviewonline.recipe
+share/calibre/recipes/nbonline.recipe
+share/calibre/recipes/ncrnext.recipe
+share/calibre/recipes/nejm.recipe
+share/calibre/recipes/neowin.recipe
+share/calibre/recipes/netzpolitik.recipe
+share/calibre/recipes/new_london_day.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/newsmoldova.recipe
+share/calibre/recipes/newsobs.recipe
+share/calibre/recipes/newsstraitstimes.recipe
+share/calibre/recipes/newsweek.recipe
+share/calibre/recipes/newsweek_argentina.recipe
+share/calibre/recipes/newsweek_polska.recipe
+share/calibre/recipes/ngz.recipe
+share/calibre/recipes/niebezpiecznik.recipe
+share/calibre/recipes/nightflier.recipe
+share/calibre/recipes/nikkei_free.recipe
+share/calibre/recipes/nikkei_news.recipe
+share/calibre/recipes/nikkei_sub.recipe
+share/calibre/recipes/nikkei_sub_economy.recipe
+share/calibre/recipes/nikkei_sub_industry.recipe
+share/calibre/recipes/nikkei_sub_life.recipe
+share/calibre/recipes/nikkei_sub_main.recipe
+share/calibre/recipes/nikkei_sub_shakai.recipe
+share/calibre/recipes/nikkei_sub_sports.recipe
+share/calibre/recipes/nin.recipe
+share/calibre/recipes/njp.recipe
+share/calibre/recipes/njuz_net.recipe
+share/calibre/recipes/nme.recipe
+share/calibre/recipes/noaa.recipe
+share/calibre/recipes/nortecastilla.recipe
+share/calibre/recipes/noticias_r7.recipe
+share/calibre/recipes/noticias_unb.recipe
+share/calibre/recipes/novaya_gazeta.recipe
+share/calibre/recipes/novinite.recipe
+share/calibre/recipes/novinky.recipe
+share/calibre/recipes/novistandard.recipe
+share/calibre/recipes/novosti.recipe
+share/calibre/recipes/now_toronto.recipe
+share/calibre/recipes/nowa_fantastyka.recipe
+share/calibre/recipes/npr.recipe
+share/calibre/recipes/npr_music_blogs.recipe
+share/calibre/recipes/nrc-nl-epub.recipe
+share/calibre/recipes/nrc.nl.recipe
+share/calibre/recipes/nspm.recipe
+share/calibre/recipes/nspm_int.recipe
+share/calibre/recipes/ntv_spor.recipe
+share/calibre/recipes/ntv_tr.recipe
+share/calibre/recipes/nu.recipe
+share/calibre/recipes/nursingtimes.recipe
+share/calibre/recipes/nymag.recipe
+share/calibre/recipes/nypost.recipe
+share/calibre/recipes/nytimes.recipe
+share/calibre/recipes/nytimes_sports.recipe
+share/calibre/recipes/nytimes_sub.recipe
+share/calibre/recipes/nytimes_tech.recipe
+share/calibre/recipes/nytimesbook.recipe
+share/calibre/recipes/nzherald.recipe
+share/calibre/recipes/nzz_ger.recipe
+share/calibre/recipes/o_globo.recipe
+share/calibre/recipes/oakland_north.recipe
+share/calibre/recipes/observa_digital.recipe
+share/calibre/recipes/observatorul_cultural.recipe
+share/calibre/recipes/observer.recipe
+share/calibre/recipes/observer_gb.recipe
+share/calibre/recipes/oc_register.recipe
+share/calibre/recipes/office_space.recipe
+share/calibre/recipes/oilprice.recipe
+share/calibre/recipes/oldnewthing.recipe
+share/calibre/recipes/omgubuntu.recipe
+share/calibre/recipes/onemagazine.recipe
+share/calibre/recipes/onionavclub.recipe
+share/calibre/recipes/open_left.recipe
+share/calibre/recipes/oregonian.recipe
+share/calibre/recipes/oriental_daily.recipe
+share/calibre/recipes/orlando_sentinel.recipe
+share/calibre/recipes/orsai.recipe
+share/calibre/recipes/osnews_pl.recipe
+share/calibre/recipes/ottawa_citizen.recipe
+share/calibre/recipes/ourdailybread.recipe
+share/calibre/recipes/outlook_india.recipe
+share/calibre/recipes/pagina12.recipe
+share/calibre/recipes/pagina_12_print_ed.recipe
+share/calibre/recipes/pajama.recipe
+share/calibre/recipes/panorama.recipe
+share/calibre/recipes/paperli_topic.recipe
+share/calibre/recipes/patente_de_corso.recipe
+share/calibre/recipes/pc_advisor.recipe
+share/calibre/recipes/pc_lab.recipe
+share/calibre/recipes/pc_mag.recipe
+share/calibre/recipes/pc_quest_india.recipe
+share/calibre/recipes/pc_world.recipe
+share/calibre/recipes/pcworld_hu.recipe
+share/calibre/recipes/pcworldro.recipe
+share/calibre/recipes/pecat.recipe
+share/calibre/recipes/penguin_news.recipe
+share/calibre/recipes/people_daily.recipe
+share/calibre/recipes/people_us_mashup.recipe
+share/calibre/recipes/perfil.recipe
+share/calibre/recipes/pescanik.recipe
+share/calibre/recipes/peterschiff.recipe
+share/calibre/recipes/phd_comics.recipe
+share/calibre/recipes/philly.recipe
+share/calibre/recipes/phoronix.recipe
+share/calibre/recipes/physics_today.recipe
+share/calibre/recipes/physics_world.recipe
+share/calibre/recipes/pilot.recipe
+share/calibre/recipes/planet_kde.recipe
+share/calibre/recipes/plus_info.recipe
+share/calibre/recipes/pobjeda.recipe
+share/calibre/recipes/podnikatel.recipe
+share/calibre/recipes/politico.recipe
+share/calibre/recipes/politifact.recipe
+share/calibre/recipes/politika.recipe
+share/calibre/recipes/politiken_dk.recipe
+share/calibre/recipes/polityka.recipe
+share/calibre/recipes/polizeipress_de.recipe
+share/calibre/recipes/popscience.recipe
+share/calibre/recipes/portafolio.recipe
+share/calibre/recipes/portfolio.recipe
+share/calibre/recipes/post_today.recipe
+share/calibre/recipes/poughkeepsie_journal.recipe
+share/calibre/recipes/praguemonitor.recipe
+share/calibre/recipes/pravda.recipe
+share/calibre/recipes/pressonline.recipe
+share/calibre/recipes/pressthink.recipe
+share/calibre/recipes/pro_linux_de.recipe
+share/calibre/recipes/pro_physik.recipe
+share/calibre/recipes/projo.recipe
+share/calibre/recipes/promotor.recipe
+share/calibre/recipes/propublica.recipe
+share/calibre/recipes/prosport.recipe
+share/calibre/recipes/prostamerika.recipe
+share/calibre/recipes/protvmagazin.recipe
+share/calibre/recipes/psych.recipe
+share/calibre/recipes/psychologies.recipe
+share/calibre/recipes/publico.recipe
+share/calibre/recipes/publika.recipe
+share/calibre/recipes/punto_informatico.recipe
+share/calibre/recipes/queleer.recipe
+share/calibre/recipes/quotidiano.recipe
+share/calibre/recipes/radikal_tr.recipe
+share/calibre/recipes/radio_prague.recipe
+share/calibre/recipes/radio_praha.recipe
+share/calibre/recipes/rbc_ru.recipe
+share/calibre/recipes/rds.recipe
+share/calibre/recipes/readers_digest.recipe
+share/calibre/recipes/readitlater.recipe
+share/calibre/recipes/realitatea.recipe
+share/calibre/recipes/red_aragon.recipe
+share/calibre/recipes/regina_leader_post.recipe
+share/calibre/recipes/replicavedetelor.recipe
+share/calibre/recipes/reptantes.recipe
+share/calibre/recipes/republica.recipe
+share/calibre/recipes/republika.recipe
+share/calibre/recipes/reuters.recipe
+share/calibre/recipes/reuters_ja.recipe
+share/calibre/recipes/revista_bla.recipe
+share/calibre/recipes/revista_muy.recipe
+share/calibre/recipes/revista_piaui.recipe
+share/calibre/recipes/revista_semana.recipe
+share/calibre/recipes/rga.recipe
+share/calibre/recipes/rheinische_post.recipe
+share/calibre/recipes/ria_ru.recipe
+share/calibre/recipes/rian_eng.recipe
+share/calibre/recipes/rian_spa.recipe
+share/calibre/recipes/rmf24_ESKN.recipe
+share/calibre/recipes/rmf24_fakty.recipe
+share/calibre/recipes/rmf24_opinie.recipe
+share/calibre/recipes/roger_ebert.recipe
+share/calibre/recipes/roger_ebert_blog.recipe
+share/calibre/recipes/rollingstone.recipe
+share/calibre/recipes/romanialibera.recipe
+share/calibre/recipes/root.recipe
+share/calibre/recipes/rstones.recipe
+share/calibre/recipes/rte.recipe
+share/calibre/recipes/rtnews.recipe
+share/calibre/recipes/rts.recipe
+share/calibre/recipes/rue89.recipe
+share/calibre/recipes/rusiahoy.recipe
+share/calibre/recipes/rzeczpospolita.recipe
+share/calibre/recipes/sabah.recipe
+share/calibre/recipes/salon.recipe
+share/calibre/recipes/samanyolu_haber.recipe
+share/calibre/recipes/samanyolu_teknoloji.recipe
+share/calibre/recipes/san_fran_chronicle.recipe
+share/calibre/recipes/sanjosemercurynews.recipe
+share/calibre/recipes/sarajevo_x.recipe
+share/calibre/recipes/saskatoon_star_phoenix.recipe
+share/calibre/recipes/sb_nation.recipe
+share/calibre/recipes/science_aas.recipe
+share/calibre/recipes/science_based_medicine.recipe
+share/calibre/recipes/science_news.recipe
+share/calibre/recipes/science_news_recent_issues.recipe
+share/calibre/recipes/sciencedaily.recipe
+share/calibre/recipes/scientific_american.recipe
+share/calibre/recipes/scinexx.recipe
+share/calibre/recipes/scmp.recipe
+share/calibre/recipes/scott_hanselman.recipe
+share/calibre/recipes/scprint.recipe
+share/calibre/recipes/seanhannity.recipe
+share/calibre/recipes/seattle_times.recipe
+share/calibre/recipes/security_watch.recipe
+share/calibre/recipes/serverside.recipe
+share/calibre/recipes/sfbg.recipe
+share/calibre/recipes/sfin.recipe
+share/calibre/recipes/sg_hu.recipe
+share/calibre/recipes/shacknews.recipe
+share/calibre/recipes/sign_on_sd.recipe
+share/calibre/recipes/silicon_republic.recipe
+share/calibre/recipes/sinfest.recipe
+share/calibre/recipes/singtao_daily.recipe
+share/calibre/recipes/siol.recipe
+share/calibre/recipes/sizinti_derigisi.recipe
+share/calibre/recipes/skeptic.recipe
+share/calibre/recipes/skeptical_enquirer.recipe
+share/calibre/recipes/slashdot.recipe
+share/calibre/recipes/slate.recipe
+share/calibre/recipes/slovo.recipe
+share/calibre/recipes/smashing.recipe
+share/calibre/recipes/sme.recipe
+share/calibre/recipes/smh.recipe
+share/calibre/recipes/smith.recipe
+share/calibre/recipes/snopes.recipe
+share/calibre/recipes/socialdiva.recipe
+share/calibre/recipes/soldiers.recipe
+share/calibre/recipes/spektrum.recipe
+share/calibre/recipes/spiegel_int.recipe
+share/calibre/recipes/spiegelde.recipe
+share/calibre/recipes/spin_magazine.recipe
+share/calibre/recipes/sportsillustrated.recipe
+share/calibre/recipes/sportsillustrated_columnists.recipe
+share/calibre/recipes/st_louis_post_dispatch.recipe
+share/calibre/recipes/st_petersburg_times.recipe
+share/calibre/recipes/stackoverflow.recipe
+share/calibre/recipes/standardmedia_ke.recipe
+share/calibre/recipes/standardmoney.recipe
+share/calibre/recipes/star_gazetesi.recipe
+share/calibre/recipes/staradvertiser.recipe
+share/calibre/recipes/starwars.recipe
+share/calibre/recipes/statesman.recipe
+share/calibre/recipes/stiintasitehnica.recipe
+share/calibre/recipes/stnn.recipe
+share/calibre/recipes/straitstimes.recipe
+share/calibre/recipes/strategy-business.recipe
+share/calibre/recipes/sueddeutsche.recipe
+share/calibre/recipes/sueddeutschezeitung.recipe
+share/calibre/recipes/sunday_times.recipe
+share/calibre/recipes/superbebe.recipe
+share/calibre/recipes/superesportes.recipe
+share/calibre/recipes/svd_se.recipe
+share/calibre/recipes/swiatkindle.recipe
+share/calibre/recipes/tablety_pl.recipe
+share/calibre/recipes/tabu.recipe
+share/calibre/recipes/tagesan.recipe
+share/calibre/recipes/tagesspiegel.recipe
+share/calibre/recipes/taggeschau_de.recipe
+share/calibre/recipes/taipei.recipe
+share/calibre/recipes/tanea.recipe
+share/calibre/recipes/tanjug.recipe
+share/calibre/recipes/taz.recipe
+share/calibre/recipes/taz_rss.recipe
+share/calibre/recipes/tech_world.recipe
+share/calibre/recipes/techcrunch.recipe
+share/calibre/recipes/technology_review.recipe
+share/calibre/recipes/technology_review_de.recipe
+share/calibre/recipes/tedneward.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/thai_post_daily.recipe
+share/calibre/recipes/thairath.recipe
+share/calibre/recipes/the_age.recipe
+share/calibre/recipes/the_budget_fashionista.recipe
+share/calibre/recipes/the_clinic_online.recipe
+share/calibre/recipes/the_escapist.recipe
+share/calibre/recipes/the_h.recipe
+share/calibre/recipes/the_journal.recipe
+share/calibre/recipes/the_marker.recipe
+share/calibre/recipes/the_nation.recipe
+share/calibre/recipes/the_nation_thai.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/the_sun.recipe
+share/calibre/recipes/the_week_magazine_free.recipe
+share/calibre/recipes/the_workingham_times.recipe
+share/calibre/recipes/thecultofghoul.recipe
+share/calibre/recipes/thedgesingapore.recipe
+share/calibre/recipes/theecocolapse.recipe
+share/calibre/recipes/theeconomictimes_india.recipe
+share/calibre/recipes/theluminouslandscape.recipe
+share/calibre/recipes/themarketticker.recipe
+share/calibre/recipes/thenews.recipe
+share/calibre/recipes/theoldfoodie.recipe
+share/calibre/recipes/theonion.recipe
+share/calibre/recipes/theonlinephotographer.recipe
+share/calibre/recipes/thestar.recipe
+share/calibre/recipes/thewest_au.recipe
+share/calibre/recipes/think_progress.recipe
+share/calibre/recipes/thn.recipe
+share/calibre/recipes/tidbits.recipe
+share/calibre/recipes/tijd.recipe
+share/calibre/recipes/tijolaco.recipe
+share/calibre/recipes/time_magazine.recipe
+share/calibre/recipes/times_online.recipe
+share/calibre/recipes/timesnewroman.recipe
+share/calibre/recipes/tmz.recipe
+share/calibre/recipes/tnxm.recipe
+share/calibre/recipes/today_online.recipe
+share/calibre/recipes/todays_zaman.recipe
+share/calibre/recipes/toi.recipe
+share/calibre/recipes/tomshardware.recipe
+share/calibre/recipes/tomshardware_de.recipe
+share/calibre/recipes/toronto_sun.recipe
+share/calibre/recipes/toyokeizai.recipe
+share/calibre/recipes/tpm_uk.recipe
+share/calibre/recipes/tr.recipe
+share/calibre/recipes/tri_city_herald.recipe
+share/calibre/recipes/trombon.recipe
+share/calibre/recipes/trouw.recipe
+share/calibre/recipes/trv.recipe
+share/calibre/recipes/tsn.recipe
+share/calibre/recipes/tulsaworld.recipe
+share/calibre/recipes/tuttosport.recipe
+share/calibre/recipes/tvmania.recipe
+share/calibre/recipes/tweakers.recipe
+share/calibre/recipes/twitchfilms.recipe
+share/calibre/recipes/twtfb.recipe
+share/calibre/recipes/tyzden.recipe
+share/calibre/recipes/ubuntu_pl.recipe
+share/calibre/recipes/ultimahora.recipe
+share/calibre/recipes/uncrate.recipe
+share/calibre/recipes/unica.recipe
+share/calibre/recipes/uninohimitu.recipe
+share/calibre/recipes/united_daily.recipe
+share/calibre/recipes/upi.recipe
+share/calibre/recipes/usatoday.recipe
+share/calibre/recipes/usnews.recipe
+share/calibre/recipes/utne.recipe
+share/calibre/recipes/utrinski.recipe
+share/calibre/recipes/vancouver_provice.recipe
+share/calibre/recipes/vancouver_sun.recipe
+share/calibre/recipes/variety.recipe
+share/calibre/recipes/vecernji_list.recipe
+share/calibre/recipes/vedomosti.recipe
+share/calibre/recipes/veintitres.recipe
+share/calibre/recipes/version2.recipe
+share/calibre/recipes/vic_times.recipe
+share/calibre/recipes/vijesti.recipe
+share/calibre/recipes/vio_mundo.recipe
+share/calibre/recipes/virtualshackles.recipe
+share/calibre/recipes/vitalia.recipe
+share/calibre/recipes/viva.recipe
+share/calibre/recipes/vnexpress.recipe
+share/calibre/recipes/volksrant.recipe
+share/calibre/recipes/volksrant_sub.recipe
+share/calibre/recipes/vreme.recipe
+share/calibre/recipes/vrijnederland.recipe
+share/calibre/recipes/waco_tribune.recipe
+share/calibre/recipes/walla.recipe
+share/calibre/recipes/wallstreetro.recipe
+share/calibre/recipes/walrusmag.recipe
+share/calibre/recipes/wapo_cartoons.recipe
+share/calibre/recipes/wash_post.recipe
+share/calibre/recipes/wash_times.recipe
+share/calibre/recipes/watchingamerica.recipe
+share/calibre/recipes/weblogs_sl.recipe
+share/calibre/recipes/welt.recipe
+share/calibre/recipes/welt_der_physik.recipe
+share/calibre/recipes/wenxuecity-znjy.recipe
+share/calibre/recipes/wichita_eagle.recipe
+share/calibre/recipes/wikinews_en.recipe
+share/calibre/recipes/windows_star.recipe
+share/calibre/recipes/winnipeg_free_press.recipe
+share/calibre/recipes/winnipeg_sun.recipe
+share/calibre/recipes/winsupersite.recipe
+share/calibre/recipes/winter_olympics.recipe
+share/calibre/recipes/wired.recipe
+share/calibre/recipes/wired_daily.recipe
+share/calibre/recipes/wired_uk.recipe
+share/calibre/recipes/wnp.recipe
+share/calibre/recipes/words_without_borders.recipe
+share/calibre/recipes/workers_world.recipe
+share/calibre/recipes/wow.recipe
+share/calibre/recipes/woz_die.recipe
+share/calibre/recipes/wprost.recipe
+share/calibre/recipes/wsj.recipe
+share/calibre/recipes/wsj_free.recipe
+share/calibre/recipes/wvhooligan.recipe
+share/calibre/recipes/xkcd.recipe
+share/calibre/recipes/yagmur_dergisi.recipe
+share/calibre/recipes/yahoo_news.recipe
+share/calibre/recipes/yakima_herald.recipe
+share/calibre/recipes/yementimes.recipe
+share/calibre/recipes/yeni_umit_dergisi.recipe
+share/calibre/recipes/yenisafak_gazetesi.recipe
+share/calibre/recipes/ynet.recipe
+share/calibre/recipes/yomiuri.recipe
+share/calibre/recipes/yomiuri_world.recipe
+share/calibre/recipes/zaman.recipe
+share/calibre/recipes/zaobao.recipe
+share/calibre/recipes/zdnet.fr.recipe
+share/calibre/recipes/zdnet.recipe
+share/calibre/recipes/zeitde.recipe
+share/calibre/recipes/zeitde_sub.recipe
+share/calibre/recipes/zerohedge.recipe
+share/calibre/recipes/ziarulfinanciar.recipe
+share/calibre/recipes/ziuaveche.recipe
share/calibre/scripts.pickle
share/calibre/template-functions.json
share/calibre/templates/book_details.css
@@ -1430,3 +2484,13 @@ share/calibre/viewer/hyphenation.js
share/calibre/viewer/images.js
share/calibre/viewer/jquery_scrollTo.js
share/calibre/viewer/referencing.js
+share/doc/calibre/COPYRIGHT
+share/doc/calibre/Changelog.old.yaml
+share/doc/calibre/Changelog.yaml
+share/doc/calibre/INSTALL
+share/doc/calibre/LICENSE.rtf
+share/doc/calibre/README
+share/mime/packages/calibre.xml
+share/pixmaps/calibre-gui.png
+share/pixmaps/calibre-lrf.png
+share/pixmaps/calibre-viewer.png
diff --git a/misc/calibre/distinfo b/misc/calibre/distinfo
index 8ed0c73b0c6..bdf6828cf76 100644
--- a/misc/calibre/distinfo
+++ b/misc/calibre/distinfo
@@ -1,13 +1,7 @@
-$NetBSD: distinfo,v 1.4 2011/05/21 15:07:48 wiz Exp $
+$NetBSD: distinfo,v 1.5 2011/10/27 20:40:02 gls Exp $
-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 (calibre-0.8.24.tar.gz) = 367ba8617c682f135381d0d842744425aafd77bd
+RMD160 (calibre-0.8.24.tar.gz) = 28d4c3e200318fd4b24a9f9881777bb331fcc542
+Size (calibre-0.8.24.tar.gz) = 37687726 bytes
SHA1 (patch-src_calibre_ebooks_pdf_images.cpp) = 950f0302f3c387fb9b4ee41cd96d7c5103b7ad45
-SHA1 (patch-src_calibre_linux.py) = bb9ae0099faf84a73ccbc0a876ff340d5be82963
-SHA1 (patch-src_calibre_utils_help2man.py) = d53a0522082793a7cd94fd97589c39bf24803bf7
+SHA1 (patch-src_calibre_linux_py) = 0f4b9c09d2a6de22ca0044895e1ab35184ae7d72
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..17dc06bde2e
--- /dev/null
+++ b/misc/calibre/patches/patch-src_calibre_linux_py
@@ -0,0 +1,111 @@
+$NetBSD: patch-src_calibre_linux_py,v 1.1 2011/10/27 20:40:02 gls Exp $
+
+Lifted from ArchLinux, saves mime and desktop files on disk
+instead of trying to add them directly.
+
+--- src/calibre/linux.py.orig Sun Jul 17 13:26:34 2011
++++ src/calibre/linux.py Sun Jul 17 13:37:59 2011
+@@ -140,19 +140,7 @@ class PostInstall:
+ self.install_man_pages()
+ 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 isbsd:
+- for f in os.listdir('.'):
+- if os.stat(f).st_uid == 0:
+- import shutil
+- shutil.rmtree(f) if os.path.isdir(f) else os.unlink(f)
+- if os.stat(config_dir).st_uid == 0:
+- os.rmdir(config_dir)
+-
+ if warn is None and self.warnings:
+ self.info('There were %d warnings'%len(self.warnings))
+ for args, kwargs in self.warnings:
+@@ -321,7 +309,7 @@ class PostInstall:
+ if isbsd:
+ manfile = os.path.join(manpath, prog+'.1')
+ else:
+- manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
++ manfile = os.path.join(manpath, prog+'.1'+'.bz2')
+ self.info('\tInstalling MAN page for', prog)
+ open(manfile, 'wb').write(raw)
+ self.manifest.append(manfile)
+@@ -339,51 +327,39 @@ class PostInstall:
+
+ with TemporaryDirectory() as tdir:
+ with CurrentDir(tdir):
+- render_img('mimetypes/lrf.png', 'calibre-lrf.png')
+- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png application-lrf', shell=True)
+- self.icon_resources.append(('mimetypes', 'application-lrf', '128'))
+- check_call('xdg-icon-resource install --noupdate --context mimetypes --size 128 calibre-lrf.png text-lrs', shell=True)
+- self.icon_resources.append(('mimetypes', 'application-lrs',
+- '128'))
+- render_img('lt.png', 'calibre-gui.png')
+- check_call('xdg-icon-resource install --noupdate --size 128 calibre-gui.png calibre-gui', shell=True)
+- self.icon_resources.append(('apps', 'calibre-gui', '128'))
+- render_img('viewer.png', 'calibre-viewer.png')
+- check_call('xdg-icon-resource install --size 128 calibre-viewer.png calibre-viewer', shell=True)
+- self.icon_resources.append(('apps', 'calibre-viewer', '128'))
++ dir = os.path.join(self.opts.staging_sharedir,'../pixmaps')
++ os.mkdir(dir)
++ render_img('mimetypes/lrf.png', os.path.join(dir,'calibre-lrf.png'))
++ render_img('lt.png', os.path.join(dir, 'calibre-gui.png'))
++ render_img('viewer.png', os.path.join(dir, 'calibre-viewer.png'))
+
+ mimetypes = set([])
+ for x in all_input_formats():
+ mt = guess_type('dummy.'+x)[0]
+- if mt and 'chemical' not in mt and 'ctc-posml' not in mt:
++ if mt and 'chemical' not in mt and 'text' not in mt and 'pdf' not in mt and 'xhtml' not in mt:
+ mimetypes.add(mt)
+
+ def write_mimetypes(f):
+ f.write('MimeType=%s;\n'%';'.join(mimetypes))
+
+- f = open('calibre-lrfviewer.desktop', 'wb')
++ dir = os.path.join(self.opts.staging_sharedir,'../applications')
++ os.mkdir(dir)
++ f = open(os.path.join(dir, 'calibre-lrfviewer.desktop'), 'wb')
+ f.write(VIEWER)
+ f.close()
+- f = open('calibre-ebook-viewer.desktop', 'wb')
++ f = open(os.path.join(dir, 'calibre-ebook-viewer.desktop'), 'wb')
+ f.write(EVIEWER)
+ write_mimetypes(f)
+ f.close()
+- f = open('calibre-gui.desktop', 'wb')
++ f = open(os.path.join(dir, 'calibre-gui.desktop'), 'wb')
+ f.write(GUI)
+ write_mimetypes(f)
+ f.close()
+- des = ('calibre-gui.desktop', 'calibre-lrfviewer.desktop',
+- 'calibre-ebook-viewer.desktop')
+- for x in des:
+- cmd = ['xdg-desktop-menu', 'install', '--noupdate', './'+x]
+- check_call(' '.join(cmd), shell=True)
+- self.menu_resources.append(x)
+- check_call(['xdg-desktop-menu', 'forceupdate'])
+- f = open('calibre-mimetypes', 'wb')
++ dir = os.path.join(self.opts.staging_sharedir,'../mime/packages/')
++ os.makedirs(dir)
++ f = open(os.path.join(dir, 'calibre.xml'), 'wb')
+ f.write(MIME)
+ f.close()
+- self.mime_resources.append('calibre-mimetypes')
+- check_call('xdg-mime install ./calibre-mimetypes', shell=True)
+ except Exception:
+ if self.opts.fatal_errors:
+ raise
+@@ -521,7 +497,7 @@ GUI = '''\
+ [Desktop Entry]
+ Version=1.0
+ Type=Application
+-Name=calibre
++Name=Calibre
+ GenericName=E-book library management
+ Comment=E-book library management: Convert, view, share, catalogue all your e-books
+ TryExec=calibre