- Update to 0.7.22. With this update the USB functionality should still

continue to work, but device enumeration now requires root privileges. Also mountpoint detection and automounting doesn't work. PR: ports/148831 Submitted by: Rusty Nejdl <rnejdl@tethys.ringofsaturn.com> (based on)
author: Stanislav Sedov <stas@FreeBSD.org> 2010-10-07 09:50:39 +0000
committer: Stanislav Sedov <stas@FreeBSD.org> 2010-10-07 09:50:39 +0000
commit: 3fb49a147820d4ab51cba07e3e0626c9326b75c9 (patch)
tree: 6d98f01c955db635992633226d2d119141a82110 /deskutils
parent: - Fix deleting a non-existing user from a group (diff)
25 files changed, 971 insertions, 672 deletions
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 7eef32089b7d..476ce62d3a5a 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	calibre
-PORTVERSION=	0.6.27
-PORTREVISION=	6
+PORTVERSION=	0.7.22
+PORTREVISION=	0
 CATEGORIES=	deskutils python
-MASTER_SITES=	ftp://ftp.SpringDaemons.com/soft/ \
-		http://calibre-ebook.googlecode.com/files/
+MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}/
 
 MAINTAINER=	stas@FreeBSD.org
 COMMENT=	Ebook management application
@@ -18,11 +17,15 @@ COMMENT=	Ebook management application
 LIB_DEPENDS=	MagickWand.4:${PORTSDIR}/graphics/ImageMagick \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		poppler-qt4.3:${PORTSDIR}/graphics/poppler-qt4 \
-		wmflite:${PORTSDIR}/graphics/libwmf
+		wmflite:${PORTSDIR}/graphics/libwmf \
+		chm.0:${PORTSDIR}/misc/chmlib
 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*-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
 RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils \
 		py*-dnspython>=0:${PORTSDIR}/dns/py-dnspython \
 		py*-dateutil>=0:${PORTSDIR}/devel/py-dateutil \
