[spyder] 09/10: refresh rules

[Frédéric-Emmanuel Picca]

This is an automated email from the git hooks/post-receive script.

picca pushed a commit to branch experimental
in repository spyder.

commit 92c305ed90b26976d9318991adfec913c2a76999
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Aug 21 13:48:21 2016 +0200

    refresh rules
---
 debian/changelog | 12 ++++++++++++
 debian/control   | 27 ++++++++++++++-------------
 debian/rules     | 14 +++++---------
 3 files changed, 31 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e210cda..9501715 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+spyder (3.0.0~b4+dfsg1-1~exp1) UNRELEASED; urgency=medium
+
+  * Imported Upstream version 3.0.0~b4+dfsg1
+  * debian/watch
+    - Use the Debian pypi redirector
+  * debian/copyright
+    - updated Files-Excluded
+  * debian/control
+    - update the Vcs-X fileds
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Sun, 21 Aug 2016 11:52:26 +0200
+
 spyder (2.3.8+dfsg1-1) unstable; urgency=medium
 
   * Imported Upstream version 2.3.8+dfsg1 (Closes: #802931)
diff --git a/debian/control b/debian/control
index f282e1e..20961d0 100644
--- a/debian/control
+++ b/debian/control
@@ -8,15 +8,16 @@ Priority: extra
 Build-Depends: debhelper (>= 9),
                dh-python,
                python-all,
+               python-qtpy,
                python-setuptools,
                python-sphinx,
                python3-all,
-               python3-pyqt4,
+               python3-qtpy,
                python3-setuptools,
                python3-sip,
                python3-sphinx,
                xsltproc
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/spyder.git
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/spyder.git
 Homepage: https://github.com/spyder-ide/spyder
@@ -46,18 +47,18 @@ Depends: ${misc:Depends},
          ${python:Depends},
          libjs-jquery,
          libjs-mathjax,
-         python-qt4,
+         python-qtpy,
          spyder-common
-Recommends: ipython-qtconsole,
-            pep8,
-            pyflakes (>= 0.5.0),
+Recommends: pyflakes,
             pylint,
             python-bs4,
             python-jedi,
             python-matplotlib,
             python-numpy,
             python-pandas,
-            python-psutil (>= 0.3.0),
+            python-pep8,
+            python-psutil,
+            python-qtconsole,
             python-rope,
             python-scipy,
             python-sphinx,
@@ -121,26 +122,26 @@ Depends: ${misc:Depends},
          ${python3:Depends},
          libjs-jquery,
          libjs-mathjax,
-         python3-pyqt4,
+         python3-qtpy,
          spyder-common
-Recommends: ipython3-qtconsole,
-            python3-pep8,
-            pyflakes (>= 0.5.0),
+Recommends: pyflakes,
             pylint,
             python3-bs4,
             python3-jedi,
             python3-matplotlib,
             python3-numpy,
             python3-pandas,
+            python3-pep8,
             python3-psutil,
+            python3-qtconsole,
             python3-scipy,
             python3-sphinx,
             python-spyderlib-doc (= ${binary:Version})
 Suggests: tortoisehg,
           gitk
-Provides: ${python3:Provides}
 Breaks: ${python3:Breaks},
-         spyder3 (<< 2.3.0+dfsg-2)
+        spyder3 (<< 2.3.0+dfsg-2)
+Provides: ${python3:Provides}
 Description: Python IDE for scientists (Python 3 modules)
  Originally written to design Spyder (the Scientific PYthon
  Development EnviRonment), the spyderlib Python library provides
diff --git a/debian/rules b/debian/rules
index 5e6fe53..3941996 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,6 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-# used only until dh_python3 pyremove is backported for wheezy 
-PY3VERS := $(shell py3versions -vr)
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 export PYBUILD_NAME=spyderlib
@@ -22,7 +19,7 @@ override_dh_auto_install:
 	dh_auto_install
 	# install the spyder-common files
 	dh_install -p spyder-common spyderlib/images usr/share/spyderlib
-	dh_install -p spyder-common spyderplugins/images usr/share/spyderplugins
+
 	# install the spyder files
 	dh_install --sourcedir=$(CURDIR)/debian/python-spyderlib -p spyder usr/bin
 	dh_install --sourcedir=$(CURDIR)/debian/python-spyderlib -p spyder usr/share/applications/spyder.desktop
@@ -31,6 +28,7 @@ override_dh_auto_install:
 	rm -rf $(CURDIR)/debian/python-spyderlib/usr/share/applications
 	rm -rf $(CURDIR)/debian/python-spyderlib/usr/share/pixmaps
 	rm -f $(CURDIR)/debian/spyder/usr/bin/*.py
+
 	# install the spyder3 files
 	dh_install --sourcedir=$(CURDIR)/debian/python3-spyderlib -p spyder3 usr/bin
 	dh_install --sourcedir=$(CURDIR)/debian/python3-spyderlib -p spyder3 usr/share/applications/spyder3.desktop
@@ -39,8 +37,6 @@ override_dh_auto_install:
 	rm -rf $(CURDIR)/debian/python3-spyderlib/usr/share/applications
 	rm -rf $(CURDIR)/debian/python3-spyderlib/usr/share/pixmaps
 	rm -f $(CURDIR)/debian/spyder3/usr/bin/*.py
-	# remove unwanted files until dh_python3 pyremove is backported to wheezy
-	for v in $(PY3VERS); do \
-		rm -rf $(CURDIR)/debian/python3-spyderlib/usr/lib/python$$v/dist-packages/spyderlib/images ;\
-		rm -rf $(CURDIR)/debian/python3-spyderlib/usr/lib/python$$v/dist-packages/spyderplugins/images ;\
-	done
+
+# skip tests for now
+override_dh_auto_test:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/spyder.git