Thu Feb 1 16:05:56 2018 UTC ()
calibre: update to 3.16.0.

Lots of changes since 2.x, too many to list here.
(2.x does not build against current qt5...)


(wiz)
diff -r1.192 -r1.193 pkgsrc/misc/calibre/Makefile
diff -r1.82 -r1.83 pkgsrc/misc/calibre/PLIST
diff -r1.92 -r1.93 pkgsrc/misc/calibre/distinfo
diff -r1.2 -r1.3 pkgsrc/misc/calibre/patches/patch-setup_build.py
diff -r1.4 -r1.5 pkgsrc/misc/calibre/patches/patch-setup_build__environment.py
diff -r1.1 -r0 pkgsrc/misc/calibre/patches/patch-src_calibre_ebooks_oeb_polish_parsing.py
cvs diff -r1.192 -r1.193 pkgsrc/misc/calibre/Makefile (expand / switch to unified diff)

--- pkgsrc/misc/calibre/Makefile 2018/01/10 22:16:25 1.192
+++ pkgsrc/misc/calibre/Makefile 2018/02/01 16:05:56 1.193
@@ -1,58 +1,50 @@ @@ -1,58 +1,50 @@
1# $NetBSD: Makefile,v 1.192 2018/01/10 22:16:25 wiz Exp $ 1# $NetBSD: Makefile,v 1.193 2018/02/01 16:05:56 wiz Exp $
2 2
3DISTNAME= calibre-2.85.1 3DISTNAME= calibre-3.16.0
4PKGREVISION= 8 
5CATEGORIES= misc 4CATEGORIES= misc
6#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/} 5#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=calibre/}
7MASTER_SITES= http://download.calibre-ebook.com/${PKGVERSION_NOREV}/ 6MASTER_SITES= http://download.calibre-ebook.com/${PKGVERSION_NOREV}/
8EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
9DISTFILES= ${DISTNAME}${EXTRACT_SUFX} 8DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
10 9
11MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
12HOMEPAGE= http://www.calibre-ebook.com/ 11HOMEPAGE= http://www.calibre-ebook.com/
13COMMENT= E-book library management application 12COMMENT= E-book library management application
14LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
15 14
16DEPENDS+= ${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow 15DEPENDS+= ${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw
17#DEPENDS+= help2man>=1.36.4:../../converters/help2man 16DEPENDS+= ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils
18DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3 
19DEPENDS+= xdg-utils>=1.0.2:../../misc/xdg-utils 
20#DEPENDS+= poppler-utils-[0-9]*:../../print/poppler-utils 
21DEPENDS+= ${PYPKGPREFIX}-lxml>=3.2.1:../../textproc/py-lxml 
22DEPENDS+= ${PYPKGPREFIX}-beautifulsoup>=3.0.5:../../www/py-beautifulsoup 
23DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.4.1:../../time/py-dateutil 17DEPENDS+= ${PYPKGPREFIX}-dateutil>=1.4.1:../../time/py-dateutil
24DEPENDS+= ${PYPKGPREFIX}-dns>=1.6.0:../../net/py-dns 18DEPENDS+= ${PYPKGPREFIX}-dns>=1.6.0:../../net/py-dns
 19DEPENDS+= ${PYPKGPREFIX}-elementtree-[0-9]*:../../textproc/py-elementtree
 20DEPENDS+= ${PYPKGPREFIX}-html5-parser-[0-9]*:../../textproc/py-html5-parser
25DEPENDS+= ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize 21DEPENDS+= ${PYPKGPREFIX}-mechanize>=0.1.11nb1:../../www/py-mechanize
26DEPENDS+= ${PYPKGPREFIX}-cssselect>=0.7.1:../../textproc/py-cssselect 22DEPENDS+= ${PYPKGPREFIX}-msgpack-[0-9]*:../../devel/py-msgpack
27DEPENDS+= ${PYPKGPREFIX}-cssutils>=0.9.9:../../textproc/py-cssutils 
28DEPENDS+= ${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil 
29# Let's depend on the ones we have in pkgsrc instead of the bundled ones. 
30DEPENDS+= ${PYPKGPREFIX}-cherrypy-[0-9]*:../../www/py-cherrypy 
31# not sure if pkgsrc version would be ok or not 
32#DEPENDS+= ${PYPKGPREFIX}-chardet-[0-9]*:../../converters/py-chardet 
33# includes own, modified copy of html5lib 
34#DEPENDS+= ${PYPKGPREFIX}-html5lib-[0-9]*:../../textproc/py-html5lib 
35DEPENDS+= ${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces 23DEPENDS+= ${PYPKGPREFIX}-netifaces>=0.8:../../net/py-netifaces
36DEPENDS+= ${PYPKGPREFIX}-apsw>=3.7.17:../../databases/py-apsw 24DEPENDS+= ${PYPKGPREFIX}-Pillow>=2.7.0:../../graphics/py-Pillow
 25DEPENDS+= ${PYPKGPREFIX}-psutil>=0.6.1:../../sysutils/py-psutil
 26DEPENDS+= ${PYPKGPREFIX}-regex-[0-9]*:../../textproc/py-regex
 27DEPENDS+= ${PYPKGPREFIX}-sqlite3-[0-9]*:../../databases/py-sqlite3
 28# for installation
 29BUILD_DEPENDS+= xdg-utils>=1.0.2:../../misc/xdg-utils
37 30
38EXTRACT_USING= bsdtar 31EXTRACT_USING= bsdtar
39 32
 33PYTHON_VERSIONS_ACCEPTED= 27 # as of 3.16.0
 34
40USE_LANGUAGES= c c++ 35USE_LANGUAGES= c c++
41USE_LIBTOOL= yes 36USE_LIBTOOL= yes
42USE_TOOLS+= pkg-config pax 37USE_TOOLS+= pkg-config pax
43PYTHON_VERSIONS_ACCEPTED= 27 
44PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not ported as of 2.1.0; also: py-mechanize, py-beautifulsoup 
45PYDISTUTILSPKG= yes 
46PYSETUPOPTARGS= # empty 38PYSETUPOPTARGS= # empty
47PYSETUPINSTALLARGS= --prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX} 39PYSETUPINSTALLARGS= --prefix=${PREFIX} --root=${DESTDIR:Q}${PREFIX}
48 40
49INSTALLATION_DIRS= share/applications 41INSTALLATION_DIRS= share/applications
50INSTALLATION_DIRS= share/icons 42INSTALLATION_DIRS= share/icons
51INSTALLATION_DIRS= share/calibre/recipes 43INSTALLATION_DIRS= share/calibre/recipes
52 44
53FIX_PYTHON_FILES+= *.py 45FIX_PYTHON_FILES+= *.py
54FIX_PYTHON_FILES+= recipes/*.recipe 46FIX_PYTHON_FILES+= recipes/*.recipe
55FIX_PYTHON_FILES+= */*.py 47FIX_PYTHON_FILES+= */*.py
56FIX_PYTHON_FILES+= */*/*.py 48FIX_PYTHON_FILES+= */*/*.py
57FIX_PYTHON_FILES+= */*/*/*.py 49FIX_PYTHON_FILES+= */*/*/*.py
58FIX_PYTHON_FILES+= */*/*/*/*.py 50FIX_PYTHON_FILES+= */*/*/*/*.py
@@ -80,72 +72,61 @@ REPLACE_PYTHON+= recipes/respekt_magazin @@ -80,72 +72,61 @@ REPLACE_PYTHON+= recipes/respekt_magazin
80REPLACE_PYTHON+= recipes/kompiutierra.recipe 72REPLACE_PYTHON+= recipes/kompiutierra.recipe
81REPLACE_PYTHON+= recipes/trouw.recipe 73REPLACE_PYTHON+= recipes/trouw.recipe
82REPLACE_PYTHON+= src/calibre/ebooks/markdown/extensions/*.py 74REPLACE_PYTHON+= src/calibre/ebooks/markdown/extensions/*.py
83REPLACE_PYTHON+= src/calibre/ebooks/metadata/odt.py 75REPLACE_PYTHON+= src/calibre/ebooks/metadata/odt.py
84REPLACE_PYTHON+= src/calibre/utils/*.py 76REPLACE_PYTHON+= src/calibre/utils/*.py
85REPLACE_PYTHON+= src/odf/*.py 77REPLACE_PYTHON+= src/odf/*.py
86 78
87MAKE_ENV+= FC_INC_DIR=${BUILDLINK_PREFIX.fontconfig}/include/fontconfig 79MAKE_ENV+= FC_INC_DIR=${BUILDLINK_PREFIX.fontconfig}/include/fontconfig
88MAKE_ENV+= FC_LIB_DIR=${BUILDLINK_PREFIX.fontconfig}/lib 80MAKE_ENV+= FC_LIB_DIR=${BUILDLINK_PREFIX.fontconfig}/lib
89MAKE_ENV+= PODOFO_INC_DIR=${BUILDLINK_PREFIX.podofo}/include/podofo 81MAKE_ENV+= PODOFO_INC_DIR=${BUILDLINK_PREFIX.podofo}/include/podofo
90MAKE_ENV+= PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib 82MAKE_ENV+= PODOFO_LIB_DIR=${BUILDLINK_PREFIX.podofo}/lib
91MAKE_ENV+= SIP_BIN=${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX} 83MAKE_ENV+= SIP_BIN=${BUILDLINK_PREFIX.py-sip}/bin/sip${PYVERSSUFFIX}
92MAKE_ENV+= LFLAGS=${LDFLAGS:Q} 84MAKE_ENV+= LFLAGS=${LDFLAGS:Q}
93#MAKE_ENV+= WITH_USB=no 
94 
95# Let's depend on the ones we have in pkgsrc instead of the bundled ones. 
96pre-configure: 
97 cd ${WRKSRC} && rm -rf src/cherrypy 
98 85
99# Turn off x bits on non-executable files. 86# Turn off x bits on non-executable files.
100post-extract: 87post-extract:
101 find ${WRKSRC}/src/calibre/devices ${WRKSRC}/src/calibre/ebooks ${WRKSRC}/src/calibre/web -name '*.py' -exec chmod a-x \{} \; 88 find ${WRKSRC}/src/calibre/devices ${WRKSRC}/src/calibre/ebooks ${WRKSRC}/src/calibre/web -name '*.py' -exec chmod a-x \{} \;
102 find ${WRKSRC}/resources/images/mimetypes -name '*.png' -exec chmod a-x \{} \; 89 find ${WRKSRC}/resources/images/mimetypes -name '*.png' -exec chmod a-x \{} \;
103 chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py 90 chmod a-x ${WRKSRC}/src/calibre/utils/Zeroconf.py
104 chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py 91 chmod a-x ${WRKSRC}/src/calibre/utils/smtplib.py
105 92
106# not sure why libheadless installed into wrong directory 
107# side effect of patch-setup_extensions.py? 
108post-install: 93post-install:
109 cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \ 94 cd ${WRKSRC}/recipes && pax -wr -pma *.recipe \
110 ${DESTDIR}${PREFIX}/share/calibre/recipes 95 ${DESTDIR}${PREFIX}/share/calibre/recipes
111 cd ${WRKSRC} && pax -wr -pma Changelog* README.md \ 96 cd ${WRKSRC} && pax -wr -pma Changelog* README.md \
112 COPYRIGHT INSTALL LICENSE.* \ 97 COPYRIGHT INSTALL LICENSE.* \
113 ${DESTDIR}${PREFIX}/share/doc/calibre 98 ${DESTDIR}${PREFIX}/share/doc/calibre
114 cd ${DESTDIR}${PREFIX} && ${MV} lib/calibre/calibre/plugins/.libs/libheadless.so lib/calibre/calibre/plugins/libheadless.so 
115 ${RM} ${DESTDIR}${PREFIX}/bin/calibre-uninstall 99 ${RM} ${DESTDIR}${PREFIX}/bin/calibre-uninstall
116 100
117.include "../../lang/python/application.mk" 101.include "../../lang/python/application.mk"
118.include "../../databases/sqlite3/buildlink3.mk" 102.include "../../databases/sqlite3/buildlink3.mk"
119BUILDLINK_API_DEPENDS.chmlib+= chmlib>=0.40 103BUILDLINK_API_DEPENDS.chmlib+= chmlib>=0.40
120.include "../../devel/chmlib/buildlink3.mk" 104.include "../../devel/chmlib/buildlink3.mk"
121BUILDLINK_API_DEPENDS.libmtp+= libmtp>=1.1.5 105BUILDLINK_API_DEPENDS.libmtp+= libmtp>=1.1.5
122.include "../../devel/libmtp/buildlink3.mk" 106.include "../../devel/libmtp/buildlink3.mk"
123BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.12 107BUILDLINK_API_DEPENDS.libusb+= libusb>=0.1.12
124.include "../../devel/libusb/buildlink3.mk" 108.include "../../devel/libusb/buildlink3.mk"
125.include "../../fonts/fontconfig/buildlink3.mk" 109.include "../../fonts/fontconfig/buildlink3.mk"
126BUILDLINK_API_DEPENDS.libwmf+= libwmf>=0.2.8 110BUILDLINK_API_DEPENDS.libwmf+= libwmf>=0.2.8
127.include "../../graphics/libwmf/buildlink3.mk" 111.include "../../graphics/libwmf/buildlink3.mk"
128.include "../../lang/python/egg.mk" 112.include "../../lang/python/egg.mk"
129_PYSETUPTOOLSINSTALLARGS= # empty 113_PYSETUPTOOLSINSTALLARGS= # empty
130# Get rid of --root=${DESTDIR}, use our own version from above instead. 114# Get rid of --root=${DESTDIR}, use our own version from above instead.
131# because the setup.py is not the standard one and behaves differently. 115# because the setup.py is not the standard one and behaves differently.
132_PYSETUPINSTALLARGS= ${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS} 116_PYSETUPINSTALLARGS= ${PYSETUPINSTALLARGS} ${PYSETUPOPTARGS} ${_PYSETUPTOOLSINSTALLARGS}
133#.include "../../lang/python/extension.mk" 
134BUILDLINK_API_DEPENDS.podofo+= podofo>=0.8.2 117BUILDLINK_API_DEPENDS.podofo+= podofo>=0.8.2
135.include "../../print/podofo/buildlink3.mk" 118.include "../../print/podofo/buildlink3.mk"
136BUILDLINK_API_DEPENDS.poppler+= poppler>=0.20.2 119BUILDLINK_API_DEPENDS.poppler+= poppler>=0.20.2
137.include "../../print/poppler-includes/buildlink3.mk" 120.include "../../print/poppler-includes/buildlink3.mk"
138.include "../../print/poppler/buildlink3.mk" 121.include "../../print/poppler/buildlink3.mk"
139.include "../../print/poppler-qt5/buildlink3.mk" 122.include "../../print/poppler-qt5/buildlink3.mk"
140.include "../../sysutils/desktop-file-utils/desktopdb.mk" 123.include "../../sysutils/desktop-file-utils/desktopdb.mk"
141.include "../../sysutils/hal/buildlink3.mk" 124.include "../../sysutils/hal/buildlink3.mk"
142BUILDLINK_API_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.82.2 125BUILDLINK_API_DEPENDS.py-dbus+= ${PYPKGPREFIX}-dbus>=0.82.2
143.include "../../sysutils/py-dbus/buildlink3.mk" 126.include "../../sysutils/py-dbus/buildlink3.mk"
144.include "../../textproc/icu/buildlink3.mk" 127.include "../../textproc/icu/buildlink3.mk"
145.include "../../databases/shared-mime-info/mimedb.mk" 128.include "../../databases/shared-mime-info/mimedb.mk"
146.include "../../textproc/py-elementtree/buildlink3.mk" 
147.include "../../x11/py-sip/buildlink3.mk" 129.include "../../x11/py-sip/buildlink3.mk"
148.include "../../x11/qt5-qtbase/buildlink3.mk" 130.include "../../x11/qt5-qtbase/buildlink3.mk"
149BUILDLINK_API_DEPENDS.py-qt5+= ${PYPKGPREFIX}-qt5>=5.4 
150.include "../../x11/py-qt5/buildlink3.mk" 131.include "../../x11/py-qt5/buildlink3.mk"
151.include "../../mk/bsd.pkg.mk" 132.include "../../mk/bsd.pkg.mk"
cvs diff -r1.82 -r1.83 pkgsrc/misc/calibre/PLIST (expand / switch to unified diff)

--- pkgsrc/misc/calibre/PLIST 2017/05/16 13:37:24 1.82
+++ pkgsrc/misc/calibre/PLIST 2018/02/01 16:05:56 1.83
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.82 2017/05/16 13:37:24 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.83 2018/02/01 16:05:56 wiz Exp $
2bin/calibre 2bin/calibre
3bin/calibre-complete 3bin/calibre-complete
4bin/calibre-customize 4bin/calibre-customize
5bin/calibre-debug 5bin/calibre-debug
6bin/calibre-parallel 6bin/calibre-parallel
7bin/calibre-server 7bin/calibre-server
8bin/calibre-smtp 8bin/calibre-smtp
9bin/calibredb 9bin/calibredb
10bin/ebook-convert 10bin/ebook-convert
11bin/ebook-device 11bin/ebook-device
12bin/ebook-edit 12bin/ebook-edit
13bin/ebook-meta 13bin/ebook-meta
14bin/ebook-polish 14bin/ebook-polish
@@ -23,26 +23,51 @@ lib/calibre/calibre/__init__.py @@ -23,26 +23,51 @@ lib/calibre/calibre/__init__.py
23lib/calibre/calibre/constants.py 23lib/calibre/calibre/constants.py
24lib/calibre/calibre/customize/__init__.py 24lib/calibre/calibre/customize/__init__.py
25lib/calibre/calibre/customize/builtins.py 25lib/calibre/calibre/customize/builtins.py
26lib/calibre/calibre/customize/conversion.py 26lib/calibre/calibre/customize/conversion.py
27lib/calibre/calibre/customize/profiles.py 27lib/calibre/calibre/customize/profiles.py
28lib/calibre/calibre/customize/ui.py 28lib/calibre/calibre/customize/ui.py
29lib/calibre/calibre/customize/zipplugin.py 29lib/calibre/calibre/customize/zipplugin.py
30lib/calibre/calibre/db/__init__.py 30lib/calibre/calibre/db/__init__.py
31lib/calibre/calibre/db/adding.py 31lib/calibre/calibre/db/adding.py
32lib/calibre/calibre/db/backend.py 32lib/calibre/calibre/db/backend.py
33lib/calibre/calibre/db/backup.py 33lib/calibre/calibre/db/backup.py
34lib/calibre/calibre/db/cache.py 34lib/calibre/calibre/db/cache.py
35lib/calibre/calibre/db/categories.py 35lib/calibre/calibre/db/categories.py
 36lib/calibre/calibre/db/cli/__init__.py
 37lib/calibre/calibre/db/cli/cmd_add.py
 38lib/calibre/calibre/db/cli/cmd_add_custom_column.py
 39lib/calibre/calibre/db/cli/cmd_add_format.py
 40lib/calibre/calibre/db/cli/cmd_backup_metadata.py
 41lib/calibre/calibre/db/cli/cmd_catalog.py
 42lib/calibre/calibre/db/cli/cmd_check_library.py
 43lib/calibre/calibre/db/cli/cmd_clone.py
 44lib/calibre/calibre/db/cli/cmd_custom_columns.py
 45lib/calibre/calibre/db/cli/cmd_embed_metadata.py
 46lib/calibre/calibre/db/cli/cmd_export.py
 47lib/calibre/calibre/db/cli/cmd_list.py
 48lib/calibre/calibre/db/cli/cmd_list_categories.py
 49lib/calibre/calibre/db/cli/cmd_remove.py
 50lib/calibre/calibre/db/cli/cmd_remove_custom_column.py
 51lib/calibre/calibre/db/cli/cmd_remove_format.py
 52lib/calibre/calibre/db/cli/cmd_restore_database.py
 53lib/calibre/calibre/db/cli/cmd_saved_searches.py
 54lib/calibre/calibre/db/cli/cmd_search.py
 55lib/calibre/calibre/db/cli/cmd_set_custom.py
 56lib/calibre/calibre/db/cli/cmd_set_metadata.py
 57lib/calibre/calibre/db/cli/cmd_show_metadata.py
 58lib/calibre/calibre/db/cli/main.py
 59lib/calibre/calibre/db/cli/tests.py
 60lib/calibre/calibre/db/cli/utils.py
36lib/calibre/calibre/db/delete_service.py 61lib/calibre/calibre/db/delete_service.py
37lib/calibre/calibre/db/errors.py 62lib/calibre/calibre/db/errors.py
38lib/calibre/calibre/db/fields.py 63lib/calibre/calibre/db/fields.py
39lib/calibre/calibre/db/lazy.py 64lib/calibre/calibre/db/lazy.py
40lib/calibre/calibre/db/legacy.py 65lib/calibre/calibre/db/legacy.py
41lib/calibre/calibre/db/locking.py 66lib/calibre/calibre/db/locking.py
42lib/calibre/calibre/db/restore.py 67lib/calibre/calibre/db/restore.py
43lib/calibre/calibre/db/schema_upgrades.py 68lib/calibre/calibre/db/schema_upgrades.py
44lib/calibre/calibre/db/search.py 69lib/calibre/calibre/db/search.py
45lib/calibre/calibre/db/tables.py 70lib/calibre/calibre/db/tables.py
46lib/calibre/calibre/db/tests/__init__.py 71lib/calibre/calibre/db/tests/__init__.py
47lib/calibre/calibre/db/tests/add_remove.py 72lib/calibre/calibre/db/tests/add_remove.py
48lib/calibre/calibre/db/tests/base.py 73lib/calibre/calibre/db/tests/base.py
@@ -51,56 +76,50 @@ lib/calibre/calibre/db/tests/legacy.py @@ -51,56 +76,50 @@ lib/calibre/calibre/db/tests/legacy.py
51lib/calibre/calibre/db/tests/locking.py 76lib/calibre/calibre/db/tests/locking.py
52lib/calibre/calibre/db/tests/main.py 77lib/calibre/calibre/db/tests/main.py
53lib/calibre/calibre/db/tests/profiling.py 78lib/calibre/calibre/db/tests/profiling.py
54lib/calibre/calibre/db/tests/reading.py 79lib/calibre/calibre/db/tests/reading.py
55lib/calibre/calibre/db/tests/utils.py 80lib/calibre/calibre/db/tests/utils.py
56lib/calibre/calibre/db/tests/writing.py 81lib/calibre/calibre/db/tests/writing.py
57lib/calibre/calibre/db/utils.py 82lib/calibre/calibre/db/utils.py
58lib/calibre/calibre/db/view.py 83lib/calibre/calibre/db/view.py
59lib/calibre/calibre/db/write.py 84lib/calibre/calibre/db/write.py
60lib/calibre/calibre/debug.py 85lib/calibre/calibre/debug.py
61lib/calibre/calibre/devices/__init__.py 86lib/calibre/calibre/devices/__init__.py
62lib/calibre/calibre/devices/android/__init__.py 87lib/calibre/calibre/devices/android/__init__.py
63lib/calibre/calibre/devices/android/driver.py 88lib/calibre/calibre/devices/android/driver.py
64lib/calibre/calibre/devices/apple/__init__.py 
65lib/calibre/calibre/devices/apple/driver.py 
66lib/calibre/calibre/devices/apple/itunes.py 
67lib/calibre/calibre/devices/binatone/__init__.py 89lib/calibre/calibre/devices/binatone/__init__.py
68lib/calibre/calibre/devices/binatone/driver.py 90lib/calibre/calibre/devices/binatone/driver.py
69lib/calibre/calibre/devices/blackberry/__init__.py 91lib/calibre/calibre/devices/blackberry/__init__.py
70lib/calibre/calibre/devices/blackberry/driver.py 92lib/calibre/calibre/devices/blackberry/driver.py
71lib/calibre/calibre/devices/boeye/__init__.py 93lib/calibre/calibre/devices/boeye/__init__.py
72lib/calibre/calibre/devices/boeye/driver.py 94lib/calibre/calibre/devices/boeye/driver.py
73lib/calibre/calibre/devices/cli.py 95lib/calibre/calibre/devices/cli.py
74lib/calibre/calibre/devices/cybook/__init__.py 96lib/calibre/calibre/devices/cybook/__init__.py
75lib/calibre/calibre/devices/cybook/driver.py 97lib/calibre/calibre/devices/cybook/driver.py
76lib/calibre/calibre/devices/cybook/t2b.py 98lib/calibre/calibre/devices/cybook/t2b.py
77lib/calibre/calibre/devices/cybook/t4b.py 99lib/calibre/calibre/devices/cybook/t4b.py
78lib/calibre/calibre/devices/eb600/__init__.py 100lib/calibre/calibre/devices/eb600/__init__.py
79lib/calibre/calibre/devices/eb600/driver.py 101lib/calibre/calibre/devices/eb600/driver.py
80lib/calibre/calibre/devices/edge/__init__.py 102lib/calibre/calibre/devices/edge/__init__.py
81lib/calibre/calibre/devices/edge/driver.py 103lib/calibre/calibre/devices/edge/driver.py
82lib/calibre/calibre/devices/errors.py 104lib/calibre/calibre/devices/errors.py
83lib/calibre/calibre/devices/eslick/__init__.py 105lib/calibre/calibre/devices/eslick/__init__.py
84lib/calibre/calibre/devices/eslick/driver.py 106lib/calibre/calibre/devices/eslick/driver.py
85lib/calibre/calibre/devices/folder_device/__init__.py 107lib/calibre/calibre/devices/folder_device/__init__.py
86lib/calibre/calibre/devices/folder_device/driver.py 108lib/calibre/calibre/devices/folder_device/driver.py
87lib/calibre/calibre/devices/hanlin/__init__.py 109lib/calibre/calibre/devices/hanlin/__init__.py
88lib/calibre/calibre/devices/hanlin/driver.py 110lib/calibre/calibre/devices/hanlin/driver.py
89lib/calibre/calibre/devices/hanvon/__init__.py 111lib/calibre/calibre/devices/hanvon/__init__.py
90lib/calibre/calibre/devices/hanvon/driver.py 112lib/calibre/calibre/devices/hanvon/driver.py
91lib/calibre/calibre/devices/idevice/__init__.py 
92lib/calibre/calibre/devices/idevice/libimobiledevice.py 
93lib/calibre/calibre/devices/idevice/parse_xml.py 
94lib/calibre/calibre/devices/iliad/__init__.py 113lib/calibre/calibre/devices/iliad/__init__.py
95lib/calibre/calibre/devices/iliad/driver.py 114lib/calibre/calibre/devices/iliad/driver.py
96lib/calibre/calibre/devices/interface.py 115lib/calibre/calibre/devices/interface.py
97lib/calibre/calibre/devices/irexdr/__init__.py 116lib/calibre/calibre/devices/irexdr/__init__.py
98lib/calibre/calibre/devices/irexdr/driver.py 117lib/calibre/calibre/devices/irexdr/driver.py
99lib/calibre/calibre/devices/iriver/__init__.py 118lib/calibre/calibre/devices/iriver/__init__.py
100lib/calibre/calibre/devices/iriver/driver.py 119lib/calibre/calibre/devices/iriver/driver.py
101lib/calibre/calibre/devices/jetbook/__init__.py 120lib/calibre/calibre/devices/jetbook/__init__.py
102lib/calibre/calibre/devices/jetbook/driver.py 121lib/calibre/calibre/devices/jetbook/driver.py
103lib/calibre/calibre/devices/kindle/__init__.py 122lib/calibre/calibre/devices/kindle/__init__.py
104lib/calibre/calibre/devices/kindle/apnx.py 123lib/calibre/calibre/devices/kindle/apnx.py
105lib/calibre/calibre/devices/kindle/bookmark.py 124lib/calibre/calibre/devices/kindle/bookmark.py
106lib/calibre/calibre/devices/kindle/driver.py 125lib/calibre/calibre/devices/kindle/driver.py
@@ -326,26 +345,27 @@ lib/calibre/calibre/ebooks/markdown/inli @@ -326,26 +345,27 @@ lib/calibre/calibre/ebooks/markdown/inli
326lib/calibre/calibre/ebooks/markdown/odict.py 345lib/calibre/calibre/ebooks/markdown/odict.py
327lib/calibre/calibre/ebooks/markdown/postprocessors.py 346lib/calibre/calibre/ebooks/markdown/postprocessors.py
328lib/calibre/calibre/ebooks/markdown/preprocessors.py 347lib/calibre/calibre/ebooks/markdown/preprocessors.py
329lib/calibre/calibre/ebooks/markdown/serializers.py 348lib/calibre/calibre/ebooks/markdown/serializers.py
330lib/calibre/calibre/ebooks/markdown/treeprocessors.py 349lib/calibre/calibre/ebooks/markdown/treeprocessors.py
331lib/calibre/calibre/ebooks/markdown/util.py 350lib/calibre/calibre/ebooks/markdown/util.py
332lib/calibre/calibre/ebooks/metadata/__init__.py 351lib/calibre/calibre/ebooks/metadata/__init__.py
333lib/calibre/calibre/ebooks/metadata/archive.py 352lib/calibre/calibre/ebooks/metadata/archive.py
334lib/calibre/calibre/ebooks/metadata/book/__init__.py 353lib/calibre/calibre/ebooks/metadata/book/__init__.py
335lib/calibre/calibre/ebooks/metadata/book/base.py 354lib/calibre/calibre/ebooks/metadata/book/base.py
336lib/calibre/calibre/ebooks/metadata/book/formatter.py 355lib/calibre/calibre/ebooks/metadata/book/formatter.py
337lib/calibre/calibre/ebooks/metadata/book/json_codec.py 356lib/calibre/calibre/ebooks/metadata/book/json_codec.py
338lib/calibre/calibre/ebooks/metadata/book/render.py 357lib/calibre/calibre/ebooks/metadata/book/render.py
 358lib/calibre/calibre/ebooks/metadata/book/serialize.py
339lib/calibre/calibre/ebooks/metadata/cli.py 359lib/calibre/calibre/ebooks/metadata/cli.py
340lib/calibre/calibre/ebooks/metadata/docx.py 360lib/calibre/calibre/ebooks/metadata/docx.py
341lib/calibre/calibre/ebooks/metadata/epub.py 361lib/calibre/calibre/ebooks/metadata/epub.py
342lib/calibre/calibre/ebooks/metadata/ereader.py 362lib/calibre/calibre/ebooks/metadata/ereader.py
343lib/calibre/calibre/ebooks/metadata/extz.py 363lib/calibre/calibre/ebooks/metadata/extz.py
344lib/calibre/calibre/ebooks/metadata/fb2.py 364lib/calibre/calibre/ebooks/metadata/fb2.py
345lib/calibre/calibre/ebooks/metadata/haodoo.py 365lib/calibre/calibre/ebooks/metadata/haodoo.py
346lib/calibre/calibre/ebooks/metadata/html.py 366lib/calibre/calibre/ebooks/metadata/html.py
347lib/calibre/calibre/ebooks/metadata/imp.py 367lib/calibre/calibre/ebooks/metadata/imp.py
348lib/calibre/calibre/ebooks/metadata/kdl.py 368lib/calibre/calibre/ebooks/metadata/kdl.py
349lib/calibre/calibre/ebooks/metadata/kfx.py 369lib/calibre/calibre/ebooks/metadata/kfx.py
350lib/calibre/calibre/ebooks/metadata/lit.py 370lib/calibre/calibre/ebooks/metadata/lit.py
351lib/calibre/calibre/ebooks/metadata/lrx.py 371lib/calibre/calibre/ebooks/metadata/lrx.py
@@ -681,26 +701,27 @@ lib/calibre/calibre/gui2/actions/unpack_ @@ -681,26 +701,27 @@ lib/calibre/calibre/gui2/actions/unpack_
681lib/calibre/calibre/gui2/actions/view.py 701lib/calibre/calibre/gui2/actions/view.py
682lib/calibre/calibre/gui2/add.py 702lib/calibre/calibre/gui2/add.py
683lib/calibre/calibre/gui2/add_filters.py 703lib/calibre/calibre/gui2/add_filters.py
684lib/calibre/calibre/gui2/auto_add.py 704lib/calibre/calibre/gui2/auto_add.py
685lib/calibre/calibre/gui2/bars.py 705lib/calibre/calibre/gui2/bars.py
686lib/calibre/calibre/gui2/book_details.py 706lib/calibre/calibre/gui2/book_details.py
687lib/calibre/calibre/gui2/catalog/__init__.py 707lib/calibre/calibre/gui2/catalog/__init__.py
688lib/calibre/calibre/gui2/catalog/catalog_bibtex.py 708lib/calibre/calibre/gui2/catalog/catalog_bibtex.py
689lib/calibre/calibre/gui2/catalog/catalog_bibtex_ui.py 709lib/calibre/calibre/gui2/catalog/catalog_bibtex_ui.py
690lib/calibre/calibre/gui2/catalog/catalog_csv_xml.py 710lib/calibre/calibre/gui2/catalog/catalog_csv_xml.py
691lib/calibre/calibre/gui2/catalog/catalog_epub_mobi.py 711lib/calibre/calibre/gui2/catalog/catalog_epub_mobi.py
692lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py 712lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py
693lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py 713lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py
 714lib/calibre/calibre/gui2/changes.py
694lib/calibre/calibre/gui2/comments_editor.py 715lib/calibre/calibre/gui2/comments_editor.py
695lib/calibre/calibre/gui2/complete2.py 716lib/calibre/calibre/gui2/complete2.py
696lib/calibre/calibre/gui2/convert/__init__.py 717lib/calibre/calibre/gui2/convert/__init__.py
697lib/calibre/calibre/gui2/convert/azw3_output.py 718lib/calibre/calibre/gui2/convert/azw3_output.py
698lib/calibre/calibre/gui2/convert/azw3_output_ui.py 719lib/calibre/calibre/gui2/convert/azw3_output_ui.py
699lib/calibre/calibre/gui2/convert/bulk.py 720lib/calibre/calibre/gui2/convert/bulk.py
700lib/calibre/calibre/gui2/convert/comic_input.py 721lib/calibre/calibre/gui2/convert/comic_input.py
701lib/calibre/calibre/gui2/convert/comic_input_ui.py 722lib/calibre/calibre/gui2/convert/comic_input_ui.py
702lib/calibre/calibre/gui2/convert/debug.py 723lib/calibre/calibre/gui2/convert/debug.py
703lib/calibre/calibre/gui2/convert/debug_ui.py 724lib/calibre/calibre/gui2/convert/debug_ui.py
704lib/calibre/calibre/gui2/convert/docx_input.py 725lib/calibre/calibre/gui2/convert/docx_input.py
705lib/calibre/calibre/gui2/convert/docx_input_ui.py 726lib/calibre/calibre/gui2/convert/docx_input_ui.py
706lib/calibre/calibre/gui2/convert/docx_output.py 727lib/calibre/calibre/gui2/convert/docx_output.py
@@ -821,59 +842,60 @@ lib/calibre/calibre/gui2/dialogs/metadat @@ -821,59 +842,60 @@ lib/calibre/calibre/gui2/dialogs/metadat
821lib/calibre/calibre/gui2/dialogs/metadata_bulk_ui.py 842lib/calibre/calibre/gui2/dialogs/metadata_bulk_ui.py
822lib/calibre/calibre/gui2/dialogs/opml.py 843lib/calibre/calibre/gui2/dialogs/opml.py
823lib/calibre/calibre/gui2/dialogs/password.py 844lib/calibre/calibre/gui2/dialogs/password.py
824lib/calibre/calibre/gui2/dialogs/password_ui.py 845lib/calibre/calibre/gui2/dialogs/password_ui.py
825lib/calibre/calibre/gui2/dialogs/plugin_updater.py 846lib/calibre/calibre/gui2/dialogs/plugin_updater.py
826lib/calibre/calibre/gui2/dialogs/progress.py 847lib/calibre/calibre/gui2/dialogs/progress.py
827lib/calibre/calibre/gui2/dialogs/quickview.py 848lib/calibre/calibre/gui2/dialogs/quickview.py
828lib/calibre/calibre/gui2/dialogs/quickview_ui.py 849lib/calibre/calibre/gui2/dialogs/quickview_ui.py
829lib/calibre/calibre/gui2/dialogs/restore_library.py 850lib/calibre/calibre/gui2/dialogs/restore_library.py
830lib/calibre/calibre/gui2/dialogs/saved_search_editor.py 851lib/calibre/calibre/gui2/dialogs/saved_search_editor.py
831lib/calibre/calibre/gui2/dialogs/saved_search_editor_ui.py 852lib/calibre/calibre/gui2/dialogs/saved_search_editor_ui.py
832lib/calibre/calibre/gui2/dialogs/scheduler.py 853lib/calibre/calibre/gui2/dialogs/scheduler.py
833lib/calibre/calibre/gui2/dialogs/search.py 854lib/calibre/calibre/gui2/dialogs/search.py
834lib/calibre/calibre/gui2/dialogs/search_item_ui.py 
835lib/calibre/calibre/gui2/dialogs/search_ui.py 
836lib/calibre/calibre/gui2/dialogs/select_formats.py 855lib/calibre/calibre/gui2/dialogs/select_formats.py
837lib/calibre/calibre/gui2/dialogs/smartdevice.py 856lib/calibre/calibre/gui2/dialogs/smartdevice.py
838lib/calibre/calibre/gui2/dialogs/smartdevice_ui.py 857lib/calibre/calibre/gui2/dialogs/smartdevice_ui.py
839lib/calibre/calibre/gui2/dialogs/tag_categories.py 858lib/calibre/calibre/gui2/dialogs/tag_categories.py
840lib/calibre/calibre/gui2/dialogs/tag_categories_ui.py 859lib/calibre/calibre/gui2/dialogs/tag_categories_ui.py
841lib/calibre/calibre/gui2/dialogs/tag_editor.py 860lib/calibre/calibre/gui2/dialogs/tag_editor.py
842lib/calibre/calibre/gui2/dialogs/tag_editor_ui.py 861lib/calibre/calibre/gui2/dialogs/tag_editor_ui.py
843lib/calibre/calibre/gui2/dialogs/tag_list_editor.py 862lib/calibre/calibre/gui2/dialogs/tag_list_editor.py
844lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py 863lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py
845lib/calibre/calibre/gui2/dialogs/template_dialog.py 864lib/calibre/calibre/gui2/dialogs/template_dialog.py
846lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py 865lib/calibre/calibre/gui2/dialogs/template_dialog_ui.py
847lib/calibre/calibre/gui2/dialogs/template_line_editor.py 866lib/calibre/calibre/gui2/dialogs/template_line_editor.py
848lib/calibre/calibre/gui2/dialogs/trim_image.py 867lib/calibre/calibre/gui2/dialogs/trim_image.py
849lib/calibre/calibre/gui2/dnd.py 868lib/calibre/calibre/gui2/dnd.py
850lib/calibre/calibre/gui2/ebook_download.py 869lib/calibre/calibre/gui2/ebook_download.py
851lib/calibre/calibre/gui2/email.py 870lib/calibre/calibre/gui2/email.py
852lib/calibre/calibre/gui2/filename_pattern_ui.py 871lib/calibre/calibre/gui2/filename_pattern_ui.py
853lib/calibre/calibre/gui2/font_family_chooser.py 872lib/calibre/calibre/gui2/font_family_chooser.py
 873lib/calibre/calibre/gui2/gestures.py
854lib/calibre/calibre/gui2/icon_theme.py 874lib/calibre/calibre/gui2/icon_theme.py
855lib/calibre/calibre/gui2/init.py 875lib/calibre/calibre/gui2/init.py
856lib/calibre/calibre/gui2/job_indicator.py 876lib/calibre/calibre/gui2/job_indicator.py
857lib/calibre/calibre/gui2/jobs.py 877lib/calibre/calibre/gui2/jobs.py
858lib/calibre/calibre/gui2/keyboard.py 878lib/calibre/calibre/gui2/keyboard.py
859lib/calibre/calibre/gui2/languages.py 879lib/calibre/calibre/gui2/languages.py
860lib/calibre/calibre/gui2/layout.py 880lib/calibre/calibre/gui2/layout.py
 881lib/calibre/calibre/gui2/layout_menu.py
861lib/calibre/calibre/gui2/library/__init__.py 882lib/calibre/calibre/gui2/library/__init__.py
862lib/calibre/calibre/gui2/library/alternate_views.py 883lib/calibre/calibre/gui2/library/alternate_views.py
863lib/calibre/calibre/gui2/library/caches.py 884lib/calibre/calibre/gui2/library/caches.py
864lib/calibre/calibre/gui2/library/delegates.py 885lib/calibre/calibre/gui2/library/delegates.py
865lib/calibre/calibre/gui2/library/models.py 886lib/calibre/calibre/gui2/library/models.py
866lib/calibre/calibre/gui2/library/views.py 887lib/calibre/calibre/gui2/library/views.py
 888lib/calibre/calibre/gui2/linux_file_dialogs.py
867lib/calibre/calibre/gui2/lrf_renderer/__init__.py 889lib/calibre/calibre/gui2/lrf_renderer/__init__.py
868lib/calibre/calibre/gui2/lrf_renderer/bookview.py 890lib/calibre/calibre/gui2/lrf_renderer/bookview.py
869lib/calibre/calibre/gui2/lrf_renderer/config_ui.py 891lib/calibre/calibre/gui2/lrf_renderer/config_ui.py
870lib/calibre/calibre/gui2/lrf_renderer/document.py 892lib/calibre/calibre/gui2/lrf_renderer/document.py
871lib/calibre/calibre/gui2/lrf_renderer/main.py 893lib/calibre/calibre/gui2/lrf_renderer/main.py
872lib/calibre/calibre/gui2/lrf_renderer/main_ui.py 894lib/calibre/calibre/gui2/lrf_renderer/main_ui.py
873lib/calibre/calibre/gui2/lrf_renderer/text.py 895lib/calibre/calibre/gui2/lrf_renderer/text.py
874lib/calibre/calibre/gui2/main.py 896lib/calibre/calibre/gui2/main.py
875lib/calibre/calibre/gui2/main_window.py 897lib/calibre/calibre/gui2/main_window.py
876lib/calibre/calibre/gui2/metadata/__init__.py 898lib/calibre/calibre/gui2/metadata/__init__.py
877lib/calibre/calibre/gui2/metadata/basic_widgets.py 899lib/calibre/calibre/gui2/metadata/basic_widgets.py
878lib/calibre/calibre/gui2/metadata/bulk_download.py 900lib/calibre/calibre/gui2/metadata/bulk_download.py
879lib/calibre/calibre/gui2/metadata/config.py 901lib/calibre/calibre/gui2/metadata/config.py
@@ -910,35 +932,35 @@ lib/calibre/calibre/gui2/preferences/mis @@ -910,35 +932,35 @@ lib/calibre/calibre/gui2/preferences/mis
910lib/calibre/calibre/gui2/preferences/plugboard.py 932lib/calibre/calibre/gui2/preferences/plugboard.py
911lib/calibre/calibre/gui2/preferences/plugboard_ui.py 933lib/calibre/calibre/gui2/preferences/plugboard_ui.py
912lib/calibre/calibre/gui2/preferences/plugins.py 934lib/calibre/calibre/gui2/preferences/plugins.py
913lib/calibre/calibre/gui2/preferences/plugins_ui.py 935lib/calibre/calibre/gui2/preferences/plugins_ui.py
914lib/calibre/calibre/gui2/preferences/save_template.py 936lib/calibre/calibre/gui2/preferences/save_template.py
915lib/calibre/calibre/gui2/preferences/save_template_ui.py 937lib/calibre/calibre/gui2/preferences/save_template_ui.py
916lib/calibre/calibre/gui2/preferences/saving.py 938lib/calibre/calibre/gui2/preferences/saving.py
917lib/calibre/calibre/gui2/preferences/saving_ui.py 939lib/calibre/calibre/gui2/preferences/saving_ui.py
918lib/calibre/calibre/gui2/preferences/search.py 940lib/calibre/calibre/gui2/preferences/search.py
919lib/calibre/calibre/gui2/preferences/search_ui.py 941lib/calibre/calibre/gui2/preferences/search_ui.py
920lib/calibre/calibre/gui2/preferences/sending.py 942lib/calibre/calibre/gui2/preferences/sending.py
921lib/calibre/calibre/gui2/preferences/sending_ui.py 943lib/calibre/calibre/gui2/preferences/sending_ui.py
922lib/calibre/calibre/gui2/preferences/server.py 944lib/calibre/calibre/gui2/preferences/server.py
923lib/calibre/calibre/gui2/preferences/server_ui.py 
924lib/calibre/calibre/gui2/preferences/template_functions.py 945lib/calibre/calibre/gui2/preferences/template_functions.py
925lib/calibre/calibre/gui2/preferences/template_functions_ui.py 946lib/calibre/calibre/gui2/preferences/template_functions_ui.py
926lib/calibre/calibre/gui2/preferences/texture_chooser.py 947lib/calibre/calibre/gui2/preferences/texture_chooser.py
927lib/calibre/calibre/gui2/preferences/toolbar.py 948lib/calibre/calibre/gui2/preferences/toolbar.py
928lib/calibre/calibre/gui2/preferences/toolbar_ui.py 949lib/calibre/calibre/gui2/preferences/toolbar_ui.py
929lib/calibre/calibre/gui2/preferences/tweaks.py 950lib/calibre/calibre/gui2/preferences/tweaks.py
930lib/calibre/calibre/gui2/proceed.py 951lib/calibre/calibre/gui2/proceed.py
931lib/calibre/calibre/gui2/progress_indicator/__init__.py 952lib/calibre/calibre/gui2/progress_indicator/__init__.py
 953lib/calibre/calibre/gui2/qt_file_dialogs.py
932lib/calibre/calibre/gui2/save.py 954lib/calibre/calibre/gui2/save.py
933lib/calibre/calibre/gui2/search_box.py 955lib/calibre/calibre/gui2/search_box.py
934lib/calibre/calibre/gui2/search_restriction_mixin.py 956lib/calibre/calibre/gui2/search_restriction_mixin.py
935lib/calibre/calibre/gui2/shortcuts.py 957lib/calibre/calibre/gui2/shortcuts.py
936lib/calibre/calibre/gui2/splash_screen.py 958lib/calibre/calibre/gui2/splash_screen.py
937lib/calibre/calibre/gui2/store/__init__.py 959lib/calibre/calibre/gui2/store/__init__.py
938lib/calibre/calibre/gui2/store/basic_config.py 960lib/calibre/calibre/gui2/store/basic_config.py
939lib/calibre/calibre/gui2/store/basic_config_widget_ui.py 961lib/calibre/calibre/gui2/store/basic_config_widget_ui.py
940lib/calibre/calibre/gui2/store/config/__init__.py 962lib/calibre/calibre/gui2/store/config/__init__.py
941lib/calibre/calibre/gui2/store/config/chooser/__init__.py 963lib/calibre/calibre/gui2/store/config/chooser/__init__.py
942lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder.py 964lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder.py
943lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder_ui.py 965lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder_ui.py
944lib/calibre/calibre/gui2/store/config/chooser/chooser_dialog.py 966lib/calibre/calibre/gui2/store/config/chooser/chooser_dialog.py
@@ -968,67 +990,62 @@ lib/calibre/calibre/gui2/store/stores/am @@ -968,67 +990,62 @@ lib/calibre/calibre/gui2/store/stores/am
968lib/calibre/calibre/gui2/store/stores/amazon_es_plugin.py 990lib/calibre/calibre/gui2/store/stores/amazon_es_plugin.py
969lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py 991lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py
970lib/calibre/calibre/gui2/store/stores/amazon_in_plugin.py 992lib/calibre/calibre/gui2/store/stores/amazon_in_plugin.py
971lib/calibre/calibre/gui2/store/stores/amazon_it_plugin.py 993lib/calibre/calibre/gui2/store/stores/amazon_it_plugin.py
972lib/calibre/calibre/gui2/store/stores/amazon_plugin.py 994lib/calibre/calibre/gui2/store/stores/amazon_plugin.py
973lib/calibre/calibre/gui2/store/stores/amazon_uk_plugin.py 995lib/calibre/calibre/gui2/store/stores/amazon_uk_plugin.py
974lib/calibre/calibre/gui2/store/stores/archive_org_plugin.py 996lib/calibre/calibre/gui2/store/stores/archive_org_plugin.py
975lib/calibre/calibre/gui2/store/stores/baen_webscription_plugin.py 997lib/calibre/calibre/gui2/store/stores/baen_webscription_plugin.py
976lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_plugin.py 998lib/calibre/calibre/gui2/store/stores/beam_ebooks_de_plugin.py
977lib/calibre/calibre/gui2/store/stores/biblio_plugin.py 999lib/calibre/calibre/gui2/store/stores/biblio_plugin.py
978lib/calibre/calibre/gui2/store/stores/bn_plugin.py 1000lib/calibre/calibre/gui2/store/stores/bn_plugin.py
979lib/calibre/calibre/gui2/store/stores/bubok_portugal_plugin.py 1001lib/calibre/calibre/gui2/store/stores/bubok_portugal_plugin.py
980lib/calibre/calibre/gui2/store/stores/bubok_publishing_plugin.py 1002lib/calibre/calibre/gui2/store/stores/bubok_publishing_plugin.py
981lib/calibre/calibre/gui2/store/stores/cdp_plugin.py 
982lib/calibre/calibre/gui2/store/stores/chitanka_plugin.py 1003lib/calibre/calibre/gui2/store/stores/chitanka_plugin.py
983lib/calibre/calibre/gui2/store/stores/ebook_nl_plugin.py 1004lib/calibre/calibre/gui2/store/stores/ebook_nl_plugin.py
984lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py 1005lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py
985lib/calibre/calibre/gui2/store/stores/ebooks_com_plugin.py 1006lib/calibre/calibre/gui2/store/stores/ebooks_com_plugin.py
986lib/calibre/calibre/gui2/store/stores/ebooksgratuits_plugin.py 1007lib/calibre/calibre/gui2/store/stores/ebooksgratuits_plugin.py
987lib/calibre/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py 1008lib/calibre/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py
988lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py 1009lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py
989lib/calibre/calibre/gui2/store/stores/empik_plugin.py 1010lib/calibre/calibre/gui2/store/stores/empik_plugin.py
990lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py 1011lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py
991lib/calibre/calibre/gui2/store/stores/google_books_plugin.py 1012lib/calibre/calibre/gui2/store/stores/google_books_plugin.py
992lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py 1013lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py
993lib/calibre/calibre/gui2/store/stores/kobo_plugin.py 1014lib/calibre/calibre/gui2/store/stores/kobo_plugin.py
994lib/calibre/calibre/gui2/store/stores/koobe_plugin.py 
995lib/calibre/calibre/gui2/store/stores/legimi_plugin.py 1015lib/calibre/calibre/gui2/store/stores/legimi_plugin.py
996lib/calibre/calibre/gui2/store/stores/libri_de_plugin.py 1016lib/calibre/calibre/gui2/store/stores/libri_de_plugin.py
997lib/calibre/calibre/gui2/store/stores/litres_plugin.py 1017lib/calibre/calibre/gui2/store/stores/litres_plugin.py
998lib/calibre/calibre/gui2/store/stores/manybooks_plugin.py 1018lib/calibre/calibre/gui2/store/stores/manybooks_plugin.py
999lib/calibre/calibre/gui2/store/stores/mills_boon_uk_plugin.py 1019lib/calibre/calibre/gui2/store/stores/mills_boon_uk_plugin.py
1000lib/calibre/calibre/gui2/store/stores/mobileread/__init__.py 1020lib/calibre/calibre/gui2/store/stores/mobileread/__init__.py
1001lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder.py 1021lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder.py
1002lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder_ui.py 1022lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder_ui.py
1003lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog.py 1023lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog.py
1004lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog_ui.py 1024lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog_ui.py
1005lib/calibre/calibre/gui2/store/stores/mobileread/cache_update_thread.py 1025lib/calibre/calibre/gui2/store/stores/mobileread/cache_update_thread.py
1006lib/calibre/calibre/gui2/store/stores/mobileread/mobileread_plugin.py 1026lib/calibre/calibre/gui2/store/stores/mobileread/mobileread_plugin.py
1007lib/calibre/calibre/gui2/store/stores/mobileread/models.py 1027lib/calibre/calibre/gui2/store/stores/mobileread/models.py
1008lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog.py 1028lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog.py
1009lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog_ui.py 1029lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog_ui.py
1010lib/calibre/calibre/gui2/store/stores/nexto_plugin.py 1030lib/calibre/calibre/gui2/store/stores/nexto_plugin.py
1011lib/calibre/calibre/gui2/store/stores/nook_uk_plugin.py 
1012lib/calibre/calibre/gui2/store/stores/open_books_plugin.py 1031lib/calibre/calibre/gui2/store/stores/open_books_plugin.py
1013lib/calibre/calibre/gui2/store/stores/ozon_ru_plugin.py 1032lib/calibre/calibre/gui2/store/stores/ozon_ru_plugin.py
1014lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py 1033lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py
1015lib/calibre/calibre/gui2/store/stores/publio_plugin.py 1034lib/calibre/calibre/gui2/store/stores/publio_plugin.py
1016lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py 1035lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py
1017lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py 1036lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py
1018lib/calibre/calibre/gui2/store/stores/sony_au_plugin.py 1037lib/calibre/calibre/gui2/store/stores/swiatebookow_plugin.py
1019lib/calibre/calibre/gui2/store/stores/sony_plugin.py 
1020lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py 1038lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py
1021lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py 
1022lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py 1039lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py
1023lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugin.py 1040lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugin.py
1024lib/calibre/calibre/gui2/store/stores/woblink_plugin.py 1041lib/calibre/calibre/gui2/store/stores/woblink_plugin.py
1025lib/calibre/calibre/gui2/store/stores/wolnelektury_plugin.py 1042lib/calibre/calibre/gui2/store/stores/wolnelektury_plugin.py
1026lib/calibre/calibre/gui2/store/stores/xinxii_plugin.py 1043lib/calibre/calibre/gui2/store/stores/xinxii_plugin.py
1027lib/calibre/calibre/gui2/store/web_control.py 1044lib/calibre/calibre/gui2/store/web_control.py
1028lib/calibre/calibre/gui2/store/web_store_dialog.py 1045lib/calibre/calibre/gui2/store/web_store_dialog.py
1029lib/calibre/calibre/gui2/store/web_store_dialog_ui.py 1046lib/calibre/calibre/gui2/store/web_store_dialog_ui.py
1030lib/calibre/calibre/gui2/tag_browser/__init__.py 1047lib/calibre/calibre/gui2/tag_browser/__init__.py
1031lib/calibre/calibre/gui2/tag_browser/model.py 1048lib/calibre/calibre/gui2/tag_browser/model.py
1032lib/calibre/calibre/gui2/tag_browser/ui.py 1049lib/calibre/calibre/gui2/tag_browser/ui.py
1033lib/calibre/calibre/gui2/tag_browser/view.py 1050lib/calibre/calibre/gui2/tag_browser/view.py
1034lib/calibre/calibre/gui2/tag_mapper.py 1051lib/calibre/calibre/gui2/tag_mapper.py
@@ -1130,121 +1147,111 @@ lib/calibre/calibre/gui2/wizard/send_ema @@ -1130,121 +1147,111 @@ lib/calibre/calibre/gui2/wizard/send_ema
1130lib/calibre/calibre/gui2/wizard/send_email_ui.py 1147lib/calibre/calibre/gui2/wizard/send_email_ui.py
1131lib/calibre/calibre/gui2/wizard/stanza_ui.py 1148lib/calibre/calibre/gui2/wizard/stanza_ui.py
1132lib/calibre/calibre/gui_launch.py 1149lib/calibre/calibre/gui_launch.py
1133lib/calibre/calibre/library/__init__.py 1150lib/calibre/calibre/library/__init__.py
1134lib/calibre/calibre/library/add_to_library.py 1151lib/calibre/calibre/library/add_to_library.py
1135lib/calibre/calibre/library/caches.py 1152lib/calibre/calibre/library/caches.py
1136lib/calibre/calibre/library/catalogs/__init__.py 1153lib/calibre/calibre/library/catalogs/__init__.py
1137lib/calibre/calibre/library/catalogs/bibtex.py 1154lib/calibre/calibre/library/catalogs/bibtex.py
1138lib/calibre/calibre/library/catalogs/csv_xml.py 1155lib/calibre/calibre/library/catalogs/csv_xml.py
1139lib/calibre/calibre/library/catalogs/epub_mobi.py 1156lib/calibre/calibre/library/catalogs/epub_mobi.py
1140lib/calibre/calibre/library/catalogs/epub_mobi_builder.py 1157lib/calibre/calibre/library/catalogs/epub_mobi_builder.py
1141lib/calibre/calibre/library/catalogs/utils.py 1158lib/calibre/calibre/library/catalogs/utils.py
1142lib/calibre/calibre/library/check_library.py 1159lib/calibre/calibre/library/check_library.py
1143lib/calibre/calibre/library/cli.py 
1144lib/calibre/calibre/library/coloring.py 1160lib/calibre/calibre/library/coloring.py
1145lib/calibre/calibre/library/comments.py 1161lib/calibre/calibre/library/comments.py
1146lib/calibre/calibre/library/custom_columns.py 1162lib/calibre/calibre/library/custom_columns.py
1147lib/calibre/calibre/library/database.py 1163lib/calibre/calibre/library/database.py
1148lib/calibre/calibre/library/database2.py 1164lib/calibre/calibre/library/database2.py
1149lib/calibre/calibre/library/field_metadata.py 1165lib/calibre/calibre/library/field_metadata.py
1150lib/calibre/calibre/library/prefs.py 1166lib/calibre/calibre/library/prefs.py
1151lib/calibre/calibre/library/restore.py 1167lib/calibre/calibre/library/restore.py
1152lib/calibre/calibre/library/save_to_disk.py 1168lib/calibre/calibre/library/save_to_disk.py
1153lib/calibre/calibre/library/schema_upgrades.py 1169lib/calibre/calibre/library/schema_upgrades.py
1154lib/calibre/calibre/library/server/__init__.py 
1155lib/calibre/calibre/library/server/ajax.py 
1156lib/calibre/calibre/library/server/base.py 
1157lib/calibre/calibre/library/server/browse.py 
1158lib/calibre/calibre/library/server/cache.py 
1159lib/calibre/calibre/library/server/content.py 
1160lib/calibre/calibre/library/server/main.py 
1161lib/calibre/calibre/library/server/mobile.py 
1162lib/calibre/calibre/library/server/opds.py 
1163lib/calibre/calibre/library/server/utils.py 
1164lib/calibre/calibre/library/server/xml.py 
1165lib/calibre/calibre/library/sqlite.py 1170lib/calibre/calibre/library/sqlite.py
1166lib/calibre/calibre/library/test_cli.py 
1167lib/calibre/calibre/libunzip.py 1171lib/calibre/calibre/libunzip.py
1168lib/calibre/calibre/linux.py 1172lib/calibre/calibre/linux.py
1169lib/calibre/calibre/plugins/_patiencediff_c.so 1173lib/calibre/calibre/plugins/_patiencediff_c.so
1170lib/calibre/calibre/plugins/_regex.so 
1171lib/calibre/calibre/plugins/bzzdec.so 1174lib/calibre/calibre/plugins/bzzdec.so
1172lib/calibre/calibre/plugins/cPalmdoc.so 1175lib/calibre/calibre/plugins/cPalmdoc.so
1173lib/calibre/calibre/plugins/certgen.so 1176lib/calibre/calibre/plugins/certgen.so
1174lib/calibre/calibre/plugins/chm_extra.so 1177lib/calibre/calibre/plugins/chm_extra.so
1175lib/calibre/calibre/plugins/chmlib.so 1178lib/calibre/calibre/plugins/chmlib.so
1176lib/calibre/calibre/plugins/dukpy.so 
1177lib/calibre/calibre/plugins/freetype.so 1179lib/calibre/calibre/plugins/freetype.so
1178lib/calibre/calibre/plugins/html.so 1180lib/calibre/calibre/plugins/html.so
1179lib/calibre/calibre/plugins/hunspell.so 1181lib/calibre/calibre/plugins/hunspell.so
1180lib/calibre/calibre/plugins/icu.so 1182lib/calibre/calibre/plugins/icu.so
1181lib/calibre/calibre/plugins/imageops.so 1183lib/calibre/calibre/plugins/imageops.so
1182lib/calibre/calibre/plugins/libheadless.so 1184lib/calibre/calibre/plugins/libheadless.so
1183lib/calibre/calibre/plugins/lzma_binding.so 1185lib/calibre/calibre/plugins/lzma_binding.so
1184lib/calibre/calibre/plugins/lzx.so 1186lib/calibre/calibre/plugins/lzx.so
1185lib/calibre/calibre/plugins/matcher.so 1187lib/calibre/calibre/plugins/matcher.so
1186lib/calibre/calibre/plugins/monotonic.so 1188lib/calibre/calibre/plugins/monotonic.so
1187lib/calibre/calibre/plugins/msdes.so 1189lib/calibre/calibre/plugins/msdes.so
1188lib/calibre/calibre/plugins/pictureflow.so 1190lib/calibre/calibre/plugins/pictureflow.so
1189lib/calibre/calibre/plugins/podofo.so 1191lib/calibre/calibre/plugins/podofo.so
1190lib/calibre/calibre/plugins/progress_indicator.so 1192lib/calibre/calibre/plugins/progress_indicator.so
1191lib/calibre/calibre/plugins/qt_hack.so 1193lib/calibre/calibre/plugins/qt_hack.so
1192lib/calibre/calibre/plugins/speedup.so 1194lib/calibre/calibre/plugins/speedup.so
1193lib/calibre/calibre/plugins/sqlite_custom.so 1195lib/calibre/calibre/plugins/sqlite_custom.so
1194lib/calibre/calibre/plugins/tokenizer.so 1196lib/calibre/calibre/plugins/tokenizer.so
1195lib/calibre/calibre/plugins/unrar.so 
1196lib/calibre/calibre/plugins/zlib2.so 1197lib/calibre/calibre/plugins/zlib2.so
1197lib/calibre/calibre/ptempfile.py 1198lib/calibre/calibre/ptempfile.py
1198lib/calibre/calibre/rpdb.py 1199lib/calibre/calibre/rpdb.py
1199lib/calibre/calibre/spell/__init__.py 1200lib/calibre/calibre/spell/__init__.py
1200lib/calibre/calibre/spell/break_iterator.py 1201lib/calibre/calibre/spell/break_iterator.py
1201lib/calibre/calibre/spell/dictionary.py 1202lib/calibre/calibre/spell/dictionary.py
1202lib/calibre/calibre/spell/import_from.py 1203lib/calibre/calibre/spell/import_from.py
1203lib/calibre/calibre/srv/__init__.py 1204lib/calibre/calibre/srv/__init__.py
1204lib/calibre/calibre/srv/ajax.py 1205lib/calibre/calibre/srv/ajax.py
1205lib/calibre/calibre/srv/auth.py 1206lib/calibre/calibre/srv/auth.py
1206lib/calibre/calibre/srv/auto_reload.py 1207lib/calibre/calibre/srv/auto_reload.py
1207lib/calibre/calibre/srv/bonjour.py 1208lib/calibre/calibre/srv/bonjour.py
1208lib/calibre/calibre/srv/books.py 1209lib/calibre/calibre/srv/books.py
 1210lib/calibre/calibre/srv/cdb.py
 1211lib/calibre/calibre/srv/changes.py
1209lib/calibre/calibre/srv/code.py 1212lib/calibre/calibre/srv/code.py
1210lib/calibre/calibre/srv/content.py 1213lib/calibre/calibre/srv/content.py
 1214lib/calibre/calibre/srv/embedded.py
1211lib/calibre/calibre/srv/errors.py 1215lib/calibre/calibre/srv/errors.py
1212lib/calibre/calibre/srv/handler.py 1216lib/calibre/calibre/srv/handler.py
1213lib/calibre/calibre/srv/http_request.py 1217lib/calibre/calibre/srv/http_request.py
1214lib/calibre/calibre/srv/http_response.py 1218lib/calibre/calibre/srv/http_response.py
1215lib/calibre/calibre/srv/jobs.py 1219lib/calibre/calibre/srv/jobs.py
1216lib/calibre/calibre/srv/legacy.py 1220lib/calibre/calibre/srv/legacy.py
 1221lib/calibre/calibre/srv/library_broker.py
1217lib/calibre/calibre/srv/loop.py 1222lib/calibre/calibre/srv/loop.py
 1223lib/calibre/calibre/srv/manage_users_cli.py
1218lib/calibre/calibre/srv/metadata.py 1224lib/calibre/calibre/srv/metadata.py
1219lib/calibre/calibre/srv/opds.py 1225lib/calibre/calibre/srv/opds.py
1220lib/calibre/calibre/srv/opts.py 1226lib/calibre/calibre/srv/opts.py
1221lib/calibre/calibre/srv/pool.py 1227lib/calibre/calibre/srv/pool.py
1222lib/calibre/calibre/srv/pre_activated.py 1228lib/calibre/calibre/srv/pre_activated.py
1223lib/calibre/calibre/srv/render_book.py 1229lib/calibre/calibre/srv/render_book.py
1224lib/calibre/calibre/srv/routes.py 1230lib/calibre/calibre/srv/routes.py
1225lib/calibre/calibre/srv/sendfile.py 1231lib/calibre/calibre/srv/sendfile.py
1226lib/calibre/calibre/srv/standalone.py 1232lib/calibre/calibre/srv/standalone.py
1227lib/calibre/calibre/srv/tests/__init__.py 1233lib/calibre/calibre/srv/tests/__init__.py
1228lib/calibre/calibre/srv/tests/ajax.py 1234lib/calibre/calibre/srv/tests/ajax.py
1229lib/calibre/calibre/srv/tests/auth.py 1235lib/calibre/calibre/srv/tests/auth.py
1230lib/calibre/calibre/srv/tests/base.py 1236lib/calibre/calibre/srv/tests/base.py
1231lib/calibre/calibre/srv/tests/content.py 1237lib/calibre/calibre/srv/tests/content.py
1232lib/calibre/calibre/srv/tests/http.py 1238lib/calibre/calibre/srv/tests/http.py
1233lib/calibre/calibre/srv/tests/loop.py 1239lib/calibre/calibre/srv/tests/loop.py
1234lib/calibre/calibre/srv/tests/main.py 1240lib/calibre/calibre/srv/tests/main.py
1235lib/calibre/calibre/srv/tests/routes.py 1241lib/calibre/calibre/srv/tests/routes.py
1236lib/calibre/calibre/srv/tests/web_sockets.py 1242lib/calibre/calibre/srv/tests/web_sockets.py
1237lib/calibre/calibre/srv/users.py 1243lib/calibre/calibre/srv/users.py
 1244lib/calibre/calibre/srv/users_api.py
1238lib/calibre/calibre/srv/utils.py 1245lib/calibre/calibre/srv/utils.py
1239lib/calibre/calibre/srv/web_socket.py 1246lib/calibre/calibre/srv/web_socket.py
1240lib/calibre/calibre/startup.py 1247lib/calibre/calibre/startup.py
1241lib/calibre/calibre/test_build.py 1248lib/calibre/calibre/test_build.py
1242lib/calibre/calibre/translations/__init__.py 1249lib/calibre/calibre/translations/__init__.py
1243lib/calibre/calibre/translations/dynamic.py 1250lib/calibre/calibre/translations/dynamic.py
1244lib/calibre/calibre/translations/msgfmt.py 1251lib/calibre/calibre/translations/msgfmt.py
1245lib/calibre/calibre/utils/Zeroconf.py 1252lib/calibre/calibre/utils/Zeroconf.py
1246lib/calibre/calibre/utils/__init__.py 1253lib/calibre/calibre/utils/__init__.py
1247lib/calibre/calibre/utils/apsw_shell.py 1254lib/calibre/calibre/utils/apsw_shell.py
1248lib/calibre/calibre/utils/bibtex.py 1255lib/calibre/calibre/utils/bibtex.py
1249lib/calibre/calibre/utils/browser.py 1256lib/calibre/calibre/utils/browser.py
1250lib/calibre/calibre/utils/certgen.py 1257lib/calibre/calibre/utils/certgen.py
@@ -1328,143 +1335,75 @@ lib/calibre/calibre/utils/open_with/wind @@ -1328,143 +1335,75 @@ lib/calibre/calibre/utils/open_with/wind
1328lib/calibre/calibre/utils/opensearch/__init__.py 1335lib/calibre/calibre/utils/opensearch/__init__.py
1329lib/calibre/calibre/utils/opensearch/description.py 1336lib/calibre/calibre/utils/opensearch/description.py
1330lib/calibre/calibre/utils/opensearch/query.py 1337lib/calibre/calibre/utils/opensearch/query.py
1331lib/calibre/calibre/utils/opensearch/url.py 1338lib/calibre/calibre/utils/opensearch/url.py
1332lib/calibre/calibre/utils/ordered_dict.py 1339lib/calibre/calibre/utils/ordered_dict.py
1333lib/calibre/calibre/utils/podofo/__init__.py 1340lib/calibre/calibre/utils/podofo/__init__.py
1334lib/calibre/calibre/utils/random_ua.py 1341lib/calibre/calibre/utils/random_ua.py
1335lib/calibre/calibre/utils/rapydscript.py 1342lib/calibre/calibre/utils/rapydscript.py
1336lib/calibre/calibre/utils/recycle_bin.py 1343lib/calibre/calibre/utils/recycle_bin.py
1337lib/calibre/calibre/utils/resources.py 1344lib/calibre/calibre/utils/resources.py
1338lib/calibre/calibre/utils/rss_gen.py 1345lib/calibre/calibre/utils/rss_gen.py
1339lib/calibre/calibre/utils/run_tests.py 1346lib/calibre/calibre/utils/run_tests.py
1340lib/calibre/calibre/utils/search_query_parser.py 1347lib/calibre/calibre/utils/search_query_parser.py
 1348lib/calibre/calibre/utils/search_query_parser_test.py
 1349lib/calibre/calibre/utils/serialize.py
1341lib/calibre/calibre/utils/serve_coffee.py 1350lib/calibre/calibre/utils/serve_coffee.py
1342lib/calibre/calibre/utils/sftp.py 1351lib/calibre/calibre/utils/sftp.py
1343lib/calibre/calibre/utils/shared_file.py 1352lib/calibre/calibre/utils/shared_file.py
1344lib/calibre/calibre/utils/short_uuid.py 1353lib/calibre/calibre/utils/short_uuid.py
1345lib/calibre/calibre/utils/smartypants.py 1354lib/calibre/calibre/utils/smartypants.py
1346lib/calibre/calibre/utils/smtp.py 1355lib/calibre/calibre/utils/smtp.py
1347lib/calibre/calibre/utils/smtplib.py 1356lib/calibre/calibre/utils/smtplib.py
1348lib/calibre/calibre/utils/socket_inheritance.py 1357lib/calibre/calibre/utils/socket_inheritance.py
1349lib/calibre/calibre/utils/soupparser.py 1358lib/calibre/calibre/utils/soupparser.py
1350lib/calibre/calibre/utils/speedups.py 1359lib/calibre/calibre/utils/speedups.py
1351lib/calibre/calibre/utils/spell/__init__.py 1360lib/calibre/calibre/utils/spell/__init__.py
1352lib/calibre/calibre/utils/terminal.py 1361lib/calibre/calibre/utils/terminal.py
 1362lib/calibre/calibre/utils/test_lock.py
1353lib/calibre/calibre/utils/text2int.py 1363lib/calibre/calibre/utils/text2int.py
1354lib/calibre/calibre/utils/threadpool.py 1364lib/calibre/calibre/utils/threadpool.py
1355lib/calibre/calibre/utils/titlecase.py 1365lib/calibre/calibre/utils/titlecase.py
 1366lib/calibre/calibre/utils/unicode_getpass.py
1356lib/calibre/calibre/utils/unrar.py 1367lib/calibre/calibre/utils/unrar.py
1357lib/calibre/calibre/utils/unsmarten.py 1368lib/calibre/calibre/utils/unsmarten.py
1358lib/calibre/calibre/utils/winreg/__init__.py 1369lib/calibre/calibre/utils/winreg/__init__.py
1359lib/calibre/calibre/utils/winreg/dde.py 1370lib/calibre/calibre/utils/winreg/dde.py
1360lib/calibre/calibre/utils/winreg/default_programs.py 1371lib/calibre/calibre/utils/winreg/default_programs.py
1361lib/calibre/calibre/utils/winreg/lib.py 1372lib/calibre/calibre/utils/winreg/lib.py
1362lib/calibre/calibre/utils/wmf/__init__.py 1373lib/calibre/calibre/utils/wmf/__init__.py
1363lib/calibre/calibre/utils/wmf/emf.py 1374lib/calibre/calibre/utils/wmf/emf.py
1364lib/calibre/calibre/utils/wmf/parse.py 1375lib/calibre/calibre/utils/wmf/parse.py
1365lib/calibre/calibre/utils/wordcount.py 1376lib/calibre/calibre/utils/wordcount.py
1366lib/calibre/calibre/utils/zipfile.py 1377lib/calibre/calibre/utils/zipfile.py
1367lib/calibre/calibre/web/__init__.py 1378lib/calibre/calibre/web/__init__.py
1368lib/calibre/calibre/web/feeds/__init__.py 1379lib/calibre/calibre/web/feeds/__init__.py
1369lib/calibre/calibre/web/feeds/feedparser.py 1380lib/calibre/calibre/web/feeds/feedparser.py
1370lib/calibre/calibre/web/feeds/news.py 1381lib/calibre/calibre/web/feeds/news.py
1371lib/calibre/calibre/web/feeds/recipes/__init__.py 1382lib/calibre/calibre/web/feeds/recipes/__init__.py
1372lib/calibre/calibre/web/feeds/recipes/collection.py 1383lib/calibre/calibre/web/feeds/recipes/collection.py
1373lib/calibre/calibre/web/feeds/recipes/model.py 1384lib/calibre/calibre/web/feeds/recipes/model.py
1374lib/calibre/calibre/web/feeds/templates.py 1385lib/calibre/calibre/web/feeds/templates.py
1375lib/calibre/calibre/web/fetch/__init__.py 1386lib/calibre/calibre/web/fetch/__init__.py
1376lib/calibre/calibre/web/fetch/simple.py 1387lib/calibre/calibre/web/fetch/simple.py
1377lib/calibre/calibre/web/fetch/utils.py 1388lib/calibre/calibre/web/fetch/utils.py
1378lib/calibre/chardet/__init__.py 
1379lib/calibre/chardet/big5freq.py 
1380lib/calibre/chardet/big5prober.py 
1381lib/calibre/chardet/chardistribution.py 
1382lib/calibre/chardet/charsetgroupprober.py 
1383lib/calibre/chardet/charsetprober.py 
1384lib/calibre/chardet/codingstatemachine.py 
1385lib/calibre/chardet/constants.py 
1386lib/calibre/chardet/escprober.py 
1387lib/calibre/chardet/escsm.py 
1388lib/calibre/chardet/eucjpprober.py 
1389lib/calibre/chardet/euckrfreq.py 
1390lib/calibre/chardet/euckrprober.py 
1391lib/calibre/chardet/euctwfreq.py 
1392lib/calibre/chardet/euctwprober.py 
1393lib/calibre/chardet/gb2312freq.py 
1394lib/calibre/chardet/gb2312prober.py 
1395lib/calibre/chardet/hebrewprober.py 
1396lib/calibre/chardet/jisfreq.py 
1397lib/calibre/chardet/jpcntx.py 
1398lib/calibre/chardet/langbulgarianmodel.py 
1399lib/calibre/chardet/langcyrillicmodel.py 
1400lib/calibre/chardet/langgreekmodel.py 
1401lib/calibre/chardet/langhebrewmodel.py 
1402lib/calibre/chardet/langhungarianmodel.py 
1403lib/calibre/chardet/langthaimodel.py 
1404lib/calibre/chardet/latin1prober.py 
1405lib/calibre/chardet/mbcharsetprober.py 
1406lib/calibre/chardet/mbcsgroupprober.py 
1407lib/calibre/chardet/mbcssm.py 
1408lib/calibre/chardet/sbcharsetprober.py 
1409lib/calibre/chardet/sbcsgroupprober.py 
1410lib/calibre/chardet/sjisprober.py 
1411lib/calibre/chardet/test.py 
1412lib/calibre/chardet/universaldetector.py 
1413lib/calibre/chardet/utf8prober.py 
1414lib/calibre/css_selectors/__init__.py 1389lib/calibre/css_selectors/__init__.py
1415lib/calibre/css_selectors/errors.py 1390lib/calibre/css_selectors/errors.py
1416lib/calibre/css_selectors/ordered_set.py 1391lib/calibre/css_selectors/ordered_set.py
1417lib/calibre/css_selectors/parser.py 1392lib/calibre/css_selectors/parser.py
1418lib/calibre/css_selectors/select.py 1393lib/calibre/css_selectors/select.py
1419lib/calibre/css_selectors/tests.py 1394lib/calibre/css_selectors/tests.py
1420lib/calibre/duktape/__init__.py 1395lib/calibre/duktape/__init__.py
1421lib/calibre/duktape/tests.py 1396lib/calibre/duktape/tests.py
1422lib/calibre/html5lib/__init__.py 
1423lib/calibre/html5lib/constants.py 
1424lib/calibre/html5lib/filters/__init__.py 
1425lib/calibre/html5lib/filters/_base.py 
1426lib/calibre/html5lib/filters/alphabeticalattributes.py 
1427lib/calibre/html5lib/filters/inject_meta_charset.py 
1428lib/calibre/html5lib/filters/lint.py 
1429lib/calibre/html5lib/filters/optionaltags.py 
1430lib/calibre/html5lib/filters/sanitizer.py 
1431lib/calibre/html5lib/filters/whitespace.py 
1432lib/calibre/html5lib/html5parser.py 
1433lib/calibre/html5lib/ihatexml.py 
1434lib/calibre/html5lib/inputstream.py 
1435lib/calibre/html5lib/sanitizer.py 
1436lib/calibre/html5lib/serializer/__init__.py 
1437lib/calibre/html5lib/serializer/htmlserializer.py 
1438lib/calibre/html5lib/tokenizer.py 
1439lib/calibre/html5lib/treeadapters/__init__.py 
1440lib/calibre/html5lib/treeadapters/sax.py 
1441lib/calibre/html5lib/treebuilders/__init__.py 
1442lib/calibre/html5lib/treebuilders/_base.py 
1443lib/calibre/html5lib/treebuilders/dom.py 
1444lib/calibre/html5lib/treebuilders/etree.py 
1445lib/calibre/html5lib/treebuilders/etree_lxml.py 
1446lib/calibre/html5lib/treewalkers/__init__.py 
1447lib/calibre/html5lib/treewalkers/_base.py 
1448lib/calibre/html5lib/treewalkers/dom.py 
1449lib/calibre/html5lib/treewalkers/etree.py 
1450lib/calibre/html5lib/treewalkers/genshistream.py 
1451lib/calibre/html5lib/treewalkers/lxmletree.py 
1452lib/calibre/html5lib/treewalkers/pulldom.py 
1453lib/calibre/html5lib/trie/__init__.py 
1454lib/calibre/html5lib/trie/_base.py 
1455lib/calibre/html5lib/trie/datrie.py 
1456lib/calibre/html5lib/trie/py.py 
1457lib/calibre/html5lib/utils.py 
1458lib/calibre/lzma/__init__.py 1397lib/calibre/lzma/__init__.py
1459lib/calibre/lzma/errors.py 1398lib/calibre/lzma/errors.py
1460lib/calibre/lzma/lzma1.py 1399lib/calibre/lzma/lzma1.py
1461lib/calibre/lzma/xz.py 1400lib/calibre/lzma/xz.py
1462lib/calibre/odf/__init__.py 1401lib/calibre/odf/__init__.py
1463lib/calibre/odf/anim.py 1402lib/calibre/odf/anim.py
1464lib/calibre/odf/attrconverters.py 1403lib/calibre/odf/attrconverters.py
1465lib/calibre/odf/chart.py 1404lib/calibre/odf/chart.py
1466lib/calibre/odf/config.py 1405lib/calibre/odf/config.py
1467lib/calibre/odf/dc.py 1406lib/calibre/odf/dc.py
1468lib/calibre/odf/dr3d.py 1407lib/calibre/odf/dr3d.py
1469lib/calibre/odf/draw.py 1408lib/calibre/odf/draw.py
1470lib/calibre/odf/easyliststyle.py 1409lib/calibre/odf/easyliststyle.py
@@ -1483,35 +1422,26 @@ lib/calibre/odf/odf2xhtml.py @@ -1483,35 +1422,26 @@ lib/calibre/odf/odf2xhtml.py
1483lib/calibre/odf/odfmanifest.py 1422lib/calibre/odf/odfmanifest.py
1484lib/calibre/odf/office.py 1423lib/calibre/odf/office.py
1485lib/calibre/odf/opendocument.py 1424lib/calibre/odf/opendocument.py
1486lib/calibre/odf/presentation.py 1425lib/calibre/odf/presentation.py
1487lib/calibre/odf/script.py 1426lib/calibre/odf/script.py
1488lib/calibre/odf/style.py 1427lib/calibre/odf/style.py
1489lib/calibre/odf/svg.py 1428lib/calibre/odf/svg.py
1490lib/calibre/odf/table.py 1429lib/calibre/odf/table.py
1491lib/calibre/odf/teletype.py 1430lib/calibre/odf/teletype.py
1492lib/calibre/odf/text.py 1431lib/calibre/odf/text.py
1493lib/calibre/odf/thumbnail.py 1432lib/calibre/odf/thumbnail.py
1494lib/calibre/odf/userfield.py 1433lib/calibre/odf/userfield.py
1495lib/calibre/odf/xforms.py 1434lib/calibre/odf/xforms.py
1496lib/calibre/regex/__init__.py 
1497lib/calibre/regex/_regex_core.py 
1498lib/calibre/routes/__init__.py 
1499lib/calibre/routes/base.py 
1500lib/calibre/routes/lru.py 
1501lib/calibre/routes/mapper.py 
1502lib/calibre/routes/middleware.py 
1503lib/calibre/routes/route.py 
1504lib/calibre/routes/util.py 
1505lib/calibre/templite/__init__.py 1435lib/calibre/templite/__init__.py
1506lib/calibre/tinycss/__init__.py 1436lib/calibre/tinycss/__init__.py
1507lib/calibre/tinycss/color3.py 1437lib/calibre/tinycss/color3.py
1508lib/calibre/tinycss/css21.py 1438lib/calibre/tinycss/css21.py
1509lib/calibre/tinycss/decoding.py 1439lib/calibre/tinycss/decoding.py
1510lib/calibre/tinycss/fonts3.py 1440lib/calibre/tinycss/fonts3.py
1511lib/calibre/tinycss/media3.py 1441lib/calibre/tinycss/media3.py
1512lib/calibre/tinycss/page3.py 1442lib/calibre/tinycss/page3.py
1513lib/calibre/tinycss/parsing.py 1443lib/calibre/tinycss/parsing.py
1514lib/calibre/tinycss/tests/__init__.py 1444lib/calibre/tinycss/tests/__init__.py
1515lib/calibre/tinycss/tests/color3.py 1445lib/calibre/tinycss/tests/color3.py
1516lib/calibre/tinycss/tests/css21.py 1446lib/calibre/tinycss/tests/css21.py
1517lib/calibre/tinycss/tests/decoding.py 1447lib/calibre/tinycss/tests/decoding.py
@@ -1538,74 +1468,26 @@ share/calibre/catalog/stylesheet.css @@ -1538,74 +1468,26 @@ share/calibre/catalog/stylesheet.css
1538share/calibre/catalog/template.xhtml 1468share/calibre/catalog/template.xhtml
1539share/calibre/coffee-script.js 1469share/calibre/coffee-script.js
1540share/calibre/compiled_coffeescript.zip 1470share/calibre/compiled_coffeescript.zip
1541share/calibre/content-server/calibre.appcache 1471share/calibre/content-server/calibre.appcache
1542share/calibre/content-server/calibre.png 1472share/calibre/content-server/calibre.png
1543share/calibre/content-server/empty.html 1473share/calibre/content-server/empty.html
1544share/calibre/content-server/index-generated.html 1474share/calibre/content-server/index-generated.html
1545share/calibre/content-server/index.html 1475share/calibre/content-server/index.html
1546share/calibre/content-server/locales.zip 1476share/calibre/content-server/locales.zip
1547share/calibre/content-server/mathjax.version 1477share/calibre/content-server/mathjax.version
1548share/calibre/content-server/mathjax.zip.xz 1478share/calibre/content-server/mathjax.zip.xz
1549share/calibre/content-server/mobile.css 1479share/calibre/content-server/mobile.css
1550share/calibre/content-server/reset.css 1480share/calibre/content-server/reset.css
1551share/calibre/content_server/av.jpg 
1552share/calibre/content_server/bg_search_box.png 
1553share/calibre/content_server/browse/browse.css 
1554share/calibre/content_server/browse/browse.html 
1555share/calibre/content_server/browse/browse.js 
1556share/calibre/content_server/browse/details.html 
1557share/calibre/content_server/browse/summary.html 
1558share/calibre/content_server/btn_search_box.png 
1559share/calibre/content_server/button-donate.png 
1560share/calibre/content_server/calibre.png 
1561share/calibre/content_server/calibre_banner.png 
1562share/calibre/content_server/date.js 
1563share/calibre/content_server/default_cover.jpg 
1564share/calibre/content_server/first.png 
1565share/calibre/content_server/gui.css 
1566share/calibre/content_server/gui.js 
1567share/calibre/content_server/index.html 
1568share/calibre/content_server/jquery.corner.js 
1569share/calibre/content_server/jquery.js 
1570share/calibre/content_server/jquery.multiselect.css 
1571share/calibre/content_server/jquery.multiselect.min.js 
1572share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_flat_75_aaaaaa_40x100.png 
1573share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_100_f5f0e5_1x400.png 
1574share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_25_cb842e_1x400.png 
1575share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_70_ede4d4_1x400.png 
1576share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_100_f4f0ec_1x100.png 
1577share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_65_fee4bd_1x100.png 
1578share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_75_f5f5b5_1x100.png 
1579share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_inset-soft_100_f4f0ec_1x100.png 
1580share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_c47a23_256x240.png 
1581share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_cb672b_256x240.png 
1582share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f08000_256x240.png 
1583share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f35f07_256x240.png 
1584share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_ff7519_256x240.png 
1585share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_ffffff_256x240.png 
1586share/calibre/content_server/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css 
1587share/calibre/content_server/jquery_ui/js/jquery-ui-1.8.5.custom.min.js 
1588share/calibre/content_server/last.png 
1589share/calibre/content_server/loading.gif 
1590share/calibre/content_server/logo.png 
1591share/calibre/content_server/mobile.css 
1592share/calibre/content_server/next.png 
1593share/calibre/content_server/previous.png 
1594share/calibre/content_server/read/monocle.js 
1595share/calibre/content_server/stacktrace.js 
1596share/calibre/content_server/star-half.png 
1597share/calibre/content_server/star-off.png 
1598share/calibre/content_server/star-on.png 
1599share/calibre/csscolorparser.js 1481share/calibre/csscolorparser.js
1600share/calibre/default_tweaks.py 1482share/calibre/default_tweaks.py
1601share/calibre/dictionaries/en-GB/en-GB.aff 1483share/calibre/dictionaries/en-GB/en-GB.aff
1602share/calibre/dictionaries/en-GB/en-GB.dic 1484share/calibre/dictionaries/en-GB/en-GB.dic
1603share/calibre/dictionaries/en-GB/locales 1485share/calibre/dictionaries/en-GB/locales
1604share/calibre/dictionaries/en-US/en-US.aff 1486share/calibre/dictionaries/en-US/en-US.aff
1605share/calibre/dictionaries/en-US/en-US.dic 1487share/calibre/dictionaries/en-US/en-US.dic
1606share/calibre/dictionaries/en-US/locales 1488share/calibre/dictionaries/en-US/locales
1607share/calibre/dictionaries/es-ES/es-ES.aff 1489share/calibre/dictionaries/es-ES/es-ES.aff
1608share/calibre/dictionaries/es-ES/es-ES.dic 1490share/calibre/dictionaries/es-ES/es-ES.dic
1609share/calibre/dictionaries/es-ES/locales 1491share/calibre/dictionaries/es-ES/locales
1610share/calibre/ebook-convert-complete.pickle 1492share/calibre/ebook-convert-complete.pickle
1611share/calibre/editor-functions.json 1493share/calibre/editor-functions.json
@@ -1620,26 +1502,27 @@ share/calibre/fonts/liberation/Liberatio @@ -1620,26 +1502,27 @@ share/calibre/fonts/liberation/Liberatio
1620share/calibre/fonts/liberation/LiberationMono-BoldItalic.ttf 1502share/calibre/fonts/liberation/LiberationMono-BoldItalic.ttf
1621share/calibre/fonts/liberation/LiberationMono-Italic.ttf 1503share/calibre/fonts/liberation/LiberationMono-Italic.ttf
1622share/calibre/fonts/liberation/LiberationMono-Regular.ttf 1504share/calibre/fonts/liberation/LiberationMono-Regular.ttf
1623share/calibre/fonts/liberation/LiberationSans-Bold.ttf 1505share/calibre/fonts/liberation/LiberationSans-Bold.ttf
1624share/calibre/fonts/liberation/LiberationSans-BoldItalic.ttf 1506share/calibre/fonts/liberation/LiberationSans-BoldItalic.ttf
1625share/calibre/fonts/liberation/LiberationSans-Italic.ttf 1507share/calibre/fonts/liberation/LiberationSans-Italic.ttf
1626share/calibre/fonts/liberation/LiberationSans-Regular.ttf 1508share/calibre/fonts/liberation/LiberationSans-Regular.ttf
1627share/calibre/fonts/liberation/LiberationSerif-Bold.ttf 1509share/calibre/fonts/liberation/LiberationSerif-Bold.ttf
1628share/calibre/fonts/liberation/LiberationSerif-BoldItalic.ttf 1510share/calibre/fonts/liberation/LiberationSerif-BoldItalic.ttf
1629share/calibre/fonts/liberation/LiberationSerif-Italic.ttf 1511share/calibre/fonts/liberation/LiberationSerif-Italic.ttf
1630share/calibre/fonts/liberation/LiberationSerif-Regular.ttf 1512share/calibre/fonts/liberation/LiberationSerif-Regular.ttf
1631share/calibre/images.qrc 1513share/calibre/images.qrc
1632share/calibre/images/add_book.png 1514share/calibre/images/add_book.png
 1515share/calibre/images/apple-touch-icon.png
1633share/calibre/images/arrow-down.png 1516share/calibre/images/arrow-down.png
1634share/calibre/images/arrow-up.png 1517share/calibre/images/arrow-up.png
1635share/calibre/images/auto-reload.png 1518share/calibre/images/auto-reload.png
1636share/calibre/images/auto_author_sort.png 1519share/calibre/images/auto_author_sort.png
1637share/calibre/images/back.png 1520share/calibre/images/back.png
1638share/calibre/images/beautify.png 1521share/calibre/images/beautify.png
1639share/calibre/images/blank.png 1522share/calibre/images/blank.png
1640share/calibre/images/book.png 1523share/calibre/images/book.png
1641share/calibre/images/bookmarks.png 1524share/calibre/images/bookmarks.png
1642share/calibre/images/books_in_series.png 1525share/calibre/images/books_in_series.png
1643share/calibre/images/catalog.png 1526share/calibre/images/catalog.png
1644share/calibre/images/chapters.png 1527share/calibre/images/chapters.png
1645share/calibre/images/character-set.png 1528share/calibre/images/character-set.png
@@ -1700,32 +1583,34 @@ share/calibre/images/font_size_larger.pn @@ -1700,32 +1583,34 @@ share/calibre/images/font_size_larger.pn
1700share/calibre/images/font_size_smaller.png 1583share/calibre/images/font_size_smaller.png
1701share/calibre/images/format-fill-color.png 1584share/calibre/images/format-fill-color.png
1702share/calibre/images/format-indent-less.png 1585share/calibre/images/format-indent-less.png
1703share/calibre/images/format-indent-more.png 1586share/calibre/images/format-indent-more.png
1704share/calibre/images/format-justify-center.png 1587share/calibre/images/format-justify-center.png
1705share/calibre/images/format-justify-fill.png 1588share/calibre/images/format-justify-fill.png
1706share/calibre/images/format-justify-left.png 1589share/calibre/images/format-justify-left.png
1707share/calibre/images/format-justify-right.png 1590share/calibre/images/format-justify-right.png
1708share/calibre/images/format-list-ordered.png 1591share/calibre/images/format-list-ordered.png
1709share/calibre/images/format-list-unordered.png 1592share/calibre/images/format-list-unordered.png
1710share/calibre/images/format-text-bold.png 1593share/calibre/images/format-text-bold.png
1711share/calibre/images/format-text-color.png 1594share/calibre/images/format-text-color.png
1712share/calibre/images/format-text-heading.png 1595share/calibre/images/format-text-heading.png
 1596share/calibre/images/format-text-hr.png
1713share/calibre/images/format-text-italic.png 1597share/calibre/images/format-text-italic.png
1714share/calibre/images/format-text-strikethrough.png 1598share/calibre/images/format-text-strikethrough.png
1715share/calibre/images/format-text-subscript.png 1599share/calibre/images/format-text-subscript.png
1716share/calibre/images/format-text-superscript.png 1600share/calibre/images/format-text-superscript.png
1717share/calibre/images/format-text-underline.png 1601share/calibre/images/format-text-underline.png
1718share/calibre/images/forward.png 1602share/calibre/images/forward.png
 1603share/calibre/images/gear.png
1719share/calibre/images/gmail_logo.png 1604share/calibre/images/gmail_logo.png
1720share/calibre/images/grid.png 1605share/calibre/images/grid.png
1721share/calibre/images/help.png 1606share/calibre/images/help.png
1722share/calibre/images/heuristics.png 1607share/calibre/images/heuristics.png
1723share/calibre/images/highlight_only_off.png 1608share/calibre/images/highlight_only_off.png
1724share/calibre/images/highlight_only_on.png 1609share/calibre/images/highlight_only_on.png
1725share/calibre/images/hotmail.png 1610share/calibre/images/hotmail.png
1726share/calibre/images/html-fix.png 1611share/calibre/images/html-fix.png
1727share/calibre/images/icon_choose.png 1612share/calibre/images/icon_choose.png
1728share/calibre/images/identifiers.png 1613share/calibre/images/identifiers.png
1729share/calibre/images/insert-link.png 1614share/calibre/images/insert-link.png
1730share/calibre/images/jobs.png 1615share/calibre/images/jobs.png
1731share/calibre/images/keyboard-prefs.png 1616share/calibre/images/keyboard-prefs.png
@@ -1790,42 +1675,45 @@ share/calibre/images/plugins/plugin_new. @@ -1790,42 +1675,45 @@ share/calibre/images/plugins/plugin_new.
1790share/calibre/images/plugins/plugin_new_invalid.png 1675share/calibre/images/plugins/plugin_new_invalid.png
1791share/calibre/images/plugins/plugin_new_valid.png 1676share/calibre/images/plugins/plugin_new_valid.png
1792share/calibre/images/plugins/plugin_updater.png 1677share/calibre/images/plugins/plugin_updater.png
1793share/calibre/images/plugins/plugin_updater_updates.png 1678share/calibre/images/plugins/plugin_updater_updates.png
1794share/calibre/images/plugins/plugin_upgrade_invalid.png 1679share/calibre/images/plugins/plugin_upgrade_invalid.png
1795share/calibre/images/plugins/plugin_upgrade_ok.png 1680share/calibre/images/plugins/plugin_upgrade_ok.png
1796share/calibre/images/plugins/plugin_upgrade_valid.png 1681share/calibre/images/plugins/plugin_upgrade_valid.png
1797share/calibre/images/plus.png 1682share/calibre/images/plus.png
1798share/calibre/images/plusplus.png 1683share/calibre/images/plusplus.png
1799share/calibre/images/polish.png 1684share/calibre/images/polish.png
1800share/calibre/images/previous.png 1685share/calibre/images/previous.png
1801share/calibre/images/print.png 1686share/calibre/images/print.png
1802share/calibre/images/publisher.png 1687share/calibre/images/publisher.png
 1688share/calibre/images/quickview.png
1803share/calibre/images/random.png 1689share/calibre/images/random.png
1804share/calibre/images/rating.png 1690share/calibre/images/rating.png
1805share/calibre/images/reader.png 1691share/calibre/images/reader.png
1806share/calibre/images/remove_books.png 1692share/calibre/images/remove_books.png
1807share/calibre/images/reports.png 1693share/calibre/images/reports.png
1808share/calibre/images/resize.png 1694share/calibre/images/resize.png
 1695share/calibre/images/restart.png
1809share/calibre/images/rotate-right.png 1696share/calibre/images/rotate-right.png
1810share/calibre/images/save.png 1697share/calibre/images/save.png
1811share/calibre/images/scheduler.png 1698share/calibre/images/scheduler.png
1812share/calibre/images/scroll.png 1699share/calibre/images/scroll.png
1813share/calibre/images/sd.png 1700share/calibre/images/sd.png
1814share/calibre/images/search.png 1701share/calibre/images/search.png
1815share/calibre/images/search_add_saved.png 1702share/calibre/images/search_add_saved.png
1816share/calibre/images/search_copy_saved.png 1703share/calibre/images/search_copy_saved.png
1817share/calibre/images/search_delete_saved.png 1704share/calibre/images/search_delete_saved.png
1818share/calibre/images/series.png 1705share/calibre/images/series.png
 1706share/calibre/images/similar.png
1819share/calibre/images/smarten-punctuation.png 1707share/calibre/images/smarten-punctuation.png
1820share/calibre/images/snippets.png 1708share/calibre/images/snippets.png
1821share/calibre/images/sort.png 1709share/calibre/images/sort.png
1822share/calibre/images/spell-check.png 1710share/calibre/images/spell-check.png
1823share/calibre/images/store.png 1711share/calibre/images/store.png
1824share/calibre/images/subset-fonts.png 1712share/calibre/images/subset-fonts.png
1825share/calibre/images/swap.png 1713share/calibre/images/swap.png
1826share/calibre/images/sync-right.png 1714share/calibre/images/sync-right.png
1827share/calibre/images/sync.png 1715share/calibre/images/sync.png
1828share/calibre/images/tags.png 1716share/calibre/images/tags.png
1829share/calibre/images/tb_folder.png 1717share/calibre/images/tb_folder.png
1830share/calibre/images/template_funcs.png 1718share/calibre/images/template_funcs.png
1831share/calibre/images/textures/dark_cloth.png 1719share/calibre/images/textures/dark_cloth.png
@@ -1846,55 +1734,57 @@ share/calibre/images/view.png @@ -1846,55 +1734,57 @@ share/calibre/images/view.png
1846share/calibre/images/viewer.png 1734share/calibre/images/viewer.png
1847share/calibre/images/window-close.png 1735share/calibre/images/window-close.png
1848share/calibre/images/wizard.png 1736share/calibre/images/wizard.png
1849share/calibre/jacket/stylesheet.css 1737share/calibre/jacket/stylesheet.css
1850share/calibre/jacket/template.xhtml 1738share/calibre/jacket/template.xhtml
1851share/calibre/jquery.simulate.js 1739share/calibre/jquery.simulate.js
1852share/calibre/localization/iso3166.pickle 1740share/calibre/localization/iso3166.pickle
1853share/calibre/localization/iso639.pickle 1741share/calibre/localization/iso639.pickle
1854share/calibre/localization/locales.zip 1742share/calibre/localization/locales.zip
1855share/calibre/localization/pykakasi/itaijidict2.pickle 1743share/calibre/localization/pykakasi/itaijidict2.pickle
1856share/calibre/localization/pykakasi/kanadict2.pickle 1744share/calibre/localization/pykakasi/kanadict2.pickle
1857share/calibre/localization/pykakasi/kanwadict2.pickle 1745share/calibre/localization/pykakasi/kanwadict2.pickle
1858share/calibre/localization/stats.pickle 1746share/calibre/localization/stats.pickle
 1747share/calibre/localization/website-languages.txt
1859share/calibre/metadata_sqlite.sql 1748share/calibre/metadata_sqlite.sql
1860share/calibre/mime.types 1749share/calibre/mime.types
1861share/calibre/mozilla-ca-certs.pem 1750share/calibre/mozilla-ca-certs.pem
1862share/calibre/quick_start/deu.epub 1751share/calibre/quick_start/deu.epub
1863share/calibre/quick_start/eng.epub 1752share/calibre/quick_start/eng.epub
1864share/calibre/quick_start/fra.epub 1753share/calibre/quick_start/fra.epub
1865share/calibre/quick_start/ita.epub 1754share/calibre/quick_start/ita.epub
 1755share/calibre/quick_start/swe.epub
1866share/calibre/rapydscript/compiler.js.xz 1756share/calibre/rapydscript/compiler.js.xz
1867share/calibre/rapydscript/lib/aes.pyj 1757share/calibre/rapydscript/lib/aes.pyj
1868share/calibre/rapydscript/lib/elementmaker.pyj 1758share/calibre/rapydscript/lib/elementmaker.pyj
1869share/calibre/rapydscript/lib/encodings.pyj 1759share/calibre/rapydscript/lib/encodings.pyj
1870share/calibre/rapydscript/lib/gettext.pyj 1760share/calibre/rapydscript/lib/gettext.pyj
1871share/calibre/rapydscript/lib/math.pyj 1761share/calibre/rapydscript/lib/math.pyj
1872share/calibre/rapydscript/lib/operator.pyj 1762share/calibre/rapydscript/lib/operator.pyj
1873share/calibre/rapydscript/lib/pythonize.pyj 1763share/calibre/rapydscript/lib/pythonize.pyj
1874share/calibre/rapydscript/lib/random.pyj 1764share/calibre/rapydscript/lib/random.pyj
1875share/calibre/rapydscript/lib/re.pyj 1765share/calibre/rapydscript/lib/re.pyj
1876share/calibre/rapydscript/lib/traceback.pyj 1766share/calibre/rapydscript/lib/traceback.pyj
1877share/calibre/rapydscript/lib/uuid.pyj 1767share/calibre/rapydscript/lib/uuid.pyj
1878share/calibre/recipes/10minutos.recipe 1768share/calibre/recipes/10minutos.recipe
1879share/calibre/recipes/180.recipe 1769share/calibre/recipes/180.recipe
1880share/calibre/recipes/1843.recipe 1770share/calibre/recipes/1843.recipe
1881share/calibre/recipes/20_minutos.recipe 1771share/calibre/recipes/20_minutos.recipe
1882share/calibre/recipes/20minutes.recipe 1772share/calibre/recipes/20minutes.recipe
1883share/calibre/recipes/20minutos.recipe 1773share/calibre/recipes/20minutos.recipe
1884share/calibre/recipes/24sata.recipe 1774share/calibre/recipes/24sata.recipe
1885share/calibre/recipes/24sata_rs.recipe 
1886share/calibre/recipes/3dnews.recipe 1775share/calibre/recipes/3dnews.recipe
1887share/calibre/recipes/7seri.recipe 1776share/calibre/recipes/7seri.recipe
 1777share/calibre/recipes/7x7.recipe
1888share/calibre/recipes/Ansa.recipe 1778share/calibre/recipes/Ansa.recipe
1889share/calibre/recipes/DrawAndCook.recipe 1779share/calibre/recipes/DrawAndCook.recipe
1890share/calibre/recipes/ZIVE.sk.recipe 1780share/calibre/recipes/ZIVE.sk.recipe
1891share/calibre/recipes/aabenraalokalavisen_dk.recipe 1781share/calibre/recipes/aabenraalokalavisen_dk.recipe
1892share/calibre/recipes/aachener_nachrichten.recipe 1782share/calibre/recipes/aachener_nachrichten.recipe
1893share/calibre/recipes/aarhuslokalavisen_dk.recipe 1783share/calibre/recipes/aarhuslokalavisen_dk.recipe
1894share/calibre/recipes/aarhusmidtlokalavisen_dk.recipe 1784share/calibre/recipes/aarhusmidtlokalavisen_dk.recipe
1895share/calibre/recipes/aarhusnordlokalavisen_dk.recipe 1785share/calibre/recipes/aarhusnordlokalavisen_dk.recipe
1896share/calibre/recipes/aarhussydlokalavisen_dk.recipe 1786share/calibre/recipes/aarhussydlokalavisen_dk.recipe
1897share/calibre/recipes/aarhusvestlokalavisen_dk.recipe 1787share/calibre/recipes/aarhusvestlokalavisen_dk.recipe
1898share/calibre/recipes/abc.recipe 1788share/calibre/recipes/abc.recipe
1899share/calibre/recipes/abc_au.recipe 1789share/calibre/recipes/abc_au.recipe
1900share/calibre/recipes/abc_es.recipe 1790share/calibre/recipes/abc_es.recipe
@@ -1904,67 +1794,64 @@ share/calibre/recipes/acrimed.recipe @@ -1904,67 +1794,64 @@ share/calibre/recipes/acrimed.recipe
1904share/calibre/recipes/ad.recipe 1794share/calibre/recipes/ad.recipe
1905share/calibre/recipes/adevarul.recipe 1795share/calibre/recipes/adevarul.recipe
1906share/calibre/recipes/adnkronos.recipe 1796share/calibre/recipes/adnkronos.recipe
1907share/calibre/recipes/ads_of_the_world.recipe 1797share/calibre/recipes/ads_of_the_world.recipe
1908share/calibre/recipes/adventure_zone_pl.recipe 1798share/calibre/recipes/adventure_zone_pl.recipe
1909share/calibre/recipes/adventuregamers.recipe 1799share/calibre/recipes/adventuregamers.recipe
1910share/calibre/recipes/aftenposten.recipe 1800share/calibre/recipes/aftenposten.recipe
1911share/calibre/recipes/agrogerila.recipe 1801share/calibre/recipes/agrogerila.recipe
1912share/calibre/recipes/aif_ru.recipe 1802share/calibre/recipes/aif_ru.recipe
1913share/calibre/recipes/air_force_times.recipe 1803share/calibre/recipes/air_force_times.recipe
1914share/calibre/recipes/ajc.recipe 1804share/calibre/recipes/ajc.recipe
1915share/calibre/recipes/ajiajin.recipe 1805share/calibre/recipes/ajiajin.recipe
1916share/calibre/recipes/aksiyon_derigisi.recipe 1806share/calibre/recipes/aksiyon_derigisi.recipe
1917share/calibre/recipes/akter.recipe 
1918share/calibre/recipes/akter_dnevnik.recipe 
1919share/calibre/recipes/aktualne.cz.recipe 1807share/calibre/recipes/aktualne.cz.recipe
1920share/calibre/recipes/al_ahram.recipe 1808share/calibre/recipes/al_ahram.recipe
1921share/calibre/recipes/al_jazeera.recipe 1809share/calibre/recipes/al_jazeera.recipe
1922share/calibre/recipes/al_masry_alyoum_arabic.recipe 1810share/calibre/recipes/al_masry_alyoum_arabic.recipe
1923share/calibre/recipes/al_monitor.recipe 1811share/calibre/recipes/al_monitor.recipe
1924share/calibre/recipes/albert_mohler.recipe 1812share/calibre/recipes/albert_mohler.recipe
1925share/calibre/recipes/albertslundlokalavisen_dk.recipe 1813share/calibre/recipes/albertslundlokalavisen_dk.recipe
1926share/calibre/recipes/alejakomiksu_com.recipe 1814share/calibre/recipes/alejakomiksu_com.recipe
1927share/calibre/recipes/alleroedlokalavisen_dk.recipe 1815share/calibre/recipes/alleroedlokalavisen_dk.recipe
1928share/calibre/recipes/alo_novine.recipe 
1929share/calibre/recipes/alt_om_herning.recipe 1816share/calibre/recipes/alt_om_herning.recipe
1930share/calibre/recipes/alternet.recipe 1817share/calibre/recipes/alternet.recipe
1931share/calibre/recipes/altomdata_dk.recipe 1818share/calibre/recipes/altomdata_dk.recipe
1932share/calibre/recipes/am730.recipe 1819share/calibre/recipes/am730.recipe
1933share/calibre/recipes/amagerbladet_dk.recipe 1820share/calibre/recipes/amagerbladet_dk.recipe
1934share/calibre/recipes/ambito.recipe 1821share/calibre/recipes/ambito.recipe
1935share/calibre/recipes/ambito_financiero.recipe 1822share/calibre/recipes/ambito_financiero.recipe
1936share/calibre/recipes/american_thinker.recipe 1823share/calibre/recipes/american_thinker.recipe
1937share/calibre/recipes/amspec.recipe 1824share/calibre/recipes/amspec.recipe
1938share/calibre/recipes/an_druma_mor.recipe 1825share/calibre/recipes/an_druma_mor.recipe
1939share/calibre/recipes/anandtech.recipe 1826share/calibre/recipes/anandtech.recipe
1940share/calibre/recipes/anchorage_daily.recipe 1827share/calibre/recipes/anchorage_daily.recipe
1941share/calibre/recipes/android_com_pl.recipe 1828share/calibre/recipes/android_com_pl.recipe
1942share/calibre/recipes/animal_politico.recipe 1829share/calibre/recipes/animal_politico.recipe
 1830share/calibre/recipes/anthony_muroni.recipe
1943share/calibre/recipes/antyweb.recipe 1831share/calibre/recipes/antyweb.recipe
1944share/calibre/recipes/ap.recipe 1832share/calibre/recipes/ap.recipe
1945share/calibre/recipes/apcom.recipe 1833share/calibre/recipes/apcom.recipe
1946share/calibre/recipes/apod.recipe 1834share/calibre/recipes/apod.recipe
1947share/calibre/recipes/app_funds.recipe 1835share/calibre/recipes/app_funds.recipe
1948share/calibre/recipes/apple_daily.recipe 1836share/calibre/recipes/apple_daily.recipe
1949share/calibre/recipes/appledaily_tw.recipe 1837share/calibre/recipes/appledaily_tw.recipe
1950share/calibre/recipes/aprospect.recipe 1838share/calibre/recipes/aprospect.recipe
1951share/calibre/recipes/ara_info.recipe 1839share/calibre/recipes/ara_info.recipe
1952share/calibre/recipes/arabian_business.recipe 1840share/calibre/recipes/arabian_business.recipe
1953share/calibre/recipes/arbetaren.recipe 1841share/calibre/recipes/arbetaren.recipe
1954share/calibre/recipes/arcadia.recipe 1842share/calibre/recipes/arcadia.recipe
1955share/calibre/recipes/arcamax.recipe 1843share/calibre/recipes/arcamax.recipe
1956share/calibre/recipes/arizona_republic.recipe 1844share/calibre/recipes/arizona_republic.recipe
1957share/calibre/recipes/army_times.recipe 
1958share/calibre/recipes/arret_sur_images.recipe 1845share/calibre/recipes/arret_sur_images.recipe
1959share/calibre/recipes/ars_technica.recipe 1846share/calibre/recipes/ars_technica.recipe
1960share/calibre/recipes/asco_de_vida.recipe 1847share/calibre/recipes/asco_de_vida.recipe
1961share/calibre/recipes/asia_one.recipe 1848share/calibre/recipes/asia_one.recipe
1962share/calibre/recipes/asianreviewofbooks.recipe 1849share/calibre/recipes/asianreviewofbooks.recipe
1963share/calibre/recipes/astro_news_pl.recipe 1850share/calibre/recipes/astro_news_pl.recipe
1964share/calibre/recipes/athens_news.recipe 1851share/calibre/recipes/athens_news.recipe
1965share/calibre/recipes/atlantic.recipe 1852share/calibre/recipes/atlantic.recipe
1966share/calibre/recipes/atlantic_com.recipe 1853share/calibre/recipes/atlantic_com.recipe
1967share/calibre/recipes/attac_es.recipe 1854share/calibre/recipes/attac_es.recipe
1968share/calibre/recipes/auto.recipe 1855share/calibre/recipes/auto.recipe
1969share/calibre/recipes/auto_blog.recipe 1856share/calibre/recipes/auto_blog.recipe
1970share/calibre/recipes/auto_prove.recipe 1857share/calibre/recipes/auto_prove.recipe
@@ -1995,52 +1882,51 @@ share/calibre/recipes/bbc.recipe @@ -1995,52 +1882,51 @@ share/calibre/recipes/bbc.recipe
1995share/calibre/recipes/bbc_arabic.recipe 1882share/calibre/recipes/bbc_arabic.recipe
1996share/calibre/recipes/bbc_brasil.recipe 1883share/calibre/recipes/bbc_brasil.recipe
1997share/calibre/recipes/bbc_chinese.recipe 1884share/calibre/recipes/bbc_chinese.recipe
1998share/calibre/recipes/bbc_es.recipe 1885share/calibre/recipes/bbc_es.recipe
1999share/calibre/recipes/bbc_fast.recipe 1886share/calibre/recipes/bbc_fast.recipe
2000share/calibre/recipes/bbc_sport.recipe 1887share/calibre/recipes/bbc_sport.recipe
2001share/calibre/recipes/bbcvietnamese.recipe 1888share/calibre/recipes/bbcvietnamese.recipe
2002share/calibre/recipes/benchmark_pl.recipe 1889share/calibre/recipes/benchmark_pl.recipe
2003share/calibre/recipes/beppe_grillo.recipe 1890share/calibre/recipes/beppe_grillo.recipe
2004share/calibre/recipes/berlin_policy_journal.recipe 1891share/calibre/recipes/berlin_policy_journal.recipe
2005share/calibre/recipes/berliner_zeitung.recipe 1892share/calibre/recipes/berliner_zeitung.recipe
2006share/calibre/recipes/berlingske_dk.recipe 1893share/calibre/recipes/berlingske_dk.recipe
2007share/calibre/recipes/berria.recipe 1894share/calibre/recipes/berria.recipe
2008share/calibre/recipes/beta.recipe 
2009share/calibre/recipes/beta_en.recipe 
2010share/calibre/recipes/biamag.recipe 1895share/calibre/recipes/biamag.recipe
2011share/calibre/recipes/biamag_en.recipe 1896share/calibre/recipes/biamag_en.recipe
2012share/calibre/recipes/bianet.recipe 1897share/calibre/recipes/bianet.recipe
2013share/calibre/recipes/big_oven.recipe 1898share/calibre/recipes/big_oven.recipe
2014share/calibre/recipes/big_picture.recipe 1899share/calibre/recipes/big_picture.recipe
2015share/calibre/recipes/biggovernment.recipe 1900share/calibre/recipes/biggovernment.recipe
2016share/calibre/recipes/bighollywood.recipe 1901share/calibre/recipes/bighollywood.recipe
2017share/calibre/recipes/bild_de.recipe 1902share/calibre/recipes/bild_de.recipe
2018share/calibre/recipes/billorielly.recipe 1903share/calibre/recipes/billorielly.recipe
2019share/calibre/recipes/birgun_gazetesi.recipe 1904share/calibre/recipes/birgun_gazetesi.recipe
2020share/calibre/recipes/birmingham_evening_mail.recipe 1905share/calibre/recipes/birmingham_evening_mail.recipe
2021share/calibre/recipes/birmingham_post.recipe 1906share/calibre/recipes/birmingham_post.recipe
2022share/calibre/recipes/bitacora.recipe 1907share/calibre/recipes/bitacora.recipe
2023share/calibre/recipes/biweekly.recipe 
2024share/calibre/recipes/biz_portal.recipe 1908share/calibre/recipes/biz_portal.recipe
2025share/calibre/recipes/blesk.recipe 1909share/calibre/recipes/blesk.recipe
2026share/calibre/recipes/blic.recipe 1910share/calibre/recipes/blic.recipe
2027share/calibre/recipes/blog_da_cidadania.recipe 1911share/calibre/recipes/blog_da_cidadania.recipe
2028share/calibre/recipes/boortz.recipe 1912share/calibre/recipes/boortz.recipe
2029share/calibre/recipes/borse_online.recipe 1913share/calibre/recipes/borse_online.recipe
2030share/calibre/recipes/borsen_dk.recipe 1914share/calibre/recipes/borsen_dk.recipe
2031share/calibre/recipes/boston.com.recipe 1915share/calibre/recipes/boston.com.recipe
 1916share/calibre/recipes/boxis.recipe
2032share/calibre/recipes/brand_eins.recipe 1917share/calibre/recipes/brand_eins.recipe
2033share/calibre/recipes/brasil_de_fato.recipe 1918share/calibre/recipes/brasil_de_fato.recipe
 1919share/calibre/recipes/breaking_mad.recipe
2034share/calibre/recipes/brecha.recipe 1920share/calibre/recipes/brecha.recipe
2035share/calibre/recipes/brewiarz.recipe 1921share/calibre/recipes/brewiarz.recipe
2036share/calibre/recipes/brigitte_de.recipe 1922share/calibre/recipes/brigitte_de.recipe
2037share/calibre/recipes/bt_dk.recipe 1923share/calibre/recipes/bt_dk.recipe
2038share/calibre/recipes/bucataras.recipe 1924share/calibre/recipes/bucataras.recipe
2039share/calibre/recipes/buchreport.recipe 1925share/calibre/recipes/buchreport.recipe
2040share/calibre/recipes/buckmasters.recipe 1926share/calibre/recipes/buckmasters.recipe
2041share/calibre/recipes/buenosaireseconomico.recipe 1927share/calibre/recipes/buenosaireseconomico.recipe
2042share/calibre/recipes/buffalo_news.recipe 1928share/calibre/recipes/buffalo_news.recipe
2043share/calibre/recipes/bugun_gazetesi.recipe 1929share/calibre/recipes/bugun_gazetesi.recipe
2044share/calibre/recipes/business_insider.recipe 1930share/calibre/recipes/business_insider.recipe
2045share/calibre/recipes/business_spectator.recipe 1931share/calibre/recipes/business_spectator.recipe
2046share/calibre/recipes/business_standard.recipe 1932share/calibre/recipes/business_standard.recipe
@@ -2128,26 +2014,27 @@ share/calibre/recipes/corriere_della_ser @@ -2128,26 +2014,27 @@ share/calibre/recipes/corriere_della_ser
2128share/calibre/recipes/corriere_dello_sport.recipe 2014share/calibre/recipes/corriere_dello_sport.recipe
2129share/calibre/recipes/cosmopolitan.recipe 2015share/calibre/recipes/cosmopolitan.recipe
2130share/calibre/recipes/cosmopolitan_de.recipe 2016share/calibre/recipes/cosmopolitan_de.recipe
2131share/calibre/recipes/cosmopolitan_uk.recipe 2017share/calibre/recipes/cosmopolitan_uk.recipe
2132share/calibre/recipes/cotidianul.recipe 2018share/calibre/recipes/cotidianul.recipe
2133share/calibre/recipes/counterpunch.recipe 2019share/calibre/recipes/counterpunch.recipe
2134share/calibre/recipes/countryfile.recipe 2020share/calibre/recipes/countryfile.recipe
2135share/calibre/recipes/courier_mail.recipe 2021share/calibre/recipes/courier_mail.recipe
2136share/calibre/recipes/courrier.recipe 2022share/calibre/recipes/courrier.recipe
2137share/calibre/recipes/courrierinternational.recipe 2023share/calibre/recipes/courrierinternational.recipe
2138share/calibre/recipes/cracked_com.recipe 2024share/calibre/recipes/cracked_com.recipe
2139share/calibre/recipes/craigslist.recipe 2025share/calibre/recipes/craigslist.recipe
2140share/calibre/recipes/credit_slips.recipe 2026share/calibre/recipes/credit_slips.recipe
 2027share/calibre/recipes/cronica.recipe
2141share/calibre/recipes/csid.recipe 2028share/calibre/recipes/csid.recipe
2142share/calibre/recipes/ct24.recipe 2029share/calibre/recipes/ct24.recipe
2143share/calibre/recipes/cubadebate.recipe 2030share/calibre/recipes/cubadebate.recipe
2144share/calibre/recipes/cumhuriyet.recipe 2031share/calibre/recipes/cumhuriyet.recipe
2145share/calibre/recipes/curierulnational.recipe 2032share/calibre/recipes/curierulnational.recipe
2146share/calibre/recipes/cvecezla.recipe 2033share/calibre/recipes/cvecezla.recipe
2147share/calibre/recipes/cyberpresse.recipe 2034share/calibre/recipes/cyberpresse.recipe
2148share/calibre/recipes/cynewslive.recipe 2035share/calibre/recipes/cynewslive.recipe
2149share/calibre/recipes/cyprus_weekly.recipe 2036share/calibre/recipes/cyprus_weekly.recipe
2150share/calibre/recipes/czas_gentlemanow.recipe 2037share/calibre/recipes/czas_gentlemanow.recipe
2151share/calibre/recipes/dachauer_nachrichten.recipe 2038share/calibre/recipes/dachauer_nachrichten.recipe
2152share/calibre/recipes/dagens_industri.recipe 2039share/calibre/recipes/dagens_industri.recipe
2153share/calibre/recipes/dagensmedicin_dk.recipe 2040share/calibre/recipes/dagensmedicin_dk.recipe
@@ -2235,44 +2122,44 @@ share/calibre/recipes/dobanevinosti.reci @@ -2235,44 +2122,44 @@ share/calibre/recipes/dobanevinosti.reci
2235share/calibre/recipes/dobreprogamy.recipe 2122share/calibre/recipes/dobreprogamy.recipe
2236share/calibre/recipes/doghousediaries.recipe 2123share/calibre/recipes/doghousediaries.recipe
2237share/calibre/recipes/dominion.recipe 2124share/calibre/recipes/dominion.recipe
2238share/calibre/recipes/dorfener_anzeiger.recipe 2125share/calibre/recipes/dorfener_anzeiger.recipe
2239share/calibre/recipes/dosisdiarias.recipe 2126share/calibre/recipes/dosisdiarias.recipe
2240share/calibre/recipes/dot_net.recipe 2127share/calibre/recipes/dot_net.recipe
2241share/calibre/recipes/dotpod.recipe 2128share/calibre/recipes/dotpod.recipe
2242share/calibre/recipes/down_to_earth.recipe 2129share/calibre/recipes/down_to_earth.recipe
2243share/calibre/recipes/dr_dk.recipe 2130share/calibre/recipes/dr_dk.recipe
2244share/calibre/recipes/drivelry.recipe 2131share/calibre/recipes/drivelry.recipe
2245share/calibre/recipes/drytooling_pl.recipe 2132share/calibre/recipes/drytooling_pl.recipe
2246share/calibre/recipes/dunya_bizim.recipe 2133share/calibre/recipes/dunya_bizim.recipe
2247share/calibre/recipes/dunya_bulteni.recipe 2134share/calibre/recipes/dunya_bulteni.recipe
 2135share/calibre/recipes/dunyahalleri.recipe
 2136share/calibre/recipes/dunyahalleri_haftaninozeti.recipe
2248share/calibre/recipes/dvhn.recipe 2137share/calibre/recipes/dvhn.recipe
2249share/calibre/recipes/dwutygodnik.recipe 2138share/calibre/recipes/dwutygodnik.recipe
2250share/calibre/recipes/dzial_zagraniczny.recipe 2139share/calibre/recipes/dzial_zagraniczny.recipe
2251share/calibre/recipes/dzieje_pl.recipe 2140share/calibre/recipes/dzieje_pl.recipe
2252share/calibre/recipes/dziennik_baltycki.recipe 2141share/calibre/recipes/dziennik_baltycki.recipe
2253share/calibre/recipes/dziennik_lodzki.recipe 2142share/calibre/recipes/dziennik_lodzki.recipe
2254share/calibre/recipes/dziennik_pl.recipe 2143share/calibre/recipes/dziennik_pl.recipe
2255share/calibre/recipes/dziennik_polski.recipe 2144share/calibre/recipes/dziennik_polski.recipe
2256share/calibre/recipes/dziennik_wschodni.recipe 2145share/calibre/recipes/dziennik_wschodni.recipe
2257share/calibre/recipes/dziennik_zachodni.recipe 2146share/calibre/recipes/dziennik_zachodni.recipe
2258share/calibre/recipes/dziennikzwiazkowy.recipe 2147share/calibre/recipes/dziennikzwiazkowy.recipe
2259share/calibre/recipes/e_novine.recipe 
2260share/calibre/recipes/ebeltoftlokalavisen_dk.recipe 2148share/calibre/recipes/ebeltoftlokalavisen_dk.recipe
2261share/calibre/recipes/ebetrsberger_zeitung.recipe 2149share/calibre/recipes/ebetrsberger_zeitung.recipe
2262share/calibre/recipes/echo_dnia.recipe 2150share/calibre/recipes/echo_dnia.recipe
2263share/calibre/recipes/echo_moskvy.recipe 2151share/calibre/recipes/echo_moskvy.recipe
2264share/calibre/recipes/echo_online.recipe 2152share/calibre/recipes/echo_online.recipe
2265share/calibre/recipes/eclicto.recipe 
2266share/calibre/recipes/eclipseonline.recipe 2153share/calibre/recipes/eclipseonline.recipe
2267share/calibre/recipes/ecogeek.recipe 2154share/calibre/recipes/ecogeek.recipe
2268share/calibre/recipes/economia.recipe 2155share/calibre/recipes/economia.recipe
2269share/calibre/recipes/economico.recipe 2156share/calibre/recipes/economico.recipe
2270share/calibre/recipes/economist.recipe 2157share/calibre/recipes/economist.recipe
2271share/calibre/recipes/economist_free.recipe 2158share/calibre/recipes/economist_free.recipe
2272share/calibre/recipes/ecotrend.recipe 2159share/calibre/recipes/ecotrend.recipe
2273share/calibre/recipes/ecuisine.recipe 2160share/calibre/recipes/ecuisine.recipe
2274share/calibre/recipes/edebistan.recipe 2161share/calibre/recipes/edebistan.recipe
2275share/calibre/recipes/edebiyat_haber.recipe 2162share/calibre/recipes/edebiyat_haber.recipe
2276share/calibre/recipes/edge_conversations.recipe 2163share/calibre/recipes/edge_conversations.recipe
2277share/calibre/recipes/editor_and_publisher.recipe 2164share/calibre/recipes/editor_and_publisher.recipe
2278share/calibre/recipes/editoriali.recipe 2165share/calibre/recipes/editoriali.recipe
@@ -2294,42 +2181,42 @@ share/calibre/recipes/el_malpensante.rec @@ -2294,42 +2181,42 @@ share/calibre/recipes/el_malpensante.rec
2294share/calibre/recipes/el_mercurio_chile.recipe 2181share/calibre/recipes/el_mercurio_chile.recipe
2295share/calibre/recipes/el_mostrador.recipe 2182share/calibre/recipes/el_mostrador.recipe
2296share/calibre/recipes/el_mundo_co.recipe 2183share/calibre/recipes/el_mundo_co.recipe
2297share/calibre/recipes/el_mundo_today.recipe 2184share/calibre/recipes/el_mundo_today.recipe
2298share/calibre/recipes/el_observador.recipe 2185share/calibre/recipes/el_observador.recipe
2299share/calibre/recipes/el_pais.recipe 2186share/calibre/recipes/el_pais.recipe
2300share/calibre/recipes/el_pais_babelia.recipe 2187share/calibre/recipes/el_pais_babelia.recipe
2301share/calibre/recipes/el_pais_uy.recipe 2188share/calibre/recipes/el_pais_uy.recipe
2302share/calibre/recipes/el_periodico.recipe 2189share/calibre/recipes/el_periodico.recipe
2303share/calibre/recipes/el_publico.recipe 2190share/calibre/recipes/el_publico.recipe
2304share/calibre/recipes/el_tiempo.recipe 2191share/calibre/recipes/el_tiempo.recipe
2305share/calibre/recipes/el_universal.recipe 2192share/calibre/recipes/el_universal.recipe
2306share/calibre/recipes/elclubdelebook.recipe 2193share/calibre/recipes/elclubdelebook.recipe
 2194share/calibre/recipes/elcohetealaluna.recipe
2307share/calibre/recipes/elcomercio.recipe 2195share/calibre/recipes/elcomercio.recipe
2308share/calibre/recipes/ele.recipe 2196share/calibre/recipes/ele.recipe
2309share/calibre/recipes/elektroda_pl.recipe 2197share/calibre/recipes/elektroda_pl.recipe
2310share/calibre/recipes/elet_es_irodalom.recipe 2198share/calibre/recipes/elet_es_irodalom.recipe
2311share/calibre/recipes/elmundo.recipe 2199share/calibre/recipes/elmundo.recipe
2312share/calibre/recipes/elpais_impreso.recipe 2200share/calibre/recipes/elpais_impreso.recipe
2313share/calibre/recipes/elpais_semanal.recipe 2201share/calibre/recipes/elpais_semanal.recipe
2314share/calibre/recipes/elperiodico_catalan.recipe 2202share/calibre/recipes/elperiodico_catalan.recipe
2315share/calibre/recipes/elperiodico_spanish.recipe 2203share/calibre/recipes/elperiodico_spanish.recipe
2316share/calibre/recipes/elsevier.recipe 2204share/calibre/recipes/elsevier.recipe
2317share/calibre/recipes/eltiempo_hn.recipe 2205share/calibre/recipes/eltiempo_hn.recipe
2318share/calibre/recipes/eluniversal_ve.recipe 2206share/calibre/recipes/eluniversal_ve.recipe
2319share/calibre/recipes/eluniversalimpresa.recipe 2207share/calibre/recipes/eluniversalimpresa.recipe
2320share/calibre/recipes/eluniverso_ec.recipe 2208share/calibre/recipes/eluniverso_ec.recipe
2321share/calibre/recipes/emg_en.recipe 2209share/calibre/recipes/emg_en.recipe
2322share/calibre/recipes/emg_rs.recipe 
2323share/calibre/recipes/empire_magazine.recipe 2210share/calibre/recipes/empire_magazine.recipe
2324share/calibre/recipes/endgadget.recipe 2211share/calibre/recipes/endgadget.recipe
2325share/calibre/recipes/endgadget_ja.recipe 2212share/calibre/recipes/endgadget_ja.recipe
2326share/calibre/recipes/entrepeneur.recipe 2213share/calibre/recipes/entrepeneur.recipe
2327share/calibre/recipes/eos_wetenschap.recipe 2214share/calibre/recipes/eos_wetenschap.recipe
2328share/calibre/recipes/epl_talk.recipe 2215share/calibre/recipes/epl_talk.recipe
2329share/calibre/recipes/epw.recipe 2216share/calibre/recipes/epw.recipe
2330share/calibre/recipes/equipped.recipe 2217share/calibre/recipes/equipped.recipe
2331share/calibre/recipes/erdinger_anzeiger.recipe 2218share/calibre/recipes/erdinger_anzeiger.recipe
2332share/calibre/recipes/erhvervs_avisen_dk.recipe 2219share/calibre/recipes/erhvervs_avisen_dk.recipe
2333share/calibre/recipes/esbjerglokalavisen_dk.recipe 2220share/calibre/recipes/esbjerglokalavisen_dk.recipe
2334share/calibre/recipes/escrevinhador.recipe 2221share/calibre/recipes/escrevinhador.recipe
2335share/calibre/recipes/esenja.recipe 2222share/calibre/recipes/esenja.recipe
@@ -2436,29 +2323,27 @@ share/calibre/recipes/gazeta_wroclawska. @@ -2436,29 +2323,27 @@ share/calibre/recipes/gazeta_wroclawska.
2436share/calibre/recipes/gazeta_wspolczesna.recipe 2323share/calibre/recipes/gazeta_wspolczesna.recipe
2437share/calibre/recipes/gazeta_wyborcza.recipe 2324share/calibre/recipes/gazeta_wyborcza.recipe
2438share/calibre/recipes/gcn.recipe 2325share/calibre/recipes/gcn.recipe
2439share/calibre/recipes/geek_poke.recipe 2326share/calibre/recipes/geek_poke.recipe
2440share/calibre/recipes/gentoftelokalavisen_dk.recipe 2327share/calibre/recipes/gentoftelokalavisen_dk.recipe
2441share/calibre/recipes/geopolityka.recipe 2328share/calibre/recipes/geopolityka.recipe
2442share/calibre/recipes/geretsrieder_merkur.recipe 2329share/calibre/recipes/geretsrieder_merkur.recipe
2443share/calibre/recipes/german_gov.recipe 2330share/calibre/recipes/german_gov.recipe
2444share/calibre/recipes/gezgin_dergi.recipe 2331share/calibre/recipes/gezgin_dergi.recipe
2445share/calibre/recipes/gildia_pl.recipe 2332share/calibre/recipes/gildia_pl.recipe
2446share/calibre/recipes/gizmodo.recipe 2333share/calibre/recipes/gizmodo.recipe
2447share/calibre/recipes/gkt.recipe 2334share/calibre/recipes/gkt.recipe
2448share/calibre/recipes/glamour.recipe 2335share/calibre/recipes/glamour.recipe
2449share/calibre/recipes/glas_srpske.recipe 
2450share/calibre/recipes/glasgow_herald.recipe 2336share/calibre/recipes/glasgow_herald.recipe
2451share/calibre/recipes/glasjavnosti.recipe 
2452share/calibre/recipes/glenn_greenwald.recipe 2337share/calibre/recipes/glenn_greenwald.recipe
2453share/calibre/recipes/glennbeck.recipe 2338share/calibre/recipes/glennbeck.recipe
2454share/calibre/recipes/globaltimes.recipe 2339share/calibre/recipes/globaltimes.recipe
2455share/calibre/recipes/globe_and_mail.recipe 2340share/calibre/recipes/globe_and_mail.recipe
2456share/calibre/recipes/globes_co_il.recipe 2341share/calibre/recipes/globes_co_il.recipe
2457share/calibre/recipes/glos_wielkopolski.recipe 2342share/calibre/recipes/glos_wielkopolski.recipe
2458share/calibre/recipes/go4it.recipe 2343share/calibre/recipes/go4it.recipe
2459share/calibre/recipes/go_comics.recipe 2344share/calibre/recipes/go_comics.recipe
2460share/calibre/recipes/goal.recipe 2345share/calibre/recipes/goal.recipe
2461share/calibre/recipes/gofin_pl.recipe 2346share/calibre/recipes/gofin_pl.recipe
2462share/calibre/recipes/golem_de.recipe 2347share/calibre/recipes/golem_de.recipe
2463share/calibre/recipes/good_house_keeping.recipe 2348share/calibre/recipes/good_house_keeping.recipe
2464share/calibre/recipes/good_to_know.recipe 2349share/calibre/recipes/good_to_know.recipe
@@ -2541,26 +2426,27 @@ share/calibre/recipes/hotnews.recipe @@ -2541,26 +2426,27 @@ share/calibre/recipes/hotnews.recipe
2541share/calibre/recipes/house_news.recipe 2426share/calibre/recipes/house_news.recipe
2542share/calibre/recipes/houston_chronicle.recipe 2427share/calibre/recipes/houston_chronicle.recipe
2543share/calibre/recipes/howtogeek.recipe 2428share/calibre/recipes/howtogeek.recipe
2544share/calibre/recipes/hoy.recipe 2429share/calibre/recipes/hoy.recipe
2545share/calibre/recipes/hrt.recipe 2430share/calibre/recipes/hrt.recipe
2546share/calibre/recipes/huffingtonpost.recipe 2431share/calibre/recipes/huffingtonpost.recipe
2547share/calibre/recipes/huffingtonpost_uk.recipe 2432share/calibre/recipes/huffingtonpost_uk.recipe
2548share/calibre/recipes/hurriyet.recipe 2433share/calibre/recipes/hurriyet.recipe
2549share/calibre/recipes/hurriyet_daily_news.recipe 2434share/calibre/recipes/hurriyet_daily_news.recipe
2550share/calibre/recipes/hvg.recipe 2435share/calibre/recipes/hvg.recipe
2551share/calibre/recipes/hvidovreavis_dk.recipe 2436share/calibre/recipes/hvidovreavis_dk.recipe
2552share/calibre/recipes/hvidovrelokalavisen_dk.recipe 2437share/calibre/recipes/hvidovrelokalavisen_dk.recipe
2553share/calibre/recipes/ibm_smarter_planet.recipe 2438share/calibre/recipes/ibm_smarter_planet.recipe
 2439share/calibre/recipes/id_pixel.recipe
2554share/calibre/recipes/ideal_almeria.recipe 2440share/calibre/recipes/ideal_almeria.recipe
2555share/calibre/recipes/ideal_granada.recipe 2441share/calibre/recipes/ideal_granada.recipe
2556share/calibre/recipes/ideal_jaen.recipe 2442share/calibre/recipes/ideal_jaen.recipe
2557share/calibre/recipes/idg_now.recipe 2443share/calibre/recipes/idg_now.recipe
2558share/calibre/recipes/idg_se.recipe 2444share/calibre/recipes/idg_se.recipe
2559share/calibre/recipes/idnes.recipe 2445share/calibre/recipes/idnes.recipe
2560share/calibre/recipes/ieeespectrum.recipe 2446share/calibre/recipes/ieeespectrum.recipe
2561share/calibre/recipes/iekspries.recipe 2447share/calibre/recipes/iekspries.recipe
2562share/calibre/recipes/ifzm.recipe 2448share/calibre/recipes/ifzm.recipe
2563share/calibre/recipes/ihned.cz.recipe 2449share/calibre/recipes/ihned.cz.recipe
2564share/calibre/recipes/ihned.recipe 2450share/calibre/recipes/ihned.recipe
2565share/calibre/recipes/iht.recipe 2451share/calibre/recipes/iht.recipe
2566share/calibre/recipes/iktibas.recipe 2452share/calibre/recipes/iktibas.recipe
@@ -2584,37 +2470,34 @@ share/calibre/recipes/indian_express.rec @@ -2584,37 +2470,34 @@ share/calibre/recipes/indian_express.rec
2584share/calibre/recipes/indy_star.recipe 2470share/calibre/recipes/indy_star.recipe
2585share/calibre/recipes/infobae.recipe 2471share/calibre/recipes/infobae.recipe
2586share/calibre/recipes/infomotori.recipe 2472share/calibre/recipes/infomotori.recipe
2587share/calibre/recipes/information_dk.recipe 2473share/calibre/recipes/information_dk.recipe
2588share/calibre/recipes/infoworld.recipe 2474share/calibre/recipes/infoworld.recipe
2589share/calibre/recipes/infra_pl.recipe 2475share/calibre/recipes/infra_pl.recipe
2590share/calibre/recipes/ing_dk.recipe 2476share/calibre/recipes/ing_dk.recipe
2591share/calibre/recipes/inopressa.recipe 2477share/calibre/recipes/inopressa.recipe
2592share/calibre/recipes/inquirer_net.recipe 2478share/calibre/recipes/inquirer_net.recipe
2593share/calibre/recipes/insan_okur.recipe 2479share/calibre/recipes/insan_okur.recipe
2594share/calibre/recipes/insider.recipe 2480share/calibre/recipes/insider.recipe
2595share/calibre/recipes/instapaper.recipe 2481share/calibre/recipes/instapaper.recipe
2596share/calibre/recipes/intelligencer.recipe 2482share/calibre/recipes/intelligencer.recipe
2597share/calibre/recipes/interia_fakty.recipe 
2598share/calibre/recipes/interia_sport.recipe 
2599share/calibre/recipes/intrefete.recipe 2483share/calibre/recipes/intrefete.recipe
2600share/calibre/recipes/io9.recipe 2484share/calibre/recipes/io9.recipe
2601share/calibre/recipes/iol_za.recipe 2485share/calibre/recipes/iol_za.recipe
2602share/calibre/recipes/ionline_pt.recipe 2486share/calibre/recipes/ionline_pt.recipe
2603share/calibre/recipes/iprofesional.recipe 2487share/calibre/recipes/iprofesional.recipe
2604share/calibre/recipes/irish_independent.recipe 2488share/calibre/recipes/irish_independent.recipe
2605share/calibre/recipes/irish_times.recipe 2489share/calibre/recipes/irish_times.recipe
2606share/calibre/recipes/isar-loisachbote.recipe 2490share/calibre/recipes/isar-loisachbote.recipe
2607share/calibre/recipes/ittechblog.recipe 
2608share/calibre/recipes/ivanamilakovic.recipe 2491share/calibre/recipes/ivanamilakovic.recipe
2609share/calibre/recipes/ixbt.recipe 2492share/calibre/recipes/ixbt.recipe
2610share/calibre/recipes/izvestia.recipe 2493share/calibre/recipes/izvestia.recipe
2611share/calibre/recipes/jacobinmag.recipe 2494share/calibre/recipes/jacobinmag.recipe
2612share/calibre/recipes/jagran_josh.recipe 2495share/calibre/recipes/jagran_josh.recipe
2613share/calibre/recipes/jakarta_globe.recipe 2496share/calibre/recipes/jakarta_globe.recipe
2614share/calibre/recipes/jakarta_post.recipe 2497share/calibre/recipes/jakarta_post.recipe
2615share/calibre/recipes/jalopnik.recipe 2498share/calibre/recipes/jalopnik.recipe
2616share/calibre/recipes/japaa.recipe 2499share/calibre/recipes/japaa.recipe
2617share/calibre/recipes/japan_news.recipe 2500share/calibre/recipes/japan_news.recipe
2618share/calibre/recipes/japan_times.recipe 2501share/calibre/recipes/japan_times.recipe
2619share/calibre/recipes/javalobby.recipe 2502share/calibre/recipes/javalobby.recipe
2620share/calibre/recipes/jazzpress.recipe 2503share/calibre/recipes/jazzpress.recipe
@@ -2666,27 +2549,26 @@ share/calibre/recipes/kommersant.recipe @@ -2666,27 +2549,26 @@ share/calibre/recipes/kommersant.recipe
2666share/calibre/recipes/kommunalsundhed_dk.recipe 2549share/calibre/recipes/kommunalsundhed_dk.recipe
2667share/calibre/recipes/kompas.recipe 2550share/calibre/recipes/kompas.recipe
2668share/calibre/recipes/kompiutierra.recipe 2551share/calibre/recipes/kompiutierra.recipe
2669share/calibre/recipes/konflikty_zbrojne.recipe 2552share/calibre/recipes/konflikty_zbrojne.recipe
2670share/calibre/recipes/kopalniawiedzy.recipe 2553share/calibre/recipes/kopalniawiedzy.recipe
2671share/calibre/recipes/korben.recipe 2554share/calibre/recipes/korben.recipe
2672share/calibre/recipes/korea_herald.recipe 2555share/calibre/recipes/korea_herald.recipe
2673share/calibre/recipes/kosmonauta_pl.recipe 2556share/calibre/recipes/kosmonauta_pl.recipe
2674share/calibre/recipes/kotaku.recipe 2557share/calibre/recipes/kotaku.recipe
2675share/calibre/recipes/kp.recipe 2558share/calibre/recipes/kp.recipe
2676share/calibre/recipes/krebs_on_security.recipe 2559share/calibre/recipes/krebs_on_security.recipe
2677share/calibre/recipes/kresy_pl.recipe 2560share/calibre/recipes/kresy_pl.recipe
2678share/calibre/recipes/kristeligt_dagblad_dk.recipe 2561share/calibre/recipes/kristeligt_dagblad_dk.recipe
2679share/calibre/recipes/krstarica.recipe 
2680share/calibre/recipes/krstarica_en.recipe 2562share/calibre/recipes/krstarica_en.recipe
2681share/calibre/recipes/ksiazka_pl.recipe 2563share/calibre/recipes/ksiazka_pl.recipe
2682share/calibre/recipes/kstar.recipe 2564share/calibre/recipes/kstar.recipe
2683share/calibre/recipes/kudika.recipe 2565share/calibre/recipes/kudika.recipe
2684share/calibre/recipes/kudy_z_nudy.recipe 2566share/calibre/recipes/kudy_z_nudy.recipe
2685share/calibre/recipes/kukuburi.recipe 2567share/calibre/recipes/kukuburi.recipe
2686share/calibre/recipes/kurier.recipe 2568share/calibre/recipes/kurier.recipe
2687share/calibre/recipes/kurier_galicyjski.recipe 2569share/calibre/recipes/kurier_galicyjski.recipe
2688share/calibre/recipes/kurier_lubelski.recipe 2570share/calibre/recipes/kurier_lubelski.recipe
2689share/calibre/recipes/kurier_poranny.recipe 2571share/calibre/recipes/kurier_poranny.recipe
2690share/calibre/recipes/kurier_szczecinski.recipe 2572share/calibre/recipes/kurier_szczecinski.recipe
2691share/calibre/recipes/kyungyhang.recipe 2573share/calibre/recipes/kyungyhang.recipe
2692share/calibre/recipes/l_espresso.recipe 2574share/calibre/recipes/l_espresso.recipe
@@ -2735,38 +2617,37 @@ share/calibre/recipes/legeartis.recipe @@ -2735,38 +2617,37 @@ share/calibre/recipes/legeartis.recipe
2735share/calibre/recipes/leggo_it.recipe 2617share/calibre/recipes/leggo_it.recipe
2736share/calibre/recipes/legitymizm.recipe 2618share/calibre/recipes/legitymizm.recipe
2737share/calibre/recipes/leipzer_volkszeitung.recipe 2619share/calibre/recipes/leipzer_volkszeitung.recipe
2738share/calibre/recipes/lemonde_dip.recipe 2620share/calibre/recipes/lemonde_dip.recipe
2739share/calibre/recipes/lenta_ru.recipe 2621share/calibre/recipes/lenta_ru.recipe
2740share/calibre/recipes/lepoint.recipe 2622share/calibre/recipes/lepoint.recipe
2741share/calibre/recipes/lequipe.recipe 2623share/calibre/recipes/lequipe.recipe
2742share/calibre/recipes/les_echos.recipe 2624share/calibre/recipes/les_echos.recipe
2743share/calibre/recipes/lescienze.recipe 2625share/calibre/recipes/lescienze.recipe
2744share/calibre/recipes/lesoir_be.recipe 2626share/calibre/recipes/lesoir_be.recipe
2745share/calibre/recipes/letsgetcritical.recipe 2627share/calibre/recipes/letsgetcritical.recipe
2746share/calibre/recipes/levante.recipe 2628share/calibre/recipes/levante.recipe
2747share/calibre/recipes/lexpress.recipe 2629share/calibre/recipes/lexpress.recipe
2748share/calibre/recipes/libartes.recipe 
2749share/calibre/recipes/liberation.recipe 2630share/calibre/recipes/liberation.recipe
2750share/calibre/recipes/liberatorio_politico.recipe 2631share/calibre/recipes/liberatorio_politico.recipe
2751share/calibre/recipes/libero.recipe 2632share/calibre/recipes/libero.recipe
2752share/calibre/recipes/libertad_digital.recipe 2633share/calibre/recipes/libertad_digital.recipe
2753share/calibre/recipes/liberty_times.recipe 2634share/calibre/recipes/liberty_times.recipe
2754share/calibre/recipes/lidovky.recipe 2635share/calibre/recipes/lidovky.recipe
2755share/calibre/recipes/lifehacker.recipe 2636share/calibre/recipes/lifehacker.recipe
2756share/calibre/recipes/lifehacker_pl.recipe 2637share/calibre/recipes/lifehacker_pl.recipe
2757share/calibre/recipes/lightspeed_magazine.recipe 2638share/calibre/recipes/lightspeed_magazine.recipe
 2639share/calibre/recipes/limba_sarda.recipe
2758share/calibre/recipes/limes.recipe 2640share/calibre/recipes/limes.recipe
2759share/calibre/recipes/linux_journal.recipe 
2760share/calibre/recipes/linux_magazine.recipe 2641share/calibre/recipes/linux_magazine.recipe
2761share/calibre/recipes/linuxportal_pl.recipe 2642share/calibre/recipes/linuxportal_pl.recipe
2762share/calibre/recipes/list_apart.recipe 2643share/calibre/recipes/list_apart.recipe
2763share/calibre/recipes/livemint.recipe 2644share/calibre/recipes/livemint.recipe
2764share/calibre/recipes/living_stones.recipe 2645share/calibre/recipes/living_stones.recipe
2765share/calibre/recipes/lomza.recipe 2646share/calibre/recipes/lomza.recipe
2766share/calibre/recipes/london_free_press.recipe 2647share/calibre/recipes/london_free_press.recipe
2767share/calibre/recipes/los_tiempos_bo.recipe 2648share/calibre/recipes/los_tiempos_bo.recipe
2768share/calibre/recipes/losservatoreromano_it.recipe 2649share/calibre/recipes/losservatoreromano_it.recipe
2769share/calibre/recipes/lr21.recipe 2650share/calibre/recipes/lr21.recipe
2770share/calibre/recipes/lrb.recipe 2651share/calibre/recipes/lrb.recipe
2771share/calibre/recipes/lrb_payed.recipe 2652share/calibre/recipes/lrb_payed.recipe
2772share/calibre/recipes/ludwig_mises.recipe 2653share/calibre/recipes/ludwig_mises.recipe
@@ -2828,27 +2709,26 @@ share/calibre/recipes/ming_pao_vancouver @@ -2828,27 +2709,26 @@ share/calibre/recipes/ming_pao_vancouver
2828share/calibre/recipes/mit_technology_review.recipe 2709share/calibre/recipes/mit_technology_review.recipe
2829share/calibre/recipes/mlody_technik_pl.recipe 2710share/calibre/recipes/mlody_technik_pl.recipe
2830share/calibre/recipes/mmc_rtv.recipe 2711share/calibre/recipes/mmc_rtv.recipe
2831share/calibre/recipes/mobile_bulgaria.recipe 2712share/calibre/recipes/mobile_bulgaria.recipe
2832share/calibre/recipes/mobilenations.recipe 2713share/calibre/recipes/mobilenations.recipe
2833share/calibre/recipes/modoros.recipe 2714share/calibre/recipes/modoros.recipe
2834share/calibre/recipes/moldovaazi.recipe 2715share/calibre/recipes/moldovaazi.recipe
2835share/calibre/recipes/monbiot.recipe 2716share/calibre/recipes/monbiot.recipe
2836share/calibre/recipes/mondedurable.recipe 2717share/calibre/recipes/mondedurable.recipe
2837share/calibre/recipes/monden.recipe 2718share/calibre/recipes/monden.recipe
2838share/calibre/recipes/money_pl.recipe 2719share/calibre/recipes/money_pl.recipe
2839share/calibre/recipes/moneycontrol.recipe 2720share/calibre/recipes/moneycontrol.recipe
2840share/calibre/recipes/moneyro.recipe 2721share/calibre/recipes/moneyro.recipe
2841share/calibre/recipes/monitor.recipe 
2842share/calibre/recipes/montevideo_com.recipe 2722share/calibre/recipes/montevideo_com.recipe
2843share/calibre/recipes/montreal_gazette.recipe 2723share/calibre/recipes/montreal_gazette.recipe
2844share/calibre/recipes/more_intelligent_life.recipe 2724share/calibre/recipes/more_intelligent_life.recipe
2845share/calibre/recipes/moscow_times.recipe 2725share/calibre/recipes/moscow_times.recipe
2846share/calibre/recipes/motherjones.recipe 2726share/calibre/recipes/motherjones.recipe
2847share/calibre/recipes/msdnmag_en.recipe 2727share/calibre/recipes/msdnmag_en.recipe
2848share/calibre/recipes/msnbc.recipe 2728share/calibre/recipes/msnbc.recipe
2849share/calibre/recipes/msnsankei.recipe 2729share/calibre/recipes/msnsankei.recipe
2850share/calibre/recipes/mult_kor.recipe 2730share/calibre/recipes/mult_kor.recipe
2851share/calibre/recipes/mumbai_mirror.recipe 2731share/calibre/recipes/mumbai_mirror.recipe
2852share/calibre/recipes/munchner_merkur_nord.recipe 2732share/calibre/recipes/munchner_merkur_nord.recipe
2853share/calibre/recipes/munchner_merkur_stadt.recipe 2733share/calibre/recipes/munchner_merkur_stadt.recipe
2854share/calibre/recipes/munchner_merkur_sud.recipe 2734share/calibre/recipes/munchner_merkur_sud.recipe
@@ -2875,27 +2755,26 @@ share/calibre/recipes/national_post.reci @@ -2875,27 +2755,26 @@ share/calibre/recipes/national_post.reci
2875share/calibre/recipes/nationalgeographicjp.recipe 2755share/calibre/recipes/nationalgeographicjp.recipe
2876share/calibre/recipes/nationalgeoro.recipe 2756share/calibre/recipes/nationalgeoro.recipe
2877share/calibre/recipes/nationalreviewonline.recipe 2757share/calibre/recipes/nationalreviewonline.recipe
2878share/calibre/recipes/nauka_w_polsce.recipe 2758share/calibre/recipes/nauka_w_polsce.recipe
2879share/calibre/recipes/navalny.recipe 2759share/calibre/recipes/navalny.recipe
2880share/calibre/recipes/navegalo.recipe 2760share/calibre/recipes/navegalo.recipe
2881share/calibre/recipes/navy_times.recipe 2761share/calibre/recipes/navy_times.recipe
2882share/calibre/recipes/nbonline.recipe 2762share/calibre/recipes/nbonline.recipe
2883share/calibre/recipes/ncrnext.recipe 2763share/calibre/recipes/ncrnext.recipe
2884share/calibre/recipes/nejm.recipe 2764share/calibre/recipes/nejm.recipe
2885share/calibre/recipes/neowin.recipe 2765share/calibre/recipes/neowin.recipe
2886share/calibre/recipes/nepszabadsag.recipe 2766share/calibre/recipes/nepszabadsag.recipe
2887share/calibre/recipes/netzpolitik.recipe 2767share/calibre/recipes/netzpolitik.recipe
2888share/calibre/recipes/neu_osnabrucker_zeitung.recipe 
2889share/calibre/recipes/neviditelny_pes.recipe 2768share/calibre/recipes/neviditelny_pes.recipe
2890share/calibre/recipes/new_london_day.recipe 2769share/calibre/recipes/new_london_day.recipe
2891share/calibre/recipes/new_scientist.recipe 2770share/calibre/recipes/new_scientist.recipe
2892share/calibre/recipes/new_statesman.recipe 2771share/calibre/recipes/new_statesman.recipe
2893share/calibre/recipes/new_york_review_of_books.recipe 2772share/calibre/recipes/new_york_review_of_books.recipe
2894share/calibre/recipes/new_york_review_of_books_no_sub.recipe 2773share/calibre/recipes/new_york_review_of_books_no_sub.recipe
2895share/calibre/recipes/new_yorker.recipe 2774share/calibre/recipes/new_yorker.recipe
2896share/calibre/recipes/news24.recipe 2775share/calibre/recipes/news24.recipe
2897share/calibre/recipes/news_busters.recipe 2776share/calibre/recipes/news_busters.recipe
2898share/calibre/recipes/news_times.recipe 2777share/calibre/recipes/news_times.recipe
2899share/calibre/recipes/newsbeast.recipe 2778share/calibre/recipes/newsbeast.recipe
2900share/calibre/recipes/newsmoldova.recipe 2779share/calibre/recipes/newsmoldova.recipe
2901share/calibre/recipes/newsobs.recipe 2780share/calibre/recipes/newsobs.recipe
@@ -2922,27 +2801,26 @@ share/calibre/recipes/non_leggerlo.recip @@ -2922,27 +2801,26 @@ share/calibre/recipes/non_leggerlo.recip
2922share/calibre/recipes/norddjurslokalavisen_dk.recipe 2801share/calibre/recipes/norddjurslokalavisen_dk.recipe
2923share/calibre/recipes/nordjyske_dk.recipe 2802share/calibre/recipes/nordjyske_dk.recipe
2924share/calibre/recipes/nortecastilla.recipe 2803share/calibre/recipes/nortecastilla.recipe
2925share/calibre/recipes/nos_nl.recipe 2804share/calibre/recipes/nos_nl.recipe
2926share/calibre/recipes/noticias_r7.recipe 2805share/calibre/recipes/noticias_r7.recipe
2927share/calibre/recipes/noticias_unb.recipe 2806share/calibre/recipes/noticias_unb.recipe
2928share/calibre/recipes/novaya_gazeta.recipe 2807share/calibre/recipes/novaya_gazeta.recipe
2929share/calibre/recipes/novilist_novine_hr.recipe 2808share/calibre/recipes/novilist_novine_hr.recipe
2930share/calibre/recipes/novilist_portal_hr.recipe 2809share/calibre/recipes/novilist_portal_hr.recipe
2931share/calibre/recipes/novinite.recipe 2810share/calibre/recipes/novinite.recipe
2932share/calibre/recipes/novinite_bg.recipe 2811share/calibre/recipes/novinite_bg.recipe
2933share/calibre/recipes/novinky.cz.recipe 2812share/calibre/recipes/novinky.cz.recipe
2934share/calibre/recipes/novinky.recipe 2813share/calibre/recipes/novinky.recipe
2935share/calibre/recipes/novistandard.recipe 
2936share/calibre/recipes/novosti.recipe 2814share/calibre/recipes/novosti.recipe
2937share/calibre/recipes/now_toronto.recipe 2815share/calibre/recipes/now_toronto.recipe
2938share/calibre/recipes/nowa_fantastyka.recipe 2816share/calibre/recipes/nowa_fantastyka.recipe
2939share/calibre/recipes/nowiny_rybnik.recipe 2817share/calibre/recipes/nowiny_rybnik.recipe
2940share/calibre/recipes/nowy_ekran.recipe 2818share/calibre/recipes/nowy_ekran.recipe
2941share/calibre/recipes/nowy_obywatel.recipe 2819share/calibre/recipes/nowy_obywatel.recipe
2942share/calibre/recipes/noz.recipe 2820share/calibre/recipes/noz.recipe
2943share/calibre/recipes/npr.recipe 2821share/calibre/recipes/npr.recipe
2944share/calibre/recipes/npr_music_blogs.recipe 2822share/calibre/recipes/npr_music_blogs.recipe
2945share/calibre/recipes/nrc-nl-epub.recipe 2823share/calibre/recipes/nrc-nl-epub.recipe
2946share/calibre/recipes/nrc.nl.recipe 2824share/calibre/recipes/nrc.nl.recipe
2947share/calibre/recipes/nrc_handelsblad.recipe 2825share/calibre/recipes/nrc_handelsblad.recipe
2948share/calibre/recipes/nrc_next.recipe 2826share/calibre/recipes/nrc_next.recipe
@@ -2958,26 +2836,27 @@ share/calibre/recipes/nuus24.recipe @@ -2958,26 +2836,27 @@ share/calibre/recipes/nuus24.recipe
2958share/calibre/recipes/nymag.recipe 2836share/calibre/recipes/nymag.recipe
2959share/calibre/recipes/nypost.recipe 2837share/calibre/recipes/nypost.recipe
2960share/calibre/recipes/nytimes.recipe 2838share/calibre/recipes/nytimes.recipe
2961share/calibre/recipes/nytimes_sports.recipe 2839share/calibre/recipes/nytimes_sports.recipe
2962share/calibre/recipes/nytimes_sub.recipe 2840share/calibre/recipes/nytimes_sub.recipe
2963share/calibre/recipes/nytimes_tech.recipe 2841share/calibre/recipes/nytimes_tech.recipe
2964share/calibre/recipes/nytimesbook.recipe 2842share/calibre/recipes/nytimesbook.recipe
2965share/calibre/recipes/nzherald.recipe 2843share/calibre/recipes/nzherald.recipe
2966share/calibre/recipes/nzz_folio.recipe 2844share/calibre/recipes/nzz_folio.recipe
2967share/calibre/recipes/nzz_ger.recipe 2845share/calibre/recipes/nzz_ger.recipe
2968share/calibre/recipes/nzz_webpaper.recipe 2846share/calibre/recipes/nzz_webpaper.recipe
2969share/calibre/recipes/o_globo.recipe 2847share/calibre/recipes/o_globo.recipe
2970share/calibre/recipes/oakland_north.recipe 2848share/calibre/recipes/oakland_north.recipe
 2849share/calibre/recipes/oba.recipe
2971share/calibre/recipes/observa_digital.recipe 2850share/calibre/recipes/observa_digital.recipe
2972share/calibre/recipes/observatorul_cultural.recipe 2851share/calibre/recipes/observatorul_cultural.recipe
2973share/calibre/recipes/observer.recipe 2852share/calibre/recipes/observer.recipe
2974share/calibre/recipes/observer_gb.recipe 2853share/calibre/recipes/observer_gb.recipe
2975share/calibre/recipes/oc_register.recipe 2854share/calibre/recipes/oc_register.recipe
2976share/calibre/recipes/odenselokalavisen_dk.recipe 2855share/calibre/recipes/odenselokalavisen_dk.recipe
2977share/calibre/recipes/odkrywcy_pl.recipe 2856share/calibre/recipes/odkrywcy_pl.recipe
2978share/calibre/recipes/oesterbroavis_dk.recipe 2857share/calibre/recipes/oesterbroavis_dk.recipe
2979share/calibre/recipes/office_space.recipe 2858share/calibre/recipes/office_space.recipe
2980share/calibre/recipes/oilprice.recipe 2859share/calibre/recipes/oilprice.recipe
2981share/calibre/recipes/oldnewthing.recipe 2860share/calibre/recipes/oldnewthing.recipe
2982share/calibre/recipes/omgubuntu.recipe 2861share/calibre/recipes/omgubuntu.recipe
2983share/calibre/recipes/onda_rock.recipe 2862share/calibre/recipes/onda_rock.recipe
@@ -2987,37 +2866,37 @@ share/calibre/recipes/opinion_bo.recipe @@ -2987,37 +2866,37 @@ share/calibre/recipes/opinion_bo.recipe
2987share/calibre/recipes/optyczne_pl.recipe 2866share/calibre/recipes/optyczne_pl.recipe
2988share/calibre/recipes/oregonian.recipe 2867share/calibre/recipes/oregonian.recipe
2989share/calibre/recipes/oreilly_premium.recipe 2868share/calibre/recipes/oreilly_premium.recipe
2990share/calibre/recipes/oriental_daily.recipe 2869share/calibre/recipes/oriental_daily.recipe
2991share/calibre/recipes/origo_hu.recipe 2870share/calibre/recipes/origo_hu.recipe
2992share/calibre/recipes/orlando_sentinel.recipe 2871share/calibre/recipes/orlando_sentinel.recipe
2993share/calibre/recipes/orsai.recipe 2872share/calibre/recipes/orsai.recipe
2994share/calibre/recipes/osel_cz.recipe 2873share/calibre/recipes/osel_cz.recipe
2995share/calibre/recipes/osw.recipe 2874share/calibre/recipes/osw.recipe
2996share/calibre/recipes/osworld_pl.recipe 2875share/calibre/recipes/osworld_pl.recipe
2997share/calibre/recipes/ottawa_citizen.recipe 2876share/calibre/recipes/ottawa_citizen.recipe
2998share/calibre/recipes/ourdailybread.recipe 2877share/calibre/recipes/ourdailybread.recipe
2999share/calibre/recipes/outlook_india.recipe 2878share/calibre/recipes/outlook_india.recipe
3000share/calibre/recipes/overclock_pl.recipe 
3001share/calibre/recipes/oxford_mail.recipe 2879share/calibre/recipes/oxford_mail.recipe
3002share/calibre/recipes/padreydecano.recipe 2880share/calibre/recipes/padreydecano.recipe
3003share/calibre/recipes/pagina12.recipe 2881share/calibre/recipes/pagina12.recipe
3004share/calibre/recipes/pagina_12_print_ed.recipe 2882share/calibre/recipes/pagina_12_print_ed.recipe
3005share/calibre/recipes/pajama.recipe 2883share/calibre/recipes/pajama.recipe
3006share/calibre/recipes/palmtop_pl.recipe 2884share/calibre/recipes/palmtop_pl.recipe
3007share/calibre/recipes/pambianco.recipe 2885share/calibre/recipes/pambianco.recipe
3008share/calibre/recipes/pandodaily.recipe 2886share/calibre/recipes/pandodaily.recipe
3009share/calibre/recipes/panorama.recipe 2887share/calibre/recipes/panorama.recipe
3010share/calibre/recipes/paperli_topic.recipe 2888share/calibre/recipes/paperli_topic.recipe
 2889share/calibre/recipes/parisreview.recipe
3011share/calibre/recipes/parlamentni_listy.recipe 2890share/calibre/recipes/parlamentni_listy.recipe
3012share/calibre/recipes/patente_de_corso.recipe 2891share/calibre/recipes/patente_de_corso.recipe
3013share/calibre/recipes/pc_advisor.recipe 2892share/calibre/recipes/pc_advisor.recipe
3014share/calibre/recipes/pc_arena.recipe 2893share/calibre/recipes/pc_arena.recipe
3015share/calibre/recipes/pc_centre_pl.recipe 2894share/calibre/recipes/pc_centre_pl.recipe
3016share/calibre/recipes/pc_foster.recipe 2895share/calibre/recipes/pc_foster.recipe
3017share/calibre/recipes/pc_lab.recipe 2896share/calibre/recipes/pc_lab.recipe
3018share/calibre/recipes/pc_mag.recipe 2897share/calibre/recipes/pc_mag.recipe
3019share/calibre/recipes/pc_world.recipe 2898share/calibre/recipes/pc_world.recipe
3020share/calibre/recipes/pcworld_hu.recipe 2899share/calibre/recipes/pcworld_hu.recipe
3021share/calibre/recipes/pcworldro.recipe 2900share/calibre/recipes/pcworldro.recipe
3022share/calibre/recipes/pecat.recipe 2901share/calibre/recipes/pecat.recipe
3023share/calibre/recipes/penguin_news.recipe 2902share/calibre/recipes/penguin_news.recipe
@@ -3056,51 +2935,51 @@ share/calibre/recipes/polizeipress_de.re @@ -3056,51 +2935,51 @@ share/calibre/recipes/polizeipress_de.re
3056share/calibre/recipes/polska_times.recipe 2935share/calibre/recipes/polska_times.recipe
3057share/calibre/recipes/polter_pl.recipe 2936share/calibre/recipes/polter_pl.recipe
3058share/calibre/recipes/popscience.recipe 2937share/calibre/recipes/popscience.recipe
3059share/calibre/recipes/poradnia_pwn.recipe 2938share/calibre/recipes/poradnia_pwn.recipe
3060share/calibre/recipes/portafolio.recipe 2939share/calibre/recipes/portafolio.recipe
3061share/calibre/recipes/portfolio.recipe 2940share/calibre/recipes/portfolio.recipe
3062share/calibre/recipes/portfolio_hu.recipe 2941share/calibre/recipes/portfolio_hu.recipe
3063share/calibre/recipes/portfolio_hu_hu.recipe 2942share/calibre/recipes/portfolio_hu_hu.recipe
3064share/calibre/recipes/post_today.recipe 2943share/calibre/recipes/post_today.recipe
3065share/calibre/recipes/poughkeepsie_journal.recipe 2944share/calibre/recipes/poughkeepsie_journal.recipe
3066share/calibre/recipes/ppe_pl.recipe 2945share/calibre/recipes/ppe_pl.recipe
3067share/calibre/recipes/praguemonitor.recipe 2946share/calibre/recipes/praguemonitor.recipe
3068share/calibre/recipes/pravda.recipe 2947share/calibre/recipes/pravda.recipe
3069share/calibre/recipes/pravda_en.recipe 
3070share/calibre/recipes/pravda_it.recipe 2948share/calibre/recipes/pravda_it.recipe
3071share/calibre/recipes/pravda_por.recipe 2949share/calibre/recipes/pravda_por.recipe
3072share/calibre/recipes/pravda_rs.recipe 2950share/calibre/recipes/pravda_rs.recipe
3073share/calibre/recipes/pravda_ru.recipe 2951share/calibre/recipes/pravda_ru.recipe
3074share/calibre/recipes/pravo.recipe 2952share/calibre/recipes/pravo.recipe
3075share/calibre/recipes/prawica_net.recipe 2953share/calibre/recipes/prawica_net.recipe
3076share/calibre/recipes/presse_portal.recipe 2954share/calibre/recipes/presse_portal.recipe
3077share/calibre/recipes/presseurop.recipe 2955share/calibre/recipes/presseurop.recipe
3078share/calibre/recipes/pressonline.recipe 2956share/calibre/recipes/pressonline.recipe
3079share/calibre/recipes/pressthink.recipe 2957share/calibre/recipes/pressthink.recipe
3080share/calibre/recipes/private_eye.recipe 2958share/calibre/recipes/private_eye.recipe
3081share/calibre/recipes/pro_linux_de.recipe 2959share/calibre/recipes/pro_linux_de.recipe
3082share/calibre/recipes/pro_physik.recipe 2960share/calibre/recipes/pro_physik.recipe
3083share/calibre/recipes/projo.recipe 2961share/calibre/recipes/projo.recipe
3084share/calibre/recipes/promotor.recipe 2962share/calibre/recipes/promotor.recipe
3085share/calibre/recipes/propublica.recipe 2963share/calibre/recipes/propublica.recipe
3086share/calibre/recipes/prospectmaguk.recipe 2964share/calibre/recipes/prospectmaguk.recipe
3087share/calibre/recipes/prosport.recipe 2965share/calibre/recipes/prosport.recipe
3088share/calibre/recipes/prostamerika.recipe 2966share/calibre/recipes/prostamerika.recipe
3089share/calibre/recipes/protagon.recipe 2967share/calibre/recipes/protagon.recipe
3090share/calibre/recipes/protvmagazin.recipe 2968share/calibre/recipes/protvmagazin.recipe
3091share/calibre/recipes/psych.recipe 2969share/calibre/recipes/psych.recipe
3092share/calibre/recipes/psychologies.recipe 2970share/calibre/recipes/psychologies.recipe
3093share/calibre/recipes/pubblico_giornale.recipe 2971share/calibre/recipes/pubblico_giornale.recipe
 2972share/calibre/recipes/publicdomainreview_org.recipe
3094share/calibre/recipes/publico.recipe 2973share/calibre/recipes/publico.recipe
3095share/calibre/recipes/publika.recipe 2974share/calibre/recipes/publika.recipe
3096share/calibre/recipes/puls_biznesu.recipe 2975share/calibre/recipes/puls_biznesu.recipe
3097share/calibre/recipes/punto_informatico.recipe 2976share/calibre/recipes/punto_informatico.recipe
3098share/calibre/recipes/pure_pc.recipe 2977share/calibre/recipes/pure_pc.recipe
3099share/calibre/recipes/pvp_online.recipe 2978share/calibre/recipes/pvp_online.recipe
3100share/calibre/recipes/queleer.recipe 2979share/calibre/recipes/queleer.recipe
3101share/calibre/recipes/queueacmorg.recipe 2980share/calibre/recipes/queueacmorg.recipe
3102share/calibre/recipes/quotidiano.recipe 2981share/calibre/recipes/quotidiano.recipe
3103share/calibre/recipes/rabble_ca.recipe 2982share/calibre/recipes/rabble_ca.recipe
3104share/calibre/recipes/racjonalista_pl.recipe 2983share/calibre/recipes/racjonalista_pl.recipe
3105share/calibre/recipes/radikal_tr.recipe 2984share/calibre/recipes/radikal_tr.recipe
3106share/calibre/recipes/radio_prague.recipe 2985share/calibre/recipes/radio_prague.recipe
@@ -3120,53 +2999,56 @@ share/calibre/recipes/regina_leader_post @@ -3120,53 +2999,56 @@ share/calibre/recipes/regina_leader_post
3120share/calibre/recipes/replicavedetelor.recipe 2999share/calibre/recipes/replicavedetelor.recipe
3121share/calibre/recipes/republica.recipe 3000share/calibre/recipes/republica.recipe
3122share/calibre/recipes/republika.recipe 3001share/calibre/recipes/republika.recipe
3123share/calibre/recipes/res_publica.recipe 3002share/calibre/recipes/res_publica.recipe
3124share/calibre/recipes/respekt_magazine.recipe 3003share/calibre/recipes/respekt_magazine.recipe
3125share/calibre/recipes/reuters.recipe 3004share/calibre/recipes/reuters.recipe
3126share/calibre/recipes/reuters_ja.recipe 3005share/calibre/recipes/reuters_ja.recipe
3127share/calibre/recipes/revista_bla.recipe 3006share/calibre/recipes/revista_bla.recipe
3128share/calibre/recipes/revista_cromos.recipe 3007share/calibre/recipes/revista_cromos.recipe
3129share/calibre/recipes/revista_muy.recipe 3008share/calibre/recipes/revista_muy.recipe
3130share/calibre/recipes/revista_piaui.recipe 3009share/calibre/recipes/revista_piaui.recipe
3131share/calibre/recipes/revista_semana.recipe 3010share/calibre/recipes/revista_semana.recipe
3132share/calibre/recipes/revista_summa.recipe 3011share/calibre/recipes/revista_summa.recipe
 3012share/calibre/recipes/revista_veintitres.recipe
3133share/calibre/recipes/rga.recipe 3013share/calibre/recipes/rga.recipe
3134share/calibre/recipes/rheinische_post.recipe 3014share/calibre/recipes/rheinische_post.recipe
3135share/calibre/recipes/ria_ru.recipe 3015share/calibre/recipes/ria_ru.recipe
3136share/calibre/recipes/rian_eng.recipe 3016share/calibre/recipes/rian_eng.recipe
3137share/calibre/recipes/rian_spa.recipe 3017share/calibre/recipes/rian_spa.recipe
3138share/calibre/recipes/rmf24_ESKN.recipe 3018share/calibre/recipes/rmf24_ESKN.recipe
3139share/calibre/recipes/rmf24_fakty.recipe 3019share/calibre/recipes/rmf24_fakty.recipe
3140share/calibre/recipes/rmf24_opinie.recipe 3020share/calibre/recipes/rmf24_opinie.recipe
3141share/calibre/recipes/roger_ebert.recipe 3021share/calibre/recipes/roger_ebert.recipe
3142share/calibre/recipes/roger_ebert_blog.recipe 3022share/calibre/recipes/roger_ebert_blog.recipe
3143share/calibre/recipes/rollingstone.recipe 3023share/calibre/recipes/rollingstone.recipe
3144share/calibre/recipes/romanialibera.recipe 3024share/calibre/recipes/romanialibera.recipe
3145share/calibre/recipes/root.recipe 3025share/calibre/recipes/root.recipe
3146share/calibre/recipes/roskildelokalavisen_dk.recipe 3026share/calibre/recipes/roskildelokalavisen_dk.recipe
3147share/calibre/recipes/rossijkaja_gazeta.recipe 3027share/calibre/recipes/rossijkaja_gazeta.recipe
3148share/calibre/recipes/rte.recipe 3028share/calibre/recipes/rte.recipe
3149share/calibre/recipes/rtnews.recipe 3029share/calibre/recipes/rtnews.recipe
3150share/calibre/recipes/rts.recipe 3030share/calibre/recipes/rts.recipe
3151share/calibre/recipes/rudersdallokalavisen_dk.recipe 3031share/calibre/recipes/rudersdallokalavisen_dk.recipe
3152share/calibre/recipes/rue89.recipe 3032share/calibre/recipes/rue89.recipe
3153share/calibre/recipes/rushisaband.recipe 3033share/calibre/recipes/rushisaband.recipe
3154share/calibre/recipes/rusiahoy.recipe 3034share/calibre/recipes/rusiahoy.recipe
 3035share/calibre/recipes/russiafeed.recipe
3155share/calibre/recipes/rybinski.recipe 3036share/calibre/recipes/rybinski.recipe
3156share/calibre/recipes/rynek_infrastruktury.recipe 3037share/calibre/recipes/rynek_infrastruktury.recipe
3157share/calibre/recipes/rynek_kolejowy.recipe 3038share/calibre/recipes/rynek_kolejowy.recipe
3158share/calibre/recipes/rynek_zdrowia.recipe 3039share/calibre/recipes/rynek_zdrowia.recipe
3159share/calibre/recipes/rzeczpospolita.recipe 3040share/calibre/recipes/rzeczpospolita.recipe
 3041share/calibre/recipes/sa_gazeta.recipe
3160share/calibre/recipes/sabah.recipe 3042share/calibre/recipes/sabah.recipe
3161share/calibre/recipes/sabit_fikir.recipe 3043share/calibre/recipes/sabit_fikir.recipe
3162share/calibre/recipes/sage_news.recipe 3044share/calibre/recipes/sage_news.recipe
3163share/calibre/recipes/sage_news_opinion.recipe 3045share/calibre/recipes/sage_news_opinion.recipe
3164share/calibre/recipes/salon.recipe 3046share/calibre/recipes/salon.recipe
3165share/calibre/recipes/salonica_press_news.recipe 3047share/calibre/recipes/salonica_press_news.recipe
3166share/calibre/recipes/samanyolu_haber.recipe 3048share/calibre/recipes/samanyolu_haber.recipe
3167share/calibre/recipes/samanyolu_teknoloji.recipe 3049share/calibre/recipes/samanyolu_teknoloji.recipe
3168share/calibre/recipes/samcik_blox.recipe 3050share/calibre/recipes/samcik_blox.recipe
3169share/calibre/recipes/san_fran_chronicle.recipe 3051share/calibre/recipes/san_fran_chronicle.recipe
3170share/calibre/recipes/sanjosemercurynews.recipe 3052share/calibre/recipes/sanjosemercurynews.recipe
3171share/calibre/recipes/sarajevo_x.recipe 3053share/calibre/recipes/sarajevo_x.recipe
3172share/calibre/recipes/saskatoon_star_phoenix.recipe 3054share/calibre/recipes/saskatoon_star_phoenix.recipe
@@ -3263,27 +3145,26 @@ share/calibre/recipes/sunday_times_magaz @@ -3263,27 +3145,26 @@ share/calibre/recipes/sunday_times_magaz
3263share/calibre/recipes/superbebe.recipe 3145share/calibre/recipes/superbebe.recipe
3264share/calibre/recipes/superesportes.recipe 3146share/calibre/recipes/superesportes.recipe
3265share/calibre/recipes/svd_se.recipe 3147share/calibre/recipes/svd_se.recipe
3266share/calibre/recipes/swiat_obrazu.recipe 3148share/calibre/recipes/swiat_obrazu.recipe
3267share/calibre/recipes/swiatkindle.recipe 3149share/calibre/recipes/swiatkindle.recipe
3268share/calibre/recipes/syddjurslokalavisen_dk.recipe 3150share/calibre/recipes/syddjurslokalavisen_dk.recipe
3269share/calibre/recipes/tablety_pl.recipe 3151share/calibre/recipes/tablety_pl.recipe
3270share/calibre/recipes/tabu.recipe 3152share/calibre/recipes/tabu.recipe
3271share/calibre/recipes/tagesan.recipe 3153share/calibre/recipes/tagesan.recipe
3272share/calibre/recipes/tagesspiegel.recipe 3154share/calibre/recipes/tagesspiegel.recipe
3273share/calibre/recipes/taggeschau_de.recipe 3155share/calibre/recipes/taggeschau_de.recipe
3274share/calibre/recipes/taipei.recipe 3156share/calibre/recipes/taipei.recipe
3275share/calibre/recipes/tanea.recipe 3157share/calibre/recipes/tanea.recipe
3276share/calibre/recipes/tanjug.recipe 
3277share/calibre/recipes/tanuki.recipe 3158share/calibre/recipes/tanuki.recipe
3278share/calibre/recipes/tawernarpg_pl.recipe 3159share/calibre/recipes/tawernarpg_pl.recipe
3279share/calibre/recipes/taz.recipe 3160share/calibre/recipes/taz.recipe
3280share/calibre/recipes/taz_rss.recipe 3161share/calibre/recipes/taz_rss.recipe
3281share/calibre/recipes/tech_economy.recipe 3162share/calibre/recipes/tech_economy.recipe
3282share/calibre/recipes/tech_world.recipe 3163share/calibre/recipes/tech_world.recipe
3283share/calibre/recipes/techcrunch.recipe 3164share/calibre/recipes/techcrunch.recipe
3284share/calibre/recipes/techdirt.recipe 3165share/calibre/recipes/techdirt.recipe
3285share/calibre/recipes/technology_review.recipe 3166share/calibre/recipes/technology_review.recipe
3286share/calibre/recipes/technology_review_de.recipe 3167share/calibre/recipes/technology_review_de.recipe
3287share/calibre/recipes/techtarget.recipe 3168share/calibre/recipes/techtarget.recipe
3288share/calibre/recipes/tedneward.recipe 3169share/calibre/recipes/tedneward.recipe
3289share/calibre/recipes/tegernseer_zeitung.recipe 3170share/calibre/recipes/tegernseer_zeitung.recipe
@@ -3295,26 +3176,27 @@ share/calibre/recipes/telepolis_artikel. @@ -3295,26 +3176,27 @@ share/calibre/recipes/telepolis_artikel.
3295share/calibre/recipes/telepolis_pl.recipe 3176share/calibre/recipes/telepolis_pl.recipe
3296share/calibre/recipes/teleread.recipe 3177share/calibre/recipes/teleread.recipe
3297share/calibre/recipes/thai_post_daily.recipe 3178share/calibre/recipes/thai_post_daily.recipe
3298share/calibre/recipes/thairath.recipe 3179share/calibre/recipes/thairath.recipe
3299share/calibre/recipes/the_age.recipe 3180share/calibre/recipes/the_age.recipe
3300share/calibre/recipes/the_budget_fashionista.recipe 3181share/calibre/recipes/the_budget_fashionista.recipe
3301share/calibre/recipes/the_clinic_online.recipe 3182share/calibre/recipes/the_clinic_online.recipe
3302share/calibre/recipes/the_conversation.recipe 3183share/calibre/recipes/the_conversation.recipe
3303share/calibre/recipes/the_daily_news_egypt.recipe 3184share/calibre/recipes/the_daily_news_egypt.recipe
3304share/calibre/recipes/the_escapist.recipe 3185share/calibre/recipes/the_escapist.recipe
3305share/calibre/recipes/the_feature.recipe 3186share/calibre/recipes/the_feature.recipe
3306share/calibre/recipes/the_freeman.recipe 3187share/calibre/recipes/the_freeman.recipe
3307share/calibre/recipes/the_friday_times.recipe 3188share/calibre/recipes/the_friday_times.recipe
 3189share/calibre/recipes/the_insider.recipe
3308share/calibre/recipes/the_journal.recipe 3190share/calibre/recipes/the_journal.recipe
3309share/calibre/recipes/the_manila_bulletin.recipe 3191share/calibre/recipes/the_manila_bulletin.recipe
3310share/calibre/recipes/the_manila_times.recipe 3192share/calibre/recipes/the_manila_times.recipe
3311share/calibre/recipes/the_marker.recipe 3193share/calibre/recipes/the_marker.recipe
3312share/calibre/recipes/the_nation.recipe 3194share/calibre/recipes/the_nation.recipe
3313share/calibre/recipes/the_new_age_za.recipe 3195share/calibre/recipes/the_new_age_za.recipe
3314share/calibre/recipes/the_new_republic.recipe 3196share/calibre/recipes/the_new_republic.recipe
3315share/calibre/recipes/the_oz.recipe 3197share/calibre/recipes/the_oz.recipe
3316share/calibre/recipes/the_philippine_daily_inquirer.recipe 3198share/calibre/recipes/the_philippine_daily_inquirer.recipe
3317share/calibre/recipes/the_philippine_star.recipe 3199share/calibre/recipes/the_philippine_star.recipe
3318share/calibre/recipes/the_register.recipe 3200share/calibre/recipes/the_register.recipe
3319share/calibre/recipes/the_scotsman.recipe 3201share/calibre/recipes/the_scotsman.recipe
3320share/calibre/recipes/the_sun.recipe 3202share/calibre/recipes/the_sun.recipe
@@ -3516,26 +3398,27 @@ share/calibre/templates/inline_toc_style @@ -3516,26 +3398,27 @@ share/calibre/templates/inline_toc_style
3516share/calibre/templates/lrf.xsl 3398share/calibre/templates/lrf.xsl
3517share/calibre/templates/new_book.html 3399share/calibre/templates/new_book.html
3518share/calibre/templates/new_nav.html 3400share/calibre/templates/new_nav.html
3519share/calibre/templates/rtf.xsl 3401share/calibre/templates/rtf.xsl
3520share/calibre/tracer.epub 3402share/calibre/tracer.epub
3521share/calibre/user-agent-data.json 3403share/calibre/user-agent-data.json
3522share/calibre/user-manual-translation-stats.json 3404share/calibre/user-manual-translation-stats.json
3523share/calibre/viewer/blank.html 3405share/calibre/viewer/blank.html
3524share/calibre/viewer/bookmarks.js 3406share/calibre/viewer/bookmarks.js
3525share/calibre/viewer/hyphenate/Hyphenator.js 3407share/calibre/viewer/hyphenate/Hyphenator.js
3526share/calibre/viewer/hyphenate/patterns.zip 3408share/calibre/viewer/hyphenate/patterns.zip
3527share/calibre/viewer/hyphenation.js 3409share/calibre/viewer/hyphenation.js
3528share/calibre/viewer/images.js 3410share/calibre/viewer/images.js
 3411share/calibre/viewer/jquery.js
3529share/calibre/viewer/jquery_scrollTo.js 3412share/calibre/viewer/jquery_scrollTo.js
3530share/calibre/viewer/mathjax/MathJax.js 3413share/calibre/viewer/mathjax/MathJax.js
3531share/calibre/viewer/mathjax/extensions/AssistiveMML.js 3414share/calibre/viewer/mathjax/extensions/AssistiveMML.js
3532share/calibre/viewer/mathjax/extensions/CHTML-preview.js 3415share/calibre/viewer/mathjax/extensions/CHTML-preview.js
3533share/calibre/viewer/mathjax/extensions/FontWarnings.js 3416share/calibre/viewer/mathjax/extensions/FontWarnings.js
3534share/calibre/viewer/mathjax/extensions/HTML-CSS/handle-floats.js 3417share/calibre/viewer/mathjax/extensions/HTML-CSS/handle-floats.js
3535share/calibre/viewer/mathjax/extensions/HelpDialog.js 3418share/calibre/viewer/mathjax/extensions/HelpDialog.js
3536share/calibre/viewer/mathjax/extensions/MatchWebFonts.js 3419share/calibre/viewer/mathjax/extensions/MatchWebFonts.js
3537share/calibre/viewer/mathjax/extensions/MathEvents.js 3420share/calibre/viewer/mathjax/extensions/MathEvents.js
3538share/calibre/viewer/mathjax/extensions/MathML/content-mathml.js 3421share/calibre/viewer/mathjax/extensions/MathML/content-mathml.js
3539share/calibre/viewer/mathjax/extensions/MathML/mml3.js 3422share/calibre/viewer/mathjax/extensions/MathML/mml3.js
3540share/calibre/viewer/mathjax/extensions/MathMenu.js 3423share/calibre/viewer/mathjax/extensions/MathMenu.js
3541share/calibre/viewer/mathjax/extensions/MathZoom.js 3424share/calibre/viewer/mathjax/extensions/MathZoom.js
@@ -3726,14 +3609,13 @@ share/calibre/viewer/mathjax/jax/output/ @@ -3726,14 +3609,13 @@ share/calibre/viewer/mathjax/jax/output/
3726share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/CombDiacritMarks.js 3609share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/CombDiacritMarks.js
3727share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/Main.js 3610share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/Main.js
3728share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/Other.js 3611share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/Typewriter/Regular/Other.js
3729share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata-extra.js 3612share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata-extra.js
3730share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata.js 3613share/calibre/viewer/mathjax/jax/output/SVG/fonts/TeX/fontdata.js
3731share/calibre/viewer/mathjax/jax/output/SVG/jax.js 3614share/calibre/viewer/mathjax/jax/output/SVG/jax.js
3732share/calibre/viewer/referencing.js 3615share/calibre/viewer/referencing.js
3733share/doc/calibre/COPYRIGHT 3616share/doc/calibre/COPYRIGHT
3734share/doc/calibre/Changelog.old.yaml 3617share/doc/calibre/Changelog.old.yaml
3735share/doc/calibre/Changelog.yaml 3618share/doc/calibre/Changelog.yaml
3736share/doc/calibre/INSTALL 3619share/doc/calibre/INSTALL
3737share/doc/calibre/LICENSE.rtf 3620share/doc/calibre/LICENSE.rtf
3738share/doc/calibre/README.md 3621share/doc/calibre/README.md
3739@pkgdir lib/calibre/calibre/plugins/.libs 
cvs diff -r1.92 -r1.93 pkgsrc/misc/calibre/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/calibre/distinfo 2017/05/16 13:37:24 1.92
+++ pkgsrc/misc/calibre/distinfo 2018/02/01 16:05:56 1.93
@@ -1,10 +1,9 @@ @@ -1,10 +1,9 @@
1$NetBSD: distinfo,v 1.92 2017/05/16 13:37:24 wiz Exp $ 1$NetBSD: distinfo,v 1.93 2018/02/01 16:05:56 wiz Exp $
2 2
3SHA1 (calibre-2.85.1.tar.xz) = 31d880c9da01ad16a2d6f0502b41b77ff32c13a9 3SHA1 (calibre-3.16.0.tar.xz) = 22fe843c3e06071cd2e65c4e10cba070924890e5
4RMD160 (calibre-2.85.1.tar.xz) = 345e4c28f2ded44a88f0b06e8d18774a47535509 4RMD160 (calibre-3.16.0.tar.xz) = a13f29ee8601d80f4d97563979ace1511e153077
5SHA512 (calibre-2.85.1.tar.xz) = ce29924213fa7461bbf2fc62f26bd53e4eafdf3b0dd58e241071592be4ee038cdb3ac6ac2982229dd0e52595a93aca7d921640ea55796950d1f3ac3c2742af4f 5SHA512 (calibre-3.16.0.tar.xz) = a5208e1e781d71265bcb10757c5cb51afaa8fa89331ef075bfe8451efc8d5e2a1e70704423440cddf90c6e70e074dc9d296a7df5347639a5f7b7f1a81697e96b
6Size (calibre-2.85.1.tar.xz) = 37783284 bytes 6Size (calibre-3.16.0.tar.xz) = 38121688 bytes
7SHA1 (patch-setup_build.py) = 4a601e44fb69085c1f05ca0f90b73ce3f6d51ba6 7SHA1 (patch-setup_build.py) = f309c8f01af375fce1d09bf5c4bac9610cf4e0c5
8SHA1 (patch-setup_build__environment.py) = 84d0084d4fe49c883ba5c4ac6e1c3ba47a88c8d5 8SHA1 (patch-setup_build__environment.py) = 8973ede2128cea065860dcc210c45f5f688a93be
9SHA1 (patch-src_calibre_ebooks_oeb_polish_parsing.py) = 62d02b7b901efac6ee3bb1b6628ab99b4a13a926 
10SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662 9SHA1 (patch-src_calibre_linux.py) = 16c3122a612ec9996f774c5c2c9d40a475723662
cvs diff -r1.2 -r1.3 pkgsrc/misc/calibre/patches/patch-setup_build.py (expand / switch to unified diff)

--- pkgsrc/misc/calibre/patches/patch-setup_build.py 2016/09/29 12:13:43 1.2
+++ pkgsrc/misc/calibre/patches/patch-setup_build.py 2018/02/01 16:05:56 1.3
@@ -1,32 +1,22 @@ @@ -1,32 +1,22 @@
1$NetBSD: patch-setup_build.py,v 1.2 2016/09/29 12:13:43 joerg Exp $ 1$NetBSD: patch-setup_build.py,v 1.3 2018/02/01 16:05:56 wiz Exp $
2 2
3Find libtool output correctly. 
4Fix linking against native X. 3Fix linking against native X.
5 4
6--- setup/build.py.orig 2016-09-29 10:28:31.000000000 +0000 5--- setup/build.py.orig 2016-09-29 10:28:31.000000000 +0000
7+++ setup/build.py 6+++ setup/build.py
8@@ -368,6 +368,7 @@ class Build(Command): 7@@ -368,6 +368,7 @@ class Build(Command):
9 INCLUDEPATH += {freetype} 8 INCLUDEPATH += {freetype}
10 DESTDIR = {destdir} 9 DESTDIR = {destdir}
11 CONFIG -= create_cmake # Prevent qmake from generating a cmake build file which it puts in the calibre src directory 10 CONFIG -= create_cmake # Prevent qmake from generating a cmake build file which it puts in the calibre src directory
12+ QMAKE_LFLAGS += $(COMPILER_RPATH_FLAG)$(X11BASE)/lib 11+ QMAKE_LFLAGS += $(COMPILER_RPATH_FLAG)$(X11BASE)/lib
13 QMAKE_LIBS_PRIVATE += {glib} {fontconfig} 12 QMAKE_LIBS_PRIVATE += {glib} {fontconfig}
14 ''').format( 13 ''').format(
15 headers=' '.join(headers), sources=' '.join(sources), others=' '.join(others), destdir=self.d( 14 headers=' '.join(headers), sources=' '.join(sources), others=' '.join(others), destdir=self.d(
16@@ -426,6 +427,7 @@ class Build(Command): 15@@ -426,6 +427,7 @@ class Build(Command):
17 SOURCES = {sources} 16 SOURCES = {sources}
18 INCLUDEPATH += {sipinc} {pyinc} 17 INCLUDEPATH += {sipinc} {pyinc}
19 VERSION = {ver} 18 VERSION = {ver}
20+ QMAKE_LFLAGS += $(COMPILER_RPATH_FLAG)$(X11BASE)/lib 19+ QMAKE_LFLAGS += $(COMPILER_RPATH_FLAG)$(X11BASE)/lib
21 win32 {{ 20 win32 {{
22 LIBS += {py_lib} 21 LIBS += {py_lib}
23 TARGET_EXT = .dll 22 TARGET_EXT = .dll
24@@ -456,7 +458,7 @@ class Build(Command): 
25 if iswindows: 
26 qmc += ['-spec', qmakespec] 
27 fext = 'dll' if iswindows else 'dylib' if isosx else 'so' 
28- name = '%s%s.%s' % ('release/' if iswindows else 'lib', sip['target'], fext) 
29+ name = '%s%s.%s' % ('release/' if iswindows else '.libs/lib', sip['target'], fext) 
30 try: 
31 os.chdir(src_dir) 
32 if self.newer(dest, sip['headers'] + sip['sources'] + ext.sources + ext.headers): 
cvs diff -r1.4 -r1.5 pkgsrc/misc/calibre/patches/Attic/patch-setup_build__environment.py (expand / switch to unified diff)

--- pkgsrc/misc/calibre/patches/Attic/patch-setup_build__environment.py 2017/02/17 15:43:43 1.4
+++ pkgsrc/misc/calibre/patches/Attic/patch-setup_build__environment.py 2018/02/01 16:05:56 1.5
@@ -1,26 +1,17 @@ @@ -1,26 +1,17 @@
1$NetBSD: patch-setup_build__environment.py,v 1.4 2017/02/17 15:43:43 wiz Exp $ 1$NetBSD: patch-setup_build__environment.py,v 1.5 2018/02/01 16:05:56 wiz Exp $
2 2
3Always build like on Linux. 3Always build like on Linux.
4 4
5--- setup/build_environment.py.orig 2017-02-12 02:09:49.000000000 +0000 5--- setup/build_environment.py.orig 2017-08-25 03:47:17.000000000 +0000
6+++ setup/build_environment.py 6+++ setup/build_environment.py
7@@ -97,8 +97,8 @@ def get_sip_dir(): 7@@ -93,8 +93,8 @@ def get_sip_dir():
8 pyqt['pyqt_sip_dir'] = get_sip_dir() 8 pyqt['pyqt_sip_dir'] = get_sip_dir()
9 pyqt['sip_inc_dir'] = os.environ.get('SIP_INC_DIR', sysconfig.get_path('include')) 9 pyqt['sip_inc_dir'] = os.environ.get('SIP_INC_DIR', sysconfig.get_path('include'))
10  10
11-glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).strip() if islinux or ishaiku else '' 11-glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).strip() if islinux or ishaiku else ''
12-fontconfig_flags = subprocess.check_output([PKGCONFIG, '--libs', 'fontconfig']).strip() if islinux or ishaiku else '' 12-fontconfig_flags = subprocess.check_output([PKGCONFIG, '--libs', 'fontconfig']).strip() if islinux or ishaiku else ''
13+glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).strip() 13+glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).strip()
14+fontconfig_flags = subprocess.check_output([PKGCONFIG, '--libs', 'fontconfig']).strip() 14+fontconfig_flags = subprocess.check_output([PKGCONFIG, '--libs', 'fontconfig']).strip()
15 qt_inc = pyqt['inc'] 15 qt_inc = pyqt['inc']
16 qt_lib = pyqt['lib'] 16 qt_lib = pyqt['lib']
17 ft_lib_dirs = [] 17 ft_lib_dirs = []
18@@ -121,7 +121,7 @@ QT_DLLS = ['Qt5' + x for x in ( 
19 'WebKit', 'WebKitWidgets', 'Widgets', 'Multimedia', 'MultimediaWidgets', 'Xml', # 'XmlPatterns', 
20 )] 
21 QT_PLUGINS = ('imageformats', 'audio', 'iconengines', 'mediaservice', 'platforms', 'playlistformats', 'printsupport', 'sqldrivers') 
22-if islinux or ishaiku: 
23+if True: 
24 # platformthemes cause crashes in Ubuntu 
25 QT_PLUGINS += ('platforminputcontexts', 'generic',) 
26  
File Deleted: pkgsrc/misc/calibre/patches/Attic/patch-src_calibre_ebooks_oeb_polish_parsing.py