diff --git a/deskutils/calibre/distinfo b/deskutils/calibre/distinfo
index 3f5f047f46d8..b054194af8f5 100644
--- a/deskutils/calibre/distinfo
+++ b/deskutils/calibre/distinfo
@@ -1,3 +1,3 @@
-MD5 (calibre-0.6.27.tar.gz) = 4bfbf9b3630cd0b2c399906dd6df99b3
-SHA256 (calibre-0.6.27.tar.gz) = f8528e84b9f1f6a2ff5f9cad4cbd56ec372beef95eb17b47cd680c29b0fe5c02
-SIZE (calibre-0.6.27.tar.gz) = 10461078
+MD5 (calibre-0.7.22.tar.gz) = 02faeda9598efdf51605a2475bce36c8
+SHA256 (calibre-0.7.22.tar.gz) = 255d48d58750b5dde30b1b1899035b02ea15ce0cd5a9e5d5b60afd6e56e4e2f4
+SIZE (calibre-0.7.22.tar.gz) = 17342409
diff --git a/deskutils/calibre/files/patch-setup___init__.py b/deskutils/calibre/files/patch-setup___init__.py
deleted file mode 100644
index ccbbea581b05..000000000000
--- a/deskutils/calibre/files/patch-setup___init__.py
+++ /dev/null
@@ -1,30 +0,0 @@
---- setup/__init__.py.orig	2009-10-11 19:11:10.000000000 +0400
-+++ setup/__init__.py	2009-10-11 19:12:17.000000000 +0400
-@@ -11,7 +11,8 @@
- is64bit = platform.architecture()[0] == '64bit'
- iswindows = re.search('win(32|64)', sys.platform)
- isosx = 'darwin' in sys.platform
--islinux = not isosx and not iswindows
-+isfreebsd = 'freebsd' in sys.platform
-+islinux = not isosx and not iswindows and not isfreebsd
- SRC = os.path.abspath('src')
- sys.path.insert(0, SRC)
- sys.resources_location = os.path.join(os.path.dirname(SRC), 'resources')
-@@ -117,7 +118,7 @@
-         self.real_user = os.environ.get('SUDO_USER', None)
- 
-     def drop_privileges(self):
--        if not islinux or isosx:
-+        if not islinux or isosx or isfreebsd:
-             return
-         if self.real_user is not None:
-             self.info('Dropping privileges to those of', self.real_user+':',
-@@ -128,7 +129,7 @@
-             os.seteuid(int(self.real_uid))
- 
-     def regain_privileges(self):
--        if not islinux or isosx:
-+        if not islinux or isosx or isfreebsd:
-             return
-         if os.geteuid() != 0 and self.orig_euid == 0:
-             self.info('Trying to get root privileges')
diff --git a/deskutils/calibre/files/patch-setup_extensions.py b/deskutils/calibre/files/patch-setup_extensions.py
deleted file mode 100644
index 2c7be42ec381..000000000000
--- a/deskutils/calibre/files/patch-setup_extensions.py
+++ /dev/null
@@ -1,46 +0,0 @@
---- setup/extensions.py.orig	2009-12-11 15:04:40.000000000 -0800
-+++ setup/extensions.py	2009-12-14 18:25:26.000000000 -0800
-@@ -11,7 +11,7 @@
- 
- from PyQt4.pyqtconfig import QtGuiModuleMakefile
- 
--from setup import Command, islinux, isosx, SRC, iswindows
-+from setup import Command, islinux, isfreebsd, isosx, SRC, iswindows
- from setup.build_environment import fc_inc, fc_lib, \
-         fc_error, poppler_libs, poppler_lib_dirs, poppler_inc_dirs, podofo_inc, \
-         podofo_lib, podofo_error, poppler_error, pyqt, OSX_SDK, NMAKE, \
-@@ -19,7 +19,7 @@
-         magick_inc_dirs, magick_lib_dirs, png_lib_dirs, png_libs, \
-         magick_error, magick_libs, ft_lib_dirs, ft_libs, jpg_libs, jpg_lib_dirs
- MT
--isunix = islinux or isosx
-+isunix = islinux or isosx or isfreebsd
- 
- make = 'make' if isunix else NMAKE
- 
-@@ -141,6 +141,11 @@
-         ['calibre/devices/libusb.c'],
-         ldflags=['-lusb-1.0']))
- 
-+if isfreebsd:
-+    if os.environ.get('WITH_USB', 'no') == 'yes':
-+        extensions.append(Extension('libusb',
-+            ['calibre/devices/libusb.c'],
-+            ldflags=['-lusb']))
- 
- if isunix:
-     cc = os.environ.get('CC', 'gcc')
-@@ -160,6 +165,13 @@
-     ldflags.append('-lpython'+sysconfig.get_python_version())
- 
- 
-+if isfreebsd:
-+    cflags.append('-pthread')
-+    ldflags.append('-shared')
-+    cflags.append('-I'+sysconfig.get_python_inc())
-+    ldflags.append('-lpython'+sysconfig.get_python_version())
-+
-+
- if isosx:
-     x, p = ('x86_64', 'ppc64') if leopard_build else ('i386', 'ppc')
-     archs = ['-arch', x, '-arch', p, '-isysroot',
diff --git a/deskutils/calibre/files/patch-setup_install.py b/deskutils/calibre/files/patch-setup_install.py
deleted file mode 100644
index 252ef090733e..000000000000
--- a/deskutils/calibre/files/patch-setup_install.py
+++ /dev/null
@@ -1,46 +0,0 @@
---- setup/install.py.orig	2009-10-10 06:15:00.000000000 +0400
-+++ setup/install.py	2009-10-12 14:23:51.000000000 +0400
-@@ -8,7 +8,7 @@
- 
- import sys, os, textwrap, subprocess, shutil, tempfile, atexit, stat
- 
--from setup import Command, islinux, basenames, modules, functions, \
-+from setup import Command, islinux, isfreebsd, basenames, modules, functions, \
-         __appname__, __version__
- 
- HEADER = '''\
-@@ -115,7 +115,7 @@
- 
- 
-     def pre_sub_commands(self, opts):
--        if not islinux:
-+        if not (islinux or isfreebsd):
-             self.info('\nSetting up a source based development environment is only '
-                     'supported on linux. On other platforms, see the User Manual'
-                     ' for help with setting up a development environment.')
-@@ -143,9 +143,9 @@
-             self.warn('Failed to compile mount helper. Auto mounting of',
-                 ' devices will not work')
- 
--        if os.geteuid() != 0:
--            return self.warn('Must be run as root to compile mount helper. Auto '
--                    'mounting of devices will not work.')
-+#        if os.geteuid() != 0:
-+#            return self.warn('Must be run as root to compile mount helper. Auto '
-+#                    'mounting of devices will not work.')
-         src = os.path.join(self.SRC, 'calibre', 'devices', 'linux_mount_helper.c')
-         dest = os.path.join(self.staging_bindir, 'calibre-mount-helper')
-         self.info('Installing mount helper to '+ dest)
-@@ -153,9 +153,9 @@
-         ret = p.wait()
-         if ret != 0:
-             return warn()
--        os.chown(dest, 0, 0)
--        os.chmod(dest, stat.S_ISUID|stat.S_ISGID|stat.S_IRUSR|stat.S_IWUSR|\
--                stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH)
-+#        os.chown(dest, 0, 0)
-+#        os.chmod(dest, stat.S_ISUID|stat.S_ISGID|stat.S_IRUSR|stat.S_IWUSR|\
-+#                stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH)
-         self.manifest.append(dest)
-         return dest
- 
diff --git a/deskutils/calibre/files/patch-src_calibre___init__.py b/deskutils/calibre/files/patch-src_calibre___init__.py
deleted file mode 100644
index a5fadf1cd941..000000000000
--- a/deskutils/calibre/files/patch-src_calibre___init__.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/calibre/__init__.py.orig	2009-10-11 20:14:29.000000000 +0400
-+++ src/calibre/__init__.py	2009-10-11 20:14:41.000000000 +0400
-@@ -14,7 +14,7 @@
- from PyQt4.QtCore import QUrl
- from PyQt4.QtGui  import QDesktopServices
- from calibre.startup import plugins, winutil, winutilerror
--from calibre.constants import iswindows, isosx, islinux, isfrozen, \
-+from calibre.constants import iswindows, isosx, islinux, isfreebsd, isfrozen, \
-                               terminal_controller, preferred_encoding, \
-                               __appname__, __version__, __author__, \
-                               win32event, win32api, winerror, fcntl, \
diff --git a/deskutils/calibre/files/patch-src_calibre_constants.py b/deskutils/calibre/files/patch-src_calibre_constants.py
deleted file mode 100644
index b9f39faf78d8..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_constants.py
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/calibre/constants.py.orig	2009-12-11 15:04:40.000000000 -0800
-+++ src/calibre/constants.py	2009-12-13 17:39:53.000000000 -0800
-@@ -22,7 +22,8 @@
- iswindows = 'win32' in sys.platform.lower() or 'win64' in sys.platform.lower()
- isosx     = 'darwin' in sys.platform.lower()
- isnewosx = isosx and getattr(sys, 'new_app_bundle', False)
--islinux   = not(iswindows or isosx)
-+isfreebsd = 'freebsd' in sys.platform.lower()
-+islinux   = not(iswindows or isosx or isfreebsd)
- isfrozen  = hasattr(sys, 'frozen')
- 
- try:
-@@ -58,6 +59,7 @@
-             'fontconfig', 'pdfreflow', 'progress_indicator'] + \
-                     (['winutil'] if iswindows else []) + \
-                     (['libusb'] if islinux else []) + \
-+                    (['libusb'] if isfreebsd else []) + \
-                     (['usbobserver'] if isosx else []):
-             try:
-                 p, err = __import__(plugin), ''
diff --git a/deskutils/calibre/files/patch-src_calibre_devices_libusb.c b/deskutils/calibre/files/patch-src_calibre_devices_libusb.c
deleted file mode 100644
index 9440151b421b..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_devices_libusb.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/calibre/devices/libusb.c.orig	2009-12-13 17:36:03.000000000 -0800
-+++ src/calibre/devices/libusb.c	2009-12-13 17:36:08.000000000 -0800
-@@ -12,7 +12,7 @@
- 
- #define PY_SSIZE_T_CLEAN
- #include <Python.h>
--#include <libusb-1.0/libusb.h>
-+#include <libusb.h>
- 
- libusb_context *ctxt = NULL;
- 
diff --git a/deskutils/calibre/files/patch-src_calibre_devices_libusb.py b/deskutils/calibre/files/patch-src_calibre_devices_libusb.py
deleted file mode 100644
index 498439997dfc..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_devices_libusb.py
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/calibre/devices/libusb.py.orig	2009-10-10 06:15:00.000000000 +0400
-+++ src/calibre/devices/libusb.py	2009-10-11 23:19:54.000000000 +0400
-@@ -8,10 +8,10 @@
-                    c_ubyte, c_ushort, c_int, c_char, c_void_p, c_byte, c_uint
- from errno import EBUSY, ENOMEM
- 
--from calibre import iswindows, isosx, load_library
-+from calibre import iswindows, isosx, isfreebsd, load_library
- 
- _libusb_name = 'libusb'
--PATH_MAX = 511 if iswindows else 1024 if isosx else 4096
-+PATH_MAX = 511 if iswindows else 1024 if isosx else 1024 if isfreebsd else 4096
- if iswindows:
-     class Structure(_Structure):
-         _pack_ = 1
diff --git a/deskutils/calibre/files/patch-src_calibre_devices_scanner.py b/deskutils/calibre/files/patch-src_calibre_devices_scanner.py
new file mode 100644
index 000000000000..e459ea3ac8a1
--- /dev/null
+++ b/deskutils/calibre/files/patch-src_calibre_devices_scanner.py
@@ -0,0 +1,82 @@
+--- src/calibre/devices/scanner.py.orig	2010-10-06 22:06:18.000000000 -0700
++++ src/calibre/devices/scanner.py	2010-10-06 22:07:36.000000000 -0700
+@@ -5,10 +5,10 @@
+ manner.
+ '''
+ 
+-import sys, os, re
++import sys, os, re, subprocess
+ from threading import RLock
+ 
+-from calibre import iswindows, isosx, plugins, islinux
++from calibre import iswindows, isosx, plugins, islinux, isfreebsd
+ 
+ osx_scanner = win_scanner = linux_scanner = None
+ 
+@@ -140,17 +140,65 @@
+             ans.add(tuple(dev))
+         return ans
+ 
++class FreeBSDScanner(object):
++
++    def __call__(self):
++        ans = set([])
++
++        try:
++            out = subprocess.Popen("/usr/sbin/usbconfig dump_device_desc | /usr/bin/awk 'function get_str(s) { split(s, a, /<|>/); if (a[2] != \"no string\") { return a[2]; } else { return \"\";} } BEGIN {state=0;} /^[[:space:]]+idVendor/ {state = 1; vendor = $3; next;} /idProduct/ {productid = $3; next;} /bcdDevice/ {bcd = $3; next;} /iManufacturer/ { manufacturer = get_str($0); next; }  /iProduct/ { product = get_str($0); next;} /iSerialNumber/ { sn = get_str($0); next;} /^$/ {if (state == 1) { state = 0; printf(\"%s%%%%%s%%%%%s%%%%%s%%%%%s%%%%%s\\n\",vendor, productid, bcd, manufacturer, product, sn);} }'", shell=True, stdout=subprocess.PIPE).communicate()[0]
++        except OSError, e:
++	    print >>sys.stderr, "Execution failed:", e
++
++        if out.strip() == "":
++            return ans
++        for line in out.strip().split("\n"):
++            ven, prod, bcd, man, prod_string, serial = line.strip().split("%%", 6)
++            dev = []
++            try:
++                dev.append(int(ven, 16))
++            except:
++                continue
++            try:
++                dev.append(int(prod, 16))
++            except:
++                continue
++            try:
++                dev.append(int(bcd, 16))
++            except:
++                continue
++            try:
++                dev.append(man)
++            except:
++                dev.append('')
++            try:
++                dev.append(prod_string)
++            except:
++                dev.append('')
++            try:
++                dev.append(serial)
++            except:
++                dev.append('')
++
++            ans.add(tuple(dev))
++        return ans
++
+ linux_scanner = None
+ 
+ if islinux:
+     linux_scanner = LinuxScanner()
+ 
++freebsd_scanner = None
++
++if isfreebsd:
++    freebsd_scanner = FreeBSDScanner()
++
+ class DeviceScanner(object):
+ 
+     def __init__(self, *args):
+         if isosx and osx_scanner is None:
+             raise RuntimeError('The Python extension usbobserver must be available on OS X.')
+-        self.scanner = win_scanner if iswindows else osx_scanner if isosx else linux_scanner
++        self.scanner = win_scanner if iswindows else osx_scanner if isosx else freebsd_scanner if isfreebsd else linux_scanner
+         self.devices = []
+ 
+     def scan(self):
diff --git a/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py b/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py
deleted file mode 100644
index e16837624293..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_devices_usbms_device.py
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/calibre/devices/usbms/device.py.orig	2009-10-11 19:19:08.000000000 +0400
-+++ src/calibre/devices/usbms/device.py	2009-10-11 19:19:46.000000000 +0400
-@@ -22,7 +22,7 @@
- from calibre.devices.interface import DevicePlugin
- from calibre.devices.errors import DeviceError, FreeSpaceError
- from calibre.devices.usbms.deviceconfig import DeviceConfig
--from calibre import iswindows, islinux, isosx, __appname__
-+from calibre import iswindows, islinux, isosx, isfreebsd, __appname__
- from calibre.utils.filenames import ascii_filename as sanitize, shorten_components_to
- 
- class Device(DeviceConfig, DevicePlugin):
-@@ -554,7 +554,7 @@
-     def open(self):
-         time.sleep(5)
-         self._main_prefix = self._card_a_prefix = self._card_b_prefix = None
--        if islinux:
-+        if islinux or isfreebsd:
-             try:
-                 self.open_linux()
-             except DeviceError:
-@@ -621,7 +621,7 @@
-                     pass
- 
-     def eject(self):
--        if islinux:
-+        if islinux or isfreebsd:
-             try:
-                 self.eject_linux()
-             except:
-@@ -655,7 +655,7 @@
-         self._linux_mount_map = {}
- 
-     def post_yank_cleanup(self):
--        if islinux:
-+        if islinux or isfreebsd:
-             try:
-                 self.linux_post_yank()
-             except:
diff --git a/deskutils/calibre/files/patch-src_calibre_ebooks_html_input.py b/deskutils/calibre/files/patch-src_calibre_ebooks_html_input.py
deleted file mode 100644
index bb4c0bb1e17b..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_ebooks_html_input.py
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/calibre/ebooks/html/input.py.orig	2009-10-11 19:20:45.000000000 +0400
-+++ src/calibre/ebooks/html/input.py	2009-10-11 19:21:09.000000000 +0400
-@@ -20,7 +20,7 @@
- from calibre.customize.conversion import InputFormatPlugin
- from calibre.ebooks.chardet import xml_to_unicode
- from calibre.customize.conversion import OptionRecommendation
--from calibre.constants import islinux
-+from calibre.constants import islinux, isfreebsd
- from calibre import unicode_path
- from calibre.utils.localization import get_lang
- 
-@@ -344,7 +344,7 @@
-         self.added_resources = {}
-         self.log = log
-         for path, href in htmlfile_map.items():
--            if not islinux:
-+            if not (islinux or isfreebsd):
-                 path = path.lower()
-             self.added_resources[path] = href
-         self.urlnormalize, self.DirContainer = urlnormalize, DirContainer
-@@ -409,7 +409,7 @@
-         link = os.path.abspath(link)
-         if not os.access(link, os.R_OK):
-             return link_
--        if not islinux:
-+        if not (islinux or isfreebsd):
-             link = link.lower()
-         if link not in self.added_resources:
-             bhref = os.path.basename(link)
diff --git a/deskutils/calibre/files/patch-src_calibre_ebooks_lrf_html_table_as_image.py b/deskutils/calibre/files/patch-src_calibre_ebooks_lrf_html_table_as_image.py
deleted file mode 100644
index dc97a35110a6..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_ebooks_lrf_html_table_as_image.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/calibre/ebooks/lrf/html/table_as_image.py.orig	2009-10-12 00:04:02.000000000 +0400
-+++ src/calibre/ebooks/lrf/html/table_as_image.py	2009-10-12 00:04:09.000000000 +0400
-@@ -9,7 +9,7 @@
- import os, tempfile, atexit, shutil
- from PyQt4.Qt import QUrl, QApplication, QSize, QEventLoop, \
-                      SIGNAL, QPainter, QImage, QObject, Qt
--from PyQt4.QtWebKit import QWebPage
-+from PyQt4.QtWebKit import *
- 
- 
- class HTMLTableRenderer(QObject):
-@@ -91,4 +91,4 @@
-         QApplication([])
-     tr = HTMLTableRenderer(html, base_dir, width, height, dpi, factor)
-     tr.loop.exec_()
--    return tr.images, tr.tdir
-\ No newline at end of file
-+    return tr.images, tr.tdir
diff --git a/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_pdftohtml.py b/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_pdftohtml.py
deleted file mode 100644
index 711780b254af..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_pdftohtml.py
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/calibre/ebooks/pdf/pdftohtml.py.orig	2009-10-11 19:20:09.000000000 +0400
-+++ src/calibre/ebooks/pdf/pdftohtml.py	2009-10-11 19:20:25.000000000 +0400
-@@ -12,7 +12,7 @@
- from functools import partial
- 
- from calibre.ebooks import ConversionError, DRMError
--from calibre import isosx, iswindows, islinux
-+from calibre import isosx, iswindows, islinux, isfreebsd
- from calibre import CurrentDir
- 
- PDFTOHTML = 'pdftohtml'
-@@ -22,7 +22,7 @@
- if iswindows and hasattr(sys, 'frozen'):
-     PDFTOHTML = os.path.join(os.path.dirname(sys.executable), 'pdftohtml.exe')
-     popen = partial(subprocess.Popen, creationflags=0x08) # CREATE_NO_WINDOW=0x08 so that no ugly console is popped up
--if islinux and getattr(sys, 'frozen_path', False):
-+if (islinux or isfreebsd) and getattr(sys, 'frozen_path', False):
-     PDFTOHTML = os.path.join(getattr(sys, 'frozen_path'), 'pdftohtml')
- 
- def pdftohtml(output_dir, pdf_path, no_images):
diff --git a/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_writer.py b/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_writer.py
deleted file mode 100644
index 8048ac460006..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_ebooks_pdf_writer.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/calibre/ebooks/pdf/writer.py.orig	2009-12-11 15:04:41.000000000 -0800
-+++ src/calibre/ebooks/pdf/writer.py	2009-12-13 16:45:34.000000000 -0800
-@@ -19,7 +19,7 @@
- from PyQt4 import QtCore
- from PyQt4.Qt import QUrl, QEventLoop, SIGNAL, QObject, \
-     QPrinter, QMetaObject, QSizeF, Qt
--from PyQt4.QtWebKit import QWebView
-+from PyQt4.QtWebKit import *
- 
- from pyPdf import PdfFileWriter, PdfFileReader
- 
diff --git a/deskutils/calibre/files/patch-src_calibre_gui2___init__.py b/deskutils/calibre/files/patch-src_calibre_gui2___init__.py
deleted file mode 100644
index 0fdbd2e806ed..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_gui2___init__.py
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/calibre/gui2/__init__.py.orig	2009-12-11 15:04:41.000000000 -0800
-+++ src/calibre/gui2/__init__.py	2009-12-13 16:46:37.000000000 -0800
-@@ -9,7 +9,7 @@
- 
- ORG_NAME = 'KovidsBrain'
- APP_UID  = 'libprs500'
--from calibre import islinux, iswindows, isosx
-+from calibre import islinux, iswindows, isosx, isfreebsd
- from calibre.utils.config import Config, ConfigProxy, dynamic
- from calibre.utils.localization import set_qt_translator
- from calibre.ebooks.metadata.meta import get_metadata, metadata_from_formats
-@@ -535,7 +535,7 @@
- 
- def is_ok_to_use_qt():
-     global gui_thread, _store_app
--    if islinux and ':' not in os.environ.get('DISPLAY', ''):
-+    if (islinux or isfreebsd) and ':' not in os.environ.get('DISPLAY', ''):
-         return False
-     if _store_app is None and QApplication.instance() is None:
-         _store_app = QApplication([])
diff --git a/deskutils/calibre/files/patch-src_calibre_gui2_dialogs_metadata_single.py b/deskutils/calibre/files/patch-src_calibre_gui2_dialogs_metadata_single.py
deleted file mode 100644
index 16207c9fbef5..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_gui2_dialogs_metadata_single.py
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./src/calibre/gui2/dialogs/metadata_single.py.orig	2009-10-11 19:16:07.000000000 +0400
-+++ ./src/calibre/gui2/dialogs/metadata_single.py	2009-10-11 19:16:34.000000000 +0400
-@@ -24,7 +24,7 @@
- from calibre.ebooks import BOOK_EXTENSIONS
- from calibre.ebooks.metadata import authors_to_sort_string, string_to_authors, authors_to_string
- from calibre.ebooks.metadata.library_thing import cover_from_isbn
--from calibre import islinux
-+from calibre import islinux, isfreebsd
- from calibre.ebooks.metadata.meta import get_metadata
- from calibre.utils.config import prefs
- from calibre.customize.ui import run_plugins_on_import
-@@ -382,8 +382,8 @@
-         height_of_rest = self.frameGeometry().height() - self.cover.height()
-         width_of_rest  = self.frameGeometry().width() - self.cover.width()
-         ag = QCoreApplication.instance().desktop().availableGeometry(self)
--        self.cover.MAX_HEIGHT = ag.height()-(25 if islinux else 0)-height_of_rest
--        self.cover.MAX_WIDTH = ag.width()-(25 if islinux else 0)-width_of_rest
-+        self.cover.MAX_HEIGHT = ag.height()-(25 if (islinux or isfreebsd) else 0)-height_of_rest
-+        self.cover.MAX_WIDTH = ag.width()-(25 if (islinux or isfreebsd) else 0)-width_of_rest
-         if cover:
-             pm = QPixmap()
-             pm.loadFromData(cover)
diff --git a/deskutils/calibre/files/patch-src_calibre_gui2_lrf_renderer_main.py b/deskutils/calibre/files/patch-src_calibre_gui2_lrf_renderer_main.py
deleted file mode 100644
index 31325d269fba..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_gui2_lrf_renderer_main.py
+++ /dev/null
@@ -1,29 +0,0 @@
---- src/calibre/gui2/lrf_renderer/main.py.orig	2009-10-11 19:13:56.000000000 +0400
-+++ src/calibre/gui2/lrf_renderer/main.py	2009-10-11 19:14:32.000000000 +0400
-@@ -5,7 +5,7 @@
- from PyQt4.QtGui import QKeySequence, QPainter, QDialog, QSpinBox, QSlider, QIcon
- from PyQt4.QtCore import Qt, QObject, SIGNAL, QCoreApplication, QThread
- 
--from calibre import __appname__, setup_cli_handlers, islinux
-+from calibre import __appname__, setup_cli_handlers, islinux, isfreebsd
- from calibre.ebooks.lrf.lrfparser import LRFDocument
- 
- from calibre.gui2 import ORG_NAME, APP_UID, error_dialog, \
-@@ -255,7 +255,7 @@
-         level = logging.DEBUG if opts.verbose else logging.INFO
-         logger = logging.getLogger('lrfviewer')
-         setup_cli_handlers(logger, level)
--    if islinux:
-+    if islinux or isfreebsd:
-         try: # Set lrfviewer as the default for LRF files for this user
-             from subprocess import call
-             call('xdg-mime default calibre-lrfviewer.desktop application/lrf', shell=True)
-@@ -304,7 +304,7 @@
-     if hasattr(opts, 'help'):
-         parser.print_help()
-         return 1
--    pid = os.fork() if islinux else -1
-+    pid = os.fork() if (islinux or isfreebsd) else -1
-     if pid <= 0:
-         app = Application(args)
-         app.setWindowIcon(QIcon(I('viewer.svg')))
diff --git a/deskutils/calibre/files/patch-src_calibre_gui2_main.py b/deskutils/calibre/files/patch-src_calibre_gui2_main.py
deleted file mode 100644
index 9015b0536f5f..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_gui2_main.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/calibre/gui2/main.py.orig	2009-12-11 15:04:41.000000000 -0800
-+++ src/calibre/gui2/main.py	2009-12-13 16:47:27.000000000 -0800
-@@ -6,7 +6,7 @@
- from PyQt4.Qt import QCoreApplication, QIcon, QMessageBox
- 
- from calibre import prints
--from calibre.constants import iswindows, __appname__, isosx
-+from calibre.constants import iswindows, __appname__, isosx, isfreebsd
- from calibre.utils.ipc import ADDRESS, RC
- from calibre.gui2 import ORG_NAME, APP_UID, initialize_file_icon_provider, \
-     Application
diff --git a/deskutils/calibre/files/patch-src_calibre_gui2_viewer_documentview.py b/deskutils/calibre/files/patch-src_calibre_gui2_viewer_documentview.py
deleted file mode 100644
index f6359ac98fe1..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_gui2_viewer_documentview.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/calibre/gui2/viewer/documentview.py.orig	2009-10-12 00:03:34.000000000 +0400
-+++ src/calibre/gui2/viewer/documentview.py	2009-10-12 00:03:45.000000000 +0400
-@@ -10,7 +10,7 @@
-                      QPainter, QPalette, QBrush, QFontDatabase, QDialog, \
-                      QColor, QPoint, QImage, QRegion, QVariant, \
-                      QFont, QObject, QApplication, pyqtSignature
--from PyQt4.QtWebKit import QWebPage, QWebView, QWebSettings
-+from PyQt4.QtWebKit import *
- 
- from calibre.utils.config import Config, StringConfig
- from calibre.utils.localization import get_language
diff --git a/deskutils/calibre/files/patch-src_calibre_gui2_viewer_main.py b/deskutils/calibre/files/patch-src_calibre_gui2_viewer_main.py
deleted file mode 100644
index 6d666709321b..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_gui2_viewer_main.py
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/calibre/gui2/viewer/main.py.orig	2009-10-11 19:16:59.000000000 +0400
-+++ src/calibre/gui2/viewer/main.py	2009-10-11 19:17:14.000000000 +0400
-@@ -19,7 +19,7 @@
-                          info_dialog, error_dialog
- from calibre.ebooks.oeb.iterator import EbookIterator
- from calibre.ebooks import DRMError
--from calibre.constants import islinux
-+from calibre.constants import islinux, isfreebsd
- from calibre.utils.config import Config, StringConfig, dynamic
- from calibre.gui2.search_box import SearchBox2
- from calibre.ebooks.metadata import MetaInformation
-@@ -665,7 +665,7 @@
- def main(args=sys.argv):
-     parser = option_parser()
-     opts, args = parser.parse_args(args)
--    pid = os.fork() if False and islinux else -1
-+    pid = os.fork() if False and (islinux or isfreebsd) else -1
-     if pid <= 0:
-         app = Application(args)
-         app.setWindowIcon(QIcon(I('viewer.svg')))
diff --git a/deskutils/calibre/files/patch-src_calibre_gui2_viewer_printing.py b/deskutils/calibre/files/patch-src_calibre_gui2_viewer_printing.py
deleted file mode 100644
index 1bd107d3e8b9..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_gui2_viewer_printing.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/calibre/gui2/viewer/printing.py.orig	2009-10-12 00:05:04.000000000 +0400
-+++ src/calibre/gui2/viewer/printing.py	2009-10-12 00:05:09.000000000 +0400
-@@ -12,7 +12,7 @@
- from PyQt4 import QtCore
- from PyQt4.Qt import QUrl, QEventLoop, SIGNAL,  QObject, QApplication, Qt, \
-     QPrinter, QPrintPreviewDialog, QPrintDialog, QDialog, QMetaObject, Q_ARG
--from PyQt4.QtWebKit import QWebView
-+from PyQt4.QtWebKit import *
- 
- PRINTCSS = 'body{width:100%;margin:0;padding:0;font-family:Arial;color:#000;background:none;font-size:12pt;text-align:left;}h1,h2,h3,h4,h5,h6{font-family:Helvetica;}h1{font-size:19pt;}h2{font-size:17pt;}h3{font-size:15pt;}h4,h5,h6{font-size:12pt;}pre,code,samp{font:10ptCourier,monospace;white-space:pre-wrap;page-break-inside:avoid;}blockquote{margin:1.3em;padding:1em;font-size:10pt;}hr{background-color:#ccc;}aimg{border:none;}a:link,a:visited{background:transparent;font-weight:700;text-decoration:underline;color:#333;}a:link:after,a{color:#000;}table{margin:1px;text-align:left;}th{border-bottom:1pxsolid#333;font-weight:bold;}td{border-bottom:1pxsolid#333;}th,td{padding:4px10px4px0;}tfoot{font-style:italic;}caption{background:#fff;margin-bottom:2em;text-align:left;}thead{display:table-header-group;}tr{page-break-inside:avoid;}#header,.header,#footer,.footer,#navbar,.navbar,#navigation,.navigation,#rightSideBar,.rightSideBar,#leftSideBar,.leftSideBar{display:none;}'
- 
diff --git a/deskutils/calibre/files/patch-src_calibre_linux.py b/deskutils/calibre/files/patch-src_calibre_linux.py
deleted file mode 100644
index d3192a434cdc..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_linux.py
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/calibre/linux.py.orig	2009-12-11 15:04:41.000000000 -0800
-+++ src/calibre/linux.py	2009-12-14 17:29:52.000000000 -0800
-@@ -128,20 +128,12 @@
-         self.icon_resources = []
-         self.menu_resources = []
-         self.mime_resources = []
--        self.setup_completion()
--        self.setup_udev_rules()
-         self.install_man_pages()
--        self.setup_desktop_integration()
-         self.create_uninstaller()
- 
-         from calibre.utils.config import config_dir
-         if os.path.exists(config_dir):
-             os.chdir(config_dir)
--            for f in os.listdir('.'):
--                if os.stat(f).st_uid == 0:
--                    os.rmdir(f) if os.path.isdir(f) else os.unlink(f)
--            if os.stat(config_dir).st_uid == 0:
--                os.rmdir(config_dir)
- 
-         if warn is None and self.warnings:
-             self.info('There were %d warnings'%len(self.warnings))
-@@ -318,7 +310,7 @@
-     def install_man_pages(self):
-         try:
-             from calibre.utils.help2man import create_man_page
--            manpath = os.path.join(self.opts.staging_sharedir, 'man/man1')
-+            manpath = os.path.join(self.opts.staging_root, 'man/man1')
-             if not os.path.exists(manpath):
-                 os.makedirs(manpath)
-             self.info('Installing MAN pages...')
-@@ -331,7 +323,7 @@
-                     continue
-                 parser = parser()
-                 raw = create_man_page(prog, parser)
--                manfile = os.path.join(manpath, prog+'.1'+__appname__+'.bz2')
-+                manfile = os.path.join(manpath, prog+'.1')
-                 self.info('\tInstalling MAN page for', prog)
-                 open(manfile, 'wb').write(raw)
-                 self.manifest.append(manfile)
diff --git a/deskutils/calibre/files/patch-src_calibre_utils_help2man.py b/deskutils/calibre/files/patch-src_calibre_utils_help2man.py
deleted file mode 100644
index 5e751b405124..000000000000
--- a/deskutils/calibre/files/patch-src_calibre_utils_help2man.py
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/calibre/utils/help2man.py.orig	2009-10-11 23:44:37.000000000 +0400
-+++ src/calibre/utils/help2man.py	2009-10-11 23:49:58.000000000 +0400
-@@ -3,7 +3,7 @@
- __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
- __docformat__ = 'restructuredtext en'
- 
--import time, bz2
-+import time, gzip
- 
- from calibre.constants import __version__, __appname__, __author__
- 
-@@ -57,6 +57,6 @@
-     lines = [x if isinstance(x, unicode) else unicode(x, 'utf-8', 'replace') for
-             x in lines]
- 
--    return  bz2.compress((u'\n'.join(lines)).encode('utf-8'))
-+    return  (u'\n'.join(lines)).encode('utf-8')
- 
- 
diff --git a/deskutils/calibre/pkg-plist b/deskutils/calibre/pkg-plist
index 8d641448c196..81fc5b1e944c 100644
--- a/deskutils/calibre/pkg-plist
+++ b/deskutils/calibre/pkg-plist
@@ -31,18 +31,28 @@ lib/calibre/calibre/debug.py
 lib/calibre/calibre/devices/__init__.py
 lib/calibre/calibre/devices/android/__init__.py
 lib/calibre/calibre/devices/android/driver.py
-lib/calibre/calibre/devices/bebook/__init__.py
-lib/calibre/calibre/devices/bebook/driver.py
+lib/calibre/calibre/devices/apple/__init__.py
+lib/calibre/calibre/devices/apple/driver.py
+lib/calibre/calibre/devices/binatone/__init__.py
+lib/calibre/calibre/devices/binatone/driver.py
 lib/calibre/calibre/devices/blackberry/__init__.py
 lib/calibre/calibre/devices/blackberry/driver.py
-lib/calibre/calibre/devices/cybookg3/__init__.py
-lib/calibre/calibre/devices/cybookg3/driver.py
-lib/calibre/calibre/devices/cybookg3/t2b.py
+lib/calibre/calibre/devices/cybook/__init__.py
+lib/calibre/calibre/devices/cybook/driver.py
+lib/calibre/calibre/devices/cybook/t2b.py
 lib/calibre/calibre/devices/eb600/__init__.py
 lib/calibre/calibre/devices/eb600/driver.py
+lib/calibre/calibre/devices/edge/__init__.py
+lib/calibre/calibre/devices/edge/driver.py
 lib/calibre/calibre/devices/errors.py
 lib/calibre/calibre/devices/eslick/__init__.py
 lib/calibre/calibre/devices/eslick/driver.py
+lib/calibre/calibre/devices/folder_device/__init__.py
+lib/calibre/calibre/devices/folder_device/driver.py
+lib/calibre/calibre/devices/hanlin/__init__.py
+lib/calibre/calibre/devices/hanlin/driver.py
+lib/calibre/calibre/devices/hanvon/__init__.py
+lib/calibre/calibre/devices/hanvon/driver.py
 lib/calibre/calibre/devices/iliad/__init__.py
 lib/calibre/calibre/devices/iliad/driver.py
 lib/calibre/calibre/devices/interface.py
@@ -54,10 +64,15 @@ lib/calibre/calibre/devices/jetbook/__init__.py
 lib/calibre/calibre/devices/jetbook/driver.py
 lib/calibre/calibre/devices/kindle/__init__.py
 lib/calibre/calibre/devices/kindle/driver.py
+lib/calibre/calibre/devices/kobo/__init__.py
+lib/calibre/calibre/devices/kobo/books.py
+lib/calibre/calibre/devices/kobo/driver.py
 lib/calibre/calibre/devices/libusb.py
-lib/calibre/calibre/devices/libusb1.py
 lib/calibre/calibre/devices/manager.py
 lib/calibre/calibre/devices/mime.py
+lib/calibre/calibre/devices/misc.py
+lib/calibre/calibre/devices/nokia/__init__.py
+lib/calibre/calibre/devices/nokia/driver.py
 lib/calibre/calibre/devices/nook/__init__.py
 lib/calibre/calibre/devices/nook/driver.py
 lib/calibre/calibre/devices/nuut2/__init__.py
@@ -69,11 +84,13 @@ lib/calibre/calibre/devices/prs500/cli/main.py
 lib/calibre/calibre/devices/prs500/driver.py
 lib/calibre/calibre/devices/prs500/prstypes.py
 lib/calibre/calibre/devices/prs505/__init__.py
-lib/calibre/calibre/devices/prs505/books.py
 lib/calibre/calibre/devices/prs505/driver.py
-lib/calibre/calibre/devices/prs700/__init__.py
-lib/calibre/calibre/devices/prs700/driver.py
+lib/calibre/calibre/devices/prs505/sony_cache.py
 lib/calibre/calibre/devices/scanner.py
+lib/calibre/calibre/devices/sne/__init__.py
+lib/calibre/calibre/devices/sne/driver.py
+lib/calibre/calibre/devices/teclast/__init__.py
+lib/calibre/calibre/devices/teclast/driver.py
 lib/calibre/calibre/devices/usbms/__init__.py
 lib/calibre/calibre/devices/usbms/books.py
 lib/calibre/calibre/devices/usbms/cli.py
@@ -89,7 +106,7 @@ lib/calibre/calibre/ebooks/chardet/big5prober.py
 lib/calibre/calibre/ebooks/chardet/chardistribution.py
 lib/calibre/calibre/ebooks/chardet/charsetgroupprober.py
 lib/calibre/calibre/ebooks/chardet/charsetprober.py
-lib/calibre/calibre/ebooks/chardet/codingstate%%PERL_ARCH%%ine.py
+lib/calibre/calibre/ebooks/chardet/codingstatemachine.py
 lib/calibre/calibre/ebooks/chardet/constants.py
 lib/calibre/calibre/ebooks/chardet/escprober.py
 lib/calibre/calibre/ebooks/chardet/escsm.py
@@ -118,6 +135,10 @@ lib/calibre/calibre/ebooks/chardet/sbcsgroupprober.py
 lib/calibre/calibre/ebooks/chardet/sjisprober.py
 lib/calibre/calibre/ebooks/chardet/universaldetector.py
 lib/calibre/calibre/ebooks/chardet/utf8prober.py
+lib/calibre/calibre/ebooks/chm/__init__.py
+lib/calibre/calibre/ebooks/chm/input.py
+lib/calibre/calibre/ebooks/chm/metadata.py
+lib/calibre/calibre/ebooks/chm/reader.py
 lib/calibre/calibre/ebooks/comic/__init__.py
 lib/calibre/calibre/ebooks/comic/input.py
 lib/calibre/calibre/ebooks/compression/__init__.py
@@ -128,10 +149,16 @@ lib/calibre/calibre/ebooks/conversion/cli.py
 lib/calibre/calibre/ebooks/conversion/config.py
 lib/calibre/calibre/ebooks/conversion/plumber.py
 lib/calibre/calibre/ebooks/conversion/preprocess.py
+lib/calibre/calibre/ebooks/conversion/utils.py
 lib/calibre/calibre/ebooks/epub/__init__.py
 lib/calibre/calibre/ebooks/epub/input.py
 lib/calibre/calibre/ebooks/epub/output.py
 lib/calibre/calibre/ebooks/epub/pages.py
+lib/calibre/calibre/ebooks/epub/fix/__init__.py
+lib/calibre/calibre/ebooks/epub/fix/container.py
+lib/calibre/calibre/ebooks/epub/fix/epubcheck.py
+lib/calibre/calibre/ebooks/epub/fix/main.py
+lib/calibre/calibre/ebooks/epub/fix/unmanifested.py
 lib/calibre/calibre/ebooks/fb2/__init__.py
 lib/calibre/calibre/ebooks/fb2/fb2ml.py
 lib/calibre/calibre/ebooks/fb2/input.py
@@ -178,7 +205,13 @@ lib/calibre/calibre/ebooks/markdown/mdx_tables.py
 lib/calibre/calibre/ebooks/markdown/mdx_toc.py
 lib/calibre/calibre/ebooks/metadata/__init__.py
 lib/calibre/calibre/ebooks/metadata/amazon.py
+lib/calibre/calibre/ebooks/metadata/archive.py
+lib/calibre/calibre/ebooks/metadata/book/__init__.py
+lib/calibre/calibre/ebooks/metadata/book/base.py
+lib/calibre/calibre/ebooks/metadata/book/json_codec.py
 lib/calibre/calibre/ebooks/metadata/cli.py
+lib/calibre/calibre/ebooks/metadata/covers.py
+lib/calibre/calibre/ebooks/metadata/douban.py
 lib/calibre/calibre/ebooks/metadata/epub.py
 lib/calibre/calibre/ebooks/metadata/ereader.py
 lib/calibre/calibre/ebooks/metadata/fb2.py
@@ -193,7 +226,6 @@ lib/calibre/calibre/ebooks/metadata/lrx.py
 lib/calibre/calibre/ebooks/metadata/meta.py
 lib/calibre/calibre/ebooks/metadata/mobi.py
 lib/calibre/calibre/ebooks/metadata/odt.py
-lib/calibre/calibre/ebooks/metadata/opf.py
 lib/calibre/calibre/ebooks/metadata/opf2.py
 lib/calibre/calibre/ebooks/metadata/pdb.py
 lib/calibre/calibre/ebooks/metadata/pdf.py
@@ -219,13 +251,13 @@ lib/calibre/calibre/ebooks/odt/input.py
 lib/calibre/calibre/ebooks/oeb/__init__.py
 lib/calibre/calibre/ebooks/oeb/base.py
 lib/calibre/calibre/ebooks/oeb/entitydefs.py
-lib/calibre/calibre/ebooks/oeb/factory.py
 lib/calibre/calibre/ebooks/oeb/iterator.py
 lib/calibre/calibre/ebooks/oeb/output.py
 lib/calibre/calibre/ebooks/oeb/profile.py
 lib/calibre/calibre/ebooks/oeb/reader.py
 lib/calibre/calibre/ebooks/oeb/stylizer.py
 lib/calibre/calibre/ebooks/oeb/transforms/__init__.py
+lib/calibre/calibre/ebooks/oeb/transforms/cover.py
 lib/calibre/calibre/ebooks/oeb/transforms/flatcss.py
 lib/calibre/calibre/ebooks/oeb/transforms/guide.py
 lib/calibre/calibre/ebooks/oeb/transforms/htmltoc.py
@@ -254,6 +286,8 @@ lib/calibre/calibre/ebooks/pdb/output.py
 lib/calibre/calibre/ebooks/pdb/palmdoc/__init__.py
 lib/calibre/calibre/ebooks/pdb/palmdoc/reader.py
 lib/calibre/calibre/ebooks/pdb/palmdoc/writer.py
+lib/calibre/calibre/ebooks/pdb/pdf/reader.py
+lib/calibre/calibre/ebooks/pdb/pdf/__init__.py
 lib/calibre/calibre/ebooks/pdb/ztxt/__init__.py
 lib/calibre/calibre/ebooks/pdb/ztxt/reader.py
 lib/calibre/calibre/ebooks/pdb/ztxt/writer.py
@@ -290,6 +324,7 @@ lib/calibre/calibre/ebooks/rb/writer.py
 lib/calibre/calibre/ebooks/rtf/__init__.py
 lib/calibre/calibre/ebooks/rtf/input.py
 lib/calibre/calibre/ebooks/rtf/output.py
+lib/calibre/calibre/ebooks/rtf/preprocess.py
 lib/calibre/calibre/ebooks/rtf/rtfml.py
 lib/calibre/calibre/ebooks/rtf2xml/ParseRtf.py
 lib/calibre/calibre/ebooks/rtf2xml/__init__.py
@@ -304,7 +339,6 @@ lib/calibre/calibre/ebooks/rtf2xml/combine_borders.py
 lib/calibre/calibre/ebooks/rtf2xml/configure_txt.py
 lib/calibre/calibre/ebooks/rtf2xml/convert_to_tags.py
 lib/calibre/calibre/ebooks/rtf2xml/copy.py
-lib/calibre/calibre/ebooks/rtf2xml/correct_unicode.py
 lib/calibre/calibre/ebooks/rtf2xml/default_encoding.py
 lib/calibre/calibre/ebooks/rtf2xml/delete_info.py
 lib/calibre/calibre/ebooks/rtf2xml/field_strings.py
@@ -355,7 +389,41 @@ lib/calibre/calibre/ebooks/unidecode/__init__.py
 lib/calibre/calibre/ebooks/unidecode/unicodepoints.py
 lib/calibre/calibre/ebooks/unidecode/unidecoder.py
 lib/calibre/calibre/gui2/__init__.py
+lib/calibre/calibre/gui2/actions/__init__.py
+lib/calibre/calibre/gui2/actions/add.py
+lib/calibre/calibre/gui2/actions/add_to_library.py
+lib/calibre/calibre/gui2/actions/annotate.py
+lib/calibre/calibre/gui2/actions/catalog.py
+lib/calibre/calibre/gui2/actions/choose_library.py
+lib/calibre/calibre/gui2/actions/convert.py
+lib/calibre/calibre/gui2/actions/copy_to_library.py
+lib/calibre/calibre/gui2/actions/delete.py
+lib/calibre/calibre/gui2/actions/device.py
+lib/calibre/calibre/gui2/actions/edit_collections.py
+lib/calibre/calibre/gui2/actions/edit_metadata.py
+lib/calibre/calibre/gui2/actions/fetch_news.py
+lib/calibre/calibre/gui2/actions/help.py
+lib/calibre/calibre/gui2/actions/open.py
+lib/calibre/calibre/gui2/actions/preferences.py
+lib/calibre/calibre/gui2/actions/restart.py
+lib/calibre/calibre/gui2/actions/save_to_disk.py
+lib/calibre/calibre/gui2/actions/show_book_details.py
+lib/calibre/calibre/gui2/actions/similar_books.py
+lib/calibre/calibre/gui2/actions/tweak_epub.py
+lib/calibre/calibre/gui2/actions/view.py
 lib/calibre/calibre/gui2/add.py
+lib/calibre/calibre/gui2/add_wizard/__init__.py
+lib/calibre/calibre/gui2/add_wizard/scan_ui.py
+lib/calibre/calibre/gui2/add_wizard/welcome_ui.py
+lib/calibre/calibre/gui2/book_details.py
+lib/calibre/calibre/gui2/catalog/__init__.py
+lib/calibre/calibre/gui2/catalog/catalog_bibtex.py
+lib/calibre/calibre/gui2/catalog/catalog_bibtex_ui.py
+lib/calibre/calibre/gui2/catalog/catalog_csv_xml.py
+lib/calibre/calibre/gui2/catalog/catalog_csv_xml_ui.py
+lib/calibre/calibre/gui2/catalog/catalog_epub_mobi.py
+lib/calibre/calibre/gui2/catalog/catalog_epub_mobi_ui.py
+lib/calibre/calibre/gui2/catalog/catalog_tab_template_ui.py
 lib/calibre/calibre/gui2/convert/__init__.py
 lib/calibre/calibre/gui2/convert/bulk.py
 lib/calibre/calibre/gui2/convert/comic_input.py
@@ -407,27 +475,37 @@ lib/calibre/calibre/gui2/convert/xexp_edit_ui.py
 lib/calibre/calibre/gui2/convert/xpath_wizard.py
 lib/calibre/calibre/gui2/convert/xpath_wizard_ui.py
 lib/calibre/calibre/gui2/cover_flow.py
+lib/calibre/calibre/gui2/custom_column_widgets.py
 lib/calibre/calibre/gui2/device.py
 lib/calibre/calibre/gui2/device_drivers/__init__.py
 lib/calibre/calibre/gui2/device_drivers/configwidget.py
 lib/calibre/calibre/gui2/device_drivers/configwidget_ui.py
 lib/calibre/calibre/gui2/dialogs/__init__.py
+lib/calibre/calibre/gui2/dialogs/tweak_epub.py
+lib/calibre/calibre/gui2/dialogs/tweak_epub_ui.py
+lib/calibre/calibre/gui2/dialogs/add_from_isbn.py
+lib/calibre/calibre/gui2/dialogs/add_from_isbn_ui.py
 lib/calibre/calibre/gui2/dialogs/book_info.py
 lib/calibre/calibre/gui2/dialogs/book_info_ui.py
+lib/calibre/calibre/gui2/dialogs/catalog.py
+lib/calibre/calibre/gui2/dialogs/catalog_ui.py
+lib/calibre/calibre/gui2/dialogs/check_library.py
 lib/calibre/calibre/gui2/dialogs/choose_format.py
 lib/calibre/calibre/gui2/dialogs/choose_format_ui.py
+lib/calibre/calibre/gui2/dialogs/choose_library.py
+lib/calibre/calibre/gui2/dialogs/choose_library_ui.py
 lib/calibre/calibre/gui2/dialogs/comicconf.py
 lib/calibre/calibre/gui2/dialogs/comicconf_ui.py
-lib/calibre/calibre/gui2/dialogs/config/__init__.py
-lib/calibre/calibre/gui2/dialogs/config/add_save.py
-lib/calibre/calibre/gui2/dialogs/config/add_save_ui.py
-lib/calibre/calibre/gui2/dialogs/config/config_ui.py
-lib/calibre/calibre/gui2/dialogs/config/history.py
-lib/calibre/calibre/gui2/dialogs/config/social.py
+lib/calibre/calibre/gui2/dialogs/comments_dialog.py
+lib/calibre/calibre/gui2/dialogs/comments_dialog_ui.py
 lib/calibre/calibre/gui2/dialogs/confirm_delete.py
 lib/calibre/calibre/gui2/dialogs/confirm_delete_ui.py
 lib/calibre/calibre/gui2/dialogs/conversion_error.py
 lib/calibre/calibre/gui2/dialogs/conversion_error_ui.py
+lib/calibre/calibre/gui2/dialogs/delete_matching_from_device.py
+lib/calibre/calibre/gui2/dialogs/delete_matching_from_device_ui.py
+lib/calibre/calibre/gui2/dialogs/edit_authors_dialog.py
+lib/calibre/calibre/gui2/dialogs/edit_authors_dialog_ui.py
 lib/calibre/calibre/gui2/dialogs/fetch_metadata.py
 lib/calibre/calibre/gui2/dialogs/fetch_metadata_ui.py
 lib/calibre/calibre/gui2/dialogs/job_view_ui.py
@@ -440,19 +518,31 @@ lib/calibre/calibre/gui2/dialogs/password.py
 lib/calibre/calibre/gui2/dialogs/password_ui.py
 lib/calibre/calibre/gui2/dialogs/progress.py
 lib/calibre/calibre/gui2/dialogs/progress_ui.py
+lib/calibre/calibre/gui2/dialogs/saved_search_editor.py
+lib/calibre/calibre/gui2/dialogs/saved_search_editor_ui.py
 lib/calibre/calibre/gui2/dialogs/scheduler.py
 lib/calibre/calibre/gui2/dialogs/scheduler_ui.py
 lib/calibre/calibre/gui2/dialogs/search.py
 lib/calibre/calibre/gui2/dialogs/search_item_ui.py
 lib/calibre/calibre/gui2/dialogs/search_ui.py
+lib/calibre/calibre/gui2/dialogs/select_formats.py
+lib/calibre/calibre/gui2/dialogs/tag_categories.py
+lib/calibre/calibre/gui2/dialogs/tag_categories_ui.py
 lib/calibre/calibre/gui2/dialogs/tag_editor.py
 lib/calibre/calibre/gui2/dialogs/tag_editor_ui.py
+lib/calibre/calibre/gui2/dialogs/tag_list_editor.py
+lib/calibre/calibre/gui2/dialogs/tag_list_editor_ui.py
 lib/calibre/calibre/gui2/dialogs/test_email_ui.py
 lib/calibre/calibre/gui2/dialogs/user_profiles.py
 lib/calibre/calibre/gui2/dialogs/user_profiles_ui.py
 lib/calibre/calibre/gui2/filename_pattern_ui.py
+lib/calibre/calibre/gui2/init.py
 lib/calibre/calibre/gui2/jobs.py
-lib/calibre/calibre/gui2/library.py
+lib/calibre/calibre/gui2/layout.py
+lib/calibre/calibre/gui2/library/__init__.py
+lib/calibre/calibre/gui2/library/delegates.py
+lib/calibre/calibre/gui2/library/models.py
+lib/calibre/calibre/gui2/library/views.py
 lib/calibre/calibre/gui2/lrf_renderer/__init__.py
 lib/calibre/calibre/gui2/lrf_renderer/bookview.py
 lib/calibre/calibre/gui2/lrf_renderer/config_ui.py
@@ -461,15 +551,54 @@ lib/calibre/calibre/gui2/lrf_renderer/main.py
 lib/calibre/calibre/gui2/lrf_renderer/main_ui.py
 lib/calibre/calibre/gui2/lrf_renderer/text.py
 lib/calibre/calibre/gui2/main.py
-lib/calibre/calibre/gui2/main_ui.py
 lib/calibre/calibre/gui2/main_window.py
 lib/calibre/calibre/gui2/metadata.py
+lib/calibre/calibre/gui2/notify.py
+lib/calibre/calibre/gui2/preferences/__init__.py
+lib/calibre/calibre/gui2/preferences/behavior.py
+lib/calibre/calibre/gui2/preferences/behavior_ui.py
+lib/calibre/calibre/gui2/preferences/custom_columns_ui.py
+lib/calibre/calibre/gui2/preferences/look_feel.py
+lib/calibre/calibre/gui2/preferences/look_feel_ui.py
+lib/calibre/calibre/gui2/preferences/adding.py
+lib/calibre/calibre/gui2/preferences/adding_ui.py
+lib/calibre/calibre/gui2/preferences/columns.py
+lib/calibre/calibre/gui2/preferences/columns_ui.py
+lib/calibre/calibre/gui2/preferences/conversion.py
+lib/calibre/calibre/gui2/preferences/conversion_ui.py
+lib/calibre/calibre/gui2/preferences/create_custom_column.py
+lib/calibre/calibre/gui2/preferences/create_custom_column_ui.py
+lib/calibre/calibre/gui2/preferences/device_debug.py
+lib/calibre/calibre/gui2/preferences/email_ui.py
+lib/calibre/calibre/gui2/preferences/emailp.py
+lib/calibre/calibre/gui2/preferences/history.py
+lib/calibre/calibre/gui2/preferences/main.py
+lib/calibre/calibre/gui2/preferences/misc.py
+lib/calibre/calibre/gui2/preferences/misc_ui.py
+lib/calibre/calibre/gui2/preferences/plugboard.py
+lib/calibre/calibre/gui2/preferences/plugboard_ui.py
+lib/calibre/calibre/gui2/preferences/plugins.py
+lib/calibre/calibre/gui2/preferences/plugins_ui.py
+lib/calibre/calibre/gui2/preferences/save_template.py
+lib/calibre/calibre/gui2/preferences/save_template_ui.py
+lib/calibre/calibre/gui2/preferences/saving.py
+lib/calibre/calibre/gui2/preferences/saving_ui.py
+lib/calibre/calibre/gui2/preferences/sending.py
+lib/calibre/calibre/gui2/preferences/sending_ui.py
+lib/calibre/calibre/gui2/preferences/server.py
+lib/calibre/calibre/gui2/preferences/server_ui.py
+lib/calibre/calibre/gui2/preferences/social.py
+lib/calibre/calibre/gui2/preferences/toolbar.py
+lib/calibre/calibre/gui2/preferences/toolbar_ui.py
+lib/calibre/calibre/gui2/preferences/tweaks.py
+lib/calibre/calibre/gui2/preferences/tweaks_ui.py
 lib/calibre/calibre/gui2/progress_indicator/__init__.py
 lib/calibre/calibre/gui2/search_box.py
+lib/calibre/calibre/gui2/search_restriction_mixin.py
 lib/calibre/calibre/gui2/shortcuts.py
 lib/calibre/calibre/gui2/shortcuts_ui.py
-lib/calibre/calibre/gui2/status.py
 lib/calibre/calibre/gui2/tag_view.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
@@ -477,6 +606,7 @@ lib/calibre/calibre/gui2/viewer/__init__.py
 lib/calibre/calibre/gui2/viewer/bookmarkmanager.py
 lib/calibre/calibre/gui2/viewer/bookmarkmanager_ui.py
 lib/calibre/calibre/gui2/viewer/config_ui.py
+lib/calibre/calibre/gui2/viewer/dictionary.py
 lib/calibre/calibre/gui2/viewer/documentview.py
 lib/calibre/calibre/gui2/viewer/keys.py
 lib/calibre/calibre/gui2/viewer/main.py
@@ -492,12 +622,32 @@ lib/calibre/calibre/gui2/wizard/send_email.py
 lib/calibre/calibre/gui2/wizard/send_email_ui.py
 lib/calibre/calibre/gui2/wizard/stanza_ui.py
 lib/calibre/calibre/library/__init__.py
+lib/calibre/calibre/library/add_to_library.py
+lib/calibre/calibre/library/caches.py
+lib/calibre/calibre/library/catalog.py
+lib/calibre/calibre/library/check_library.py
 lib/calibre/calibre/library/cli.py
+lib/calibre/calibre/library/comments.py
+lib/calibre/calibre/library/custom_columns.py
 lib/calibre/calibre/library/database.py
 lib/calibre/calibre/library/database2.py
+lib/calibre/calibre/library/db/__init__.py
+lib/calibre/calibre/library/db/base.py
+lib/calibre/calibre/library/field_metadata.py
 lib/calibre/calibre/library/move.py
+lib/calibre/calibre/library/prefs.py
+lib/calibre/calibre/library/restore.py
 lib/calibre/calibre/library/save_to_disk.py
-lib/calibre/calibre/library/server.py
+lib/calibre/calibre/library/schema_upgrades.py
+lib/calibre/calibre/library/server/__init__.py
+lib/calibre/calibre/library/server/base.py
+lib/calibre/calibre/library/server/cache.py
+lib/calibre/calibre/library/server/content.py
+lib/calibre/calibre/library/server/main.py
+lib/calibre/calibre/library/server/mobile.py
+lib/calibre/calibre/library/server/opds.py
+lib/calibre/calibre/library/server/utils.py
+lib/calibre/calibre/library/server/xml.py
 lib/calibre/calibre/library/sqlite.py
 lib/calibre/calibre/library/test.py
 lib/calibre/calibre/libunrar.py
@@ -509,9 +659,11 @@ lib/calibre/calibre/manual/custom.py
 lib/calibre/calibre/manual/epub.py
 lib/calibre/calibre/manual/qthelp.py
 lib/calibre/calibre/plugins/cPalmdoc.so
+lib/calibre/calibre/plugins/chm_extra.so
+lib/calibre/calibre/plugins/chmlib.so
 lib/calibre/calibre/plugins/fontconfig.so
-%%USB%%lib/calibre/calibre/plugins/libusb.so
 lib/calibre/calibre/plugins/lzx.so
+lib/calibre/calibre/plugins/magick.so
 lib/calibre/calibre/plugins/msdes.so
 lib/calibre/calibre/plugins/pdfreflow.so
 lib/calibre/calibre/plugins/pictureflow.so
@@ -525,33 +677,20 @@ lib/calibre/calibre/trac/setup.py
 lib/calibre/calibre/translations/__init__.py
 lib/calibre/calibre/translations/dynamic.py
 lib/calibre/calibre/translations/msgfmt.py
-lib/calibre/calibre/utils/PythonMagickWand.py
 lib/calibre/calibre/utils/Zeroconf.py
+lib/calibre/calibre/utils/smartypants.py
+lib/calibre/calibre/utils/formatter.py
 lib/calibre/calibre/utils/__init__.py
+lib/calibre/calibre/utils/bibtex.py
+lib/calibre/calibre/utils/chm/__init__.py
+lib/calibre/calibre/utils/chm/chm.py
+lib/calibre/calibre/utils/chm/chmlib.py
 lib/calibre/calibre/utils/complete.py
 lib/calibre/calibre/utils/config.py
+lib/calibre/calibre/utils/date.py
+lib/calibre/calibre/utils/dictclient.py
 lib/calibre/calibre/utils/filenames.py
 lib/calibre/calibre/utils/fonts/__init__.py
-lib/calibre/calibre/utils/genshi/__init__.py
-lib/calibre/calibre/utils/genshi/builder.py
-lib/calibre/calibre/utils/genshi/core.py
-lib/calibre/calibre/utils/genshi/filters/__init__.py
-lib/calibre/calibre/utils/genshi/filters/html.py
-lib/calibre/calibre/utils/genshi/filters/i18n.py
-lib/calibre/calibre/utils/genshi/filters/transform.py
-lib/calibre/calibre/utils/genshi/input.py
-lib/calibre/calibre/utils/genshi/output.py
-lib/calibre/calibre/utils/genshi/path.py
-lib/calibre/calibre/utils/genshi/template/__init__.py
-lib/calibre/calibre/utils/genshi/template/base.py
-lib/calibre/calibre/utils/genshi/template/directives.py
-lib/calibre/calibre/utils/genshi/template/eval.py
-lib/calibre/calibre/utils/genshi/template/interpolation.py
-lib/calibre/calibre/utils/genshi/template/loader.py
-lib/calibre/calibre/utils/genshi/template/markup.py
-lib/calibre/calibre/utils/genshi/template/plugin.py
-lib/calibre/calibre/utils/genshi/template/text.py
-lib/calibre/calibre/utils/genshi/util.py
 lib/calibre/calibre/utils/help2man.py
 lib/calibre/calibre/utils/ipc/__init__.py
 lib/calibre/calibre/utils/ipc/job.py
@@ -561,10 +700,22 @@ lib/calibre/calibre/utils/ipc/worker.py
 lib/calibre/calibre/utils/localization.py
 lib/calibre/calibre/utils/lock.py
 lib/calibre/calibre/utils/logging.py
+lib/calibre/calibre/utils/magick/__init__.py
+lib/calibre/calibre/utils/magick/draw.py
+lib/calibre/calibre/utils/magick/generate.py
 lib/calibre/calibre/utils/mdns.py
+lib/calibre/calibre/utils/network.py
+lib/calibre/calibre/utils/ordered_dict.py
 lib/calibre/calibre/utils/osx_symlinks.py
 lib/calibre/calibre/utils/pdftk.py
 lib/calibre/calibre/utils/podofo/__init__.py
+lib/calibre/calibre/utils/pyconsole/__init__.py
+lib/calibre/calibre/utils/pyconsole/console.py
+lib/calibre/calibre/utils/pyconsole/controller.py
+lib/calibre/calibre/utils/pyconsole/formatter.py
+lib/calibre/calibre/utils/pyconsole/history.py
+lib/calibre/calibre/utils/pyconsole/interpreter.py
+lib/calibre/calibre/utils/pyconsole/main.py
 lib/calibre/calibre/utils/pyparsing.py
 lib/calibre/calibre/utils/resources.py
 lib/calibre/calibre/utils/rss_gen.py
@@ -574,6 +725,7 @@ lib/calibre/calibre/utils/sigil.py
 lib/calibre/calibre/utils/smtp.py
 lib/calibre/calibre/utils/terminfo.py
 lib/calibre/calibre/utils/threadpool.py
+lib/calibre/calibre/utils/titlecase.py
 lib/calibre/calibre/utils/winshell.py
 lib/calibre/calibre/utils/zipfile.py
 lib/calibre/calibre/web/__init__.py
@@ -624,49 +776,6 @@ lib/calibre/cherrypy/process/win32.py
 lib/calibre/cherrypy/process/wspbus.py
 lib/calibre/cherrypy/scaffold/__init__.py
 lib/calibre/cherrypy/wsgiserver/__init__.py
-lib/calibre/cssutils/__init__.py
-lib/calibre/cssutils/_fetch.py
-lib/calibre/cssutils/_fetchgae.py
-lib/calibre/cssutils/codec.py
-lib/calibre/cssutils/css/__init__.py
-lib/calibre/cssutils/css/csscharsetrule.py
-lib/calibre/cssutils/css/csscomment.py
-lib/calibre/cssutils/css/cssfontfacerule.py
-lib/calibre/cssutils/css/cssimportrule.py
-lib/calibre/cssutils/css/cssmediarule.py
-lib/calibre/cssutils/css/cssnamespacerule.py
-lib/calibre/cssutils/css/csspagerule.py
-lib/calibre/cssutils/css/cssproperties.py
-lib/calibre/cssutils/css/cssrule.py
-lib/calibre/cssutils/css/cssrulelist.py
-lib/calibre/cssutils/css/cssstyledeclaration.py
-lib/calibre/cssutils/css/cssstylerule.py
-lib/calibre/cssutils/css/cssstylesheet.py
-lib/calibre/cssutils/css/cssunknownrule.py
-lib/calibre/cssutils/css/cssvalue.py
-lib/calibre/cssutils/css/cssvariablesdeclaration.py
-lib/calibre/cssutils/css/cssvariablesrule.py
-lib/calibre/cssutils/css/property.py
-lib/calibre/cssutils/css/selector.py
-lib/calibre/cssutils/css/selectorlist.py
-lib/calibre/cssutils/css2productions.py
-lib/calibre/cssutils/cssproductions.py
-lib/calibre/cssutils/errorhandler.py
-lib/calibre/cssutils/helper.py
-lib/calibre/cssutils/parse.py
-lib/calibre/cssutils/prodparser.py
-lib/calibre/cssutils/profiles.py
-lib/calibre/cssutils/script.py
-lib/calibre/cssutils/serialize.py
-lib/calibre/cssutils/settings.py
-lib/calibre/cssutils/stylesheets/__init__.py
-lib/calibre/cssutils/stylesheets/medialist.py
-lib/calibre/cssutils/stylesheets/mediaquery.py
-lib/calibre/cssutils/stylesheets/stylesheet.py
-lib/calibre/cssutils/stylesheets/stylesheetlist.py
-lib/calibre/cssutils/tokenize2.py
-lib/calibre/cssutils/util.py
-lib/calibre/encutils/__init__.py
 lib/calibre/odf/__init__.py
 lib/calibre/odf/anim.py
 lib/calibre/odf/attrconverters.py
@@ -707,7 +816,18 @@ lib/calibre/pyPdf/generic.py
 lib/calibre/pyPdf/pdf.py
 lib/calibre/pyPdf/utils.py
 lib/calibre/pyPdf/xmp.py
+lib/calibre/routes/__init__.py
+lib/calibre/routes/base.py
+lib/calibre/routes/lru.py
+lib/calibre/routes/mapper.py
+lib/calibre/routes/middleware.py
+lib/calibre/routes/route.py
+lib/calibre/routes/util.py
 share/calibre/builtin_recipes.xml
+share/calibre/calibre-portable.bat
+share/calibre/catalog/DefaultCover.jpg
+share/calibre/catalog/mastheadImage.gif
+share/calibre/catalog/stylesheet.css
 share/calibre/content_server/av.jpg
 share/calibre/content_server/bg_search_box.png
 share/calibre/content_server/btn_search_box.png
@@ -722,8 +842,10 @@ share/calibre/content_server/index.html
 share/calibre/content_server/jquery.js
 share/calibre/content_server/last.png
 share/calibre/content_server/loading.gif
+share/calibre/content_server/mobile.css
 share/calibre/content_server/next.png
 share/calibre/content_server/previous.png
+share/calibre/default_tweaks.py
 share/calibre/ebook-convert-complete.pickle
 share/calibre/fonts/liberation/LiberationMono-Bold.ttf
 share/calibre/fonts/liberation/LiberationMono-BoldItalic.ttf
@@ -741,86 +863,167 @@ share/calibre/fonts/prs500/tt0003m_.ttf
 share/calibre/fonts/prs500/tt0011m_.ttf
 share/calibre/fonts/prs500/tt0419m_.ttf
 share/calibre/images.qrc
-share/calibre/images/add_book.svg
-share/calibre/images/arrow-down.svg
-share/calibre/images/arrow-up.svg
-share/calibre/images/auto_author_sort.svg
-share/calibre/images/back.svg
-share/calibre/images/book.svg
-share/calibre/images/bookmarks.svg
-share/calibre/images/books_in_series.svg
-share/calibre/images/chapters.svg
-share/calibre/images/clear_left.svg
-share/calibre/images/config.svg
-share/calibre/images/convert.svg
-share/calibre/images/cover_flow.svg
-share/calibre/images/debug.svg
-share/calibre/images/dialog_error.svg
-share/calibre/images/dialog_information.svg
-share/calibre/images/dialog_warning.svg
-share/calibre/images/document_open.svg
-share/calibre/images/donate.svg
-share/calibre/images/edit_input.svg
-share/calibre/images/eject.svg
-share/calibre/images/exec.svg
-share/calibre/images/font_size_larger.svg
-share/calibre/images/font_size_smaller.svg
-share/calibre/images/forward.svg
+share/calibre/images/add_book.png
+share/calibre/images/arrow-down.png
+share/calibre/images/arrow-up.png
+share/calibre/images/auto_author_sort.png
+share/calibre/images/back.png
+share/calibre/images/blank.png
+share/calibre/images/book.png
+share/calibre/images/bookmarks.png
+share/calibre/images/books_in_series.png
+share/calibre/images/catalog.png
+share/calibre/images/chapters.png
+share/calibre/images/clear_left.png
+share/calibre/images/column.png
+share/calibre/images/config.png
+share/calibre/images/connect_share.png
+share/calibre/images/convert.png
+share/calibre/images/cover_flow.png
+share/calibre/images/debug.png
+share/calibre/images/default_cover.png
+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_open.png
+share/calibre/images/donate.png
+share/calibre/images/drawer.png
+share/calibre/images/edit_copy.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/forward.png
 share/calibre/images/gmail_logo.png
-share/calibre/images/jobs.svg
 share/calibre/images/library.png
-share/calibre/images/list_remove.svg
-share/calibre/images/lookfeel.svg
-share/calibre/images/mail.svg
-share/calibre/images/metadata.svg
-share/calibre/images/mimetypes/bmp.svg
-share/calibre/images/mimetypes/computer.svg
-share/calibre/images/mimetypes/dir.svg
-share/calibre/images/mimetypes/epub.svg
-share/calibre/images/mimetypes/fb2.svg
-share/calibre/images/mimetypes/gif.svg
-share/calibre/images/mimetypes/html.svg
-share/calibre/images/mimetypes/jpeg.svg
-share/calibre/images/mimetypes/lit.svg
-share/calibre/images/mimetypes/lrf.svg
-share/calibre/images/mimetypes/lrx.svg
-share/calibre/images/mimetypes/mobi.svg
-share/calibre/images/mimetypes/pdf.svg
-share/calibre/images/mimetypes/png.svg
-share/calibre/images/mimetypes/rar.svg
-share/calibre/images/mimetypes/rtf.svg
-share/calibre/images/mimetypes/svg.svg
-share/calibre/images/mimetypes/txt.svg
-share/calibre/images/mimetypes/unknown.svg
-share/calibre/images/mimetypes/zero.svg
-share/calibre/images/mimetypes/zip.svg
-share/calibre/images/minus.svg
-share/calibre/images/network-server.svg
-share/calibre/images/news.svg
+share/calibre/images/notify.png
+share/calibre/images/publisher.png
+share/calibre/images/help.png
+share/calibre/images/jobs.png
+share/calibre/images/list_remove.png
+share/calibre/images/lookfeel.png
+share/calibre/images/mail.png
+share/calibre/images/merge_books.png
+share/calibre/images/metadata.png
+share/calibre/images/minus.png
+share/calibre/images/network-server.png
+share/calibre/images/news.png
+share/calibre/images/next.png
+share/calibre/images/ok.png
+share/calibre/images/page.png
+share/calibre/images/plugins.png
+share/calibre/images/plus.png
+share/calibre/images/previous.png
+share/calibre/images/print-preview.png
+share/calibre/images/print.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/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/console.png
+share/calibre/images/plugboard.png
+share/calibre/images/devices/folder.png
+share/calibre/images/devices/ipad.png
+share/calibre/images/devices/italica.png
+share/calibre/images/devices/itunes.png
+share/calibre/images/devices/kindle.jpg
+share/calibre/images/devices/nook.jpg
+share/calibre/images/lt.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/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/news/eluniverso_ec.png
+share/calibre/images/news/howtogeek.png
+share/calibre/images/news/jpost_fr.png
+share/calibre/images/news/science_news_recent_issues.png
+share/calibre/images/news/ajc.png
+share/calibre/images/news/boortz.png
+share/calibre/images/news/fronda.png
+share/calibre/images/news/gazeta_pomorska.png
+share/calibre/images/news/journalgazette.png
+share/calibre/images/news/kstar.png
+share/calibre/images/news/legeartis.png
+share/calibre/images/news/popscience.png
+share/calibre/images/news/rmf24_ESKN.png
+share/calibre/images/news/rmf24_fakty.png
+share/calibre/images/news/walrusmag.png
 share/calibre/images/news/24sata.png
 share/calibre/images/news/24sata_rs.png
+share/calibre/images/news/abc_py.png
+share/calibre/images/news/ad.png
 share/calibre/images/news/adventuregamers.png
+share/calibre/images/news/aif_ru.png
+share/calibre/images/news/akter.png
+share/calibre/images/news/alo_novine.png
 share/calibre/images/news/ambito.png
+share/calibre/images/news/american_thinker.png
 share/calibre/images/news/amspec.png
 share/calibre/images/news/ars_technica.png
 share/calibre/images/news/atlantic.png
 share/calibre/images/news/axxon_news.png
 share/calibre/images/news/azstarnet.png
 share/calibre/images/news/b92.png
+share/calibre/images/news/balkaninsight.png
 share/calibre/images/news/barrons.png
 share/calibre/images/news/bbc.png
+share/calibre/images/news/berlingske_dk.png
 share/calibre/images/news/beta.png
 share/calibre/images/news/beta_en.png
+share/calibre/images/news/biggovernment.png
 share/calibre/images/news/blic.png
 share/calibre/images/news/borba.png
 share/calibre/images/news/business_standard.png
 share/calibre/images/news/businessworldin.png
+share/calibre/images/news/bwmagazine.png
 share/calibre/images/news/carta.png
 share/calibre/images/news/chicago_breaking_news.png
+share/calibre/images/news/chinadaily.png
 share/calibre/images/news/chr_mon.png
 share/calibre/images/news/clarin.png
+share/calibre/images/news/cnetnews.png
 share/calibre/images/news/cnn.png
 share/calibre/images/news/coding_horror.png
+share/calibre/images/news/columbusdispatch.png
+share/calibre/images/news/consumerist.png
 share/calibre/images/news/corriere_della_sera_en.png
 share/calibre/images/news/corriere_della_sera_it.png
 share/calibre/images/news/criticadigital.png
@@ -828,52 +1031,104 @@ share/calibre/images/news/cubadebate.png
 share/calibre/images/news/dailyreckoning.png
 share/calibre/images/news/danas.png
 share/calibre/images/news/darknet.png
+share/calibre/images/news/deadspin.png
 share/calibre/images/news/der_standard.png
+share/calibre/images/news/di.png
+share/calibre/images/news/diariovasco.png
 share/calibre/images/news/diepresse.png
+share/calibre/images/news/digitaljournal.png
+share/calibre/images/news/digitalspy_uk.png
+share/calibre/images/news/dilbert.png
+share/calibre/images/news/discover_magazine.png
 share/calibre/images/news/dn_se.png
 share/calibre/images/news/dnevni_avaz.png
+share/calibre/images/news/dr_dk.png
 share/calibre/images/news/e_novine.png
+share/calibre/images/news/eclicto.png
 share/calibre/images/news/economist.png
+share/calibre/images/news/eksiazki.png
 share/calibre/images/news/el_mercurio_chile.png
 share/calibre/images/news/el_universal.png
 share/calibre/images/news/elargentino.png
+share/calibre/images/news/elcomercio.png
 share/calibre/images/news/elcronista.png
 share/calibre/images/news/elektrolese.png
 share/calibre/images/news/elmundo.png
+share/calibre/images/news/elpais_impreso.png
+share/calibre/images/news/elpais_semanal.png
 share/calibre/images/news/elperiodico_catalan.png
 share/calibre/images/news/elperiodico_spanish.png
+share/calibre/images/news/elsevier.png
 share/calibre/images/news/eltiempo_hn.png
+share/calibre/images/news/eluniversal.png
+share/calibre/images/news/eluniversal_ve.png
+share/calibre/images/news/emg_en.png
+share/calibre/images/news/emg_rs.recipe
 share/calibre/images/news/endgadget.png
+share/calibre/images/news/entrepeneur.png
 share/calibre/images/news/espn.png
 share/calibre/images/news/esquire.png
 share/calibre/images/news/estadao.png
+share/calibre/images/news/evz.ro.png
 share/calibre/images/news/expansion_spanish.png
 share/calibre/images/news/fastcompany.png
 share/calibre/images/news/faznet.png
+share/calibre/images/news/fe_india.png
+share/calibre/images/news/fleshbot.png
+share/calibre/images/news/foreignaffairs.png
+share/calibre/images/news/foxnews.png
 share/calibre/images/news/freakonomics.png
+share/calibre/images/news/fstream.png
 share/calibre/images/news/ftd.png
 share/calibre/images/news/fudzilla.png
+share/calibre/images/news/futurismic.png
+share/calibre/images/news/gamasutra_fa.png
+share/calibre/images/news/gamasutra_news.png
+share/calibre/images/news/gawker.png
+share/calibre/images/news/gizmodo.png
 share/calibre/images/news/glas_srpske.png
 share/calibre/images/news/glasjavnosti.png
 share/calibre/images/news/granma.png
+share/calibre/images/news/greensboro_news_and_record.png
 share/calibre/images/news/guardian.png
 share/calibre/images/news/gva_be.png
+share/calibre/images/news/haaretz.png
+share/calibre/images/news/haaretz_en.png
 share/calibre/images/news/heise.png
 share/calibre/images/news/hln.png
 share/calibre/images/news/hln_be.png
 share/calibre/images/news/hna.png
+share/calibre/images/news/hotair.png
+share/calibre/images/news/houston_chronicle-2.png
 share/calibre/images/news/hrt.png
 share/calibre/images/news/ieco.png
 share/calibre/images/news/infobae.png
+share/calibre/images/news/information_dk.png
 share/calibre/images/news/inquirer_net.png
 share/calibre/images/news/instapaper.png
+share/calibre/images/news/interia_fakty.png
+share/calibre/images/news/interia_sport.png
+share/calibre/images/news/io9.png
+share/calibre/images/news/ionline_pt.png
+share/calibre/images/news/izvestia.png
+share/calibre/images/news/jalopnik.png
 share/calibre/images/news/jb_online.png
+share/calibre/images/news/jezebel.png
 share/calibre/images/news/joelonsoftware.png
+share/calibre/images/news/joop.png
+share/calibre/images/news/jp_dk.png
 share/calibre/images/news/jpost.png
 share/calibre/images/news/jutarnji.png
+share/calibre/images/news/kamerabild.png
+share/calibre/images/news/kitsapun.png
+share/calibre/images/news/kommersant.png
+share/calibre/images/news/kotaku.png
 share/calibre/images/news/krstarica.png
 share/calibre/images/news/krstarica_en.png
+share/calibre/images/news/kurier.png
 share/calibre/images/news/la_cuarta.png
+share/calibre/images/news/la_jornada.png
+share/calibre/images/news/la_razon_bo.png
 share/calibre/images/news/la_tercera.png
 share/calibre/images/news/lanacion.png
 share/calibre/images/news/lanacion_chile.png
@@ -881,47 +1136,76 @@ share/calibre/images/news/laprensa_hn.png
 share/calibre/images/news/laprensa_ni.png
 share/calibre/images/news/latribuna.png
 share/calibre/images/news/le_monde.png
+share/calibre/images/news/ledevoir.png
+share/calibre/images/news/legitymizm.png
 share/calibre/images/news/lemonde_dip.png
 share/calibre/images/news/liberation.png
+share/calibre/images/news/lifehacker.png
 share/calibre/images/news/linux_magazine.png
 share/calibre/images/news/linuxdevices.png
 share/calibre/images/news/livemint.png
+share/calibre/images/news/los_tiempos_bo.png
+share/calibre/images/news/lrb.png
+share/calibre/images/news/lrb_payed.png
 share/calibre/images/news/lwn.png
 share/calibre/images/news/miami_herald.png
+share/calibre/images/news/michalkiewicz.png
+share/calibre/images/news/michellemalkin_icon.png
+share/calibre/images/news/motherjones.png
 share/calibre/images/news/msdnmag_en.png
+share/calibre/images/news/msnbc.png
 share/calibre/images/news/nacional_cro.png
 share/calibre/images/news/nasa.png
+share/calibre/images/news/nationalreviewonline.png
+share/calibre/images/news/neowin.png
 share/calibre/images/news/new_yorker.png
+share/calibre/images/news/newsstraitstimes.png
 share/calibre/images/news/newsweek.png
 share/calibre/images/news/noaa.png
 share/calibre/images/news/novosti.png
+share/calibre/images/news/nrc.nl.png
+share/calibre/images/news/nrcnext.png
 share/calibre/images/news/nspm.png
 share/calibre/images/news/nspm_int.png
+share/calibre/images/news/nursingtimes.png
+share/calibre/images/news/nypost.png
 share/calibre/images/news/nytimes.png
 share/calibre/images/news/nytimes_sub.png
 share/calibre/images/news/nzz_ger.png
 share/calibre/images/news/o_globo.png
+share/calibre/images/news/observer.png
+share/calibre/images/news/oldnewthing.png
+share/calibre/images/news/ourdailybread.png
 share/calibre/images/news/pagina12.png
 share/calibre/images/news/pescanik.png
 share/calibre/images/news/pobjeda.png
 share/calibre/images/news/politico.png
 share/calibre/images/news/politika.png
+share/calibre/images/news/politiken_dk.png
 share/calibre/images/news/portfolio.png
+share/calibre/images/news/praguemonitor.png
 share/calibre/images/news/pressonline.png
+share/calibre/images/news/propublica.png
+share/calibre/images/news/radikal_tr.png
+share/calibre/images/news/readitlater.png
+share/calibre/images/news/ria_ru.png
 share/calibre/images/news/rts.png
 share/calibre/images/news/sanjosemercurynews.png
+share/calibre/images/news/sarajevo_x.png
 share/calibre/images/news/sciencedaily.png
 share/calibre/images/news/scott_hanselman.png
 share/calibre/images/news/seattle_times.png
 share/calibre/images/news/security_watch.png
 share/calibre/images/news/smashing.png
+share/calibre/images/news/smh.png
 share/calibre/images/news/soldiers.png
 share/calibre/images/news/spiegel_int.png
 share/calibre/images/news/spiegelde.png
 share/calibre/images/news/stackoverflow.png
-share/calibre/images/news/starbulletin.png
+share/calibre/images/news/staradvertiser.png
 share/calibre/images/news/straitstimes.png
 share/calibre/images/news/sueddeutsche.png
+share/calibre/images/news/sueddeutschezeitung.png
 share/calibre/images/news/svd_se.png
 share/calibre/images/news/tanjug.png
 share/calibre/images/news/telegraph_uk.png
@@ -929,55 +1213,40 @@ share/calibre/images/news/telepolis.png
 share/calibre/images/news/telepolis_artikel.png
 share/calibre/images/news/teleread.png
 share/calibre/images/news/the_oz.png
+share/calibre/images/news/the_week_magazine_free.png
 share/calibre/images/news/theeconomictimes_india.png
+share/calibre/images/news/theluminouslandscape.png
 share/calibre/images/news/themarketticker.png
 share/calibre/images/news/theonion.png
 share/calibre/images/news/thestar.png
+share/calibre/images/news/thewest_au.png
+share/calibre/images/news/tidbits.png
 share/calibre/images/news/tijd.png
 share/calibre/images/news/time_magazine.png
 share/calibre/images/news/times_online.png
 share/calibre/images/news/tomshardware.png
 share/calibre/images/news/tomshardware_de.png
 share/calibre/images/news/toronto_sun.png
+share/calibre/images/news/tulsaworld.png
+share/calibre/images/news/ultimahora.png
 share/calibre/images/news/uncrate.png
 share/calibre/images/news/usnews.png
 share/calibre/images/news/utne.png
 share/calibre/images/news/variety.png
 share/calibre/images/news/vecernji_list.png
 share/calibre/images/news/vijesti.png
+share/calibre/images/news/virtualshackles.png
 share/calibre/images/news/vreme.png
+share/calibre/images/news/wapo_cartoons.png
 share/calibre/images/news/welt.png
 share/calibre/images/news/wikinews_en.png
 share/calibre/images/news/wired.png
+share/calibre/images/news/wired_uk.png
 share/calibre/images/news/wsj.png
 share/calibre/images/news/zdnet.png
 share/calibre/images/news/zeitde.png
-share/calibre/images/next.svg
-share/calibre/images/ok.svg
-share/calibre/images/page.svg
-share/calibre/images/plugins.svg
-share/calibre/images/plus.svg
-share/calibre/images/previous.svg
-share/calibre/images/print-preview.svg
-share/calibre/images/print.svg
-share/calibre/images/publisher.png
-share/calibre/images/reader.svg
-share/calibre/images/save.svg
-share/calibre/images/scheduler.svg
-share/calibre/images/sd.svg
-share/calibre/images/search.svg
-share/calibre/images/series.svg
-share/calibre/images/star.png
-share/calibre/images/swap.svg
-share/calibre/images/sync.svg
-share/calibre/images/tags.svg
-share/calibre/images/trash.svg
-share/calibre/images/user_profile.svg
-share/calibre/images/view.svg
-share/calibre/images/viewer.svg
-share/calibre/images/welcome_wizard.svg
-share/calibre/images/window-close.svg
-share/calibre/images/wizard.svg
+share/calibre/jacket/stylesheet.css
+share/calibre/jacket/template.xhtml
 share/calibre/jquery.simulate.js
 share/calibre/localization/iso639.pickle
 share/calibre/localization/locales/af/LC_MESSAGES/iso639.mo
@@ -985,12 +1254,16 @@ share/calibre/localization/locales/af/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/ar/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/ar/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/ar/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/ast/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/ast/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/bg/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/bg/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/bn/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/ca/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/ca/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/cs/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/cs/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/cs/LC_MESSAGES/qt.qm
 share/calibre/localization/locales/da/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/da/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/da/LC_MESSAGES/qt.qm
@@ -999,36 +1272,59 @@ share/calibre/localization/locales/de/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/de/LC_MESSAGES/qt.qm
 share/calibre/localization/locales/el/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/el/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/en_AU/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/en_CA/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/en_GB/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/eo/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/eo/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/es/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/es/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/es/LC_MESSAGES/qt.qm
 share/calibre/localization/locales/eu/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/eu/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/fa/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/fa/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/fr/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/fr/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/fr/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/fi/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/fi/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/fo/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/gl/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/gl/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/he/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/he/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/he/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/hi/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/hi/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/hr/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/hr/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/hu/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/hu/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/id/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/id/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/it/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/it/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/ja/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/ja/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/ko/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/ko/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/lt/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/lt/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/lv/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/lv/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/ml/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/mr/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/mr/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/ms/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/ms/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/nb/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/nb/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/nds/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/nl/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/nl/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/oc/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/oc/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/pl/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/pl/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/pl/LC_MESSAGES/qt.qm
@@ -1048,13 +1344,24 @@ share/calibre/localization/locales/sk/LC_MESSAGES/qt.qm
 share/calibre/localization/locales/sl/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/sl/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/sl/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/sq/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/sr/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/sr/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/sv/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/sv/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/sv/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/ta/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/ta/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/th/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/th/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/tr/LC_MESSAGES/messages.mo
+share/calibre/localization/locales/tr/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/te/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/uk/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/uk/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/uk/LC_MESSAGES/qt.qm
+share/calibre/localization/locales/vi/LC_MESSAGES/iso639.mo
+share/calibre/localization/locales/vi/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/yi/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/zh_CN/LC_MESSAGES/iso639.mo
 share/calibre/localization/locales/zh_CN/LC_MESSAGES/messages.mo
@@ -1066,147 +1373,334 @@ share/calibre/localization/locales/zh_TW/LC_MESSAGES/messages.mo
 share/calibre/localization/locales/zh_TW/LC_MESSAGES/qt.qm
 share/calibre/localization/stats.pickle
 share/calibre/metadata_sqlite.sql
+share/calibre/quick_start.epub
+share/calibre/recipes/bbc_sport.recipe
+share/calibre/recipes/cinebel_be.recipe
+share/calibre/recipes/dhnet_be.recipe
+share/calibre/recipes/eluniverso_ec.recipe
+share/calibre/recipes/howtogeek.recipe
+share/calibre/recipes/jpost_fr.recipe
+share/calibre/recipes/lalibre_be.recipe
+share/calibre/recipes/lameuse_be.recipe
+share/calibre/recipes/lavenir_be.recipe
+share/calibre/recipes/lesoir_be.recipe
+share/calibre/recipes/oriental_daily.recipe
+share/calibre/recipes/revista_muy.recipe
+share/calibre/recipes/rmf24_opinie.recipe
+share/calibre/recipes/science_news_recent_issues.recipe
+share/calibre/recipes/twtfb.recipe
 share/calibre/recipes/24sata.recipe
 share/calibre/recipes/24sata_rs.recipe
 share/calibre/recipes/7dias.recipe
+share/calibre/recipes/Ansa.recipe
+share/calibre/recipes/DrawAndCook.recipe
+share/calibre/recipes/ZIVE.sk.recipe
+share/calibre/recipes/abc_py.recipe
 share/calibre/recipes/accountancyage.recipe
+share/calibre/recipes/ad.recipe
+share/calibre/recipes/adnkronos.recipe
 share/calibre/recipes/adventuregamers.recipe
+share/calibre/recipes/aftenposten.recipe
+share/calibre/recipes/agrogerila.recipe
+share/calibre/recipes/aif_ru.recipe
+share/calibre/recipes/ajc.recipe
+share/calibre/recipes/akter.recipe
 share/calibre/recipes/al_jazeera.recipe
+share/calibre/recipes/alo_novine.recipe
+share/calibre/recipes/alternet.recipe
 share/calibre/recipes/ambito.recipe
+share/calibre/recipes/american_thinker.recipe
 share/calibre/recipes/amspec.recipe
 share/calibre/recipes/an_druma_mor.recipe
+share/calibre/recipes/anchorage_daily.recipe
 share/calibre/recipes/ap.recipe
+share/calibre/recipes/apcom.recipe
+share/calibre/recipes/apod.recipe
+share/calibre/recipes/aprospect.recipe
+share/calibre/recipes/arbetaren.recipe
 share/calibre/recipes/ars_technica.recipe
+share/calibre/recipes/asia_one.recipe
 share/calibre/recipes/atlantic.recipe
+share/calibre/recipes/auto.recipe
+share/calibre/recipes/auto_prove.recipe
+share/calibre/recipes/axxon_magazine.recipe
 share/calibre/recipes/axxon_news.recipe
 share/calibre/recipes/azstarnet.recipe
 share/calibre/recipes/b92.recipe
+share/calibre/recipes/balkaninsight.recipe
 share/calibre/recipes/bangkokpost.recipe
 share/calibre/recipes/barrons.recipe
 share/calibre/recipes/bbc.recipe
+share/calibre/recipes/bbc_chinese.recipe
+share/calibre/recipes/bbc_fast.recipe
 share/calibre/recipes/bbcvietnamese.recipe
+share/calibre/recipes/berlingske_dk.recipe
 share/calibre/recipes/beta.recipe
 share/calibre/recipes/beta_en.recipe
+share/calibre/recipes/big_oven.recipe
+share/calibre/recipes/biggovernment.recipe
+share/calibre/recipes/billorielly.recipe
 share/calibre/recipes/blic.recipe
+share/calibre/recipes/boortz.recipe
+share/calibre/recipes/brand_eins.recipe
+share/calibre/recipes/buckmasters.recipe
+share/calibre/recipes/gazeta_pomorska.recipe
+share/calibre/recipes/journalgazette.recipe
+share/calibre/recipes/kstar.recipe
+share/calibre/recipes/le_journal.recipe
+share/calibre/recipes/popscience.recipe
+share/calibre/recipes/rmf24_ESKN.recipe
+share/calibre/recipes/rmf24_fakty.recipe
+share/calibre/recipes/superesportes.recipe
+share/calibre/recipes/tagesan.recipe
+share/calibre/recipes/taz_rss.recipe
+share/calibre/recipes/the_marker.recipe
+share/calibre/recipes/walrusmag.recipe
+share/calibre/recipes/wsj_free.recipe
 share/calibre/recipes/borba.recipe
+share/calibre/recipes/boston.com.recipe
 share/calibre/recipes/buenosaireseconomico.recipe
 share/calibre/recipes/business_standard.recipe
 share/calibre/recipes/business_week.recipe
 share/calibre/recipes/businessworldin.recipe
+share/calibre/recipes/bwmagazine.recipe
+share/calibre/recipes/calgary_herald.recipe
+share/calibre/recipes/canardpc.recipe
 share/calibre/recipes/carta.recipe
+share/calibre/recipes/cbc_canada.recipe
+share/calibre/recipes/cetnixploitation.recipe
 share/calibre/recipes/chicago_breaking_news.recipe
 share/calibre/recipes/chicago_tribune.recipe
+share/calibre/recipes/china_economic_net.recipe
+share/calibre/recipes/china_press.recipe
+share/calibre/recipes/chinadaily.recipe
+share/calibre/recipes/chowk.recipe
 share/calibre/recipes/chr_mon.recipe
 share/calibre/recipes/cincinnati_enquirer.recipe
+share/calibre/recipes/cio.recipe
+share/calibre/recipes/cjr.recipe
 share/calibre/recipes/clarin.recipe
+share/calibre/recipes/clarion_ledger.recipe
 share/calibre/recipes/climate_progress.recipe
+share/calibre/recipes/cnetnews.recipe
 share/calibre/recipes/cnn.recipe
 share/calibre/recipes/coding_horror.recipe
+share/calibre/recipes/columbusdispatch.recipe
+share/calibre/recipes/comics_com.recipe
 share/calibre/recipes/common_dreams.recipe
+share/calibre/recipes/computer_active.recipe
+share/calibre/recipes/consumerist.recipe
 share/calibre/recipes/corren2.recipe
 share/calibre/recipes/corriere_della_sera_en.recipe
 share/calibre/recipes/corriere_della_sera_it.recipe
+share/calibre/recipes/corriere_dello_sport.recipe
+share/calibre/recipes/courrier.recipe
 share/calibre/recipes/courrierinternational.recipe
 share/calibre/recipes/craigslist.recipe
 share/calibre/recipes/criticadigital.recipe
 share/calibre/recipes/cubadebate.recipe
 share/calibre/recipes/cyberpresse.recipe
+share/calibre/recipes/cynewslive.recipe
+share/calibre/recipes/cyprus_weekly.recipe
 share/calibre/recipes/daily_mail.recipe
 share/calibre/recipes/daily_telegraph.recipe
 share/calibre/recipes/dailyreckoning.recipe
+share/calibre/recipes/dallas.recipe
 share/calibre/recipes/danas.recipe
+share/calibre/recipes/dani.recipe
 share/calibre/recipes/darknet.recipe
+share/calibre/recipes/daum_net.recipe
+share/calibre/recipes/dawn.recipe
 share/calibre/recipes/de_standaard.recipe
+share/calibre/recipes/deadspin.recipe
 share/calibre/recipes/degentenaar.recipe
 share/calibre/recipes/demorgen_be.recipe
+share/calibre/recipes/denver_post.recipe
 share/calibre/recipes/der_standard.recipe
+share/calibre/recipes/di.recipe
 share/calibre/recipes/diagonales.recipe
+share/calibre/recipes/diario_cordoba.recipe
+share/calibre/recipes/diariovasco.recipe
 share/calibre/recipes/diepresse.recipe
+share/calibre/recipes/digital_arts.recipe
+share/calibre/recipes/digitaljournal.recipe
+share/calibre/recipes/digitalspy_uk.recipe
+share/calibre/recipes/dilbert.recipe
 share/calibre/recipes/discover_magazine.recipe
 share/calibre/recipes/dn_se.recipe
 share/calibre/recipes/dna.recipe
 share/calibre/recipes/dnevni_avaz.recipe
 share/calibre/recipes/dnevnik_cro.recipe
+share/calibre/recipes/dominion.recipe
+share/calibre/recipes/dosisdiarias.recipe
+share/calibre/recipes/dr_dk.recipe
+share/calibre/recipes/drivelry.recipe
 share/calibre/recipes/e_novine.recipe
+share/calibre/recipes/eclicto.recipe
 share/calibre/recipes/ecogeek.recipe
 share/calibre/recipes/economist.recipe
 share/calibre/recipes/economist_free.recipe
+share/calibre/recipes/editor_and_publisher.recipe
+share/calibre/recipes/edmonton_journal.recipe
+share/calibre/recipes/ekot.recipe
+share/calibre/recipes/eksiazki.recipe
 share/calibre/recipes/el_mercurio_chile.recipe
+share/calibre/recipes/el_observador.recipe
 share/calibre/recipes/el_pais.recipe
 share/calibre/recipes/el_universal.recipe
 share/calibre/recipes/elargentino.recipe
+share/calibre/recipes/elcomercio.recipe
 share/calibre/recipes/elcronista.recipe
 share/calibre/recipes/elektrolese.recipe
 share/calibre/recipes/elmundo.recipe
+share/calibre/recipes/elpais_impreso.recipe
+share/calibre/recipes/elpais_semanal.recipe
 share/calibre/recipes/elperiodico_catalan.recipe
 share/calibre/recipes/elperiodico_spanish.recipe
+share/calibre/recipes/elsevier.recipe
 share/calibre/recipes/eltiempo_hn.recipe
+share/calibre/recipes/eluniversal_ve.recipe
+share/calibre/recipes/eluniversalimpresa.recipe
+share/calibre/recipes/emg_en.recipe
+share/calibre/recipes/emg_rs.recipe
 share/calibre/recipes/endgadget.recipe
+share/calibre/recipes/entrepeneur.recipe
+share/calibre/recipes/epicurious.recipe
 share/calibre/recipes/espn.recipe
 share/calibre/recipes/esquire.recipe
 share/calibre/recipes/estadao.recipe
+share/calibre/recipes/europasur.recipe
+share/calibre/recipes/evz.ro.recipe
 share/calibre/recipes/exiled.recipe
 share/calibre/recipes/expansion_spanish.recipe
+share/calibre/recipes/factcheck.recipe
 share/calibre/recipes/fastcompany.recipe
 share/calibre/recipes/faznet.recipe
+share/calibre/recipes/fe_india.recipe
 share/calibre/recipes/financial_times.recipe
+share/calibre/recipes/fleshbot.recipe
 share/calibre/recipes/fokkeensukke.recipe
+share/calibre/recipes/folhadesaopaulo.recipe
 share/calibre/recipes/forbes.recipe
+share/calibre/recipes/forbes_india.recipe
+share/calibre/recipes/foreign_policy.recipe
+share/calibre/recipes/foreignaffairs.recipe
+share/calibre/recipes/foxnews.recipe
+share/calibre/recipes/fr_online.recipe
 share/calibre/recipes/freakonomics.recipe
+share/calibre/recipes/freenature.recipe
+share/calibre/recipes/fria.recipe
+share/calibre/recipes/fronda.recipe
+share/calibre/recipes/fstream.recipe
 share/calibre/recipes/ftd.recipe
 share/calibre/recipes/fudzilla.recipe
+share/calibre/recipes/futurismic.recipe
+share/calibre/recipes/gamasutra_fa.recipe
+share/calibre/recipes/gamasutra_news.recipe
+share/calibre/recipes/gawker.recipe
+share/calibre/recipes/gizmodo.recipe
 share/calibre/recipes/glas_srpske.recipe
 share/calibre/recipes/glasgow_herald.recipe
 share/calibre/recipes/glasjavnosti.recipe
 share/calibre/recipes/glennbeck.recipe
 share/calibre/recipes/globe_and_mail.recipe
+share/calibre/recipes/go_comics.recipe
+share/calibre/recipes/golem_de.recipe
 share/calibre/recipes/granma.recipe
 share/calibre/recipes/greader.recipe
+share/calibre/recipes/greader_uber.recipe
+share/calibre/recipes/greensboro_news_and_record.recipe
 share/calibre/recipes/guardian.recipe
 share/calibre/recipes/gulli.recipe
 share/calibre/recipes/gva_be.recipe
 share/calibre/recipes/h1.recipe
 share/calibre/recipes/h2.recipe
 share/calibre/recipes/h3.recipe
+share/calibre/recipes/haaretz_en.recipe
 share/calibre/recipes/harpers.recipe
 share/calibre/recipes/harpers_full.recipe
+share/calibre/recipes/hartford_courant.recipe
+share/calibre/recipes/hawaii.recipe
 share/calibre/recipes/hbr.recipe
+share/calibre/recipes/hbr_blogs.recipe
 share/calibre/recipes/heise.recipe
+share/calibre/recipes/heraldo.recipe
 share/calibre/recipes/hindu.recipe
+share/calibre/recipes/hindu_business_line.recipe
 share/calibre/recipes/hln.recipe
 share/calibre/recipes/hln_be.recipe
 share/calibre/recipes/hna.recipe
-share/calibre/recipes/honoluluadvertiser.recipe
 share/calibre/recipes/honvedelem.recipe
+share/calibre/recipes/hotair.recipe
+share/calibre/recipes/houston_chronicle.recipe
+share/calibre/recipes/hoy.recipe
 share/calibre/recipes/hrt.recipe
 share/calibre/recipes/huffingtonpost.recipe
 share/calibre/recipes/huntechnet.recipe
 share/calibre/recipes/ieco.recipe
+share/calibre/recipes/ieeespectrum.recipe
+share/calibre/recipes/ifzm.recipe
 share/calibre/recipes/iht.recipe
+share/calibre/recipes/il_giornale.recipe
+share/calibre/recipes/il_messaggero.recipe
+share/calibre/recipes/iliteratura_cz.recipe
+share/calibre/recipes/ilsole24ore.recipe
+share/calibre/recipes/inc.recipe
+share/calibre/recipes/independent.recipe
 share/calibre/recipes/index_hu.recipe
+share/calibre/recipes/india_today.recipe
+share/calibre/recipes/indian_express.recipe
 share/calibre/recipes/indy_star.recipe
 share/calibre/recipes/infobae.recipe
+share/calibre/recipes/infomotori.recipe
+share/calibre/recipes/information_dk.recipe
 share/calibre/recipes/infoworld.recipe
 share/calibre/recipes/inquirer_net.recipe
 share/calibre/recipes/instapaper.recipe
 share/calibre/recipes/intelligencer.recipe
+share/calibre/recipes/interia_fakty.recipe
+share/calibre/recipes/interia_sport.recipe
+share/calibre/recipes/io9.recipe
+share/calibre/recipes/ionline_pt.recipe
 share/calibre/recipes/irish_independent.recipe
 share/calibre/recipes/irish_times.recipe
+share/calibre/recipes/izvestia.recipe
+share/calibre/recipes/jalopnik.recipe
 share/calibre/recipes/japan_times.recipe
 share/calibre/recipes/javalobby.recipe
 share/calibre/recipes/jb_online.recipe
+share/calibre/recipes/jezebel.recipe
 share/calibre/recipes/joelonsoftware.recipe
+share/calibre/recipes/johm.recipe
+share/calibre/recipes/joop.recipe
+share/calibre/recipes/journalofaccountancy.recipe
+share/calibre/recipes/jp_dk.recipe
 share/calibre/recipes/jpost.recipe
+share/calibre/recipes/jsonline.recipe
 share/calibre/recipes/jutarnji.recipe
 share/calibre/recipes/juventudrebelde.recipe
 share/calibre/recipes/juventudrebelde_english.recipe
+share/calibre/recipes/kamerabild.recipe
+share/calibre/recipes/kathemerini.recipe
 share/calibre/recipes/kellog_faculty.recipe
 share/calibre/recipes/kellog_insight.recipe
+share/calibre/recipes/kidney.recipe
+share/calibre/recipes/kitsapun.recipe
+share/calibre/recipes/kleinezeitung.recipe
+share/calibre/recipes/kommersant.recipe
+share/calibre/recipes/kotaku.recipe
 share/calibre/recipes/krstarica.recipe
 share/calibre/recipes/krstarica_en.recipe
+share/calibre/recipes/kukuburi.recipe
+share/calibre/recipes/kurier.recipe
+share/calibre/recipes/l_espresso.recipe
 share/calibre/recipes/la_cuarta.recipe
+share/calibre/recipes/la_gazzeta_dello_sport.recipe
+share/calibre/recipes/la_jornada.recipe
+share/calibre/recipes/la_razon_bo.recipe
 share/calibre/recipes/la_republica.recipe
 share/calibre/recipes/la_segunda.recipe
+share/calibre/recipes/la_stampa.recipe
 share/calibre/recipes/la_tercera.recipe
 share/calibre/recipes/lamujerdemivida.recipe
 share/calibre/recipes/lanacion.recipe
@@ -1214,89 +1708,183 @@ share/calibre/recipes/lanacion_chile.recipe
 share/calibre/recipes/laprensa.recipe
 share/calibre/recipes/laprensa_hn.recipe
 share/calibre/recipes/laprensa_ni.recipe
+share/calibre/recipes/las_vegas_review.recipe
 share/calibre/recipes/latimes.recipe
 share/calibre/recipes/latribuna.recipe
 share/calibre/recipes/lavanguardia.recipe
 share/calibre/recipes/le_monde.recipe
 share/calibre/recipes/le_temps.recipe
+share/calibre/recipes/ledevoir.recipe
+share/calibre/recipes/legeartis.recipe
+share/calibre/recipes/leggo_it.recipe
+share/calibre/recipes/legitymizm.recipe
 share/calibre/recipes/lemonde_dip.recipe
+share/calibre/recipes/lescienze.recipe
 share/calibre/recipes/levante.recipe
 share/calibre/recipes/liberation.recipe
+share/calibre/recipes/libero.recipe
+share/calibre/recipes/lifehacker.recipe
 share/calibre/recipes/linux_magazine.recipe
 share/calibre/recipes/linuxdevices.recipe
 share/calibre/recipes/livemint.recipe
+share/calibre/recipes/living_digital.recipe
+share/calibre/recipes/london_free_press.recipe
+share/calibre/recipes/los_tiempos_bo.recipe
+share/calibre/recipes/losservatoreromano_it.recipe
 share/calibre/recipes/lrb.recipe
+share/calibre/recipes/lrb_payed.recipe
 share/calibre/recipes/lwn.recipe
+share/calibre/recipes/mac_video.recipe
+share/calibre/recipes/mac_world.recipe
+share/calibre/recipes/mac_world_uk.recipe
+share/calibre/recipes/macleans.recipe
 share/calibre/recipes/marca.recipe
+share/calibre/recipes/maximum_pc.recipe
+share/calibre/recipes/mdj.recipe
 share/calibre/recipes/mediapart.recipe
+share/calibre/recipes/metro_montreal.recipe
 share/calibre/recipes/miami_herald.recipe
+share/calibre/recipes/michalkiewicz.recipe
+share/calibre/recipes/michellemalkin.recipe
+share/calibre/recipes/midday.recipe
+share/calibre/recipes/milenio.recipe
 share/calibre/recipes/miradasalsur.recipe
 share/calibre/recipes/mondedurable.recipe
 share/calibre/recipes/moneycontrol.recipe
 share/calibre/recipes/moneynews.recipe
 share/calibre/recipes/monitor.recipe
+share/calibre/recipes/montreal_gazette.recipe
 share/calibre/recipes/moscow_times.recipe
+share/calibre/recipes/motherjones.recipe
 share/calibre/recipes/msdnmag_en.recipe
+share/calibre/recipes/msnbc.recipe
 share/calibre/recipes/nacional_cro.recipe
 share/calibre/recipes/nakedcapitalism.recipe
 share/calibre/recipes/nasa.recipe
+share/calibre/recipes/nation_ke.recipe
+share/calibre/recipes/national_post.recipe
+share/calibre/recipes/nationalreviewonline.recipe
 share/calibre/recipes/ncrnext.recipe
+share/calibre/recipes/nejm.recipe
+share/calibre/recipes/neowin.recipe
+share/calibre/recipes/netzpolitik.recipe
 share/calibre/recipes/new_scientist.recipe
 share/calibre/recipes/new_york_review_of_books.recipe
 share/calibre/recipes/new_york_review_of_books_no_sub.recipe
 share/calibre/recipes/new_yorker.recipe
 share/calibre/recipes/news_times.recipe
+share/calibre/recipes/newsobs.recipe
+share/calibre/recipes/newsstraitstimes.recipe
 share/calibre/recipes/newsweek.recipe
 share/calibre/recipes/newsweek_argentina.recipe
 share/calibre/recipes/nin.recipe
 share/calibre/recipes/noaa.recipe
+share/calibre/recipes/nortecastilla.recipe
 share/calibre/recipes/novosti.recipe
 share/calibre/recipes/npr.recipe
+share/calibre/recipes/npr_music_blogs.recipe
+share/calibre/recipes/nrc.nl.recipe
 share/calibre/recipes/nspm.recipe
 share/calibre/recipes/nspm_int.recipe
+share/calibre/recipes/nu.recipe
+share/calibre/recipes/nursingtimes.recipe
+share/calibre/recipes/nymag.recipe
+share/calibre/recipes/nypost.recipe
 share/calibre/recipes/nytimes.recipe
 share/calibre/recipes/nytimes_sub.recipe
+share/calibre/recipes/nytimesbook.recipe
+share/calibre/recipes/nzherald.recipe
 share/calibre/recipes/nzz_ger.recipe
 share/calibre/recipes/o_globo.recipe
+share/calibre/recipes/observer.recipe
+share/calibre/recipes/observer_gb.recipe
+share/calibre/recipes/oc_register.recipe
+share/calibre/recipes/oilprice.recipe
+share/calibre/recipes/oldnewthing.recipe
+share/calibre/recipes/onionavclub.recipe
+share/calibre/recipes/open_left.recipe
+share/calibre/recipes/orlando_sentinel.recipe
+share/calibre/recipes/ottawa_citizen.recipe
 share/calibre/recipes/ourdailybread.recipe
 share/calibre/recipes/outlook_india.recipe
 share/calibre/recipes/pagina12.recipe
+share/calibre/recipes/pajama.recipe
+share/calibre/recipes/panorama.recipe
+share/calibre/recipes/pc_advisor.recipe
+share/calibre/recipes/pc_mag.recipe
+share/calibre/recipes/pc_quest_india.recipe
+share/calibre/recipes/pc_world.recipe
 share/calibre/recipes/pcworld_hu.recipe
+share/calibre/recipes/people_daily.recipe
+share/calibre/recipes/people_us_mashup.recipe
 share/calibre/recipes/pescanik.recipe
+share/calibre/recipes/peterschiff.recipe
 share/calibre/recipes/phd_comics.recipe
 share/calibre/recipes/philly.recipe
 share/calibre/recipes/physics_today.recipe
 share/calibre/recipes/physics_world.recipe
+share/calibre/recipes/pilot.recipe
 share/calibre/recipes/pobjeda.recipe
 share/calibre/recipes/politico.recipe
+share/calibre/recipes/politifact.recipe
 share/calibre/recipes/politika.recipe
+share/calibre/recipes/politiken_dk.recipe
 share/calibre/recipes/portfolio.recipe
+share/calibre/recipes/praguemonitor.recipe
+share/calibre/recipes/pravda.recipe
 share/calibre/recipes/pressonline.recipe
+share/calibre/recipes/projo.recipe
+share/calibre/recipes/propublica.recipe
+share/calibre/recipes/psych.recipe
 share/calibre/recipes/publico.recipe
+share/calibre/recipes/punto_informatico.recipe
+share/calibre/recipes/queleer.recipe
+share/calibre/recipes/quotidiano.recipe
+share/calibre/recipes/radikal_tr.recipe
+share/calibre/recipes/readers_digest.recipe
+share/calibre/recipes/readitlater.recipe
+share/calibre/recipes/regina_leader_post.recipe
+share/calibre/recipes/reptantes.recipe
 share/calibre/recipes/republika.recipe
 share/calibre/recipes/reuters.recipe
 share/calibre/recipes/rga.recipe
+share/calibre/recipes/ria_ru.recipe
 share/calibre/recipes/rian_eng.recipe
 share/calibre/recipes/rian_spa.recipe
+share/calibre/recipes/rte.recipe
 share/calibre/recipes/rts.recipe
+share/calibre/recipes/runa.recipe
 share/calibre/recipes/rzeczpospolita.recipe
 share/calibre/recipes/sabah.recipe
 share/calibre/recipes/salon.recipe
 share/calibre/recipes/san_fran_chronicle.recipe
 share/calibre/recipes/sanjosemercurynews.recipe
+share/calibre/recipes/sarajevo_x.recipe
+share/calibre/recipes/saskatoon_star_phoenix.recipe
 share/calibre/recipes/science_aas.recipe
 share/calibre/recipes/science_news.recipe
 share/calibre/recipes/sciencedaily.recipe
 share/calibre/recipes/scientific_american.recipe
+share/calibre/recipes/scinexx.recipe
 share/calibre/recipes/scott_hanselman.recipe
+share/calibre/recipes/seanhannity.recipe
 share/calibre/recipes/seattle_times.recipe
 share/calibre/recipes/security_watch.recipe
 share/calibre/recipes/serverside.recipe
+share/calibre/recipes/sfbg.recipe
+share/calibre/recipes/sg_hu.recipe
 share/calibre/recipes/shacknews.recipe
+share/calibre/recipes/singtao_daily.recipe
+share/calibre/recipes/skeptic.recipe
+share/calibre/recipes/skeptical_enquirer.recipe
 share/calibre/recipes/slashdot.recipe
 share/calibre/recipes/slate.recipe
+share/calibre/recipes/slovo.recipe
 share/calibre/recipes/smashing.recipe
+share/calibre/recipes/sme.recipe
 share/calibre/recipes/smh.recipe
+share/calibre/recipes/smith.recipe
+share/calibre/recipes/snopes.recipe
 share/calibre/recipes/soldiers.recipe
 share/calibre/recipes/spiegel_int.recipe
 share/calibre/recipes/spiegelde.recipe
@@ -1304,59 +1892,104 @@ share/calibre/recipes/sportsillustrated.recipe
 share/calibre/recipes/sportsillustrated_columnists.recipe
 share/calibre/recipes/st_petersburg_times.recipe
 share/calibre/recipes/stackoverflow.recipe
-share/calibre/recipes/starbulletin.recipe
+share/calibre/recipes/standardmedia_ke.recipe
+share/calibre/recipes/staradvertiser.recipe
+share/calibre/recipes/starwars.recipe
+share/calibre/recipes/statesman.recipe
 share/calibre/recipes/straitstimes.recipe
+share/calibre/recipes/strategy-business.recipe
 share/calibre/recipes/sueddeutsche.recipe
+share/calibre/recipes/sueddeutschezeitung.recipe
 share/calibre/recipes/svd_se.recipe
+share/calibre/recipes/tagesspiegel.recipe
+share/calibre/recipes/tanea.recipe
 share/calibre/recipes/tanjug.recipe
+share/calibre/recipes/taz.recipe
+share/calibre/recipes/tech_world.recipe
+share/calibre/recipes/technology_review.recipe
 share/calibre/recipes/telegraph_uk.recipe
 share/calibre/recipes/telepolis.recipe
 share/calibre/recipes/telepolis_artikel.recipe
 share/calibre/recipes/teleread.recipe
+share/calibre/recipes/thairath.recipe
 share/calibre/recipes/the_age.recipe
 share/calibre/recipes/the_budget_fashionista.recipe
+share/calibre/recipes/the_escapist.recipe
 share/calibre/recipes/the_nation.recipe
+share/calibre/recipes/the_nation_thai.recipe
 share/calibre/recipes/the_new_republic.recipe
 share/calibre/recipes/the_oz.recipe
 share/calibre/recipes/the_register.recipe
 share/calibre/recipes/the_scotsman.recipe
+share/calibre/recipes/the_sun.recipe
+share/calibre/recipes/the_week_magazine_free.recipe
+share/calibre/recipes/thecultofghoul.recipe
 share/calibre/recipes/thedgesingapore.recipe
 share/calibre/recipes/theeconomictimes_india.recipe
+share/calibre/recipes/theluminouslandscape.recipe
 share/calibre/recipes/themarketticker.recipe
+share/calibre/recipes/thenews.recipe
 share/calibre/recipes/theoldfoodie.recipe
 share/calibre/recipes/theonion.recipe
+share/calibre/recipes/theonlinephotographer.recipe
 share/calibre/recipes/thestar.recipe
+share/calibre/recipes/thewest_au.recipe
+share/calibre/recipes/think_progress.recipe
+share/calibre/recipes/tidbits.recipe
 share/calibre/recipes/tijd.recipe
 share/calibre/recipes/time_magazine.recipe
 share/calibre/recipes/times_online.recipe
+share/calibre/recipes/tmz.recipe
 share/calibre/recipes/tnxm.recipe
+share/calibre/recipes/today_online.recipe
+share/calibre/recipes/toi.recipe
 share/calibre/recipes/tomshardware.recipe
 share/calibre/recipes/tomshardware_de.recipe
 share/calibre/recipes/toronto_sun.recipe
 share/calibre/recipes/trouw.recipe
+share/calibre/recipes/trv.recipe
+share/calibre/recipes/tulsaworld.recipe
+share/calibre/recipes/tuttosport.recipe
 share/calibre/recipes/tweakers.recipe
 share/calibre/recipes/twitchfilms.recipe
+share/calibre/recipes/ultimahora.recipe
 share/calibre/recipes/uncrate.recipe
 share/calibre/recipes/upi.recipe
 share/calibre/recipes/usatoday.recipe
 share/calibre/recipes/usnews.recipe
 share/calibre/recipes/utne.recipe
+share/calibre/recipes/vancouver_provice.recipe
+share/calibre/recipes/vancouver_sun.recipe
 share/calibre/recipes/variety.recipe
 share/calibre/recipes/vecernji_list.recipe
 share/calibre/recipes/veintitres.recipe
+share/calibre/recipes/vic_times.recipe
 share/calibre/recipes/vijesti.recipe
+share/calibre/recipes/virtualshackles.recipe
 share/calibre/recipes/vnexpress.recipe
 share/calibre/recipes/volksrant.recipe
 share/calibre/recipes/vreme.recipe
 share/calibre/recipes/vrijnederland.recipe
+share/calibre/recipes/waco_tribune.recipe
+share/calibre/recipes/wapo_cartoons.recipe
 share/calibre/recipes/wash_post.recipe
+share/calibre/recipes/wash_times.recipe
+share/calibre/recipes/watchingamerica.recipe
 share/calibre/recipes/welt.recipe
 share/calibre/recipes/wikinews_en.recipe
+share/calibre/recipes/windows_star.recipe
+share/calibre/recipes/winnipeg_free_press.recipe
+share/calibre/recipes/winnipeg_sun.recipe
 share/calibre/recipes/winsupersite.recipe
+share/calibre/recipes/winter_olympics.recipe
 share/calibre/recipes/wired.recipe
+share/calibre/recipes/wired_daily.recipe
+share/calibre/recipes/wired_uk.recipe
 share/calibre/recipes/woz_die.recipe
 share/calibre/recipes/wsj.recipe
 share/calibre/recipes/xkcd.recipe
+share/calibre/recipes/yahoo_news.recipe
+share/calibre/recipes/yementimes.recipe
 share/calibre/recipes/zaman.recipe
 share/calibre/recipes/zaobao.recipe
 share/calibre/recipes/zdnet.recipe
@@ -1365,9 +1998,8 @@ share/calibre/scripts.pickle
 share/calibre/templates/fb2.xsl
 share/calibre/templates/html.css
 share/calibre/templates/lrf.xsl
-share/calibre/templates/ncx.xml
-share/calibre/templates/opf.xml
 share/calibre/templates/rtf.xsl
+share/calibre/tracer.epub
 share/calibre/viewer/bookmarks.js
 share/calibre/viewer/hyphenate/Hyphenator.js
 share/calibre/viewer/hyphenate/patterns/bn.js
@@ -1395,6 +2027,7 @@ share/calibre/viewer/hyphenate/patterns/ta.js
 share/calibre/viewer/hyphenate/patterns/te.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
@@ -1402,6 +2035,7 @@ share/calibre/viewer/referencing.js
 @dirrm share/calibre/viewer
 @dirrm share/calibre/templates
 @dirrm share/calibre/recipes
+@dirrm share/calibre/jacket
 @dirrm share/calibre/localization/locales/zh_TW/LC_MESSAGES
 @dirrm share/calibre/localization/locales/zh_TW
 @dirrm share/calibre/localization/locales/zh_HK/LC_MESSAGES
@@ -1410,12 +2044,50 @@ share/calibre/viewer/referencing.js
 @dirrm share/calibre/localization/locales/zh_CN
 @dirrm share/calibre/localization/locales/yi/LC_MESSAGES
 @dirrm share/calibre/localization/locales/yi
+@dirrm share/calibre/localization/locales/vi/LC_MESSAGES
+@dirrm share/calibre/localization/locales/vi
 @dirrm share/calibre/localization/locales/uk/LC_MESSAGES
 @dirrm share/calibre/localization/locales/uk
 @dirrm share/calibre/localization/locales/te/LC_MESSAGES
 @dirrm share/calibre/localization/locales/te
+@dirrm share/calibre/localization/locales/lt/LC_MESSAGES
+@dirrm share/calibre/localization/locales/lt
+@dirrm share/calibre/localization/locales/tr/LC_MESSAGES
+@dirrm share/calibre/localization/locales/tr
+@dirrm share/calibre/localization/locales/ta/LC_MESSAGES
+@dirrm share/calibre/localization/locales/ta
+@dirrm share/calibre/localization/locales/th/LC_MESSAGES
+@dirrm share/calibre/localization/locales/th
+@dirrm share/calibre/localization/locales/hi/LC_MESSAGES
+@dirrm share/calibre/localization/locales/hi
+@dirrm share/calibre/localization/locales/bn/LC_MESSAGES
+@dirrm share/calibre/localization/locales/bn
+@dirrm share/calibre/localization/locales/id/LC_MESSAGES
+@dirrm share/calibre/localization/locales/id
+@dirrm share/calibre/localization/locales/ml/LC_MESSAGES
+@dirrm share/calibre/localization/locales/ml
+@dirrm share/calibre/localization/locales/fa/LC_MESSAGES
+@dirrm share/calibre/localization/locales/fa
+@dirrm share/calibre/localization/locales/fi/LC_MESSAGES
+@dirrm share/calibre/localization/locales/fi
+@dirrm share/calibre/localization/locales/fo/LC_MESSAGES
+@dirrm share/calibre/localization/locales/fo
+@dirrm share/calibre/localization/locales/oc/LC_MESSAGES
+@dirrm share/calibre/localization/locales/oc
+@dirrm share/calibre/localization/locales/ms/LC_MESSAGES
+@dirrm share/calibre/localization/locales/ms
+@dirrm share/calibre/localization/locales/mr/LC_MESSAGES
+@dirrm share/calibre/localization/locales/mr
+@dirrm share/calibre/localization/locales/eo/LC_MESSAGES
+@dirrm share/calibre/localization/locales/eo
+@dirrm share/calibre/localization/locales/ast/LC_MESSAGES
+@dirrm share/calibre/localization/locales/ast
 @dirrm share/calibre/localization/locales/sv/LC_MESSAGES
 @dirrm share/calibre/localization/locales/sv
+@dirrm share/calibre/localization/locales/sq/LC_MESSAGES
+@dirrm share/calibre/localization/locales/sq
+@dirrm share/calibre/localization/locales/sr/LC_MESSAGES
+@dirrm share/calibre/localization/locales/sr
 @dirrm share/calibre/localization/locales/sl/LC_MESSAGES
 @dirrm share/calibre/localization/locales/sl
 @dirrm share/calibre/localization/locales/sk/LC_MESSAGES
@@ -1460,6 +2132,10 @@ share/calibre/viewer/referencing.js
 @dirrm share/calibre/localization/locales/es
 @dirrm share/calibre/localization/locales/en_GB/LC_MESSAGES
 @dirrm share/calibre/localization/locales/en_GB
+@dirrm share/calibre/localization/locales/en_CA/LC_MESSAGES
+@dirrm share/calibre/localization/locales/en_CA
+@dirrm share/calibre/localization/locales/en_AU/LC_MESSAGES
+@dirrm share/calibre/localization/locales/en_AU
 @dirrm share/calibre/localization/locales/el/LC_MESSAGES
 @dirrm share/calibre/localization/locales/el
 @dirrm share/calibre/localization/locales/de/LC_MESSAGES
@@ -1480,18 +2156,16 @@ share/calibre/viewer/referencing.js
 @dirrm share/calibre/localization
 @dirrm share/calibre/images/news
 @dirrm share/calibre/images/mimetypes
+@dirrm share/calibre/images/devices
 @dirrm share/calibre/images
 @dirrm share/calibre/fonts/prs500
 @dirrm share/calibre/fonts/liberation
 @dirrm share/calibre/fonts
 @dirrm share/calibre/content_server
+@dirrm share/calibre/catalog
 @dirrm share/calibre
 @dirrm lib/calibre/pyPdf
 @dirrm lib/calibre/odf
-@dirrm lib/calibre/encutils
-@dirrm lib/calibre/cssutils/stylesheets
-@dirrm lib/calibre/cssutils/css
-@dirrm lib/calibre/cssutils
 @dirrm lib/calibre/cherrypy/wsgiserver
 @dirrm lib/calibre/cherrypy/scaffold
 @dirrm lib/calibre/cherrypy/process
@@ -1501,26 +2175,32 @@ share/calibre/viewer/referencing.js
 @dirrm lib/calibre/calibre/web/feeds/recipes
 @dirrm lib/calibre/calibre/web/feeds
 @dirrm lib/calibre/calibre/web
+@dirrm lib/calibre/calibre/utils/pyconsole
 @dirrm lib/calibre/calibre/utils/podofo
+@dirrm lib/calibre/calibre/utils/magick
 @dirrm lib/calibre/calibre/utils/ipc
-@dirrm lib/calibre/calibre/utils/genshi/template
-@dirrm lib/calibre/calibre/utils/genshi/filters
-@dirrm lib/calibre/calibre/utils/genshi
 @dirrm lib/calibre/calibre/utils/fonts
+@dirrm lib/calibre/calibre/utils/chm
 @dirrm lib/calibre/calibre/utils
 @dirrm lib/calibre/calibre/translations
 @dirrm lib/calibre/calibre/trac
 @dirrm lib/calibre/calibre/plugins
 @dirrm lib/calibre/calibre/manual
+@dirrm lib/calibre/calibre/library/db
+@dirrm lib/calibre/calibre/library/server
 @dirrm lib/calibre/calibre/library
 @dirrm lib/calibre/calibre/gui2/wizard
 @dirrm lib/calibre/calibre/gui2/viewer
 @dirrm lib/calibre/calibre/gui2/progress_indicator
+@dirrm lib/calibre/calibre/gui2/preferences
 @dirrm lib/calibre/calibre/gui2/lrf_renderer
-@dirrm lib/calibre/calibre/gui2/dialogs/config
 @dirrm lib/calibre/calibre/gui2/dialogs
 @dirrm lib/calibre/calibre/gui2/device_drivers
 @dirrm lib/calibre/calibre/gui2/convert
+@dirrm lib/calibre/calibre/gui2/library
+@dirrm lib/calibre/calibre/gui2/catalog
+@dirrm lib/calibre/calibre/gui2/add_wizard
+@dirrm lib/calibre/calibre/gui2/actions
 @dirrm lib/calibre/calibre/gui2
 @dirrm lib/calibre/calibre/ebooks/unidecode
 @dirrm lib/calibre/calibre/ebooks/txt
@@ -1534,11 +2214,13 @@ share/calibre/viewer/referencing.js
 @dirrm lib/calibre/calibre/ebooks/pdb/ztxt
 @dirrm lib/calibre/calibre/ebooks/pdb/palmdoc
 @dirrm lib/calibre/calibre/ebooks/pdb/ereader
+@dirrm lib/calibre/calibre/ebooks/pdb/pdf
 @dirrm lib/calibre/calibre/ebooks/pdb
 @dirrm lib/calibre/calibre/ebooks/oeb/transforms
 @dirrm lib/calibre/calibre/ebooks/oeb
 @dirrm lib/calibre/calibre/ebooks/odt
 @dirrm lib/calibre/calibre/ebooks/mobi
+@dirrm lib/calibre/calibre/ebooks/metadata/book
 @dirrm lib/calibre/calibre/ebooks/metadata
 @dirrm lib/calibre/calibre/ebooks/markdown
 @dirrm lib/calibre/calibre/ebooks/lrf/pylrs
@@ -1550,32 +2232,43 @@ share/calibre/viewer/referencing.js
 @dirrm lib/calibre/calibre/ebooks/lit
 @dirrm lib/calibre/calibre/ebooks/html
 @dirrm lib/calibre/calibre/ebooks/fb2
+@dirrm lib/calibre/calibre/ebooks/epub/fix
 @dirrm lib/calibre/calibre/ebooks/epub
 @dirrm lib/calibre/calibre/ebooks/conversion
 @dirrm lib/calibre/calibre/ebooks/compression
 @dirrm lib/calibre/calibre/ebooks/comic
 @dirrm lib/calibre/calibre/ebooks/chardet
+@dirrm lib/calibre/calibre/ebooks/chm
 @dirrm lib/calibre/calibre/ebooks
 @dirrm lib/calibre/calibre/devices/usbobserver
 @dirrm lib/calibre/calibre/devices/usbms
-@dirrm lib/calibre/calibre/devices/prs700
+@dirrm lib/calibre/calibre/devices/teclast
+@dirrm lib/calibre/calibre/devices/sne
 @dirrm lib/calibre/calibre/devices/prs505
 @dirrm lib/calibre/calibre/devices/prs500/cli
 @dirrm lib/calibre/calibre/devices/prs500
 @dirrm lib/calibre/calibre/devices/nuut2
 @dirrm lib/calibre/calibre/devices/nook
+@dirrm lib/calibre/calibre/devices/nokia
+@dirrm lib/calibre/calibre/devices/kobo
 @dirrm lib/calibre/calibre/devices/kindle
 @dirrm lib/calibre/calibre/devices/jetbook
 @dirrm lib/calibre/calibre/devices/iriver
 @dirrm lib/calibre/calibre/devices/irexdr
 @dirrm lib/calibre/calibre/devices/iliad
+@dirrm lib/calibre/calibre/devices/hanvon
+@dirrm lib/calibre/calibre/devices/hanlin
+@dirrm lib/calibre/calibre/devices/folder_device
 @dirrm lib/calibre/calibre/devices/eslick
+@dirrm lib/calibre/calibre/devices/edge
 @dirrm lib/calibre/calibre/devices/eb600
-@dirrm lib/calibre/calibre/devices/cybookg3
+@dirrm lib/calibre/calibre/devices/cybook
 @dirrm lib/calibre/calibre/devices/blackberry
-@dirrm lib/calibre/calibre/devices/bebook
+@dirrm lib/calibre/calibre/devices/binatone
+@dirrm lib/calibre/calibre/devices/apple
 @dirrm lib/calibre/calibre/devices/android
 @dirrm lib/calibre/calibre/devices
 @dirrm lib/calibre/calibre/customize
 @dirrm lib/calibre/calibre
+@dirrm lib/calibre/routes
 @dirrm lib/calibre
author	Stanislav Sedov <stas@FreeBSD.org>	2010-10-07 09:50:39 +0000
committer	Stanislav Sedov <stas@FreeBSD.org>	2010-10-07 09:50:39 +0000
commit	3fb49a147820d4ab51cba07e3e0626c9326b75c9 (patch)
tree	6d98f01c955db635992633226d2d119141a82110 /deskutils
parent	- Fix deleting a non-existing user from a group (diff)