Package: calibre Severity: normal Tags: patch Dear Martin,
The version of calibre in Debian is showing a little bit of its age. Please find attached a patch, which should update it to 2.70.0. It is a single diff but changes are: * Some build depends added * Patches refreshed. some dropped. I built and tested it locally. Thanks. -- System Information: Debian Release: stretch/sid APT prefers unstable APT policy: (990, 'unstable'), (990, 'testing'), (500, 'unstable-debug'), (500, 'testing-debug'), (100, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.8.1brk1+ (SMP w/4 CPU cores) Locale: LANG=en_IN, LC_CTYPE=en_IN (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages calibre depends on: ii calibre-bin 2.70.0+dfsg-1 ii fonts-liberation 1:1.07.4-2 ii imagemagick 8:6.9.6.2+dfsg-2 ii imagemagick-6.q16 [imagemagick] 8:6.9.6.2+dfsg-2 ii libjs-mathjax 2.6.1-1 ii poppler-utils 0.44.0-3 ii python-apsw 3.13.0-r1-1 ii python-beautifulsoup 3.2.1-1 ii python-chardet 2.3.0-2 ii python-cherrypy3 3.5.0-2 ii python-cssselect 0.9.2-1 ii python-cssutils 1.0-4.1 ii python-dateutil 2.5.3-2 ii python-dbus 1.2.4-1 ii python-feedparser 5.1.3-3 ii python-imaging 3.3.1-1 ii python-lxml 3.6.4-1 ii python-markdown 2.6.7-1 ii python-mechanize 1:0.2.5-3 ii python-netifaces 0.10.4-0.1+b2 ii python-pil 3.3.1-1 ii python-pkg-resources 28.0.0-1 ii python-pyparsing 2.1.9+dfsg1-1 ii python-pyqt5 5.7+dfsg-2 ii python-pyqt5.qtsvg 5.7+dfsg-2 ii python-pyqt5.qtwebkit 5.7+dfsg-2 ii python-routes 2.3.1-2 ii python2.7 2.7.12-3+b1 ii xdg-utils 1.1.1-1 Versions of packages calibre recommends: ii python-dnspython 1.14.0-3 calibre suggests no packages. -- no debconf information
=== modified file 'debian/changelog' --- debian/changelog 2016-06-30 08:51:36 +0000 +++ debian/changelog 2016-10-15 15:44:41 +0000 @@ -1,3 +1,9 @@ +calibre (2.70.0+dfsg-1) UNRELEASED; urgency=medium + + * New upstream release + + -- Ritesh Raj Sarraf <[email protected]> Sat, 15 Oct 2016 21:14:19 +0530 + calibre (2.60.0+dfsg-1) unstable; urgency=medium * New upstream release. === modified file 'debian/control' --- debian/control 2016-04-17 21:18:51 +0000 +++ debian/control 2016-10-16 11:17:56 +0000 @@ -8,8 +8,10 @@ python-setuptools, txt2man, pyqt5-dev (>= 5.3.1), + python-pyqt5.qtwebkit, qt5-qmake, qtchooser, + python-apsw (>= 3.7.17), python-pil | python-imaging, python-lxml (>= 3.2.1), python-mechanize (>= 0.2.5), === modified file 'debian/patches/disable_plugins.py' --- debian/patches/disable_plugins.py 2011-12-20 18:44:00 +0000 +++ debian/patches/disable_plugins.py 2016-10-16 08:08:11 +0000 @@ -2,11 +2,11 @@ Author: Martin Pitt <[email protected]> Bug-Debian: http://bugs.debian.org/640026 -Index: calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py +Index: calibre/src/calibre/gui2/actions/preferences.py =================================================================== ---- calibre-0.8.29+dfsg.orig/src/calibre/gui2/actions/preferences.py 2011-12-16 05:49:14.000000000 +0100 -+++ calibre-0.8.29+dfsg/src/calibre/gui2/actions/preferences.py 2011-12-20 19:29:04.798468930 +0100 -@@ -28,8 +28,6 @@ +--- calibre.orig/src/calibre/gui2/actions/preferences.py 2016-10-16 13:38:08.251366411 +0530 ++++ calibre/src/calibre/gui2/actions/preferences.py 2016-10-16 13:38:08.234699421 +0530 +@@ -29,8 +29,6 @@ pm.addAction(QIcon(I('config.png')), _('Preferences'), self.do_config) cm('welcome wizard', _('Run welcome wizard'), icon='wizard.png', triggered=self.gui.run_wizard) === modified file 'debian/patches/dont_build_unrar_plugin.patch' --- debian/patches/dont_build_unrar_plugin.patch 2014-02-02 09:42:44 +0000 +++ debian/patches/dont_build_unrar_plugin.patch 2016-10-16 08:53:27 +0000 @@ -3,40 +3,11 @@ Forwarded: not-needed Last-Update: 2013-04-04 -Index: calibre/setup/extensions.py -=================================================================== ---- calibre.orig/setup/extensions.py 2014-02-02 10:42:14.510954007 +0100 -+++ calibre/setup/extensions.py 2014-02-02 10:42:14.502954007 +0100 -@@ -209,24 +209,6 @@ - sip_files=['calibre/ebooks/pdf/render/qt_hack.sip'] - ), - -- Extension('unrar', -- ['unrar/%s.cpp'%(x.partition('.')[0]) for x in ''' -- rar.o strlist.o strfn.o pathfn.o savepos.o smallfn.o global.o file.o -- filefn.o filcreat.o archive.o arcread.o unicode.o system.o -- isnt.o crypt.o crc.o rawread.o encname.o resource.o match.o -- timefn.o rdwrfn.o consio.o options.o ulinks.o errhnd.o rarvm.o -- secpassword.o rijndael.o getbits.o sha1.o extinfo.o extract.o -- volume.o list.o find.o unpack.o cmddata.o filestr.o scantree.o -- '''.split()] + ['calibre/utils/unrar.cpp'], -- inc_dirs=['unrar'], -- cflags=[('/' if iswindows else '-') + x for x in ( -- 'DSILENT', 'DRARDLL', 'DUNRAR')] + ( -- [] if iswindows else ['-D_FILE_OFFSET_BITS=64', -- '-D_LARGEFILE_SOURCE']), -- optimize_level=2, -- libraries=['User32', 'Advapi32', 'kernel32', 'Shell32'] if iswindows else [] -- ), -- - ] - - Index: calibre/src/calibre/ebooks/metadata/archive.py =================================================================== ---- calibre.orig/src/calibre/ebooks/metadata/archive.py 2014-02-02 10:42:14.510954007 +0100 -+++ calibre/src/calibre/ebooks/metadata/archive.py 2014-02-02 10:42:14.502954007 +0100 -@@ -42,7 +42,7 @@ +--- calibre.orig/src/calibre/ebooks/metadata/archive.py 2016-10-16 14:22:45.053345668 +0530 ++++ calibre/src/calibre/ebooks/metadata/archive.py 2016-10-16 14:22:45.053345668 +0530 +@@ -44,7 +44,7 @@ description = _('Extract common e-book formats from archives ' '(zip/rar) files. Also try to autodetect if they are actually ' 'cbz/cbr files.') @@ -45,3 +16,22 @@ supported_platforms = ['windows', 'osx', 'linux'] on_import = True +Index: calibre/setup/extensions.json +=================================================================== +--- calibre.orig/setup/extensions.json 2016-10-14 09:26:48.000000000 +0530 ++++ calibre/setup/extensions.json 2016-10-16 14:23:24.474234835 +0530 +@@ -211,14 +211,5 @@ + "sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c", + "headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h", + "libraries": "mtp" +- }, +- { +- "name": "unrar", +- "sources": "unrar/rar.cpp unrar/strlist.cpp unrar/strfn.cpp unrar/pathfn.cpp unrar/savepos.cpp unrar/smallfn.cpp unrar/global.cpp unrar/file.cpp unrar/filefn.cpp unrar/filcreat.cpp unrar/archive.cpp unrar/arcread.cpp unrar/unicode.cpp unrar/system.cpp unrar/isnt.cpp unrar/crypt.cpp unrar/crc.cpp unrar/rawread.cpp unrar/encname.cpp unrar/resource.cpp unrar/match.cpp unrar/timefn.cpp unrar/rdwrfn.cpp unrar/consio.cpp unrar/options.cpp unrar/ulinks.cpp unrar/errhnd.cpp unrar/rarvm.cpp unrar/secpassword.cpp unrar/rijndael.cpp unrar/getbits.cpp unrar/sha1.cpp unrar/extinfo.cpp unrar/extract.cpp unrar/volume.cpp unrar/list.cpp unrar/find.cpp unrar/unpack.cpp unrar/cmddata.cpp unrar/filestr.cpp unrar/scantree.cpp calibre/utils/unrar.cpp", +- "inc_dirs": "unrar", +- "defines": "SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE", +- "windows_defines": "SILENT RARDLL UNRAR", +- "optimize_level": 2, +- "windows_libraries": "User32 Advapi32 kernel32 Shell32" + } + ] === modified file 'debian/patches/links-privacy.patch' --- debian/patches/links-privacy.patch 2016-04-17 21:43:33 +0000 +++ debian/patches/links-privacy.patch 2016-10-16 08:17:42 +0000 @@ -2,10 +2,10 @@ Author: Martin Pitt <[email protected]> Forwarded: no -Index: calibre-2.55.0+dfsg/resources/content_server/browse/browse.html +Index: calibre/resources/content_server/browse/browse.html =================================================================== ---- calibre-2.55.0+dfsg.orig/resources/content_server/browse/browse.html -+++ calibre-2.55.0+dfsg/resources/content_server/browse/browse.html +--- calibre.orig/resources/content_server/browse/browse.html 2016-10-16 13:47:34.902355496 +0530 ++++ calibre/resources/content_server/browse/browse.html 2016-10-16 13:47:34.899022097 +0530 @@ -7,7 +7,7 @@ <title>..:: calibre {library} ::.. {title}</title> <meta http-equiv="X-UA-Compatible" content="IE=100" /> @@ -24,10 +24,10 @@ </div> </form> <div id="calibre-home-link" title="Go to the calibre website"></div> -Index: calibre-2.55.0+dfsg/resources/content_server/index.html +Index: calibre/resources/content_server/index.html =================================================================== ---- calibre-2.55.0+dfsg.orig/resources/content_server/index.html -+++ calibre-2.55.0+dfsg/resources/content_server/index.html +--- calibre.orig/resources/content_server/index.html 2016-10-16 13:47:34.902355496 +0530 ++++ calibre/resources/content_server/index.html 2016-10-16 13:47:34.899022097 +0530 @@ -9,7 +9,7 @@ <script type="text/javascript" src="{prefix}/static/date.js" charset="utf-8"></script> <script type="text/javascript" src="{prefix}/static/jquery.js" charset="utf-8"></script> === modified file 'debian/patches/no_updates_dialog.patch' --- debian/patches/no_updates_dialog.patch 2014-02-02 09:42:44 +0000 +++ debian/patches/no_updates_dialog.patch 2016-10-16 08:08:05 +0000 @@ -1,9 +1,9 @@ # Description: Disable update check by default. Index: calibre/src/calibre/gui2/main.py =================================================================== ---- calibre.orig/src/calibre/gui2/main.py 2014-02-02 10:41:28.470954623 +0100 -+++ calibre/src/calibre/gui2/main.py 2014-02-02 10:41:56.546954247 +0100 -@@ -37,8 +37,8 @@ +--- calibre.orig/src/calibre/gui2/main.py 2016-10-16 13:37:55.947794697 +0530 ++++ calibre/src/calibre/gui2/main.py 2016-10-16 13:37:55.944461299 +0530 +@@ -40,8 +40,8 @@ help=_('Start minimized to system tray.')) parser.add_option('-v', '--verbose', default=0, action='count', help=_('Ignored, do not use. Present only for legacy reasons')) === modified file 'debian/patches/series' --- debian/patches/series 2016-04-17 21:43:33 +0000 +++ debian/patches/series 2016-10-16 08:17:26 +0000 @@ -6,7 +6,5 @@ no_updates_dialog.patch disable_plugins.py use-system-feedparser.patch -python_multiarch_inc.patch dont_build_unrar_plugin.patch -mips_no_build_threads.patch links-privacy.patch === modified file 'debian/patches/use-system-feedparser.patch' --- debian/patches/use-system-feedparser.patch 2013-12-06 06:24:12 +0000 +++ debian/patches/use-system-feedparser.patch 2016-10-16 08:11:46 +0000 @@ -1,8 +1,8 @@ Index: calibre/recipes/lenta_ru.recipe =================================================================== ---- calibre.orig/recipes/lenta_ru.recipe 2013-12-06 07:22:25.477237324 +0100 -+++ calibre/recipes/lenta_ru.recipe 2013-12-06 07:22:25.473237324 +0100 -@@ -4,11 +4,14 @@ +--- calibre.orig/recipes/lenta_ru.recipe 2016-10-16 13:38:50.428850361 +0530 ++++ calibre/recipes/lenta_ru.recipe 2016-10-16 13:40:19.527243965 +0530 +@@ -4,11 +4,13 @@ Lenta.ru ''' @@ -14,26 +14,25 @@ import re +parse = partial(parse, agent='Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.11) Gecko/20101012 Firefox/3.6.11') -+ + class LentaRURecipe(BasicNewsRecipe): title = u'Lenta.ru: \u041d\u043e\u0432\u043e\u0441\u0442\u0438' - __author__ = 'Nikolai Kotchetkov' Index: calibre/src/calibre/web/feeds/__init__.py =================================================================== ---- calibre.orig/src/calibre/web/feeds/__init__.py 2013-12-06 07:22:25.477237324 +0100 -+++ calibre/src/calibre/web/feeds/__init__.py 2013-12-06 07:22:25.473237324 +0100 -@@ -11,6 +11,10 @@ - from calibre import entity_to_unicode, strftime +--- calibre.orig/src/calibre/web/feeds/__init__.py 2016-10-16 13:38:50.428850361 +0530 ++++ calibre/src/calibre/web/feeds/__init__.py 2016-10-16 13:41:36.702073563 +0530 +@@ -11,7 +11,10 @@ + from calibre import entity_to_unicode, strftime, force_unicode from calibre.utils.date import dt_factory, utcnow, local_tz - from calibre.utils.cleantext import clean_ascii_chars + from calibre.utils.cleantext import clean_ascii_chars, clean_xml_chars +from feedparser import parse +from functools import partial -+ + +parse = partial(parse, agent='Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US; rv:1.9.2.11) Gecko/20101012 Firefox/3.6.11') class Article(object): -@@ -331,7 +335,6 @@ +@@ -334,7 +337,6 @@ max_articles_per_feed=100, get_article_url=lambda item: item.get('link', None), log=default_log): === modified file 'debian/rules' --- debian/rules 2016-04-17 21:52:18 +0000 +++ debian/rules 2016-10-16 12:27:14 +0000 @@ -33,7 +33,6 @@ rm -r debian/tmp/usr/lib/calibre/routes rm -r debian/tmp/usr/lib/calibre/chardet - rm debian/tmp/usr/lib/calibre/calibre/utils/pyparsing.py rm debian/tmp/usr/lib/calibre/calibre/web/feeds/feedparser.py find debian/tmp/ -name '*.py' | xargs sed -i 's/calibre.utils.pyparsing/pyparsing/g' find debian/tmp/ -name '*.py' -o -name "markdown-calibre" | xargs sed -i 's/calibre.ebooks.markdown/markdown/g' @@ -99,7 +98,7 @@ rm -rf jquery-ui-1.8.5; \ rm jquery-ui-1.8.5.zip; \ \ - wget https://datejs.googlecode.com/files/Datejs-all-Alpha1.zip; unzip Datejs-all-Alpha1.zip; \ + wget https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/datejs/Datejs-all-Alpha1.zip; unzip Datejs-all-Alpha1.zip; \ (cd Datejs-all*/src; cat globalization/en-US.js core-debug.js sugarpak-debug.js parser-debug.js) > `ls -d calibre*`/resources/content_server/date.js.orig; \ rm -rf Datejs-all*; \ \
