From owner-svn-ports-all@FreeBSD.ORG Sat Nov 24 10:30:00 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C84D56BA; Sat, 24 Nov 2012 10:30:00 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A83298FC12; Sat, 24 Nov 2012 10:30:00 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAOAU0j4027499; Sat, 24 Nov 2012 10:30:00 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAOAU0cQ027493; Sat, 24 Nov 2012 10:30:00 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201211241030.qAOAU0cQ027493@svn.freebsd.org> From: Pawel Pekala Date: Sat, 24 Nov 2012 10:30:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r307712 - head/deskutils/calibre X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Nov 2012 10:30:01 -0000 Author: pawel Date: Sat Nov 24 10:30:00 2012 New Revision: 307712 URL: http://svnweb.freebsd.org/changeset/ports/307712 Log: - Update to version 0.9.6 - Remove PODOFO option, graphics/podofo is now required to build While I`m here: - Remove shlib versions - Don't quote CFLAGS, LDFLAGS - Remove uneeded plist substitutions - Fix plist PR: ports/173096 [1] PR: ports/173525 [2] Submitted by: maintainer [1] Armin Gruner [2] Approved by: maintainer (with modifications) Feature safe: yes Modified: head/deskutils/calibre/Makefile head/deskutils/calibre/distinfo head/deskutils/calibre/pkg-plist Modified: head/deskutils/calibre/Makefile ============================================================================== --- head/deskutils/calibre/Makefile Sat Nov 24 06:56:16 2012 (r307711) +++ head/deskutils/calibre/Makefile Sat Nov 24 10:30:00 2012 (r307712) @@ -2,19 +2,20 @@ # $FreeBSD$ PORTNAME= calibre -PORTVERSION= 0.8.70 +PORTVERSION= 0.9.6 CATEGORIES= deskutils python MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/ MAINTAINER= rnejdl@ringofsaturn.com COMMENT= Ebook management application -LIB_DEPENDS= MagickWand.5:${PORTSDIR}/graphics/ImageMagick \ - fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ - poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 \ +LIB_DEPENDS= MagickWand:${PORTSDIR}/graphics/ImageMagick \ + fontconfig:${PORTSDIR}/x11-fonts/fontconfig \ + poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 \ wmflite:${PORTSDIR}/graphics/libwmf \ - chm.0:${PORTSDIR}/misc/chmlib \ - icudata.48:${PORTSDIR}/devel/icu + chm:${PORTSDIR}/misc/chmlib \ + icudata:${PORTSDIR}/devel/icu \ + podofo:${PORTSDIR}/graphics/podofo BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:${PORTSDIR}/devel/py-setuptools \ ${PYTHON_PKGNAMEPREFIX}sip>=0:${PORTSDIR}/devel/py-sip \ ${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \ @@ -38,41 +39,30 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/ ${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml \ ${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus \ ${PYTHON_PKGNAMEPREFIX}netifaces>=0:${PORTSDIR}/net/py-netifaces \ + ${PYTHON_PKGNAMEPREFIX}cssselect>=0:${PORTSDIR}/www/py-cssselect \ pdftohtml:${PORTSDIR}/graphics/poppler-utils \ lshal:${PORTSDIR}/sysutils/hal -OPTIONS_DEFINE= PODOFO -PODOFO_DESC= PDF support via PoDoFo library -OPTIONS_DEFAULT=PODOFO - USE_XZ= yes USE_PYTHON= 2.7 USE_QT4= qmake_build moc_build INSTALLS_ICONS= yes WRKSRC= ${WRKDIR}/${PORTNAME} -CFLAGS+= "-I${LOCALBASE}/include" -LDFLAGS+= "-L${LOCALBASE}/lib" +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV+= FC_INC_DIR="${LOCALBASE}/include/fontconfig" \ FC_LIB_DIR="${LOCALBASE}/lib" \ OVERRIDE_CFLAGS="${CFLAGS}" \ - OVERRIDE_LDFLAGS="${LDFLAGS}" + OVERRIDE_LDFLAGS="${LDFLAGS}" \ + PODOFO_LIB_DIR="${LOCALBASE}/lib" \ + PODOFO_INC_DIR="${LOCALBASE}/include/podofo" .include .if ${OSVERSION} < 800069 MAKE_ENV+= WITH_USB=no -PLIST_SUB+= USB="@comment " .else MAKE_ENV+= WITH_USB=yes -PLIST_SUB+= USB="" -.endif -.if ${PORT_OPTIONS:MPODOFO} || exists(${LOCALBASE}/lib/libpodofo.so) -LIB_DEPENDS+= podofo:${PORTSDIR}/graphics/podofo -MAKE_ENV+= PODOFO_LIB_DIR="${LOCALBASE}/lib" \ - PODOFO_INC_DIR="${LOCALBASE}/include/podofo" -PLIST_SUB+= PODOFO="" -.else -PLIST_SUB+= PODOFO="@comment " .endif do-build: Modified: head/deskutils/calibre/distinfo ============================================================================== --- head/deskutils/calibre/distinfo Sat Nov 24 06:56:16 2012 (r307711) +++ head/deskutils/calibre/distinfo Sat Nov 24 10:30:00 2012 (r307712) @@ -1,2 +1,2 @@ -SHA256 (calibre-0.8.70.tar.xz) = 2f1cc5270f19d9912b73467f7356fb3a27a52714ad3e3198e1d93293d1e55b89 -SIZE (calibre-0.8.70.tar.xz) = 26931608 +SHA256 (calibre-0.9.6.tar.xz) = d2cb83a8fc32b3258f3a491f33f4271bfd4020ac4fdbbf01131deb81bba9624f +SIZE (calibre-0.9.6.tar.xz) = 27346664 Modified: head/deskutils/calibre/pkg-plist ============================================================================== --- head/deskutils/calibre/pkg-plist Sat Nov 24 06:56:16 2012 (r307711) +++ head/deskutils/calibre/pkg-plist Sat Nov 24 10:30:00 2012 (r307712) @@ -20,7 +20,6 @@ bin/lrs2lrf bin/markdown-calibre bin/web2disk etc/bash_completion.d/calibre -%%PYTHON_SITELIBDIR%%/init_calibre.py lib/calibre/calibre/__init__.py lib/calibre/calibre/constants.py lib/calibre/calibre/customize/__init__.py @@ -29,6 +28,19 @@ lib/calibre/calibre/customize/conversion lib/calibre/calibre/customize/profiles.py lib/calibre/calibre/customize/ui.py lib/calibre/calibre/customize/zipplugin.py +lib/calibre/calibre/db/__init__.py +lib/calibre/calibre/db/backend.py +lib/calibre/calibre/db/cache.py +lib/calibre/calibre/db/errors.py +lib/calibre/calibre/db/fields.py +lib/calibre/calibre/db/lazy.py +lib/calibre/calibre/db/locking.py +lib/calibre/calibre/db/schema_upgrades.py +lib/calibre/calibre/db/tables.py +lib/calibre/calibre/db/tests/__init__.py +lib/calibre/calibre/db/tests/base.py +lib/calibre/calibre/db/tests/reading.py +lib/calibre/calibre/db/view.py lib/calibre/calibre/debug.py lib/calibre/calibre/devices/__init__.py lib/calibre/calibre/devices/android/__init__.py @@ -76,19 +88,19 @@ lib/calibre/calibre/devices/kindle/apnx. lib/calibre/calibre/devices/kindle/bookmark.py lib/calibre/calibre/devices/kindle/driver.py lib/calibre/calibre/devices/kobo/__init__.py +lib/calibre/calibre/devices/kobo/bookmark.py lib/calibre/calibre/devices/kobo/books.py lib/calibre/calibre/devices/kobo/driver.py -lib/calibre/calibre/devices/kobo/bookmark.py lib/calibre/calibre/devices/manager.py lib/calibre/calibre/devices/mime.py lib/calibre/calibre/devices/misc.py -lib/calibre/calibre/devices/mtp/books.py lib/calibre/calibre/devices/mtp/__init__.py +lib/calibre/calibre/devices/mtp/base.py +lib/calibre/calibre/devices/mtp/books.py lib/calibre/calibre/devices/mtp/defaults.py lib/calibre/calibre/devices/mtp/driver.py -lib/calibre/calibre/devices/mtp/test.py -lib/calibre/calibre/devices/mtp/base.py lib/calibre/calibre/devices/mtp/filesystem_cache.py +lib/calibre/calibre/devices/mtp/test.py lib/calibre/calibre/devices/mtp/unix/__init__.py lib/calibre/calibre/devices/mtp/unix/driver.py lib/calibre/calibre/devices/mtp/unix/upstream/update.py @@ -114,8 +126,6 @@ lib/calibre/calibre/devices/sne/driver.p lib/calibre/calibre/devices/teclast/__init__.py lib/calibre/calibre/devices/teclast/driver.py lib/calibre/calibre/devices/udisks.py -lib/calibre/calibre/devices/user_defined/__init__.py -lib/calibre/calibre/devices/user_defined/driver.py lib/calibre/calibre/devices/usbms/__init__.py lib/calibre/calibre/devices/usbms/books.py lib/calibre/calibre/devices/usbms/cli.py @@ -123,20 +133,9 @@ lib/calibre/calibre/devices/usbms/device lib/calibre/calibre/devices/usbms/deviceconfig.py lib/calibre/calibre/devices/usbms/driver.py lib/calibre/calibre/devices/usbobserver/test.py +lib/calibre/calibre/devices/user_defined/__init__.py +lib/calibre/calibre/devices/user_defined/driver.py lib/calibre/calibre/devices/utils.py -lib/calibre/calibre/db/__init__.py -lib/calibre/calibre/db/backend.py -lib/calibre/calibre/db/locking.py -lib/calibre/calibre/db/schema_upgrades.py -lib/calibre/calibre/db/errors.py -lib/calibre/calibre/db/tables.py -lib/calibre/calibre/db/cache.py -lib/calibre/calibre/db/lazy.py -lib/calibre/calibre/db/view.py -lib/calibre/calibre/db/fields.py -lib/calibre/calibre/db/tests/__init__.py -lib/calibre/calibre/db/tests/base.py -lib/calibre/calibre/db/tests/reading.py lib/calibre/calibre/ebooks/BeautifulSoup.py lib/calibre/calibre/ebooks/__init__.py lib/calibre/calibre/ebooks/azw4/__init__.py @@ -153,51 +152,50 @@ lib/calibre/calibre/ebooks/compression/t lib/calibre/calibre/ebooks/conversion/__init__.py lib/calibre/calibre/ebooks/conversion/cli.py lib/calibre/calibre/ebooks/conversion/config.py -lib/calibre/calibre/ebooks/conversion/plumber.py -lib/calibre/calibre/ebooks/conversion/preprocess.py -lib/calibre/calibre/ebooks/conversion/utils.py -lib/calibre/calibre/ebooks/conversion/plugins/pml_output.py -lib/calibre/calibre/ebooks/conversion/plugins/htmlz_output.py -lib/calibre/calibre/ebooks/conversion/plugins/tcr_input.py +lib/calibre/calibre/ebooks/conversion/plugins/__init__.py +lib/calibre/calibre/ebooks/conversion/plugins/azw4_input.py lib/calibre/calibre/ebooks/conversion/plugins/chm_input.py -lib/calibre/calibre/ebooks/conversion/plugins/odt_input.py -lib/calibre/calibre/ebooks/conversion/plugins/mobi_input.py -lib/calibre/calibre/ebooks/conversion/plugins/lrf_input.py -lib/calibre/calibre/ebooks/conversion/plugins/pdb_input.py -lib/calibre/calibre/ebooks/conversion/plugins/epub_output.py -lib/calibre/calibre/ebooks/conversion/plugins/pdb_output.py -lib/calibre/calibre/ebooks/conversion/plugins/pdf_output.py -lib/calibre/calibre/ebooks/conversion/plugins/lit_input.py +lib/calibre/calibre/ebooks/conversion/plugins/comic_input.py lib/calibre/calibre/ebooks/conversion/plugins/djvu_input.py -lib/calibre/calibre/ebooks/conversion/plugins/snb_input.py -lib/calibre/calibre/ebooks/conversion/plugins/tcr_output.py -lib/calibre/calibre/ebooks/conversion/plugins/rtf_input.py +lib/calibre/calibre/ebooks/conversion/plugins/epub_input.py +lib/calibre/calibre/ebooks/conversion/plugins/epub_output.py lib/calibre/calibre/ebooks/conversion/plugins/fb2_input.py -lib/calibre/calibre/ebooks/conversion/plugins/__init__.py -lib/calibre/calibre/ebooks/conversion/plugins/snb_output.py -lib/calibre/calibre/ebooks/conversion/plugins/azw4_input.py -lib/calibre/calibre/ebooks/conversion/plugins/pdf_input.py -lib/calibre/calibre/ebooks/conversion/plugins/mobi_output.py lib/calibre/calibre/ebooks/conversion/plugins/fb2_output.py -lib/calibre/calibre/ebooks/conversion/plugins/rb_output.py -lib/calibre/calibre/ebooks/conversion/plugins/htmlz_input.py -lib/calibre/calibre/ebooks/conversion/plugins/txt_input.py +lib/calibre/calibre/ebooks/conversion/plugins/html_input.py lib/calibre/calibre/ebooks/conversion/plugins/html_output.py -lib/calibre/calibre/ebooks/conversion/plugins/comic_input.py -lib/calibre/calibre/ebooks/conversion/plugins/rtf_output.py +lib/calibre/calibre/ebooks/conversion/plugins/htmlz_input.py +lib/calibre/calibre/ebooks/conversion/plugins/htmlz_output.py +lib/calibre/calibre/ebooks/conversion/plugins/lit_input.py lib/calibre/calibre/ebooks/conversion/plugins/lit_output.py -lib/calibre/calibre/ebooks/conversion/plugins/pml_input.py -lib/calibre/calibre/ebooks/conversion/plugins/html_input.py +lib/calibre/calibre/ebooks/conversion/plugins/lrf_input.py lib/calibre/calibre/ebooks/conversion/plugins/lrf_output.py +lib/calibre/calibre/ebooks/conversion/plugins/mobi_input.py +lib/calibre/calibre/ebooks/conversion/plugins/mobi_output.py +lib/calibre/calibre/ebooks/conversion/plugins/odt_input.py lib/calibre/calibre/ebooks/conversion/plugins/oeb_output.py +lib/calibre/calibre/ebooks/conversion/plugins/pdb_input.py +lib/calibre/calibre/ebooks/conversion/plugins/pdb_output.py +lib/calibre/calibre/ebooks/conversion/plugins/pdf_input.py +lib/calibre/calibre/ebooks/conversion/plugins/pdf_output.py +lib/calibre/calibre/ebooks/conversion/plugins/pml_input.py +lib/calibre/calibre/ebooks/conversion/plugins/pml_output.py +lib/calibre/calibre/ebooks/conversion/plugins/rb_input.py +lib/calibre/calibre/ebooks/conversion/plugins/rb_output.py lib/calibre/calibre/ebooks/conversion/plugins/recipe_input.py +lib/calibre/calibre/ebooks/conversion/plugins/rtf_input.py +lib/calibre/calibre/ebooks/conversion/plugins/rtf_output.py +lib/calibre/calibre/ebooks/conversion/plugins/snb_input.py +lib/calibre/calibre/ebooks/conversion/plugins/snb_output.py +lib/calibre/calibre/ebooks/conversion/plugins/tcr_input.py +lib/calibre/calibre/ebooks/conversion/plugins/tcr_output.py +lib/calibre/calibre/ebooks/conversion/plugins/txt_input.py lib/calibre/calibre/ebooks/conversion/plugins/txt_output.py -lib/calibre/calibre/ebooks/conversion/plugins/epub_input.py -lib/calibre/calibre/ebooks/conversion/plugins/rb_input.py -lib/calibre/calibre/ebooks/cssselect.py +lib/calibre/calibre/ebooks/conversion/plumber.py +lib/calibre/calibre/ebooks/conversion/preprocess.py +lib/calibre/calibre/ebooks/conversion/utils.py lib/calibre/calibre/ebooks/djvu/__init__.py -lib/calibre/calibre/ebooks/djvu/djvubzzdec.py lib/calibre/calibre/ebooks/djvu/djvu.py +lib/calibre/calibre/ebooks/djvu/djvubzzdec.py lib/calibre/calibre/ebooks/epub/__init__.py lib/calibre/calibre/ebooks/epub/fix/__init__.py lib/calibre/calibre/ebooks/epub/fix/container.py @@ -248,28 +246,28 @@ lib/calibre/calibre/ebooks/lrf/tags.py lib/calibre/calibre/ebooks/markdown/__init__.py lib/calibre/calibre/ebooks/markdown/blockparser.py lib/calibre/calibre/ebooks/markdown/blockprocessors.py +lib/calibre/calibre/ebooks/markdown/commandline.py lib/calibre/calibre/ebooks/markdown/etree_loader.py +lib/calibre/calibre/ebooks/markdown/extensions/__init__.py +lib/calibre/calibre/ebooks/markdown/extensions/abbr.py +lib/calibre/calibre/ebooks/markdown/extensions/codehilite.py +lib/calibre/calibre/ebooks/markdown/extensions/def_list.py +lib/calibre/calibre/ebooks/markdown/extensions/extra.py +lib/calibre/calibre/ebooks/markdown/extensions/fenced_code.py +lib/calibre/calibre/ebooks/markdown/extensions/footnotes.py +lib/calibre/calibre/ebooks/markdown/extensions/headerid.py +lib/calibre/calibre/ebooks/markdown/extensions/meta.py +lib/calibre/calibre/ebooks/markdown/extensions/rss.py +lib/calibre/calibre/ebooks/markdown/extensions/tables.py +lib/calibre/calibre/ebooks/markdown/extensions/toc.py +lib/calibre/calibre/ebooks/markdown/extensions/wikilinks.py lib/calibre/calibre/ebooks/markdown/html4.py lib/calibre/calibre/ebooks/markdown/inlinepatterns.py lib/calibre/calibre/ebooks/markdown/markdown.py lib/calibre/calibre/ebooks/markdown/odict.py +lib/calibre/calibre/ebooks/markdown/postprocessors.py lib/calibre/calibre/ebooks/markdown/preprocessors.py lib/calibre/calibre/ebooks/markdown/treeprocessors.py -lib/calibre/calibre/ebooks/markdown/postprocessors.py -lib/calibre/calibre/ebooks/markdown/commandline.py -lib/calibre/calibre/ebooks/markdown/extensions/rss.py -lib/calibre/calibre/ebooks/markdown/extensions/wikilinks.py -lib/calibre/calibre/ebooks/markdown/extensions/footnotes.py -lib/calibre/calibre/ebooks/markdown/extensions/__init__.py -lib/calibre/calibre/ebooks/markdown/extensions/codehilite.py -lib/calibre/calibre/ebooks/markdown/extensions/toc.py -lib/calibre/calibre/ebooks/markdown/extensions/fenced_code.py -lib/calibre/calibre/ebooks/markdown/extensions/abbr.py -lib/calibre/calibre/ebooks/markdown/extensions/tables.py -lib/calibre/calibre/ebooks/markdown/extensions/def_list.py -lib/calibre/calibre/ebooks/markdown/extensions/headerid.py -lib/calibre/calibre/ebooks/markdown/extensions/extra.py -lib/calibre/calibre/ebooks/markdown/extensions/meta.py lib/calibre/calibre/ebooks/metadata/__init__.py lib/calibre/calibre/ebooks/metadata/archive.py lib/calibre/calibre/ebooks/metadata/book/__init__.py @@ -321,53 +319,54 @@ lib/calibre/calibre/ebooks/metadata/work lib/calibre/calibre/ebooks/metadata/xisbn.py lib/calibre/calibre/ebooks/metadata/zip.py lib/calibre/calibre/ebooks/mobi/__init__.py -lib/calibre/calibre/ebooks/mobi/debug/main.py lib/calibre/calibre/ebooks/mobi/debug/__init__.py -lib/calibre/calibre/ebooks/mobi/debug/mobi6.py lib/calibre/calibre/ebooks/mobi/debug/headers.py -lib/calibre/calibre/ebooks/mobi/debug/mobi8.py lib/calibre/calibre/ebooks/mobi/debug/index.py +lib/calibre/calibre/ebooks/mobi/debug/main.py +lib/calibre/calibre/ebooks/mobi/debug/mobi6.py +lib/calibre/calibre/ebooks/mobi/debug/mobi8.py lib/calibre/calibre/ebooks/mobi/huffcdic.py lib/calibre/calibre/ebooks/mobi/langcodes.py lib/calibre/calibre/ebooks/mobi/mobiml.py +lib/calibre/calibre/ebooks/mobi/reader/__init__.py +lib/calibre/calibre/ebooks/mobi/reader/headers.py lib/calibre/calibre/ebooks/mobi/reader/index.py lib/calibre/calibre/ebooks/mobi/reader/markup.py -lib/calibre/calibre/ebooks/mobi/reader/ncx.py -lib/calibre/calibre/ebooks/mobi/reader/__init__.py lib/calibre/calibre/ebooks/mobi/reader/mobi6.py -lib/calibre/calibre/ebooks/mobi/reader/headers.py lib/calibre/calibre/ebooks/mobi/reader/mobi8.py +lib/calibre/calibre/ebooks/mobi/reader/ncx.py lib/calibre/calibre/ebooks/mobi/tweak.py lib/calibre/calibre/ebooks/mobi/utils.py lib/calibre/calibre/ebooks/mobi/writer2/__init__.py -lib/calibre/calibre/ebooks/mobi/writer2/main.py lib/calibre/calibre/ebooks/mobi/writer2/indexer.py +lib/calibre/calibre/ebooks/mobi/writer2/main.py lib/calibre/calibre/ebooks/mobi/writer2/resources.py lib/calibre/calibre/ebooks/mobi/writer2/serializer.py -lib/calibre/calibre/ebooks/mobi/writer8/main.py lib/calibre/calibre/ebooks/mobi/writer8/__init__.py -lib/calibre/calibre/ebooks/mobi/writer8/index.py -lib/calibre/calibre/ebooks/mobi/writer8/skeleton.py lib/calibre/calibre/ebooks/mobi/writer8/cleanup.py lib/calibre/calibre/ebooks/mobi/writer8/exth.py -lib/calibre/calibre/ebooks/mobi/writer8/tbs.py lib/calibre/calibre/ebooks/mobi/writer8/header.py +lib/calibre/calibre/ebooks/mobi/writer8/index.py +lib/calibre/calibre/ebooks/mobi/writer8/main.py lib/calibre/calibre/ebooks/mobi/writer8/mobi.py +lib/calibre/calibre/ebooks/mobi/writer8/skeleton.py +lib/calibre/calibre/ebooks/mobi/writer8/tbs.py lib/calibre/calibre/ebooks/mobi/writer8/toc.py lib/calibre/calibre/ebooks/odt/__init__.py lib/calibre/calibre/ebooks/odt/input.py lib/calibre/calibre/ebooks/oeb/__init__.py lib/calibre/calibre/ebooks/oeb/base.py -lib/calibre/calibre/ebooks/oeb/parse_utils.py -lib/calibre/calibre/ebooks/oeb/reader.py -lib/calibre/calibre/ebooks/oeb/stylizer.py lib/calibre/calibre/ebooks/oeb/display/__init__.py -lib/calibre/calibre/ebooks/oeb/display/webview.py lib/calibre/calibre/ebooks/oeb/display/test-cfi/run.py +lib/calibre/calibre/ebooks/oeb/display/webview.py +lib/calibre/calibre/ebooks/oeb/iterator/__init__.py lib/calibre/calibre/ebooks/oeb/iterator/book.py lib/calibre/calibre/ebooks/oeb/iterator/bookmarks.py -lib/calibre/calibre/ebooks/oeb/iterator/__init__.py +lib/calibre/calibre/ebooks/oeb/iterator/extract_fonts.py lib/calibre/calibre/ebooks/oeb/iterator/spine.py +lib/calibre/calibre/ebooks/oeb/parse_utils.py +lib/calibre/calibre/ebooks/oeb/reader.py +lib/calibre/calibre/ebooks/oeb/stylizer.py lib/calibre/calibre/ebooks/oeb/transforms/__init__.py lib/calibre/calibre/ebooks/oeb/transforms/cover.py lib/calibre/calibre/ebooks/oeb/transforms/filenames.py @@ -383,6 +382,7 @@ lib/calibre/calibre/ebooks/oeb/transform lib/calibre/calibre/ebooks/oeb/transforms/rescale.py lib/calibre/calibre/ebooks/oeb/transforms/split.py lib/calibre/calibre/ebooks/oeb/transforms/structure.py +lib/calibre/calibre/ebooks/oeb/transforms/subset.py lib/calibre/calibre/ebooks/oeb/transforms/trimmanifest.py lib/calibre/calibre/ebooks/oeb/transforms/unsmarten.py lib/calibre/calibre/ebooks/oeb/writer.py @@ -423,8 +423,8 @@ lib/calibre/calibre/ebooks/rb/rbml.py lib/calibre/calibre/ebooks/rb/reader.py lib/calibre/calibre/ebooks/rb/writer.py lib/calibre/calibre/ebooks/readability/__init__.py -lib/calibre/calibre/ebooks/readability/debug.py lib/calibre/calibre/ebooks/readability/cleaners.py +lib/calibre/calibre/ebooks/readability/debug.py lib/calibre/calibre/ebooks/readability/htmls.py lib/calibre/calibre/ebooks/readability/readability.py lib/calibre/calibre/ebooks/rtf/__init__.py @@ -558,15 +558,15 @@ lib/calibre/calibre/gui2/comments_editor lib/calibre/calibre/gui2/complete.py lib/calibre/calibre/gui2/complete2.py lib/calibre/calibre/gui2/convert/__init__.py -lib/calibre/calibre/gui2/convert/azw3_output_ui.py lib/calibre/calibre/gui2/convert/azw3_output.py +lib/calibre/calibre/gui2/convert/azw3_output_ui.py lib/calibre/calibre/gui2/convert/bulk.py lib/calibre/calibre/gui2/convert/comic_input.py lib/calibre/calibre/gui2/convert/comic_input_ui.py lib/calibre/calibre/gui2/convert/debug.py lib/calibre/calibre/gui2/convert/debug_ui.py -lib/calibre/calibre/gui2/convert/djvu_input_ui.py lib/calibre/calibre/gui2/convert/djvu_input.py +lib/calibre/calibre/gui2/convert/djvu_input_ui.py lib/calibre/calibre/gui2/convert/epub_output.py lib/calibre/calibre/gui2/convert/epub_output_ui.py lib/calibre/calibre/gui2/convert/fb2_input.py @@ -578,8 +578,8 @@ lib/calibre/calibre/gui2/convert/font_ke lib/calibre/calibre/gui2/convert/gui_conversion.py lib/calibre/calibre/gui2/convert/heuristics.py lib/calibre/calibre/gui2/convert/heuristics_ui.py -lib/calibre/calibre/gui2/convert/htmlz_output_ui.py lib/calibre/calibre/gui2/convert/htmlz_output.py +lib/calibre/calibre/gui2/convert/htmlz_output_ui.py lib/calibre/calibre/gui2/convert/look_and_feel.py lib/calibre/calibre/gui2/convert/look_and_feel_ui.py lib/calibre/calibre/gui2/convert/lrf_output.py @@ -590,7 +590,6 @@ lib/calibre/calibre/gui2/convert/mobi_ou lib/calibre/calibre/gui2/convert/mobi_output_ui.py lib/calibre/calibre/gui2/convert/page_setup.py lib/calibre/calibre/gui2/convert/page_setup_ui.py -lib/calibre/calibre/gui2/convert/pdb_input_ui.py lib/calibre/calibre/gui2/convert/pdb_output.py lib/calibre/calibre/gui2/convert/pdb_output_ui.py lib/calibre/calibre/gui2/convert/pdf_input.py @@ -674,8 +673,8 @@ lib/calibre/calibre/gui2/dialogs/passwor lib/calibre/calibre/gui2/dialogs/plugin_updater.py lib/calibre/calibre/gui2/dialogs/progress.py lib/calibre/calibre/gui2/dialogs/progress_ui.py -lib/calibre/calibre/gui2/dialogs/quickview_ui.py lib/calibre/calibre/gui2/dialogs/quickview.py +lib/calibre/calibre/gui2/dialogs/quickview_ui.py lib/calibre/calibre/gui2/dialogs/restore_library.py lib/calibre/calibre/gui2/dialogs/saved_search_editor.py lib/calibre/calibre/gui2/dialogs/saved_search_editor_ui.py @@ -685,8 +684,8 @@ lib/calibre/calibre/gui2/dialogs/search. lib/calibre/calibre/gui2/dialogs/search_item_ui.py lib/calibre/calibre/gui2/dialogs/search_ui.py lib/calibre/calibre/gui2/dialogs/select_formats.py -lib/calibre/calibre/gui2/dialogs/smartdevice_ui.py lib/calibre/calibre/gui2/dialogs/smartdevice.py +lib/calibre/calibre/gui2/dialogs/smartdevice_ui.py lib/calibre/calibre/gui2/dialogs/tag_categories.py lib/calibre/calibre/gui2/dialogs/tag_categories_ui.py lib/calibre/calibre/gui2/dialogs/tag_editor.py @@ -704,11 +703,12 @@ lib/calibre/calibre/gui2/duplicates.py lib/calibre/calibre/gui2/ebook_download.py lib/calibre/calibre/gui2/email.py lib/calibre/calibre/gui2/filename_pattern_ui.py +lib/calibre/calibre/gui2/font_family_chooser.py lib/calibre/calibre/gui2/init.py lib/calibre/calibre/gui2/jobs.py -lib/calibre/calibre/gui2/layout.py -lib/calibre/calibre/gui2/languages.py lib/calibre/calibre/gui2/keyboard.py +lib/calibre/calibre/gui2/languages.py +lib/calibre/calibre/gui2/layout.py lib/calibre/calibre/gui2/library/__init__.py lib/calibre/calibre/gui2/library/delegates.py lib/calibre/calibre/gui2/library/models.py @@ -741,7 +741,6 @@ lib/calibre/calibre/gui2/preferences/con lib/calibre/calibre/gui2/preferences/conversion_ui.py lib/calibre/calibre/gui2/preferences/create_custom_column.py lib/calibre/calibre/gui2/preferences/create_custom_column_ui.py -lib/calibre/calibre/gui2/preferences/custom_columns_ui.py lib/calibre/calibre/gui2/preferences/device_debug.py lib/calibre/calibre/gui2/preferences/device_user_defined.py lib/calibre/calibre/gui2/preferences/email_ui.py @@ -752,8 +751,8 @@ lib/calibre/calibre/gui2/preferences/key lib/calibre/calibre/gui2/preferences/look_feel.py lib/calibre/calibre/gui2/preferences/look_feel_ui.py lib/calibre/calibre/gui2/preferences/main.py -lib/calibre/calibre/gui2/preferences/metadata_sources_ui.py lib/calibre/calibre/gui2/preferences/metadata_sources.py +lib/calibre/calibre/gui2/preferences/metadata_sources_ui.py lib/calibre/calibre/gui2/preferences/misc.py lib/calibre/calibre/gui2/preferences/misc_ui.py lib/calibre/calibre/gui2/preferences/plugboard.py @@ -782,115 +781,113 @@ lib/calibre/calibre/gui2/search_box.py lib/calibre/calibre/gui2/search_restriction_mixin.py lib/calibre/calibre/gui2/shortcuts.py lib/calibre/calibre/gui2/shortcuts_ui.py -lib/calibre/calibre/gui2/store/search_ui.py lib/calibre/calibre/gui2/store/__init__.py -lib/calibre/calibre/gui2/store/mobileread_store_dialog_ui.py -lib/calibre/calibre/gui2/store/web_control.py -lib/calibre/calibre/gui2/store/web_store_dialog_ui.py -lib/calibre/calibre/gui2/store/search_result.py lib/calibre/calibre/gui2/store/basic_config.py -lib/calibre/calibre/gui2/store/opensearch_store.py -lib/calibre/calibre/gui2/store/web_store_dialog.py lib/calibre/calibre/gui2/store/basic_config_widget_ui.py +lib/calibre/calibre/gui2/store/config/__init__.py +lib/calibre/calibre/gui2/store/config/chooser/__init__.py +lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder.py +lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder_ui.py +lib/calibre/calibre/gui2/store/config/chooser/chooser_dialog.py +lib/calibre/calibre/gui2/store/config/chooser/chooser_widget.py +lib/calibre/calibre/gui2/store/config/chooser/chooser_widget_ui.py +lib/calibre/calibre/gui2/store/config/chooser/models.py +lib/calibre/calibre/gui2/store/config/chooser/results_view.py +lib/calibre/calibre/gui2/store/config/search/__init__.py +lib/calibre/calibre/gui2/store/config/search/search_widget.py +lib/calibre/calibre/gui2/store/config/search/search_widget_ui.py +lib/calibre/calibre/gui2/store/config/store.py +lib/calibre/calibre/gui2/store/opensearch_store.py +lib/calibre/calibre/gui2/store/search/__init__.py +lib/calibre/calibre/gui2/store/search/adv_search_builder.py +lib/calibre/calibre/gui2/store/search/adv_search_builder_ui.py +lib/calibre/calibre/gui2/store/search/download_thread.py +lib/calibre/calibre/gui2/store/search/models.py +lib/calibre/calibre/gui2/store/search/results_view.py +lib/calibre/calibre/gui2/store/search/search.py +lib/calibre/calibre/gui2/store/search/search_ui.py +lib/calibre/calibre/gui2/store/search_result.py +lib/calibre/calibre/gui2/store/stores/__init__.py +lib/calibre/calibre/gui2/store/stores/amazon_de_plugin.py lib/calibre/calibre/gui2/store/stores/amazon_es_plugin.py lib/calibre/calibre/gui2/store/stores/amazon_fr_plugin.py lib/calibre/calibre/gui2/store/stores/amazon_it_plugin.py +lib/calibre/calibre/gui2/store/stores/amazon_plugin.py +lib/calibre/calibre/gui2/store/stores/amazon_uk_plugin.py +lib/calibre/calibre/gui2/store/stores/archive_org_plugin.py +lib/calibre/calibre/gui2/store/stores/baen_webscription_plugin.py +lib/calibre/calibre/gui2/store/stores/bewrite_plugin.py lib/calibre/calibre/gui2/store/stores/biblio_plugin.py +lib/calibre/calibre/gui2/store/stores/bn_plugin.py +lib/calibre/calibre/gui2/store/stores/bookoteka_plugin.py +lib/calibre/calibre/gui2/store/stores/chitanka_plugin.py +lib/calibre/calibre/gui2/store/stores/diesel_ebooks_plugin.py +lib/calibre/calibre/gui2/store/stores/ebook_nl_plugin.py lib/calibre/calibre/gui2/store/stores/ebookpoint_plugin.py +lib/calibre/calibre/gui2/store/stores/ebooks_com_plugin.py lib/calibre/calibre/gui2/store/stores/ebooksgratuits_plugin.py +lib/calibre/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py +lib/calibre/calibre/gui2/store/stores/eharlequin_plugin.py +lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py +lib/calibre/calibre/gui2/store/stores/empik_plugin.py lib/calibre/calibre/gui2/store/stores/escapemagazine_plugin.py +lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py +lib/calibre/calibre/gui2/store/stores/foyles_uk_plugin.py lib/calibre/calibre/gui2/store/stores/gandalf_plugin.py +lib/calibre/calibre/gui2/store/stores/google_books_plugin.py +lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py +lib/calibre/calibre/gui2/store/stores/kobo_plugin.py +lib/calibre/calibre/gui2/store/stores/legimi_plugin.py +lib/calibre/calibre/gui2/store/stores/libri_de_plugin.py lib/calibre/calibre/gui2/store/stores/litres_plugin.py +lib/calibre/calibre/gui2/store/stores/manybooks_plugin.py lib/calibre/calibre/gui2/store/stores/mills_boon_uk_plugin.py -lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py +lib/calibre/calibre/gui2/store/stores/mobileread/__init__.py +lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder.py +lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder_ui.py +lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog.py +lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog_ui.py +lib/calibre/calibre/gui2/store/stores/mobileread/cache_update_thread.py +lib/calibre/calibre/gui2/store/stores/mobileread/mobileread_plugin.py +lib/calibre/calibre/gui2/store/stores/mobileread/models.py +lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog.py +lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog_ui.py lib/calibre/calibre/gui2/store/stores/nexto_plugin.py +lib/calibre/calibre/gui2/store/stores/open_books_plugin.py +lib/calibre/calibre/gui2/store/stores/ozon_ru_plugin.py +lib/calibre/calibre/gui2/store/stores/pragmatic_bookshelf_plugin.py lib/calibre/calibre/gui2/store/stores/rw2010_plugin.py +lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py lib/calibre/calibre/gui2/store/stores/sony_plugin.py +lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py +lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py +lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py lib/calibre/calibre/gui2/store/stores/whsmith_uk_plugin.py -lib/calibre/calibre/gui2/store/stores/zixo_plugin.py lib/calibre/calibre/gui2/store/stores/woblink_plugin.py -lib/calibre/calibre/gui2/store/stores/archive_org_plugin.py -lib/calibre/calibre/gui2/store/stores/weightless_books_plugin.py -lib/calibre/calibre/gui2/store/stores/bewrite_plugin.py -lib/calibre/calibre/gui2/store/stores/baen_webscription_plugin.py -lib/calibre/calibre/gui2/store/stores/__init__.py -lib/calibre/calibre/gui2/store/stores/eharlequin_plugin.py -lib/calibre/calibre/gui2/store/stores/waterstones_uk_plugin.py -lib/calibre/calibre/gui2/store/stores/ebooks_com_plugin.py -lib/calibre/calibre/gui2/store/stores/gutenberg_plugin.py -lib/calibre/calibre/gui2/store/stores/amazon_de_plugin.py -lib/calibre/calibre/gui2/store/stores/bn_plugin.py -lib/calibre/calibre/gui2/store/stores/feedbooks_plugin.py -lib/calibre/calibre/gui2/store/stores/kobo_plugin.py -lib/calibre/calibre/gui2/store/stores/smashwords_plugin.py -lib/calibre/calibre/gui2/store/stores/foyles_uk_plugin.py -lib/calibre/calibre/gui2/store/stores/diesel_ebooks_plugin.py -lib/calibre/calibre/gui2/store/stores/manybooks_plugin.py -lib/calibre/calibre/gui2/store/stores/amazon_plugin.py -lib/calibre/calibre/gui2/store/stores/amazon_uk_plugin.py -lib/calibre/calibre/gui2/store/stores/legimi_plugin.py -lib/calibre/calibre/gui2/store/stores/ebookshoppe_uk_plugin.py -lib/calibre/calibre/gui2/store/stores/virtualo_plugin.py -lib/calibre/calibre/gui2/store/stores/open_books_plugin.py -lib/calibre/calibre/gui2/store/stores/libri_de_plugin.py -lib/calibre/calibre/gui2/store/stores/google_books_plugin.py lib/calibre/calibre/gui2/store/stores/xinxii_plugin.py -lib/calibre/calibre/gui2/store/stores/bookoteka_plugin.py -lib/calibre/calibre/gui2/store/stores/ebook_nl_plugin.py -lib/calibre/calibre/gui2/store/stores/chitanka_plugin.py -lib/calibre/calibre/gui2/store/stores/ozon_ru_plugin.py -lib/calibre/calibre/gui2/store/stores/eknigi_plugin.py -lib/calibre/calibre/gui2/store/config/__init__.py -lib/calibre/calibre/gui2/store/config/search_widget_ui.py -lib/calibre/calibre/gui2/store/config/store.py -lib/calibre/calibre/gui2/store/config/search/__init__.py -lib/calibre/calibre/gui2/store/config/search/search_widget_ui.py -lib/calibre/calibre/gui2/store/config/search/search_widget.py -lib/calibre/calibre/gui2/store/config/chooser/results_view.py -lib/calibre/calibre/gui2/store/config/chooser/__init__.py -lib/calibre/calibre/gui2/store/config/chooser/chooser_dialog.py -lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder.py -lib/calibre/calibre/gui2/store/config/chooser/models.py -lib/calibre/calibre/gui2/store/config/chooser/adv_search_builder_ui.py -lib/calibre/calibre/gui2/store/config/chooser/chooser_widget.py -lib/calibre/calibre/gui2/store/config/chooser/chooser_widget_ui.py -lib/calibre/calibre/gui2/store/stores/mobileread/__init__.py -lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder.py -lib/calibre/calibre/gui2/store/stores/mobileread/adv_search_builder_ui.py -lib/calibre/calibre/gui2/store/stores/mobileread/models.py -lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog.py -lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog_ui.py -lib/calibre/calibre/gui2/store/stores/mobileread/cache_update_thread.py -lib/calibre/calibre/gui2/store/stores/mobileread/cache_progress_dialog.py -lib/calibre/calibre/gui2/store/stores/mobileread/store_dialog_ui.py -lib/calibre/calibre/gui2/store/stores/mobileread/mobileread_plugin.py -lib/calibre/calibre/gui2/store/search/results_view.py -lib/calibre/calibre/gui2/store/search/search_ui.py -lib/calibre/calibre/gui2/store/search/__init__.py -lib/calibre/calibre/gui2/store/search/download_thread.py -lib/calibre/calibre/gui2/store/search/adv_search_builder.py -lib/calibre/calibre/gui2/store/search/models.py -lib/calibre/calibre/gui2/store/search/search.py -lib/calibre/calibre/gui2/store/search/adv_search_builder_ui.py +lib/calibre/calibre/gui2/store/stores/zixo_plugin.py +lib/calibre/calibre/gui2/store/web_control.py +lib/calibre/calibre/gui2/store/web_store_dialog.py +lib/calibre/calibre/gui2/store/web_store_dialog_ui.py lib/calibre/calibre/gui2/tag_browser/__init__.py +lib/calibre/calibre/gui2/tag_browser/model.py lib/calibre/calibre/gui2/tag_browser/ui.py lib/calibre/calibre/gui2/tag_browser/view.py -lib/calibre/calibre/gui2/tag_browser/model.py lib/calibre/calibre/gui2/threaded_jobs.py lib/calibre/calibre/gui2/throbber.py lib/calibre/calibre/gui2/tools.py lib/calibre/calibre/gui2/ui.py lib/calibre/calibre/gui2/update.py lib/calibre/calibre/gui2/viewer/__init__.py -lib/calibre/calibre/gui2/viewer/config.py lib/calibre/calibre/gui2/viewer/bookmarkmanager.py lib/calibre/calibre/gui2/viewer/bookmarkmanager_ui.py +lib/calibre/calibre/gui2/viewer/config.py lib/calibre/calibre/gui2/viewer/config_ui.py lib/calibre/calibre/gui2/viewer/dictionary.py lib/calibre/calibre/gui2/viewer/documentview.py -lib/calibre/calibre/gui2/viewer/javascript.py lib/calibre/calibre/gui2/viewer/flip.py lib/calibre/calibre/gui2/viewer/image_popup.py +lib/calibre/calibre/gui2/viewer/javascript.py lib/calibre/calibre/gui2/viewer/keys.py lib/calibre/calibre/gui2/viewer/main.py lib/calibre/calibre/gui2/viewer/main_ui.py @@ -909,11 +906,11 @@ lib/calibre/calibre/gui2/wizard/stanza_u lib/calibre/calibre/library/__init__.py lib/calibre/calibre/library/add_to_library.py lib/calibre/calibre/library/caches.py -lib/calibre/calibre/library/catalogs/bibtex.py -lib/calibre/calibre/library/catalogs/epub_mobi_builder.py -lib/calibre/calibre/library/catalogs/epub_mobi.py lib/calibre/calibre/library/catalogs/__init__.py +lib/calibre/calibre/library/catalogs/bibtex.py lib/calibre/calibre/library/catalogs/csv_xml.py +lib/calibre/calibre/library/catalogs/epub_mobi.py +lib/calibre/calibre/library/catalogs/epub_mobi_builder.py lib/calibre/calibre/library/catalogs/utils.py lib/calibre/calibre/library/check_library.py lib/calibre/calibre/library/cli.py @@ -945,20 +942,21 @@ lib/calibre/calibre/libunrar.py lib/calibre/calibre/libunzip.py lib/calibre/calibre/libwand.py lib/calibre/calibre/linux.py -lib/calibre/calibre/plugins/calibre_style.so lib/calibre/calibre/plugins/cPalmdoc.so +lib/calibre/calibre/plugins/calibre_style.so lib/calibre/calibre/plugins/chm_extra.so lib/calibre/calibre/plugins/chmlib.so -lib/calibre/calibre/plugins/fontconfig.so +lib/calibre/calibre/plugins/freetype.so lib/calibre/calibre/plugins/icu.so lib/calibre/calibre/plugins/lzx.so lib/calibre/calibre/plugins/magick.so lib/calibre/calibre/plugins/msdes.so lib/calibre/calibre/plugins/pictureflow.so -%%PODOFO%%lib/calibre/calibre/plugins/podofo.so +lib/calibre/calibre/plugins/podofo.so lib/calibre/calibre/plugins/progress_indicator.so lib/calibre/calibre/plugins/speedup.so lib/calibre/calibre/plugins/sqlite_custom.so +lib/calibre/calibre/plugins/woff.so lib/calibre/calibre/ptempfile.py lib/calibre/calibre/startup.py lib/calibre/calibre/test_build.py @@ -982,6 +980,27 @@ lib/calibre/calibre/utils/date.py lib/calibre/calibre/utils/dictclient.py lib/calibre/calibre/utils/filenames.py lib/calibre/calibre/utils/fonts/__init__.py +lib/calibre/calibre/utils/fonts/free_type.py +lib/calibre/calibre/utils/fonts/metadata.py +lib/calibre/calibre/utils/fonts/scanner.py +lib/calibre/calibre/utils/fonts/sfnt/__init__.py +lib/calibre/calibre/utils/fonts/sfnt/cff/__init__.py +lib/calibre/calibre/utils/fonts/sfnt/cff/constants.py +lib/calibre/calibre/utils/fonts/sfnt/cff/dict_data.py +lib/calibre/calibre/utils/fonts/sfnt/cff/table.py +lib/calibre/calibre/utils/fonts/sfnt/cff/writer.py +lib/calibre/calibre/utils/fonts/sfnt/cmap.py +lib/calibre/calibre/utils/fonts/sfnt/container.py +lib/calibre/calibre/utils/fonts/sfnt/errors.py +lib/calibre/calibre/utils/fonts/sfnt/glyf.py +lib/calibre/calibre/utils/fonts/sfnt/head.py +lib/calibre/calibre/utils/fonts/sfnt/kern.py +lib/calibre/calibre/utils/fonts/sfnt/loca.py +lib/calibre/calibre/utils/fonts/sfnt/maxp.py +lib/calibre/calibre/utils/fonts/sfnt/subset.py +lib/calibre/calibre/utils/fonts/utils.py +lib/calibre/calibre/utils/fonts/win_fonts.py +lib/calibre/calibre/utils/fonts/woff/__init__.py lib/calibre/calibre/utils/formatter.py lib/calibre/calibre/utils/formatter_functions.py lib/calibre/calibre/utils/html2text.py @@ -990,12 +1009,14 @@ lib/calibre/calibre/utils/icu.py lib/calibre/calibre/utils/ipc/__init__.py lib/calibre/calibre/utils/ipc/job.py lib/calibre/calibre/utils/ipc/launch.py +lib/calibre/calibre/utils/ipc/proxy.py lib/calibre/calibre/utils/ipc/server.py lib/calibre/calibre/utils/ipc/simple_worker.py -lib/calibre/calibre/utils/ipc/proxy.py lib/calibre/calibre/utils/ipc/worker.py lib/calibre/calibre/utils/ipython.py +lib/calibre/calibre/utils/linux_trash.py lib/calibre/calibre/utils/localization.py +lib/calibre/calibre/utils/localunzip.py lib/calibre/calibre/utils/lock.py lib/calibre/calibre/utils/logging.py lib/calibre/calibre/utils/magick/__init__.py @@ -1005,11 +1026,11 @@ lib/calibre/calibre/utils/mdns.py lib/calibre/calibre/utils/mem.py lib/calibre/calibre/utils/mreplace.py lib/calibre/calibre/utils/network.py -lib/calibre/calibre/utils/ordered_dict.py lib/calibre/calibre/utils/opensearch/__init__.py lib/calibre/calibre/utils/opensearch/description.py -lib/calibre/calibre/utils/opensearch/url.py lib/calibre/calibre/utils/opensearch/query.py +lib/calibre/calibre/utils/opensearch/url.py +lib/calibre/calibre/utils/ordered_dict.py lib/calibre/calibre/utils/osx_symlinks.py lib/calibre/calibre/utils/pdftk.py lib/calibre/calibre/utils/podofo/__init__.py @@ -1032,7 +1053,6 @@ lib/calibre/calibre/utils/smartypants.py lib/calibre/calibre/utils/smtp.py lib/calibre/calibre/utils/smtplib.py lib/calibre/calibre/utils/soupparser.py -lib/calibre/calibre/utils/linux_trash.py lib/calibre/calibre/utils/terminfo.py lib/calibre/calibre/utils/text2int.py lib/calibre/calibre/utils/threadpool.py @@ -1053,47 +1073,47 @@ lib/calibre/calibre/web/feeds/recipes/mo lib/calibre/calibre/web/feeds/templates.py lib/calibre/calibre/web/fetch/__init__.py lib/calibre/calibre/web/fetch/simple.py -lib/calibre/calibre/web/jsbrowser/browser.py lib/calibre/calibre/web/jsbrowser/__init__.py +lib/calibre/calibre/web/jsbrowser/browser.py +lib/calibre/calibre/web/jsbrowser/forms.py lib/calibre/calibre/web/jsbrowser/login.py lib/calibre/calibre/web/jsbrowser/test.py -lib/calibre/calibre/web/jsbrowser/forms.py +lib/calibre/chardet/__init__.py +lib/calibre/chardet/big5freq.py +lib/calibre/chardet/big5prober.py +lib/calibre/chardet/chardistribution.py +lib/calibre/chardet/charsetgroupprober.py +lib/calibre/chardet/charsetprober.py +lib/calibre/chardet/codingstatemachine.py +lib/calibre/chardet/constants.py +lib/calibre/chardet/escprober.py +lib/calibre/chardet/escsm.py +lib/calibre/chardet/eucjpprober.py +lib/calibre/chardet/euckrfreq.py +lib/calibre/chardet/euckrprober.py +lib/calibre/chardet/euctwfreq.py lib/calibre/chardet/euctwprober.py +lib/calibre/chardet/gb2312freq.py +lib/calibre/chardet/gb2312prober.py lib/calibre/chardet/hebrewprober.py -lib/calibre/chardet/euckrfreq.py -lib/calibre/chardet/charsetgroupprober.py -lib/calibre/chardet/latin1prober.py -lib/calibre/chardet/mbcssm.py +lib/calibre/chardet/jisfreq.py +lib/calibre/chardet/jpcntx.py +lib/calibre/chardet/langbulgarianmodel.py +lib/calibre/chardet/langcyrillicmodel.py +lib/calibre/chardet/langgreekmodel.py +lib/calibre/chardet/langhebrewmodel.py +lib/calibre/chardet/langhungarianmodel.py lib/calibre/chardet/langthaimodel.py -lib/calibre/chardet/euckrprober.py -lib/calibre/chardet/escprober.py +lib/calibre/chardet/latin1prober.py lib/calibre/chardet/mbcharsetprober.py -lib/calibre/chardet/langcyrillicmodel.py -lib/calibre/chardet/__init__.py -lib/calibre/chardet/chardistribution.py +lib/calibre/chardet/mbcsgroupprober.py +lib/calibre/chardet/mbcssm.py lib/calibre/chardet/sbcharsetprober.py +lib/calibre/chardet/sbcsgroupprober.py lib/calibre/chardet/sjisprober.py -lib/calibre/chardet/langbulgarianmodel.py -lib/calibre/chardet/langhebrewmodel.py -lib/calibre/chardet/gb2312prober.py -lib/calibre/chardet/escsm.py -lib/calibre/chardet/utf8prober.py -lib/calibre/chardet/codingstatemachine.py lib/calibre/chardet/test.py -lib/calibre/chardet/big5freq.py -lib/calibre/chardet/gb2312freq.py -lib/calibre/chardet/langgreekmodel.py -lib/calibre/chardet/euctwfreq.py -lib/calibre/chardet/eucjpprober.py -lib/calibre/chardet/jpcntx.py -lib/calibre/chardet/jisfreq.py -lib/calibre/chardet/charsetprober.py -lib/calibre/chardet/sbcsgroupprober.py -lib/calibre/chardet/constants.py -lib/calibre/chardet/mbcsgroupprober.py -lib/calibre/chardet/langhungarianmodel.py lib/calibre/chardet/universaldetector.py -lib/calibre/chardet/big5prober.py +lib/calibre/chardet/utf8prober.py lib/calibre/cherrypy/__init__.py lib/calibre/cherrypy/_cpchecker.py lib/calibre/cherrypy/_cpcompat.py @@ -1141,42 +1161,42 @@ lib/calibre/cherrypy/wsgiserver/ssl_buil lib/calibre/cherrypy/wsgiserver/ssl_pyopenssl.py lib/calibre/cherrypy/wsgiserver/wsgiserver2.py lib/calibre/cherrypy/wsgiserver/wsgiserver3.py -lib/calibre/html5lib/sanitizer.py -lib/calibre/html5lib/tokenizer.py -lib/calibre/html5lib/html5parser.py -lib/calibre/html5lib/ihatexml.py lib/calibre/html5lib/__init__.py -lib/calibre/html5lib/tokenizer_old.py -lib/calibre/html5lib/inputstream.py -lib/calibre/html5lib/utils.py lib/calibre/html5lib/constants.py -lib/calibre/html5lib/filters/lint.py -lib/calibre/html5lib/filters/sanitizer.py -lib/calibre/html5lib/filters/whitespace.py lib/calibre/html5lib/filters/__init__.py -lib/calibre/html5lib/filters/inject_meta_charset.py lib/calibre/html5lib/filters/_base.py lib/calibre/html5lib/filters/formfiller.py +lib/calibre/html5lib/filters/inject_meta_charset.py +lib/calibre/html5lib/filters/lint.py lib/calibre/html5lib/filters/optionaltags.py -lib/calibre/html5lib/serializer/xhtmlserializer.py +lib/calibre/html5lib/filters/sanitizer.py +lib/calibre/html5lib/filters/whitespace.py +lib/calibre/html5lib/html5parser.py +lib/calibre/html5lib/ihatexml.py +lib/calibre/html5lib/inputstream.py +lib/calibre/html5lib/sanitizer.py lib/calibre/html5lib/serializer/__init__.py lib/calibre/html5lib/serializer/htmlserializer.py -lib/calibre/html5lib/treewalkers/dom.py -lib/calibre/html5lib/treewalkers/genshistream.py -lib/calibre/html5lib/treewalkers/etree.py -lib/calibre/html5lib/treewalkers/__init__.py -lib/calibre/html5lib/treewalkers/pulldom.py -lib/calibre/html5lib/treewalkers/soup.py -lib/calibre/html5lib/treewalkers/lxmletree.py -lib/calibre/html5lib/treewalkers/_base.py -lib/calibre/html5lib/treewalkers/simpletree.py +lib/calibre/html5lib/serializer/xhtmlserializer.py +lib/calibre/html5lib/tokenizer.py +lib/calibre/html5lib/tokenizer_old.py +lib/calibre/html5lib/treebuilders/__init__.py +lib/calibre/html5lib/treebuilders/_base.py lib/calibre/html5lib/treebuilders/dom.py lib/calibre/html5lib/treebuilders/etree.py -lib/calibre/html5lib/treebuilders/__init__.py lib/calibre/html5lib/treebuilders/etree_lxml.py -lib/calibre/html5lib/treebuilders/soup.py -lib/calibre/html5lib/treebuilders/_base.py lib/calibre/html5lib/treebuilders/simpletree.py +lib/calibre/html5lib/treebuilders/soup.py +lib/calibre/html5lib/treewalkers/__init__.py +lib/calibre/html5lib/treewalkers/_base.py +lib/calibre/html5lib/treewalkers/dom.py +lib/calibre/html5lib/treewalkers/etree.py +lib/calibre/html5lib/treewalkers/genshistream.py +lib/calibre/html5lib/treewalkers/lxmletree.py +lib/calibre/html5lib/treewalkers/pulldom.py +lib/calibre/html5lib/treewalkers/simpletree.py +lib/calibre/html5lib/treewalkers/soup.py +lib/calibre/html5lib/utils.py lib/calibre/odf/__init__.py lib/calibre/odf/anim.py lib/calibre/odf/attrconverters.py @@ -1220,33 +1240,10 @@ lib/calibre/routes/middleware.py lib/calibre/routes/route.py lib/calibre/routes/util.py lib/calibre/templite/__init__.py +%%PYTHON_SITELIBDIR%%/init_calibre.py +share/applications/calibre-ebook-viewer.desktop share/applications/calibre-gui.desktop share/applications/calibre-lrfviewer.desktop -share/applications/calibre-ebook-viewer.desktop -share/mime/packages/calibre-mimetypes.xml -share/icons/hicolor/128x128/apps/calibre-viewer.png -share/icons/hicolor/128x128/mimetypes/application-lrf.png -share/icons/hicolor/128x128/mimetypes/gnome-mime-application-lrf.png -share/icons/hicolor/128x128/mimetypes/text-lrs.png -share/icons/hicolor/128x128/mimetypes/gnome-mime-text-lrs.png -share/icons/hicolor/128x128/mimetypes/application-x-mobipocket-ebook.png -share/icons/hicolor/128x128/mimetypes/application-x-topaz-ebook.png -share/icons/hicolor/128x128/mimetypes/application-x-kindle-application.png -share/icons/hicolor/128x128/mimetypes/application-x-mobi8-ebook.png -share/icons/hicolor/128x128/mimetypes/gnome-mime-application-x-mobipocket-ebook.png -share/icons/hicolor/128x128/mimetypes/gnome-mime-application-x-topaz-ebook.png -share/icons/hicolor/128x128/mimetypes/gnome-mime-application-x-kindle-application.png -share/icons/hicolor/128x128/mimetypes/gnome-mime-application-x-mobi8-ebook.png -share/icons/hicolor/256x256/apps/calibre-gui.png -share/gnome/apps/calibre-gui.desktop -share/gnome/apps/calibre-lrfviewer.desktop -share/gnome/apps/calibre-ebook-viewer.desktop -share/mime/application/x-sony-bbeb.xml -share/mime/application/x-topaz-ebook.xml -share/mime/application/x-mobi8-ebook.xml -share/mime/application/x-kindle-application.xml -share/mime/application/x-mobipocket-subscription.xml -share/mime/text/lrs.xml %%DATADIR%%/builtin_recipes.xml %%DATADIR%%/builtin_recipes.zip %%DATADIR%%/calibre-portable.bat @@ -1307,6 +1304,7 @@ share/mime/text/lrs.xml %%DATADIR%%/content_server/star-on.png %%DATADIR%%/default_tweaks.py %%DATADIR%%/ebook-convert-complete.pickle +%%DATADIR%%/fonts/calibreSymbols.otf %%DATADIR%%/fonts/liberation/LiberationMono-Bold.ttf %%DATADIR%%/fonts/liberation/LiberationMono-BoldItalic.ttf %%DATADIR%%/fonts/liberation/LiberationMono-Italic.ttf @@ -1322,7 +1320,6 @@ share/mime/text/lrs.xml %%DATADIR%%/fonts/prs500/tt0003m_.ttf %%DATADIR%%/fonts/prs500/tt0011m_.ttf %%DATADIR%%/fonts/prs500/tt0419m_.ttf -%%DATADIR%%/fonts/calibreSymbols.otf %%DATADIR%%/images.qrc %%DATADIR%%/images/add_book.png %%DATADIR%%/images/arrow-down.png @@ -1339,9 +1336,11 @@ share/mime/text/lrs.xml %%DATADIR%%/images/column.png %%DATADIR%%/images/config.png %%DATADIR%%/images/connect_share.png +%%DATADIR%%/images/connect_share_on.png %%DATADIR%%/images/console.png %%DATADIR%%/images/convert.png %%DATADIR%%/images/cover_flow.png +%%DATADIR%%/images/cover_texture.png %%DATADIR%%/images/debug.png %%DATADIR%%/images/default_cover.png %%DATADIR%%/images/devices/bambook.png @@ -1361,7 +1360,11 @@ share/mime/text/lrs.xml %%DATADIR%%/images/document-encrypt.png %%DATADIR%%/images/document_open.png %%DATADIR%%/images/donate.png +%%DATADIR%%/images/dot_green.png +%%DATADIR%%/images/dot_red.png %%DATADIR%%/images/drawer.png +%%DATADIR%%/images/drm-locked.png +%%DATADIR%%/images/drm-unlocked.png %%DATADIR%%/images/edit-clear.png %%DATADIR%%/images/edit-copy.png %%DATADIR%%/images/edit-cut.png @@ -1372,6 +1375,7 @@ share/mime/text/lrs.xml %%DATADIR%%/images/edit_input.png %%DATADIR%%/images/eject.png %%DATADIR%%/images/exec.png +%%DATADIR%%/images/font.png %%DATADIR%%/images/font_size_larger.png %%DATADIR%%/images/font_size_smaller.png %%DATADIR%%/images/format-fill-color.png @@ -1395,12 +1399,14 @@ share/mime/text/lrs.xml *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***