- Update to 0.8.37

while here...
- update python dependencies per standards
- remove unneeded gettext dependency
- drop PYSETUP assignment, as it is the default
- use DATADIR in pkg-plist, in favor of "share/calibre"

PR:	ports/164713
Submitted by:	maintainer, rnejdl at ringofsaturn.com
Approved by:	crees (mentor)

3 files changed, 332 insertions, 371 deletions

diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 0765c9511434..523add49a23d 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	calibre
-PORTVERSION=	0.8.33
+PORTVERSION=	0.8.37
 CATEGORIES=	deskutils python
 MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
@@ -19,44 +19,39 @@ LIB_DEPENDS=	MagickWand.5:${PORTSDIR}/graphics/ImageMagick \
 		wmflite:${PORTSDIR}/graphics/libwmf \
 		chm.0:${PORTSDIR}/misc/chmlib \
 		icudata.48:${PORTSDIR}/devel/icu
-BUILD_DEPENDS=	py*-setuptools>=0:${PORTSDIR}/devel/py-setuptools \
-		py*-sip>=0:${PORTSDIR}/devel/py-sip \
-		py*-qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \
-		py*-qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		py*-cssutils>=0:${PORTSDIR}/www/py-cssutils \
-		py*-dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		py*-lxml>=0:${PORTSDIR}/devel/py-lxml
+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 \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}cssutils>=0:${PORTSDIR}/www/py-cssutils \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
-		py*-dnspython>=0:${PORTSDIR}/dns/py-dnspython \
-		py*-dateutil>=0:${PORTSDIR}/devel/py-dateutil \
-		py*-beautifulsoup>=0:${PORTSDIR}/www/py-beautifulsoup \
-		py*-imaging>=0:${PORTSDIR}/graphics/py-imaging \
-		py*-lxml>=0:${PORTSDIR}/devel/py-lxml \
-		py*-mechanize>=0:${PORTSDIR}/www/py-mechanize \
-		py*-sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
-		py*-qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \
-		py*-qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
-		py*-qt4-network>=0:${PORTSDIR}/net/py-qt4-network \
-		py*-qt4-svg>=0:${PORTSDIR}/graphics/py-qt4-svg \
-		py*-qt4-webkit>=0:${PORTSDIR}/www/py-qt4-webkit \
-		py*-qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml \
-		py*-dbus>=0:${PORTSDIR}/devel/py-dbus \
+		${PYTHON_PKGNAMEPREFIX}dnspython>=0:${PORTSDIR}/dns/py-dnspython \
+		${PYTHON_PKGNAMEPREFIX}dateutil>=0:${PORTSDIR}/devel/py-dateutil \
+		${PYTHON_PKGNAMEPREFIX}beautifulsoup>=0:${PORTSDIR}/www/py-beautifulsoup \
+		${PYTHON_PKGNAMEPREFIX}imaging>=0:${PORTSDIR}/graphics/py-imaging \
+		${PYTHON_PKGNAMEPREFIX}lxml>=0:${PORTSDIR}/devel/py-lxml \
+		${PYTHON_PKGNAMEPREFIX}mechanize>=0:${PORTSDIR}/www/py-mechanize \
+		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
+		${PYTHON_PKGNAMEPREFIX}qt4-core>=0:${PORTSDIR}/devel/py-qt4-core \
+		${PYTHON_PKGNAMEPREFIX}qt4-gui>=0:${PORTSDIR}/x11-toolkits/py-qt4-gui \
+		${PYTHON_PKGNAMEPREFIX}qt4-network>=0:${PORTSDIR}/net/py-qt4-network \
+		${PYTHON_PKGNAMEPREFIX}qt4-svg>=0:${PORTSDIR}/graphics/py-qt4-svg \
+		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=0:${PORTSDIR}/www/py-qt4-webkit \
+		${PYTHON_PKGNAMEPREFIX}qt4-xml>=0:${PORTSDIR}/textproc/py-qt4-xml \
+		${PYTHON_PKGNAMEPREFIX}dbus>=0:${PORTSDIR}/devel/py-dbus \
 		pdftohtml:${PORTSDIR}/graphics/poppler-utils \
 		lshal:${PORTSDIR}/sysutils/hal
 
-OPTIONS=	PODOFO	"PDF support via PoDoFo library" on \
-		NLS	"Enable NLS support"	on
+OPTIONS=	PODOFO	"PDF support via PoDoFo library" on
 
 USE_XZ=		yes
-.if defined(WITH_NLS)
-USE_GETTEXT=	yes
-.endif
 USE_PYTHON=	2.7+
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build
 INSTALLS_ICONS=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
-PYSETUP=	setup.py
 CFLAGS+=	"-I${LOCALBASE}/include"
 LDFLAGS+=	"-L${LOCALBASE}/lib"
 MAKE_ENV+=	FC_INC_DIR="${LOCALBASE}/include/fontconfig" \
@@ -101,11 +96,9 @@ do-build:
 		${PYSETUP} build)
 
 do-install:
