Bug#856837: unblock: yade/2017.01a-7
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package yade
There were several uploads, which are fixing the RC-bugs #856175
(GUI was not visible completely) and #856218 (detected FTBFS during
generation of PDF-file). Debdiff is attached.
unblock yade/2017.01a-7
Thanks,
Anton
diff -Nru yade-2017.01a/debian/changelog yade-2017.01a/debian/changelog
--- yade-2017.01a/debian/changelog 2017-01-23 17:36:15.000000000 +0100
+++ yade-2017.01a/debian/changelog 2017-02-28 22:03:24.000000000 +0100
@@ -1,3 +1,34 @@
+yade (2017.01a-7) unstable; urgency=medium
+
+ * [31387da] Add missing dependency on python-pyqt5.qtsvg in python-yade.
+
+ -- Anton Gladky <gladk@debian.org> Tue, 28 Feb 2017 22:03:24 +0100
+
+yade (2017.01a-6) unstable; urgency=medium
+
+ * [2366d84] Add missing dependency on python-pyqt5.qtsvg.
+
+ -- Anton Gladky <gladk@debian.org> Tue, 28 Feb 2017 21:53:02 +0100
+
+yade (2017.01a-5) unstable; urgency=medium
+
+ * [eb193dd] Revert patch applied by last upload.
+ * [11efabc] Stop generating of PDF file. (Closes: #856218)
+
+ -- Anton Gladky <gladk@debian.org> Mon, 27 Feb 2017 23:20:27 +0100
+
+yade (2017.01a-4) unstable; urgency=medium
+
+ * [e248862] Fix FTBFS during documentation build. (Closes: #856218)
+
+ -- Anton Gladky <gladk@debian.org> Sun, 26 Feb 2017 20:21:22 +0100
+
+yade (2017.01a-3) unstable; urgency=medium
+
+ * [14120f5] Initialize GUI in IPython 5. (Closes: #856175)
+
+ -- Anton Gladky <gladk@debian.org> Sun, 26 Feb 2017 00:47:26 +0100
+
yade (2017.01a-2) unstable; urgency=medium
* [1a804bb] Disable parallel build.
diff -Nru yade-2017.01a/debian/control yade-2017.01a/debian/control
--- yade-2017.01a/debian/control 2017-01-19 22:48:02.000000000 +0100
+++ yade-2017.01a/debian/control 2017-02-28 22:03:03.000000000 +0100
@@ -32,6 +32,7 @@
python-numpy,
python-sip,
python-pyqt5,
+ python-pyqt5.qtsvg,
python-tk,
python-xlib,
zlib1g-dev
@@ -108,6 +109,7 @@
python-matplotlib,
python-minieigen,
python-pyqt5,
+ python-pyqt5.qtsvg,
python-tk,
python-xlib,
${misc:Depends},
diff -Nru yade-2017.01a/debian/patches/08_fix_gui.patch yade-2017.01a/debian/patches/08_fix_gui.patch
--- yade-2017.01a/debian/patches/08_fix_gui.patch 1970-01-01 01:00:00.000000000 +0100
+++ yade-2017.01a/debian/patches/08_fix_gui.patch 2017-02-26 00:46:13.000000000 +0100
@@ -0,0 +1,21 @@
+From: Anton Gladky <gladk@debian.org>
+Date: Sat, 25 Feb 2017 22:30:24 +0100
+Subject: [PATCH] Initialize gui in IPython 5.
+---
+ core/main/main.py.in | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+Index: yade/core/main/main.py.in
+===================================================================
+--- yade.orig/core/main/main.py.in
++++ yade/core/main/main.py.in
+@@ -244,6 +244,9 @@ def userSession(gui='none',qapp=None):
+ InteractiveShellEmbed.config=cfg
+ InteractiveShellEmbed.banner1=banner+'\n'
+ ipshell=InteractiveShellEmbed()
++ # If IPython > 5 one need to initialize graphic gui
++ if ((gui == "qt5" or gui == "qt4")and yade.runtime.ipython_version>=500):
++ ipshell.enable_gui(gui)
+ ipshell()
+
+ ## run userSession in a way corresponding to the features we use:
diff -Nru yade-2017.01a/debian/patches/series yade-2017.01a/debian/patches/series
--- yade-2017.01a/debian/patches/series 2017-01-19 22:46:11.000000000 +0100
+++ yade-2017.01a/debian/patches/series 2017-02-26 20:21:22.000000000 +0100
@@ -1 +1,3 @@
01_remove_google_analytics.patch
+08_fix_gui.patch
+
diff -Nru yade-2017.01a/debian/rules yade-2017.01a/debian/rules
--- yade-2017.01a/debian/rules 2017-01-23 17:35:59.000000000 +0100
+++ yade-2017.01a/debian/rules 2017-02-27 23:21:05.000000000 +0100
@@ -47,7 +47,7 @@
dh_numpy
ifeq ($(BUILD_DOC), yes)
#Generate docs
- cd $(CURDIR)/doc/sphinx; PYTHONPATH=. $(tmpInstall)/usr/bin/yade yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex;
+ cd $(CURDIR)/doc/sphinx; PYTHONPATH=. $(tmpInstall)/usr/bin/yade yadeSphinx.py
endif
#Delete all pyc files
find . -name '*.pyc' -print0 | xargs -0 rm -f
diff -Nru yade-2017.01a/debian/yade-doc.doc-base yade-2017.01a/debian/yade-doc.doc-base
--- yade-2017.01a/debian/yade-doc.doc-base 2014-06-25 20:23:46.000000000 +0200
+++ yade-2017.01a/debian/yade-doc.doc-base 2017-02-27 23:21:05.000000000 +0100
@@ -7,6 +7,3 @@
Format: html
Index: /usr/share/doc/yade-doc/html/index.html
Files: /usr/share/doc/yade-doc/*.*
-
-Format: PDF
-Files: /usr/share/doc/yade-doc/Yade.pdf
diff -Nru yade-2017.01a/debian/yade-doc.docs yade-2017.01a/debian/yade-doc.docs
--- yade-2017.01a/debian/yade-doc.docs 2014-06-25 20:23:46.000000000 +0200
+++ yade-2017.01a/debian/yade-doc.docs 2017-02-27 23:21:05.000000000 +0100
@@ -1,2 +1 @@
doc/sphinx/_build/html
-doc/sphinx/_build/latex/Yade.pdf
Reply to: