[spyder] 08/08: switch to pybuild for real

[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 250488f1cb2d6b572645cb1cba98975c57e6339b
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Thu Apr 10 22:52:56 2014 +0200

    switch to pybuild for real
---
 debian/changelog |  4 ++--
 debian/control   | 10 +++++-----
 debian/rules     |  7 ++++++-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7959344..a906e8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-spyder (2.3.0~beta3+dfsg-1) experimental; urgency=low
+spyder (2.3.0~beta4+dfsg-1) UNRELEASED; urgency=low
 
-  * Imported Upstream version 2.3.0~beta3+dfsg
+  * Imported Upstream version 2.3.0~beta4+dfsg
   * Add python-spyderlib-doc, spyder3 and python3-spyderlib binary packages
   * Bump Standards-Version to 3.9.5 (no changes required)
   * Use compat level 9
diff --git a/debian/control b/debian/control
index c58f88a..fe10d30 100644
--- a/debian/control
+++ b/debian/control
@@ -9,11 +9,11 @@ Build-Depends: debhelper (>= 9),
                dh-python,
                python-all,
                python-setuptools,
+               python-sphinx,
                python3-all,
-               python3-setuptools
-Build-Depends-Indep: python-sphinx,
-                     python3-sphinx,
-                     xsltproc
+               python3-setuptools,
+               python3-sphinx,
+               xsltproc
 Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/spyder.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/spyder.git
@@ -130,4 +130,4 @@ Description: python IDE for scientists (Python 3)
  Python binding module PyQt4 (and is compatible with PySide since
  v2.2).
  .
- This is the Python 3 version of the package.
\ No newline at end of file
+ This is the Python 3 version of the package.
diff --git a/debian/rules b/debian/rules
index 2bb2d90..706f5bf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,8 @@ export PYBUILD_INSTALL_ARGS=--no-doc
 %:
 	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-override_dh_auto_build-indep: 
+override_dh_auto_build:
+	dh_auto_build
 	PYTHONPATH=. http_proxy='localhost' sphinx-build -N -bhtml doc/ build/html  # HTML generator
 	PYTHONPATH=. http_proxy='localhost' sphinx-build -N -bman doc/ build/man  # HTML generator
 
@@ -18,10 +19,14 @@ override_dh_auto_install:
 	dh_auto_install
 	# 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
 	rm -rf $(CURDIR)/debian/python-spyderlib/usr/bin
+	rm -rf $(CURDIR)/debian/python-spyderlib/usr/share/applications
 	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
 	rm -rf $(CURDIR)/debian/python3-spyderlib/usr/bin
+	rm -rf $(CURDIR)/debian/python3-spyderlib/usr/share/applications
 	rm -f $(CURDIR)/debian/spyder3/usr/bin/*.py

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