-	${MKDIR} ${PREFIX}/share/desktop-directories
-	${MKDIR} ${PREFIX}/share/applications
-	${MKDIR} ${PREFIX}/share/gnome/apps
-	${MKDIR} ${PREFIX}/share/mime/packages
-	${MKDIR} ${PREFIX}/share/icons/hicolor/128x128/apps
+.for dir in desktop-directories applications  gnome/apps mime/packages icons/hicolor/128x128/apps
+	${MKDIR} ${PREFIX}/share/${dir}
+.endfor
 	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} \
 		${PYSETUP} ${INSTALL} --prefix ${PREFIX})
 
diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo
index e6e792056c78..86b6d5e6166b 100644
--- a/deskutils/calibre/distinfo
+++ b/deskutils/calibre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (calibre-0.8.33.tar.xz) = 885baed4810a92ceea78c49e4780a00aed19166b2475b430c9491396d3c0b74d
-SIZE (calibre-0.8.33.tar.xz) = 21848976
+SHA256 (calibre-0.8.37.tar.xz) = eedde8124f0e688d826de0013dabf2f16ff5fa0621df89f0897fd3848bc8d59d
+SIZE (calibre-0.8.37.tar.xz) = 23614740
diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist
index 11c9606394fe..b1254d8fd514 100644
--- a/deskutils/calibre/pkg-plist
+++ b/deskutils/calibre/pkg-plist
@@ -121,6 +121,7 @@ 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
@@ -304,7 +305,7 @@ lib/calibre/calibre/ebooks/oeb/output.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/test/test.py
+lib/calibre/calibre/ebooks/oeb/display/test-cfi/run.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
@@ -837,11 +838,12 @@ lib/calibre/calibre/gui2/viewer/bookmarkmanager_ui.py
 lib/calibre/calibre/gui2/viewer/config_ui.py
 lib/calibre/calibre/gui2/viewer/dictionary.py
 lib/calibre/calibre/gui2/viewer/documentview.py
+lib/calibre/calibre/gui2/viewer/javascript.py
 lib/calibre/calibre/gui2/viewer/flip.py
-lib/calibre/calibre/gui2/viewer/gestures.py
 lib/calibre/calibre/gui2/viewer/keys.py
 lib/calibre/calibre/gui2/viewer/main.py
 lib/calibre/calibre/gui2/viewer/main_ui.py
+lib/calibre/calibre/gui2/viewer/position.py
 lib/calibre/calibre/gui2/viewer/printing.py
 lib/calibre/calibre/gui2/widgets.py
 lib/calibre/calibre/gui2/wizard/__init__.py
@@ -943,8 +945,10 @@ 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/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/localization.py
 lib/calibre/calibre/utils/lock.py
 lib/calibre/calibre/utils/logging.py
@@ -975,13 +979,13 @@ lib/calibre/calibre/utils/recycle_bin.py
 lib/calibre/calibre/utils/resources.py
 lib/calibre/calibre/utils/rss_gen.py
 lib/calibre/calibre/utils/search_query_parser.py
+lib/calibre/calibre/utils/serve_coffee.py
 lib/calibre/calibre/utils/sftp.py
 lib/calibre/calibre/utils/sigil.py
 lib/calibre/calibre/utils/smartypants.py
 lib/calibre/calibre/utils/smtp.py
 lib/calibre/calibre/utils/smtplib.py
 lib/calibre/calibre/utils/soupparser.py
-lib/calibre/calibre/utils/coffeescript.py
 lib/calibre/calibre/utils/linux_trash.py
 lib/calibre/calibre/utils/terminfo.py
 lib/calibre/calibre/utils/text2int.py
@@ -1190,338 +1194,302 @@ share/icons/hicolor/128x128/mimetypes/gnome-mime-text-lrs.png
 share/gnome/apps/calibre-gui.desktop
 share/gnome/apps/calibre-lrfviewer.desktop
 share/gnome/apps/calibre-ebook-viewer.desktop
