[SCM] A Python IDE for scientists branch, master, updated. debian/2.0.11-1-12-ga687c0c

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit d40b28998887ca8d15d95ee3c959b25370d61b33
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sat Aug 6 10:41:30 2011 +0200

    add dh_sphinxdoc

diff --git a/debian/changelog b/debian/changelog
index 04e53a5..2c1de80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,13 @@ spyder (2.0.12-2) UNRELEASED; urgency=low
 
   * debian/control
     - fix Breaks and Replace
+    - Depends: python-sphinx (>= 1.0.7+dfsg)
   * debian/copyright fixed using config-edit
+  * debian/rules
+    - use the new dh_sphinxdoc helper
   * debian/patches
+    - 0001-fix-documentation-installation.patch (updated)
+           build the sphinx documentation only once.
     - 0002-feature-forwarded-fix-for-ipython-0.11.patch (new)
            Thanks Julian Taylor for the patch (Closes: #636726)
 
diff --git a/debian/control b/debian/control
index 33dfca9..c14eb4a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Ludovic Aubry <laubrycomm at free.fr>,
 	   Picca Frédéric-Emmanuel <picca at debian.org>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 8.1.1), python-all (>= 2.6.6-3~)
-Build-Depends-Indep: python-sphinx, xsltproc
+Build-Depends-Indep: python-sphinx (>= 1.0.7+dfsg), xsltproc
 Standards-Version: 3.9.2
 X-Python-Version: >= 2.6
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/spyder.git
@@ -30,8 +30,8 @@ Architecture: all
 Section: python
 Depends: ${misc:Depends},
 	 ${python:Depends},
-	 python-qt4,
-	 libjs-jquery
+	 ${sphinxdoc:Depends},
+	 python-qt4
 Recommends: python-scipy, python-numpy, python-matplotlib, ipython, pyflakes, pylint, python-rope, python-sphinx
 Provides: ${python:Provides}
 Breaks: ${python:Breaks}, spyder (<< 2.0.12-1),
diff --git a/debian/patches/0001-fix-documentation-installation.patch b/debian/patches/0001-fix-documentation-installation.patch
index 65c716f..36c8b22 100644
--- a/debian/patches/0001-fix-documentation-installation.patch
+++ b/debian/patches/0001-fix-documentation-installation.patch
@@ -1,13 +1,27 @@
-From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at synchrotron-soleil.fr>
-Date: Thu, 3 Mar 2011 22:39:45 +0100
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Sat, 6 Aug 2011 10:39:46 +0200
 Subject: fix-documentation-installation
 
 ---
+ setup.py            |    2 --
  spyderlib/config.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 2 files changed, 1 insertions(+), 3 deletions(-)
 
+diff --git a/setup.py b/setup.py
+index b2a6754..717cb27 100644
+--- a/setup.py
++++ b/setup.py
+@@ -47,8 +47,6 @@ class MyBuildDoc(setup_command.BuildDoc):
+     def run(self):
+         build = self.get_finalized_command('build')
+         sys.path.insert(0, os.path.abspath(build.build_lib))
+-        dirname = self.distribution.get_command_obj('build').build_purelib
+-        self.builder_target_dir = osp.join(dirname, 'spyderlib', 'doc')
+         try:
+             setup_command.BuildDoc.run(self)
+         except UnicodeDecodeError:
 diff --git a/spyderlib/config.py b/spyderlib/config.py
-index 9fbca59..38c82b6 100644
+index 9fbca59..7838054 100644
 --- a/spyderlib/config.py
 +++ b/spyderlib/config.py
 @@ -28,7 +28,7 @@ DOC_DEV_PATH = osp.join(DATA_DEV_PATH, 'doc')
@@ -15,7 +29,7 @@ index 9fbca59..38c82b6 100644
  # The two following lines are patched when making the debian package:
  DATA_PATH = DATA_DEV_PATH # @@@DATA_PATH@@@
 -DOC_PATH = DOC_DEV_PATH # @@@DOC_PATH@@@
-+DOC_PATH = "/usr/share/doc/spyder/html" # @@@DOC_PATH@@@
++DOC_PATH = "/usr/share/doc/python-spyderlib/html" # @@@DOC_PATH@@@
  
  EDITABLE_TYPES = [int, long, float, list, dict, tuple, str, unicode, date]
  try:
diff --git a/debian/python-spyderlib.docs b/debian/python-spyderlib.docs
new file mode 100644
index 0000000..8ed30c1
--- /dev/null
+++ b/debian/python-spyderlib.docs
@@ -0,0 +1 @@
+build/sphinx/html
\ No newline at end of file
diff --git a/debian/python-spyderlib.links b/debian/python-spyderlib.links
deleted file mode 100644
index 1896a29..0000000
--- a/debian/python-spyderlib.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/javascript/jquery/jquery.js /usr/share/pyshared/spyderlib/doc/_static/jquery.js
-/usr/share/pyshared/spyderlib/doc /usr/share/doc/python-spyderlib/html
diff --git a/debian/rules b/debian/rules
index f12dbac..370e679 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@
 # This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
 
 DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
@@ -19,5 +19,9 @@ debian/spyder.1: debian/manpage.xml
 installman: spyder.1
 	dh installman
 
+override_dh_clean:
+	rm -rf build/sphinx
+	dh_clean
+
 %:
-	dh  $@ --with python2
+	dh  $@ --with python2 --with sphinxdoc
diff --git a/debian/spyder.links b/debian/spyder.links
index e0efc17..ab642da 100644
--- a/debian/spyder.links
+++ b/debian/spyder.links
@@ -1 +1 @@
-/usr/share/pyshared/spyderlib/doc /usr/share/doc/spyder/html
+/usr/share/doc/python-spyderlib/html /usr/share/doc/spyder/html

-- 
A Python IDE for scientists