--- Begin Message ---
Package: calibre
Version: 2.71.0+dfsg-0.1
Severity: normal
Hi Martin,
thanks for maintaining calibre, one of the important pieces of
software on my computer.
I have tried to update the current packaging to the current
releae 2.71, and attach a patch.
Two patches in debian/patches I haven't changed itself, but
created new ones because many things have changed and I am not
sure.
Compiling and running worked on my computer, but I have the feeling
that the icons have become much bigger and everything uses up
much more space.
Hope it helps you
Norbert
-- System Information:
Debian Release: stretch/sid
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'unstable'), (200,
'experimental'), (1, 'experimental-debug')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.9.0-rc3+ (SMP w/4 CPU cores; PREEMPT)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (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.71.0+dfsg-0.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.7.0-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.4.2-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.4.2-1
ii python-pkg-resources 28.7.1-1
ii python-pyparsing 2.1.10+dfsg1-1
ii python-pyqt5 5.7+dfsg-2+b1
ii python-pyqt5.qtsvg 5.7+dfsg-2+b1
ii python-pyqt5.qtwebkit 5.7+dfsg-2+b1
ii python-routes 2.3.1-2
ii python2.7 2.7.12-4
ii xdg-utils 1.1.1-1
Versions of packages calibre recommends:
pn python-dnspython <none>
calibre suggests no packages.
-- no debconf information
Norbert
--
PREINING Norbert + TeX Live & Debian Developer + http://www.preining.info
GPG: 0x860CDC13 fp: F7D8 A928 26E3 16A1 9FA0 ACF0 6CAC A448 860C DC13
diff -urN -x .bzr debian.bzr/debian/changelog mydebian.bzr/debian/changelog
--- debian.bzr/debian/changelog 2016-07-11 14:36:03.793256000 +0900
+++ mydebian.bzr/debian/changelog 2016-11-05 15:55:25.133275867 +0900
@@ -1,3 +1,10 @@
+calibre (2.71.0+dfsg-0.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * New upstream releases.
+
+ -- Norbert Preining <[email protected]> Sat, 05 Nov 2016 15:55:16 +0900
+
calibre (2.60.0+dfsg-1) unstable; urgency=medium
* New upstream release.
diff -urN -x .bzr debian.bzr/debian/patches/disable_plugins.py mydebian.bzr/debian/patches/disable_plugins.py
--- debian.bzr/debian/patches/disable_plugins.py 2013-07-01 12:42:41.791723715 +0900
+++ mydebian.bzr/debian/patches/disable_plugins.py 2016-11-05 15:55:45.569120207 +0900
@@ -2,11 +2,13 @@
Author: Martin Pitt <[email protected]>
Bug-Debian: http://bugs.debian.org/640026
-Index: calibre-0.8.29+dfsg/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 @@
+---
+ src/calibre/gui2/actions/preferences.py | 2 --
+ 1 file changed, 2 deletions(-)
+
+--- calibre-2.71.0.orig/src/calibre/gui2/actions/preferences.py
++++ calibre-2.71.0/src/calibre/gui2/actions/preferences.py
+@@ -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)
diff -urN -x .bzr debian.bzr/debian/patches/dont_build_unrar_plugin_new.patch mydebian.bzr/debian/patches/dont_build_unrar_plugin_new.patch
--- debian.bzr/debian/patches/dont_build_unrar_plugin_new.patch 1970-01-01 09:00:00.000000000 +0900
+++ mydebian.bzr/debian/patches/dont_build_unrar_plugin_new.patch 2016-11-05 15:55:58.097024781 +0900
@@ -0,0 +1,33 @@
+---
+ setup/extensions.json | 9 ---------
+ src/calibre/ebooks/metadata/archive.py | 2 +-
+ 2 files changed, 1 insertion(+), 10 deletions(-)
+
+--- calibre-2.71.0.orig/setup/extensions.json
++++ calibre-2.71.0/setup/extensions.json
+@@ -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"
+ }
+ ]
+--- calibre-2.71.0.orig/src/calibre/ebooks/metadata/archive.py
++++ calibre-2.71.0/src/calibre/ebooks/metadata/archive.py
+@@ -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.')
+- file_types = set(['zip', 'rar'])
++ file_types = set(['zip'])
+ supported_platforms = ['windows', 'osx', 'linux']
+ on_import = True
+
diff -urN -x .bzr debian.bzr/debian/patches/mips_no_build_threads_new.patch mydebian.bzr/debian/patches/mips_no_build_threads_new.patch
--- debian.bzr/debian/patches/mips_no_build_threads_new.patch 1970-01-01 09:00:00.000000000 +0900
+++ mydebian.bzr/debian/patches/mips_no_build_threads_new.patch 2016-11-05 14:39:21.775662766 +0900
@@ -0,0 +1,25 @@
+---
+ setup/parallel_build.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- calibre-2.69.0.orig/setup/parallel_build.py
++++ calibre-2.69.0/setup/parallel_build.py
+@@ -13,6 +13,8 @@
+
+ from setup import iswindows
+
++import os
++
+ if iswindows:
+ from ctypes import windll, Structure, POINTER, c_size_t
+ from ctypes.wintypes import WORD, DWORD, LPVOID
+@@ -35,6 +37,9 @@
+ si = SYSTEM_INFO()
+ gsi(si)
+ cpu_count = si.dwNumberOfProcessors
++# http://bugs.debian.org/760865
++elif 'mips' in os.uname()[4]:
++ cpu_count = 1
+ else:
+ from multiprocessing import cpu_count
+ try:
diff -urN -x .bzr debian.bzr/debian/patches/no_updates_dialog.patch mydebian.bzr/debian/patches/no_updates_dialog.patch
--- debian.bzr/debian/patches/no_updates_dialog.patch 2014-02-25 14:29:47.442527000 +0900
+++ mydebian.bzr/debian/patches/no_updates_dialog.patch 2016-11-05 15:55:36.397190069 +0900
@@ -1,9 +1,11 @@
# 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 @@
+---
+# src/calibre/gui2/main.py | 4 ++--
+# 1 file changed, 2 insertions(+), 2 deletions(-)
+#
+--- calibre-2.71.0.orig/src/calibre/gui2/main.py
++++ calibre-2.71.0/src/calibre/gui2/main.py
+@@ -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'))
diff -urN -x .bzr debian.bzr/debian/patches/python_multiarch_inc_new.patch mydebian.bzr/debian/patches/python_multiarch_inc_new.patch
--- debian.bzr/debian/patches/python_multiarch_inc_new.patch 1970-01-01 09:00:00.000000000 +0900
+++ mydebian.bzr/debian/patches/python_multiarch_inc_new.patch 2016-11-05 14:31:55.643310157 +0900
@@ -0,0 +1,19 @@
+---
+ setup/build.py | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- calibre-2.69.0.orig/setup/build.py
++++ calibre-2.69.0/setup/build.py
+@@ -143,7 +143,11 @@
+ if islinux:
+ cflags.append('-pthread')
+ ldflags.append('-shared')
+- cflags.append('-I'+sysconfig.get_python_inc())
++ import sys
++ config = subprocess.Popen([sys.executable + '-config', '--includes'],
++ stdout=subprocess.PIPE)
++ cflags += config.communicate()[0].strip().split()
++ assert config.returncode == 0
+ ldflags.append('-lpython'+sysconfig.get_python_version())
+
+ if isbsd:
diff -urN -x .bzr debian.bzr/debian/patches/series mydebian.bzr/debian/patches/series
--- debian.bzr/debian/patches/series 2016-05-09 00:11:40.218914000 +0900
+++ mydebian.bzr/debian/patches/series 2016-11-05 14:38:08.271806298 +0900
@@ -6,7 +6,10 @@
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
+python_multiarch_inc_new.patch
+#python_multiarch_inc.patch
+dont_build_unrar_plugin_new.patch
+#dont_build_unrar_plugin.patch
+mips_no_build_threads_new.patch
+#mips_no_build_threads.patch
links-privacy.patch
diff -urN -x .bzr debian.bzr/debian/patches/use-system-feedparser.patch mydebian.bzr/debian/patches/use-system-feedparser.patch
--- debian.bzr/debian/patches/use-system-feedparser.patch 2013-12-13 13:06:47.442519000 +0900
+++ mydebian.bzr/debian/patches/use-system-feedparser.patch 2016-11-05 15:55:52.953063963 +0900
@@ -1,8 +1,11 @@
-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 @@
+---
+ recipes/lenta_ru.recipe | 4 +++-
+ src/calibre/web/feeds/__init__.py | 6 +++++-
+ 2 files changed, 8 insertions(+), 2 deletions(-)
+
+--- calibre-2.71.0.orig/recipes/lenta_ru.recipe
++++ calibre-2.71.0/recipes/lenta_ru.recipe
+@@ -4,11 +4,13 @@
Lenta.ru
'''
@@ -14,26 +17,24 @@
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-2.71.0.orig/src/calibre/web/feeds/__init__.py
++++ calibre-2.71.0/src/calibre/web/feeds/__init__.py
+@@ -11,6 +11,11 @@
+ 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 @@
+ class Article(object):
+@@ -334,7 +339,6 @@
max_articles_per_feed=100,
get_article_url=lambda item: item.get('link', None),
log=default_log):
diff -urN -x .bzr debian.bzr/debian/rules mydebian.bzr/debian/rules
--- debian.bzr/debian/rules 2016-05-09 00:11:40.218914000 +0900
+++ mydebian.bzr/debian/rules 2016-11-05 15:59:30.215409044 +0900
@@ -33,7 +33,7 @@
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/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 +99,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*; \
\
--- End Message ---