-share/calibre/builtin_recipes.xml
-share/calibre/builtin_recipes.zip
-share/calibre/calibre-portable.bat
-share/calibre/catalog/DefaultCover.jpg
-share/calibre/catalog/mastheadImage.gif
-share/calibre/catalog/section_list_templates.py
-share/calibre/catalog/stylesheet.css
-share/calibre/catalog/template.xhtml
-share/calibre/content_server/av.jpg
-share/calibre/content_server/bg_search_box.png
-share/calibre/content_server/browse/browse.css
-share/calibre/content_server/browse/browse.html
-share/calibre/content_server/browse/browse.js
-share/calibre/content_server/browse/details.html
-share/calibre/content_server/browse/summary.html
-share/calibre/content_server/btn_search_box.png
-share/calibre/content_server/button-donate.png
-share/calibre/content_server/calibre.png
-share/calibre/content_server/calibre_banner.png
-share/calibre/content_server/date.js
-share/calibre/content_server/default_cover.jpg
-share/calibre/content_server/first.png
-share/calibre/content_server/gui.css
-share/calibre/content_server/gui.js
-share/calibre/content_server/index.html
-share/calibre/content_server/jquery.corner.js
-share/calibre/content_server/jquery.js
-share/calibre/content_server/jquery.multiselect.css
-share/calibre/content_server/jquery.multiselect.min.js
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_flat_75_aaaaaa_40x100.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_100_f5f0e5_1x400.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_25_cb842e_1x400.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_70_ede4d4_1x400.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_100_f4f0ec_1x100.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_65_fee4bd_1x100.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_75_f5f5b5_1x100.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-bg_inset-soft_100_f4f0ec_1x100.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_c47a23_256x240.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_cb672b_256x240.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f08000_256x240.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f35f07_256x240.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_ff7519_256x240.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/images/ui-icons_ffffff_256x240.png
-share/calibre/content_server/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css
-share/calibre/content_server/jquery_ui/js/jquery-ui-1.8.5.custom.min.js
-share/calibre/content_server/last.png
-share/calibre/content_server/loading.gif
-share/calibre/content_server/logo.png
-share/calibre/content_server/mobile.css
-share/calibre/content_server/next.png
-share/calibre/content_server/previous.png
-share/calibre/content_server/read/monocle.js
-share/calibre/content_server/stacktrace.js
-share/calibre/content_server/star-half.png
-share/calibre/content_server/star-off.png
-share/calibre/content_server/star-on.png
-share/calibre/default_tweaks.py
-share/calibre/display/cfi.js
-share/calibre/ebook-convert-complete.pickle
-share/calibre/fonts/liberation/LiberationMono-Bold.ttf
-share/calibre/fonts/liberation/LiberationMono-BoldItalic.ttf
-share/calibre/fonts/liberation/LiberationMono-Italic.ttf
-share/calibre/fonts/liberation/LiberationMono-Regular.ttf
-share/calibre/fonts/liberation/LiberationSans-Bold.ttf
-share/calibre/fonts/liberation/LiberationSans-BoldItalic.ttf
-share/calibre/fonts/liberation/LiberationSans-Italic.ttf
-share/calibre/fonts/liberation/LiberationSans-Regular.ttf
-share/calibre/fonts/liberation/LiberationSerif-Bold.ttf
-share/calibre/fonts/liberation/LiberationSerif-BoldItalic.ttf
-share/calibre/fonts/liberation/LiberationSerif-Italic.ttf
-share/calibre/fonts/liberation/LiberationSerif-Regular.ttf
-share/calibre/fonts/prs500/tt0003m_.ttf
-share/calibre/fonts/prs500/tt0011m_.ttf
-share/calibre/fonts/prs500/tt0419m_.ttf
-share/calibre/images.qrc
-share/calibre/images/add_book.png
-share/calibre/images/arrow-down.png
-share/calibre/images/arrow-up.png
-share/calibre/images/auto_author_sort.png
-share/calibre/images/back.png
-share/calibre/images/blank.png
-share/calibre/images/book.png
-share/calibre/images/bookmarks.png
-share/calibre/images/books_in_series.png
-share/calibre/images/catalog.png
-share/calibre/images/chapters.png
-share/calibre/images/clear_left.png
-share/calibre/images/column.png
-share/calibre/images/config.png
-share/calibre/images/connect_share.png
-share/calibre/images/console.png
-share/calibre/images/convert.png
-share/calibre/images/cover_flow.png
-share/calibre/images/debug.png
-share/calibre/images/default_cover.png
-share/calibre/images/devices/bambook.png
-share/calibre/images/devices/boox.jpg
-share/calibre/images/devices/folder.png
-share/calibre/images/devices/ipad.png
-share/calibre/images/devices/italica.png
-share/calibre/images/devices/itunes.png
-share/calibre/images/devices/kindle.jpg
-share/calibre/images/devices/nook.jpg
-share/calibre/images/dialog_error.png
-share/calibre/images/dialog_information.png
-share/calibre/images/dialog_question.png
-share/calibre/images/dialog_warning.png
-share/calibre/images/dictionary.png
-share/calibre/images/document-encrypt.png
-share/calibre/images/document_open.png
-share/calibre/images/donate.png
-share/calibre/images/drawer.png
-share/calibre/images/edit-clear.png
-share/calibre/images/edit-copy.png
-share/calibre/images/edit-cut.png
-share/calibre/images/edit-paste.png
-share/calibre/images/edit-redo.png
-share/calibre/images/edit-select-all.png
-share/calibre/images/edit-undo.png
-share/calibre/images/edit_input.png
-share/calibre/images/eject.png
-share/calibre/images/exec.png
-share/calibre/images/font_size_larger.png
-share/calibre/images/font_size_smaller.png
-share/calibre/images/format-fill-color.png
-share/calibre/images/format-indent-less.png
-share/calibre/images/format-indent-more.png
-share/calibre/images/format-justify-center.png
-share/calibre/images/format-justify-fill.png
-share/calibre/images/format-justify-left.png
-share/calibre/images/format-justify-right.png
-share/calibre/images/format-list-ordered.png
-share/calibre/images/format-list-unordered.png
-share/calibre/images/format-text-bold.png
-share/calibre/images/format-text-color.png
-share/calibre/images/format-text-heading.png
-share/calibre/images/format-text-italic.png
-share/calibre/images/format-text-strikethrough.png
-share/calibre/images/format-text-subscript.png
-share/calibre/images/format-text-superscript.png
-share/calibre/images/format-text-underline.png
-share/calibre/images/forward.png
-share/calibre/images/gmail_logo.png
-share/calibre/images/help.png
-share/calibre/images/heuristics.png
-share/calibre/images/hotmail.png
-share/calibre/images/insert-link.png
-share/calibre/images/jobs.png
-share/calibre/images/languages.png
-share/calibre/images/random.png
-share/calibre/images/keyboard-prefs.png
-share/calibre/images/library.png
-share/calibre/images/list_remove.png
-share/calibre/images/lookfeel.png
-share/calibre/images/lt.png
-share/calibre/images/mail.png
-share/calibre/images/merge_books.png
-share/calibre/images/metadata.png
-share/calibre/images/mimetypes/bmp.png
-share/calibre/images/mimetypes/computer.png
-share/calibre/images/mimetypes/dir.png
-share/calibre/images/mimetypes/epub.png
-share/calibre/images/mimetypes/fb2.png
-share/calibre/images/mimetypes/gif.png
-share/calibre/images/mimetypes/html.png
-share/calibre/images/mimetypes/jpeg.png
-share/calibre/images/mimetypes/lit.png
-share/calibre/images/mimetypes/lrf.png
-share/calibre/images/mimetypes/lrx.png
-share/calibre/images/mimetypes/mobi.png
-share/calibre/images/mimetypes/odt.png
-share/calibre/images/mimetypes/pdf.png
-share/calibre/images/mimetypes/png.png
-share/calibre/images/mimetypes/rar.png
-share/calibre/images/mimetypes/rtf.png
-share/calibre/images/mimetypes/snb.png
-share/calibre/images/mimetypes/svg.png
-share/calibre/images/mimetypes/txt.png
-share/calibre/images/mimetypes/unknown.png
-share/calibre/images/mimetypes/zero.png
-share/calibre/images/mimetypes/zip.png
-share/calibre/images/mimetypes/djvu.png
-share/calibre/images/mimetypes/xps.png
-share/calibre/images/minus.png
-share/calibre/images/minusminus.png
-share/calibre/images/network-server.png
-share/calibre/images/news.png
-share/calibre/images/next.png
-share/calibre/images/notify.png
-share/calibre/images/ok.png
-share/calibre/images/page.png
-share/calibre/images/plugboard.png
-share/calibre/images/plugins.png
-share/calibre/images/plugins/plugin_updater_updates.png
-share/calibre/images/plugins/plugin_new_invalid.png
-share/calibre/images/plugins/plugin_upgrade_ok.png
-share/calibre/images/plugins/plugin_disabled_ok.png
-share/calibre/images/plugins/plugin_new_valid.png
-share/calibre/images/plugins/plugin_new.png
-share/calibre/images/plugins/plugin_upgrade_valid.png
-share/calibre/images/plugins/plugin_deprecated.png
-share/calibre/images/plugins/mobileread.png
-share/calibre/images/plugins/plugin_disabled_invalid.png
-share/calibre/images/plugins/plugin_updater.png
-share/calibre/images/plugins/plugin_disabled_valid.png
-share/calibre/images/plugins/plugin_upgrade_invalid.png
-share/calibre/images/plus.png
-share/calibre/images/plusplus.png
-share/calibre/images/previous.png
-share/calibre/images/print-preview.png
-share/calibre/images/print.png
-share/calibre/images/publisher.png
-share/calibre/images/rating.png
-share/calibre/images/reader.png
-share/calibre/images/save.png
-share/calibre/images/scheduler.png
-share/calibre/images/sd.png
-share/calibre/images/search.png
-share/calibre/images/search_add_saved.png
-share/calibre/images/search_copy_saved.png
-share/calibre/images/search_delete_saved.png
-share/calibre/images/series.png
-share/calibre/images/swap.png
-share/calibre/images/sync.png
-share/calibre/images/tags.png
-share/calibre/images/tb_folder.png
-share/calibre/images/template_funcs.png
-share/calibre/images/trash.png
-share/calibre/images/trim.png
-share/calibre/images/user_profile.png
-share/calibre/images/view.png
-share/calibre/images/viewer.png
-share/calibre/images/welcome_wizard.png
-share/calibre/images/window-close.png
-share/calibre/images/wizard.png
-share/calibre/images/store.png
-share/calibre/images/highlight_only_off.png
-share/calibre/images/identifiers.png
-share/calibre/images/drm-locked.png
-share/calibre/images/highlight_only_on.png
-share/calibre/images/connect_share_on.png
-share/calibre/images/drm-unlocked.png
-share/calibre/jacket/stylesheet.css
-share/calibre/jacket/template.xhtml
-share/calibre/jquery.simulate.js
-share/calibre/localization/iso639.pickle
-share/calibre/localization/pykakasi/itaijidict2.pickle
-share/calibre/localization/pykakasi/kanadict2.pickle
-share/calibre/localization/pykakasi/kanwadict2.pickle
-share/calibre/localization/locales.zip
-share/calibre/localization/stats.pickle
-share/calibre/metadata_sqlite.sql
-share/calibre/mime.types
-share/calibre/quick_start.epub
-share/calibre/scripts.pickle
-share/calibre/template-functions.json
-share/calibre/templates/fb2.xsl
-share/calibre/templates/html.css
-share/calibre/templates/html_export_default.css
-share/calibre/templates/html_export_default.tmpl
-share/calibre/templates/html_export_default_index.tmpl
-share/calibre/templates/lrf.xsl
-share/calibre/templates/rtf.xsl
-share/calibre/templates/book_details.css
-share/calibre/tracer.epub
-share/calibre/viewer/bookmarks.js
-share/calibre/viewer/hyphenate/Hyphenator.js
-share/calibre/viewer/hyphenate/patterns/be.js
-share/calibre/viewer/hyphenate/patterns/bn.js
-share/calibre/viewer/hyphenate/patterns/cs.js
-share/calibre/viewer/hyphenate/patterns/da.js
-share/calibre/viewer/hyphenate/patterns/de.js
-share/calibre/viewer/hyphenate/patterns/el-monoton.js
-share/calibre/viewer/hyphenate/patterns/el-polyton.js
-share/calibre/viewer/hyphenate/patterns/en-gb.js
-share/calibre/viewer/hyphenate/patterns/en-us.js
-share/calibre/viewer/hyphenate/patterns/es.js
-share/calibre/viewer/hyphenate/patterns/fi.js
-share/calibre/viewer/hyphenate/patterns/fr.js
-share/calibre/viewer/hyphenate/patterns/grc.js
-share/calibre/viewer/hyphenate/patterns/gu.js
-share/calibre/viewer/hyphenate/patterns/hi.js
-share/calibre/viewer/hyphenate/patterns/hu.js
-share/calibre/viewer/hyphenate/patterns/hy.js
-share/calibre/viewer/hyphenate/patterns/it.js
-share/calibre/viewer/hyphenate/patterns/kn.js
-share/calibre/viewer/hyphenate/patterns/la.js
-share/calibre/viewer/hyphenate/patterns/lt.js
-share/calibre/viewer/hyphenate/patterns/lv.js
-share/calibre/viewer/hyphenate/patterns/ml.js
-share/calibre/viewer/hyphenate/patterns/nl.js
-share/calibre/viewer/hyphenate/patterns/no-nb.js
-share/calibre/viewer/hyphenate/patterns/or.js
-share/calibre/viewer/hyphenate/patterns/pa.js
-share/calibre/viewer/hyphenate/patterns/pl.js
-share/calibre/viewer/hyphenate/patterns/pt.js
-share/calibre/viewer/hyphenate/patterns/ru.js
-share/calibre/viewer/hyphenate/patterns/sl.js
-share/calibre/viewer/hyphenate/patterns/sv.js
-share/calibre/viewer/hyphenate/patterns/ta.js
-share/calibre/viewer/hyphenate/patterns/te.js
-share/calibre/viewer/hyphenate/patterns/tr.js
-share/calibre/viewer/hyphenate/patterns/uk.js
-share/calibre/viewer/hyphenation.js
-share/calibre/viewer/images.js
-share/calibre/viewer/jquery_scrollTo.js
-share/calibre/viewer/referencing.js
-@dirrm share/calibre/viewer/hyphenate/patterns
-@dirrm share/calibre/viewer/hyphenate
-@dirrm share/calibre/viewer
-@dirrm share/calibre/templates
-@dirrm share/calibre/localization/pykakasi
-@dirrm share/calibre/localization
-@dirrm share/calibre/jacket
-@dirrm share/calibre/images/mimetypes
-@dirrm share/calibre/images/devices
-@dirrm share/calibre/images/plugins
-@dirrm share/calibre/images
-@dirrm share/calibre/fonts/prs500
-@dirrm share/calibre/fonts/liberation
-@dirrm share/calibre/fonts
-@dirrm share/calibre/display
-@dirrm share/calibre/content_server/read
-@dirrm share/calibre/content_server/jquery_ui/js
-@dirrm share/calibre/content_server/jquery_ui/css/humanity-custom/images
-@dirrm share/calibre/content_server/jquery_ui/css/humanity-custom
-@dirrm share/calibre/content_server/jquery_ui/css
-@dirrm share/calibre/content_server/jquery_ui
-@dirrm share/calibre/content_server/browse
-@dirrm share/calibre/content_server
-@dirrm share/calibre/catalog
-@dirrm share/calibre
+%%DATADIR%%/builtin_recipes.xml
+%%DATADIR%%/builtin_recipes.zip
+%%DATADIR%%/calibre-portable.bat
+%%DATADIR%%/catalog/DefaultCover.jpg
+%%DATADIR%%/catalog/mastheadImage.gif
+%%DATADIR%%/catalog/section_list_templates.py
+%%DATADIR%%/catalog/stylesheet.css
+%%DATADIR%%/catalog/template.xhtml
+%%DATADIR%%/content_server/av.jpg
+%%DATADIR%%/content_server/bg_search_box.png
+%%DATADIR%%/content_server/browse/browse.css
+%%DATADIR%%/content_server/browse/browse.html
+%%DATADIR%%/content_server/browse/browse.js
+%%DATADIR%%/content_server/browse/details.html
+%%DATADIR%%/content_server/browse/summary.html
+%%DATADIR%%/content_server/btn_search_box.png
+%%DATADIR%%/content_server/button-donate.png
+%%DATADIR%%/content_server/calibre.png
+%%DATADIR%%/content_server/calibre_banner.png
+%%DATADIR%%/content_server/date.js
+%%DATADIR%%/content_server/default_cover.jpg
+%%DATADIR%%/content_server/first.png
+%%DATADIR%%/content_server/gui.css
+%%DATADIR%%/content_server/gui.js
+%%DATADIR%%/content_server/index.html
+%%DATADIR%%/content_server/jquery.corner.js
+%%DATADIR%%/content_server/jquery.js
+%%DATADIR%%/content_server/jquery.multiselect.css
+%%DATADIR%%/content_server/jquery.multiselect.min.js
+%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-bg_flat_75_aaaaaa_40x100.png
+%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_100_f5f0e5_1x400.png
+%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_25_cb842e_1x400.png
+%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_70_ede4d4_1x400.png
+%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_100_f4f0ec_1x100.png
+%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_65_fee4bd_1x100.png
+%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-bg_highlight-hard_75_f5f5b5_1x100.png
+%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-bg_inset-soft_100_f4f0ec_1x100.png
+%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-icons_c47a23_256x240.png
+%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-icons_cb672b_256x240.png
+%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f08000_256x240.png
+%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f35f07_256x240.png
+%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-icons_ff7519_256x240.png
+%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images/ui-icons_ffffff_256x240.png
+%%DATADIR%%/content_server/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css
+%%DATADIR%%/content_server/jquery_ui/js/jquery-ui-1.8.5.custom.min.js
+%%DATADIR%%/content_server/last.png
+%%DATADIR%%/content_server/loading.gif
+%%DATADIR%%/content_server/logo.png
+%%DATADIR%%/content_server/mobile.css
+%%DATADIR%%/content_server/next.png
+%%DATADIR%%/content_server/previous.png
+%%DATADIR%%/content_server/read/monocle.js
+%%DATADIR%%/content_server/stacktrace.js
+%%DATADIR%%/content_server/star-half.png
+%%DATADIR%%/content_server/star-off.png
+%%DATADIR%%/content_server/star-on.png
+%%DATADIR%%/default_tweaks.py
+%%DATADIR%%/display/cfi.js
+%%DATADIR%%/ebook-convert-complete.pickle
+%%DATADIR%%/fonts/liberation/LiberationMono-Bold.ttf
+%%DATADIR%%/fonts/liberation/LiberationMono-BoldItalic.ttf
+%%DATADIR%%/fonts/liberation/LiberationMono-Italic.ttf
+%%DATADIR%%/fonts/liberation/LiberationMono-Regular.ttf
+%%DATADIR%%/fonts/liberation/LiberationSans-Bold.ttf
+%%DATADIR%%/fonts/liberation/LiberationSans-BoldItalic.ttf
+%%DATADIR%%/fonts/liberation/LiberationSans-Italic.ttf
+%%DATADIR%%/fonts/liberation/LiberationSans-Regular.ttf
+%%DATADIR%%/fonts/liberation/LiberationSerif-Bold.ttf
+%%DATADIR%%/fonts/liberation/LiberationSerif-BoldItalic.ttf
+%%DATADIR%%/fonts/liberation/LiberationSerif-Italic.ttf
+%%DATADIR%%/fonts/liberation/LiberationSerif-Regular.ttf
+%%DATADIR%%/fonts/prs500/tt0003m_.ttf
+%%DATADIR%%/fonts/prs500/tt0011m_.ttf
+%%DATADIR%%/fonts/prs500/tt0419m_.ttf
+%%DATADIR%%/images.qrc
+%%DATADIR%%/images/add_book.png
+%%DATADIR%%/images/arrow-down.png
+%%DATADIR%%/images/arrow-up.png
+%%DATADIR%%/images/auto_author_sort.png
+%%DATADIR%%/images/back.png
+%%DATADIR%%/images/blank.png
+%%DATADIR%%/images/book.png
+%%DATADIR%%/images/bookmarks.png
+%%DATADIR%%/images/books_in_series.png
+%%DATADIR%%/images/catalog.png
+%%DATADIR%%/images/chapters.png
+%%DATADIR%%/images/clear_left.png
+%%DATADIR%%/images/column.png
+%%DATADIR%%/images/config.png
+%%DATADIR%%/images/connect_share.png
+%%DATADIR%%/images/console.png
+%%DATADIR%%/images/convert.png
+%%DATADIR%%/images/cover_flow.png
+%%DATADIR%%/images/debug.png
+%%DATADIR%%/images/default_cover.png
+%%DATADIR%%/images/devices/bambook.png
+%%DATADIR%%/images/devices/boox.jpg
+%%DATADIR%%/images/devices/folder.png
+%%DATADIR%%/images/devices/ipad.png
+%%DATADIR%%/images/devices/italica.png
+%%DATADIR%%/images/devices/itunes.png
+%%DATADIR%%/images/devices/kindle.jpg
+%%DATADIR%%/images/devices/nook.jpg
+%%DATADIR%%/images/dialog_error.png
+%%DATADIR%%/images/dialog_information.png
+%%DATADIR%%/images/dialog_question.png
+%%DATADIR%%/images/dialog_warning.png
+%%DATADIR%%/images/dictionary.png
+%%DATADIR%%/images/document-encrypt.png
+%%DATADIR%%/images/document_open.png
+%%DATADIR%%/images/donate.png
+%%DATADIR%%/images/drawer.png
+%%DATADIR%%/images/edit-clear.png
+%%DATADIR%%/images/edit-copy.png
+%%DATADIR%%/images/edit-cut.png
+%%DATADIR%%/images/edit-paste.png
+%%DATADIR%%/images/edit-redo.png
+%%DATADIR%%/images/edit-select-all.png
+%%DATADIR%%/images/edit-undo.png
+%%DATADIR%%/images/edit_input.png
+%%DATADIR%%/images/eject.png
+%%DATADIR%%/images/exec.png
+%%DATADIR%%/images/font_size_larger.png
+%%DATADIR%%/images/font_size_smaller.png
+%%DATADIR%%/images/format-fill-color.png
+%%DATADIR%%/images/format-indent-less.png
+%%DATADIR%%/images/format-indent-more.png
+%%DATADIR%%/images/format-justify-center.png
+%%DATADIR%%/images/format-justify-fill.png
+%%DATADIR%%/images/format-justify-left.png
+%%DATADIR%%/images/format-justify-right.png
+%%DATADIR%%/images/format-list-ordered.png
+%%DATADIR%%/images/format-list-unordered.png
+%%DATADIR%%/images/format-text-bold.png
+%%DATADIR%%/images/format-text-color.png
+%%DATADIR%%/images/format-text-heading.png
+%%DATADIR%%/images/format-text-italic.png
+%%DATADIR%%/images/format-text-strikethrough.png
+%%DATADIR%%/images/format-text-subscript.png
+%%DATADIR%%/images/format-text-superscript.png
+%%DATADIR%%/images/format-text-underline.png
+%%DATADIR%%/images/forward.png
+%%DATADIR%%/images/gmail_logo.png
+%%DATADIR%%/images/help.png
+%%DATADIR%%/images/heuristics.png
+%%DATADIR%%/images/hotmail.png
+%%DATADIR%%/images/insert-link.png
+%%DATADIR%%/images/jobs.png
+%%DATADIR%%/images/languages.png
+%%DATADIR%%/images/random.png
+%%DATADIR%%/images/keyboard-prefs.png
+%%DATADIR%%/images/library.png
+%%DATADIR%%/images/list_remove.png
+%%DATADIR%%/images/lookfeel.png
+%%DATADIR%%/images/lt.png
+%%DATADIR%%/images/mail.png
+%%DATADIR%%/images/merge_books.png
+%%DATADIR%%/images/metadata.png
+%%DATADIR%%/images/mimetypes/bmp.png
+%%DATADIR%%/images/mimetypes/computer.png
+%%DATADIR%%/images/mimetypes/dir.png
+%%DATADIR%%/images/mimetypes/epub.png
+%%DATADIR%%/images/mimetypes/fb2.png
+%%DATADIR%%/images/mimetypes/gif.png
+%%DATADIR%%/images/mimetypes/html.png
+%%DATADIR%%/images/mimetypes/jpeg.png
+%%DATADIR%%/images/mimetypes/lit.png
+%%DATADIR%%/images/mimetypes/lrf.png
+%%DATADIR%%/images/mimetypes/lrx.png
+%%DATADIR%%/images/mimetypes/mobi.png
+%%DATADIR%%/images/mimetypes/odt.png
+%%DATADIR%%/images/mimetypes/pdf.png
+%%DATADIR%%/images/mimetypes/png.png
+%%DATADIR%%/images/mimetypes/rar.png
+%%DATADIR%%/images/mimetypes/rtf.png
+%%DATADIR%%/images/mimetypes/snb.png
+%%DATADIR%%/images/mimetypes/svg.png
+%%DATADIR%%/images/mimetypes/txt.png
+%%DATADIR%%/images/mimetypes/unknown.png
+%%DATADIR%%/images/mimetypes/zero.png
+%%DATADIR%%/images/mimetypes/zip.png
+%%DATADIR%%/images/mimetypes/djvu.png
+%%DATADIR%%/images/mimetypes/xps.png
+%%DATADIR%%/images/minus.png
+%%DATADIR%%/images/minusminus.png
+%%DATADIR%%/images/network-server.png
+%%DATADIR%%/images/news.png
+%%DATADIR%%/images/next.png
+%%DATADIR%%/images/notify.png
+%%DATADIR%%/images/ok.png
+%%DATADIR%%/images/page.png
+%%DATADIR%%/images/plugboard.png
+%%DATADIR%%/images/plugins.png
+%%DATADIR%%/images/plugins/plugin_updater_updates.png
+%%DATADIR%%/images/plugins/plugin_new_invalid.png
+%%DATADIR%%/images/plugins/plugin_upgrade_ok.png
+%%DATADIR%%/images/plugins/plugin_disabled_ok.png
+%%DATADIR%%/images/plugins/plugin_new_valid.png
+%%DATADIR%%/images/plugins/plugin_new.png
+%%DATADIR%%/images/plugins/plugin_upgrade_valid.png
+%%DATADIR%%/images/plugins/plugin_deprecated.png
+%%DATADIR%%/images/plugins/mobileread.png
+%%DATADIR%%/images/plugins/plugin_disabled_invalid.png
+%%DATADIR%%/images/plugins/plugin_updater.png
+%%DATADIR%%/images/plugins/plugin_disabled_valid.png
+%%DATADIR%%/images/plugins/plugin_upgrade_invalid.png
+%%DATADIR%%/images/plus.png
+%%DATADIR%%/images/plusplus.png
+%%DATADIR%%/images/previous.png
+%%DATADIR%%/images/print-preview.png
+%%DATADIR%%/images/print.png
+%%DATADIR%%/images/publisher.png
+%%DATADIR%%/images/rating.png
+%%DATADIR%%/images/reader.png
+%%DATADIR%%/images/save.png
+%%DATADIR%%/images/scheduler.png
+%%DATADIR%%/images/sd.png
+%%DATADIR%%/images/search.png
+%%DATADIR%%/images/search_add_saved.png
+%%DATADIR%%/images/search_copy_saved.png
+%%DATADIR%%/images/search_delete_saved.png
+%%DATADIR%%/images/series.png
+%%DATADIR%%/images/swap.png
+%%DATADIR%%/images/sync.png
+%%DATADIR%%/images/tags.png
+%%DATADIR%%/images/tb_folder.png
+%%DATADIR%%/images/template_funcs.png
+%%DATADIR%%/images/trash.png
+%%DATADIR%%/images/trim.png
+%%DATADIR%%/images/user_profile.png
+%%DATADIR%%/images/view.png
+%%DATADIR%%/images/viewer.png
+%%DATADIR%%/images/welcome_wizard.png
+%%DATADIR%%/images/window-close.png
+%%DATADIR%%/images/wizard.png
+%%DATADIR%%/images/store.png
+%%DATADIR%%/images/highlight_only_off.png
+%%DATADIR%%/images/identifiers.png
+%%DATADIR%%/images/drm-locked.png
+%%DATADIR%%/images/highlight_only_on.png
+%%DATADIR%%/images/connect_share_on.png
+%%DATADIR%%/images/drm-unlocked.png
+%%DATADIR%%/jacket/stylesheet.css
+%%DATADIR%%/jacket/template.xhtml
+%%DATADIR%%/jquery.simulate.js
+%%DATADIR%%/localization/iso639.pickle
+%%DATADIR%%/localization/pykakasi/itaijidict2.pickle
+%%DATADIR%%/localization/pykakasi/kanadict2.pickle
+%%DATADIR%%/localization/pykakasi/kanwadict2.pickle
+%%DATADIR%%/localization/locales.zip
+%%DATADIR%%/localization/stats.pickle
+%%DATADIR%%/metadata_sqlite.sql
+%%DATADIR%%/mime.types
+%%DATADIR%%/quick_start.epub
+%%DATADIR%%/scripts.pickle
+%%DATADIR%%/template-functions.json
+%%DATADIR%%/templates/fb2.xsl
+%%DATADIR%%/templates/html.css
+%%DATADIR%%/templates/html_export_default.css
+%%DATADIR%%/templates/html_export_default.tmpl
+%%DATADIR%%/templates/html_export_default_index.tmpl
+%%DATADIR%%/templates/lrf.xsl
+%%DATADIR%%/templates/rtf.xsl
+%%DATADIR%%/templates/book_details.css
+%%DATADIR%%/tracer.epub
+%%DATADIR%%/viewer/bookmarks.js
+%%DATADIR%%/viewer/hyphenate/Hyphenator.js
+%%DATADIR%%/viewer/hyphenate/patterns.zip
+%%DATADIR%%/viewer/hyphenation.js
+%%DATADIR%%/viewer/images.js
+%%DATADIR%%/viewer/jquery_scrollTo.js
+%%DATADIR%%/viewer/referencing.js
+@dirrm %%DATADIR%%/viewer/hyphenate
+@dirrm %%DATADIR%%/viewer
+@dirrm %%DATADIR%%/templates
+@dirrm %%DATADIR%%/localization/pykakasi
+@dirrm %%DATADIR%%/localization
+@dirrm %%DATADIR%%/jacket
+@dirrm %%DATADIR%%/images/mimetypes
+@dirrm %%DATADIR%%/images/devices
+@dirrm %%DATADIR%%/images/plugins
+@dirrm %%DATADIR%%/images
+@dirrm %%DATADIR%%/fonts/prs500
+@dirrm %%DATADIR%%/fonts/liberation
+@dirrm %%DATADIR%%/fonts
+@dirrm %%DATADIR%%/display
+@dirrm %%DATADIR%%/content_server/read
+@dirrm %%DATADIR%%/content_server/jquery_ui/js
+@dirrm %%DATADIR%%/content_server/jquery_ui/css/humanity-custom/images
+@dirrm %%DATADIR%%/content_server/jquery_ui/css/humanity-custom
+@dirrm %%DATADIR%%/content_server/jquery_ui/css
+@dirrm %%DATADIR%%/content_server/jquery_ui
+@dirrm %%DATADIR%%/content_server/browse
+@dirrm %%DATADIR%%/content_server
+@dirrm %%DATADIR%%/catalog
+@dirrm %%DATADIR%%
 @dirrm lib/calibre/templite
 @dirrm lib/calibre/routes
 @dirrm lib/calibre/pyPdf
@@ -1596,7 +1564,7 @@ share/calibre/viewer/referencing.js
 @dirrm lib/calibre/calibre/ebooks/pdb/palmdoc
 @dirrm lib/calibre/calibre/ebooks/pdb/ereader
 @dirrm lib/calibre/calibre/ebooks/pdb
-@dirrm lib/calibre/calibre/ebooks/oeb/display/test
+@dirrm lib/calibre/calibre/ebooks/oeb/display/test-cfi
 @dirrm lib/calibre/calibre/ebooks/oeb/display
 @dirrm lib/calibre/calibre/ebooks/oeb/transforms
 @dirrm lib/calibre/calibre/ebooks/oeb