Package: calibre
Version: 2.85.1+dfsg-1
Severity: normal
Dear Martin,
I have been updating the calibre package locally regularly, and also for
version 3. So I send you the changes I made.
Note that one of the RC bugs (date.js source) is closed by this, since
v3 switched to coffee-script and I adapted the sources to use the
Debian package for it.
Please abuse to your liking
All the best
Norbert
-- System Information:
Debian Release: 9.0
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.12.0-rc6 (SMP w/8 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8),
LANGUAGE=en_US:en (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 3.1.1+dfsg-0.1
ii fonts-liberation 1:1.07.4-2
ii imagemagick 8:6.9.7.4+dfsg-11
ii imagemagick-6.q16 [imagemagick] 8:6.9.7.4+dfsg-11
ii libjs-coffeescript 1.10.0~dfsg-1
ii libjs-mathjax 2.7.0-2
ii poppler-utils 0.48.0-2
ii python-apsw 3.16.2-r1-2
ii python-beautifulsoup 3.2.1-1
ii python-chardet 3.0.4-1
ii python-cherrypy3 3.5.0-2
ii python-cssselect 1.0.1-1
ii python-cssutils 1.0-4.1
ii python-dateutil 2.5.3-2
ii python-dbus 1.2.4-1+b1
ii python-feedparser 5.1.3-3
ii python-imaging 4.0.0-4
ii python-lxml 3.8.0-1
ii python-markdown 2.6.8-1
ii python-mechanize 1:0.2.5-3
ii python-netifaces 0.10.4-0.1+b2
ii python-pil 4.0.0-4
ii python-pkg-resources 36.0.1-1
ii python-pyparsing 2.1.10+dfsg1-1
ii python-pyqt5 5.7+dfsg-5
ii python-pyqt5.qtsvg 5.7+dfsg-5
ii python-pyqt5.qtwebkit 5.7+dfsg-5
ii python-routes 2.3.1-2
ii python2.7 2.7.13-2
ii xdg-utils 1.1.1-1
Versions of packages calibre recommends:
ii python-dnspython 1.15.0-1
calibre suggests no packages.
-- no debconf information
diff --git a/debian/calibre.README.Debian b/debian/calibre.README.Debian
index 8b192b81..7972d74c 100644
--- a/debian/calibre.README.Debian
+++ b/debian/calibre.README.Debian
@@ -3,7 +3,7 @@ calibre for Debian
Customizing LRF fonts
---------------------
-By default, the calibre package maps the LRF standard fonts to the the
+By default, the calibre package maps the LRF standard fonts to the
free Liberation fonts (package fonts-liberation):
Swis721 BT Roman -> LiberationSans-Regular.ttf
diff --git a/debian/calibre.install b/debian/calibre.install
index 1f199341..06854303 100644
--- a/debian/calibre.install
+++ b/debian/calibre.install
@@ -4,7 +4,6 @@ usr/lib/calibre/calibre/
usr/lib/calibre/odf
usr/lib/calibre/templite
usr/lib/calibre/html5lib
-usr/lib/calibre/regex
usr/lib/calibre/tinycss
usr/lib/calibre/css_selectors
usr/lib/calibre/duktape
diff --git a/debian/changelog b/debian/changelog
index 32cddee9..3e92b50b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+calibre (3.1.1+dfsg-0.1) experimental; urgency=medium
+
+ * new releases
+ * add python-regex to dependencies
+
+ -- Norbert Preining <prein...@debian.org> Sat, 24 Jun 2017 12:18:22 +0900
+
calibre (2.85.1+dfsg-1) experimental; urgency=medium
* New upstream release. (Closes: #864057)
diff --git a/debian/control b/debian/control
index dcd7e9f3..fba092f4 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,7 @@
Source: calibre
Section: text
Priority: extra
-Build-Depends: cdbs (>= 0.4.43),
- debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
dh-buildinfo,
python2.7-dev,
python-setuptools,
@@ -24,6 +23,7 @@ Build-Depends: cdbs (>= 0.4.43),
python-markdown,
python-pyparsing,
python-routes,
+ python-regex,
python-chardet,
python-netifaces,
pyqt5-dev-tools,
@@ -78,6 +78,7 @@ Depends: python2.7,
poppler-utils,
fonts-liberation,
libjs-mathjax (>= 2.1+20121028-1),
+ libjs-coffeescript,
calibre-bin (>= ${source:Version}),
${misc:Depends}
Recommends: python-dnspython (>= 1.6.0)
diff --git a/debian/patches/Disable-update-check-by-default.patch
b/debian/patches/Disable-update-check-by-default.patch
index ab08374b..df5bcf66 100644
--- a/debian/patches/Disable-update-check-by-default.patch
+++ b/debian/patches/Disable-update-check-by-default.patch
@@ -3,14 +3,12 @@ Date: Mon, 14 Nov 2016 22:41:23 +0100
Subject: Disable update check by default
---
- src/calibre/gui2/main.py | 4 ++--
+ src/calibre/gui2/main.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-diff --git a/src/calibre/gui2/main.py b/src/calibre/gui2/main.py
-index b6836d9..1e22b6a 100644
---- a/src/calibre/gui2/main.py
-+++ b/src/calibre/gui2/main.py
-@@ -48,8 +48,8 @@ path_to_ebook to the database.
+--- calibre-2.99.10.orig/src/calibre/gui2/main.py
++++ calibre-2.99.10/src/calibre/gui2/main.py
+@@ -49,8 +49,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 --git a/debian/patches/series b/debian/patches/series
index a1963fae..8ec46450 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
Disable-update-check-by-default.patch
Disable-plugin-dialog.patch
Use-packaged-instead-of-bundled-feedparser-Python-module.patch
Do-not-build-unrar-extension-as-we-strip-unrar-from-the-t.patch
-content-server-Don-t-load-external-URLs-for-privacy.patch
+#content-server-Don-t-load-external-URLs-for-privacy.patch
diff --git a/debian/rules b/debian/rules
index 9a5a0e09..a54b83a0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,9 +29,7 @@ debian/tmp:
# remove bundled python libraries which are provided by system
# packages
- rm -r debian/tmp/usr/lib/calibre/cherrypy
- rm -r debian/tmp/usr/lib/calibre/routes
- rm -r debian/tmp/usr/lib/calibre/chardet
+ # rm -r debian/tmp/usr/lib/calibre/tinycss
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'
@@ -50,6 +48,10 @@ debian/tmp:
rm -rf debian/tmp/usr/share/calibre/viewer/mathjax
ln -s /usr/share/javascript/mathjax
debian/tmp/usr/share/calibre/viewer/mathjax
+ # use system coffee-script
+ rm -rf debian/tmp/usr/share/calibre/coffee-script.js
+ ln -s /usr/share/javascript/coffeescript/coffee-script.min.js
debian/tmp/usr/share/calibre/coffee-script.js
+
# fix executable permissions
find debian/tmp/usr/lib/calibre/calibre -type f | xargs chmod a-x
find debian/tmp/usr/share/calibre/images -type f | xargs chmod a-x
@@ -88,23 +90,9 @@ get-orig-source:
mkdir -p debian/orig; cd debian/orig; \
wget -O - http://download.calibre-ebook.com/$$V/calibre-$$V.tar.xz | xz
-cd | tar x; \
\
- wget -O -
https://github.com/ehynds/jquery-ui-multiselect-widget/archive/1.5.tar.gz | tar
zx; \
- \
- cp jquery-ui-multiselect-widget-1.5/src/jquery.multiselect.js `ls -d
calibre*`/resources/content_server/; \
- rm -rf 1.5.tar.gz jquery-ui-multiselect-widget-1.5; \
- \
- wget https://jqueryui.com/resources/download/jquery-ui-1.8.5.zip &&
unzip jquery-ui-1.8.5.zip; \
- cp jquery-ui-1.8.5/ui/jquery-ui.js `ls -d
calibre*`/resources/content_server/jquery_ui/js/jquery-ui-1.8.5.custom.js.orig;
\
- rm -rf jquery-ui-1.8.5; \
- rm jquery-ui-1.8.5.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*; \
- \
D=`pwd`; rm -f calibre*/src/odf/thumbnail.py; \
- rm -rf calibre*/src/unrar; \
rm -rf calibre*/resources/viewer/mathjax; \
+ rm -rf calibre*/resources/coffee-script.js; \
rm -rf calibre*/src/calibre/ebooks/markdown; \
cd $$D; tar c * | xz -9 > ../../../calibre_$$V+dfsg.orig.tar.xz; \
cd ../..; rm -r debian/orig
