diff --git a/installer/linux/freeze.py b/installer/linux/freeze.py
index 8115c2fabd..f6f7960658 100644
--- a/installer/linux/freeze.py
+++ b/installer/linux/freeze.py
@@ -21,7 +21,8 @@ def freeze():
QTDIR = '/usr/lib/qt4'
- QTDLLS = ('QtCore', 'QtGui', 'QtNetwork', 'QtSvg', 'QtXml', 'QtWebKit')
+ QTDLLS = ('QtCore', 'QtGui', 'QtNetwork', 'QtSvg', 'QtXml',
+ 'QtWebKit', 'QtDBus')
binary_excludes = ['libGLcore*', 'libGL*', 'libnvidia*']
diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index e709e5593d..341a7fa37d 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -16,7 +16,7 @@ file containing all linked files. This plugin is run \
every time you add an HTML file to the library.\
'''))
version = numeric_version
- file_types = set(['html', 'htm', 'xhtml', 'xhtm'])
+ file_types = set(['html', 'htm', 'xhtml', 'xhtm', 'shtm', 'shtml'])
supported_platforms = ['windows', 'osx', 'linux']
on_import = True
@@ -356,7 +356,7 @@ from calibre.devices.prs505.driver import PRS505
from calibre.devices.prs700.driver import PRS700
-plugins = []
+plugins = [HTML2ZIP]
plugins += [
ComicInput,
EPUBInput,
diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index 6450b5e33c..e1e8f3890c 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -235,12 +235,13 @@ class Device(DeviceConfig, DevicePlugin):
wmi = __import__('wmi', globals(), locals(), [], -1)
c = wmi.WMI(find_classes=False)
for drive in c.Win32_DiskDrive():
- if self.windows_match_device(drive, 'WINDOWS_MAIN_MEM') and not drives.get('main', None):
- drives['main'] = self.windows_get_drive_prefix(drive)
- elif self.windows_match_device(drive, 'WINDOWS_CARD_A_MEM') and not drives.get('carda', None):
+ if self.windows_match_device(drive, 'WINDOWS_CARD_A_MEM') and not drives.get('carda', None):
drives['carda'] = self.windows_get_drive_prefix(drive)
elif self.windows_match_device(drive, 'WINDOWS_CARD_B_MEM') and not drives.get('cardb', None):
drives['cardb'] = self.windows_get_drive_prefix(drive)
+ elif self.windows_match_device(drive, 'WINDOWS_MAIN_MEM') and not drives.get('main', None):
+ drives['main'] = self.windows_get_drive_prefix(drive)
+
if 'main' in drives.keys() and 'carda' in drives.keys() and \
'cardb' in drives.keys():
break
diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py
index 4f5df32479..e9b9051159 100644
--- a/src/calibre/ebooks/conversion/plumber.py
+++ b/src/calibre/ebooks/conversion/plumber.py
@@ -688,7 +688,7 @@ OptionRecommendation(name='list_recipes',
self.flush()
def create_oebbook(log, path_or_stream, opts, input_plugin, reader=None,
- encoding='utf-8'):
+ encoding='utf-8', populate=True):
'''
Create an OEBBook.
'''
@@ -697,6 +697,8 @@ def create_oebbook(log, path_or_stream, opts, input_plugin, reader=None,
opts.preprocess_html)
oeb = OEBBook(log, html_preprocessor,
pretty_print=opts.pretty_print, input_encoding=encoding)
+ if not populate:
+ return oeb
# Read OEB Book into OEBBook
log('Parsing all content...')
if reader is None:
diff --git a/src/calibre/ebooks/epub/output.py b/src/calibre/ebooks/epub/output.py
index 3256e1168a..0794747a64 100644
--- a/src/calibre/ebooks/epub/output.py
+++ b/src/calibre/ebooks/epub/output.py
@@ -56,6 +56,7 @@ class EPUBOutput(OutputFormatPlugin):
TITLEPAGE_COVER = '''\
+
Cover