From 2e99dd91a9d8e57c4b9aa05e15330edd49997187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= Date: Sat, 31 Aug 2019 10:48:16 +0200 Subject: release 3.3.6+dfsg1-2 --- debian/changelog | 9 ++++ debian/control | 2 + .../patches/0004-Removed-pylint-dependency.patch | 26 +++++++++ debian/patches/Always-use-setuptools.patch | 4 +- debian/patches/Customize-paths-for-Debian.patch | 4 +- .../Remove-pyqt5-from-install-requires.patch | 8 +-- debian/patches/help_images_static.patch | 63 ---------------------- debian/patches/series | 2 +- debian/rules | 2 +- 9 files changed, 50 insertions(+), 70 deletions(-) create mode 100644 debian/patches/0004-Removed-pylint-dependency.patch delete mode 100644 debian/patches/help_images_static.patch diff --git a/debian/changelog b/debian/changelog index 614fb03..d362d7b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +spyder (3.3.6+dfsg1-2) unstable; urgency=medium + + * Fixed by upstream in a previous release (Closes: #932987) + * d/copyright: MIT -> Expat (the real variant used) + * d/control: removed pylint3 build depends. + * d/patches: Added 0004-Removed-pylint-dependency.patch + + -- Picca Frédéric-Emmanuel Sun, 01 Sep 2019 14:44:51 +0200 + spyder (3.3.6+dfsg1-1) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index 23fc7f4..4e12ee4 100644 --- a/debian/control +++ b/debian/control @@ -77,6 +77,7 @@ Architecture: all Section: python Depends: libjs-jquery, libjs-mathjax, + pylint, spyder-common (= ${binary:Version}), ${misc:Depends}, ${python:Depends} @@ -128,6 +129,7 @@ Architecture: all Section: python Depends: libjs-jquery, libjs-mathjax, + pylint, python3-keyring, spyder-common (= ${binary:Version}), ${misc:Depends}, diff --git a/debian/patches/0004-Removed-pylint-dependency.patch b/debian/patches/0004-Removed-pylint-dependency.patch new file mode 100644 index 0000000..77fb4c0 --- /dev/null +++ b/debian/patches/0004-Removed-pylint-dependency.patch @@ -0,0 +1,26 @@ +From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= +Date: Sun, 1 Sep 2019 14:41:46 +0200 +Subject: Removed pylint dependency + +dh_python3 generate a pylint3 dependency. So we need to remove it, until +it is fixed by the dh-python upstream +--- + setup.py | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 63393c7..539c812 100644 +--- a/setup.py ++++ b/setup.py +@@ -224,7 +224,10 @@ install_requires = [ + 'nbconvert', + 'sphinx', + 'pycodestyle', +- 'pylint', ++ # dh_python3 automatically convert pylint dependency into pylin3. ++ # until it is fixed by dh_python3, just remote it and add it byhand in ++ # the control file ++ #'pylint', + 'psutil', + 'qtawesome>=0.5.7', + 'qtpy>=1.5.0', diff --git a/debian/patches/Always-use-setuptools.patch b/debian/patches/Always-use-setuptools.patch index 504aedc..d302295 100644 --- a/debian/patches/Always-use-setuptools.patch +++ b/debian/patches/Always-use-setuptools.patch @@ -6,9 +6,11 @@ Subject: Always use setuptools setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/setup.py b/setup.py +index 37b3a0a..c0948d1 100644 --- a/setup.py +++ b/setup.py -@@ -28,7 +28,7 @@ +@@ -28,7 +28,7 @@ import subprocess import sys import shutil diff --git a/debian/patches/Customize-paths-for-Debian.patch b/debian/patches/Customize-paths-for-Debian.patch index 187e671..365c90c 100644 --- a/debian/patches/Customize-paths-for-Debian.patch +++ b/debian/patches/Customize-paths-for-Debian.patch @@ -7,9 +7,11 @@ Subject: Customize paths for Debian spyder/__init__.py | 5 +++++ 1 file changed, 5 insertions(+) +diff --git a/spyder/__init__.py b/spyder/__init__.py +index 890ecbc..aee35ea 100644 --- a/spyder/__init__.py +++ b/spyder/__init__.py -@@ -42,6 +42,11 @@ +@@ -42,6 +42,11 @@ __website_url__ = 'https://www.spyder-ide.org/' # Dear (Debian, RPM, ...) package makers, please feel free to customize the # following path to module's data (images) and translations: DATAPATH = LOCALEPATH = DOCPATH = MATHJAXPATH = JQUERYPATH = '' diff --git a/debian/patches/Remove-pyqt5-from-install-requires.patch b/debian/patches/Remove-pyqt5-from-install-requires.patch index bd48021..f7caa33 100644 --- a/debian/patches/Remove-pyqt5-from-install-requires.patch +++ b/debian/patches/Remove-pyqt5-from-install-requires.patch @@ -3,12 +3,14 @@ Date: Sun, 4 Mar 2018 16:48:14 +0000 Subject: Remove pyqt5 from install requires --- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +diff --git a/setup.py b/setup.py +index c0948d1..63393c7 100644 --- a/setup.py +++ b/setup.py -@@ -238,10 +238,10 @@ +@@ -238,10 +238,10 @@ install_requires = [ 'keyring;sys_platform!="linux2"', # Packages for pyqt5 are only available in # Python 3 diff --git a/debian/patches/help_images_static.patch b/debian/patches/help_images_static.patch deleted file mode 100644 index b04e404..0000000 --- a/debian/patches/help_images_static.patch +++ /dev/null @@ -1,63 +0,0 @@ -Index: spyder/spyder/utils/help/tutorial.rst -=================================================================== ---- spyder.orig/spyder/utils/help/tutorial.rst -+++ spyder/spyder/utils/help/tutorial.rst -@@ -142,7 +142,7 @@ The Spyder environment also provides a : - - While the cursor is on the name of an object, press :kbd:`Ctrl-I` (or :kbd:`Command-I` on macOS), and you should find that the same information as we obtained from ``help(hello)`` is provided automatically in the :guilabel:`Help` pane: - --.. image:: images/spyder-hello-docstring.png -+.. image:: static/images/spyder-hello-docstring.png - :align: center - - This works in the :guilabel:`Console` and in the :guilabel:`Editor`. -@@ -331,7 +331,7 @@ You'll need to have SymPy installed for - - We can now use the variables ``x`` and ``y``, for example like this: - --.. image:: images/spyder-sympy-example.png -+.. image:: static/images/spyder-sympy-example.png - :align: center - - -@@ -557,7 +557,7 @@ If you follow those guidelines, you can - - For example, to get an ``average()`` function look like this in the Spyder :guilabel:`Help` pane: - --.. image:: images/spyder-nice-docstring-rendering.png -+.. image:: static/images/spyder-nice-docstring-rendering.png - :align: center - - you need to format the documentation string as follows: -@@ -611,19 +611,19 @@ The :guilabel:`Editor` pane will then hi - - After entering debug mode, you can execute the code line by line using the ``Step`` button of the :guilabel:`Debug` toolbar: - --.. image:: images/debug-step-over.png -+.. image:: static/images/debug-step-over.png - :align: center - - or the shortcut :kbd:`Ctrl-F10`. - You can also inspect how a particular function is working by stepping into it with the ``Step Into`` button - --.. image:: images/debug-step-in.png -+.. image:: static/images/debug-step-in.png - :align: center - - or the shortcut :kbd:`Ctrl-F11`. - Finally, to get out of a function and continue with the next line you need to use the ``Step Return`` button - --.. image:: images/debug-step-out.png -+.. image:: static/images/debug-step-out.png - :align: center - - or the shortcut :kbd:`Ctrl-Shift-F12`. -@@ -634,7 +634,7 @@ A red dot in this position indicates a b - - After entering the Debugger, you can press the ``Continue`` button - --.. image:: images/debug-continue.png -+.. image:: static/images/debug-continue.png - :align: center - - to stop the execution at the first breakpoint. diff --git a/debian/patches/series b/debian/patches/series index d8a6170..cce59a4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ Customize-paths-for-Debian.patch Always-use-setuptools.patch Remove-pyqt5-from-install-requires.patch -#help_images_static.patch +0004-Removed-pylint-dependency.patch diff --git a/debian/rules b/debian/rules index e841acb..98f9616 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,7 @@ # -*- makefile -*- # Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +export DH_VERBOSE=1 export PYBUILD_NAME=spyder export PYBUILD_DESTDIR_python2=debian/python-$(PYBUILD_NAME) -- cgit v1.2.3