[pytango] 03/04: simply rules in order to deal with the profile.

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository pytango.

commit 6dc30ef796457adac53484d6600eb45cbf777a8d
Author: Picca FrÃÂÂÃÂÂà [...]
Date:   Sat Oct 28 12:47:09 2017 +0200

    simply rules in order to deal with the profile.
---
 debian/control                                     |  4 ++-
 .../patches/0002-Use-jquery-from-the-archive.patch |  8 ++----
 ...eal-with-sphinx-only-via-the-debian-rules.patch | 23 +++++++++++++++++
 debian/patches/series                              |  1 +
 debian/python-tango-doc.docs                       |  1 -
 debian/python-tango.examples                       |  1 -
 debian/python3-tango.examples                      |  1 -
 debian/rules                                       | 29 +++++++++-------------
 8 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/debian/control b/debian/control
index 52408ee..334ff06 100644
--- a/debian/control
+++ b/debian/control
@@ -16,12 +16,14 @@ Build-Depends: debhelper (>= 10),
                python-numpy,
                python-setuptools,
                python-six,
+               python-sphinx <!nodoc>,
                python3-all-dev,
                python3-gevent <!nodoc>,
                python3-numpy,
                python3-setuptools,
                python3-six,
-               python3-sphinx <!nodoc>
+               python3-sphinx <!nodoc>,
+               sphinx-common
 Standards-Version: 4.1.0
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/pytango.git
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/pytango.git
diff --git a/debian/patches/0002-Use-jquery-from-the-archive.patch b/debian/patches/0002-Use-jquery-from-the-archive.patch
index 5321271..0b5542c 100644
--- a/debian/patches/0002-Use-jquery-from-the-archive.patch
+++ b/debian/patches/0002-Use-jquery-from-the-archive.patch
@@ -1,14 +1,13 @@
-From 3f223a28f97eeb30a2543abe9130ef82bf1df14d Mon Sep 17 00:00:00 2001
 From: Bodo-Merle Sandor <sbodomerle at gmail.com>
 Date: Tue, 30 Aug 2016 20:21:51 +0200
-Subject: [PATCH] Use jquery from the archive
+Subject: Use jquery from the archive
 
 ---
  doc/_templates/index.html | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/doc/_templates/index.html b/doc/_templates/index.html
-index b71ff99..6ccefde 100644
+index 8191519..bee36e8 100644
 --- a/doc/_templates/index.html
 +++ b/doc/_templates/index.html
 @@ -1,7 +1,7 @@
@@ -20,6 +19,3 @@ index b71ff99..6ccefde 100644
                                        "_static/jssor.js",
                                        "_static/jssor.slider.js"] %}
  
--- 
-2.9.3
-
diff --git a/debian/patches/0002-deal-with-sphinx-only-via-the-debian-rules.patch b/debian/patches/0002-deal-with-sphinx-only-via-the-debian-rules.patch
new file mode 100644
index 0000000..46b6c81
--- /dev/null
+++ b/debian/patches/0002-deal-with-sphinx-only-via-the-debian-rules.patch
@@ -0,0 +1,23 @@
+From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?=
+ <picca at synchrotron-soleil.fr>
+Date: Sat, 28 Oct 2017 18:46:04 +0200
+Subject: deal with sphinx only via the debian/rules
+
+---
+ setup.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/setup.py b/setup.py
+index 04d4247..dd05d2f 100644
+--- a/setup.py
++++ b/setup.py
+@@ -34,6 +34,9 @@ try:
+ except ImportError:
+     sphinx = None
+ 
++# let's deal with documentation in the debian/rules
++sphinx = None
++
+ # Detect numpy
+ try:
+     import numpy
diff --git a/debian/patches/series b/debian/patches/series
index 4184ed1..2b74af6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0002-Use-jquery-from-the-archive.patch
+0002-deal-with-sphinx-only-via-the-debian-rules.patch
diff --git a/debian/python-tango-doc.docs b/debian/python-tango-doc.docs
deleted file mode 100644
index 6f7511e..0000000
--- a/debian/python-tango-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-build/sphinx/html
diff --git a/debian/python-tango.examples b/debian/python-tango.examples
deleted file mode 100644
index e39721e..0000000
--- a/debian/python-tango.examples
+++ /dev/null
@@ -1 +0,0 @@
-examples/*
diff --git a/debian/python3-tango.examples b/debian/python3-tango.examples
deleted file mode 100644
index e39721e..0000000
--- a/debian/python3-tango.examples
+++ /dev/null
@@ -1 +0,0 @@
-examples/*
diff --git a/debian/rules b/debian/rules
index b4487a7..e1efb08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +1,23 @@
 #!/usr/bin/make -f
 
 export PYBUILD_NAME=tango
-export PYBUILD_INSTALL_ARGS_python3=--install-html=$(CURDIR)/debian/python-tango-doc/usr/share/doc/python-tango-doc/html
-
-# sphinxdoc is available only when building the arch-all packages
-WITH_SPHINXDOC = $(shell if [ -x /usr/bin/dh_sphinxdoc ]; then echo "--with sphinxdoc"; fi)
+export PYBUILD_AFTER_INSTALL=dh_numpy ; dh_numpy3
 
 %:
-	dh $@ --with python2,python3 $(WITH_SPHINXDOC) --buildsystem=pybuild
-
-override_dh_auto_install:
-	dh_auto_install -O--buildsystem=pybuild
-	dh_numpy
-	dh_numpy3
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
 
-override_dh_installdocs:
-	dh_installdocs
-	dh_installexamples
-ifneq (,$(filter python-tango-doc, $(shell dh_listpackages)))
-	# add the - for backport where dh_sphinxdoc is not available
-	-dh_sphinxdoc -ppython-tango-doc
-endif
 
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -rf build
 	rm -rf *.egg-info
+	rm -rf build
+
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
+	PYBUILD_SYSTEM=custom \
+	PYBUILD_BUILD_ARGS="PYTHONPATH={build_dir} {interpreter} -m sphinx -N -bhtml doc build/html" dh_auto_build  # HTML generator
+	dh_installdocs "build/html" -p python-tango-doc
+	dh_installdocs "examples" -p python-tango-doc
+	dh_sphinxdoc -O--buildsystem=pybuild
+endif

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