[sardana] 04/04: release

[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 sardana.

commit 87d5da52e2ff05ffaae34ca4205fa5733c8f4e68
Author: Picca FrédÃÂà[...]
Date:   Sat Dec 31 10:11:58 2016 +0100

    release
    
    migrate to pybuild
    compat level 9 - > 10
---
 debian/changelog               |  7 +++++++
 debian/compat                  |  2 +-
 debian/control                 | 29 ++++++++++++++++-------------
 debian/python-sardana-doc.docs |  1 -
 debian/python-sardana.install  |  3 ---
 debian/rules                   | 29 ++++++++++++-----------------
 6 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 890e1f5..c9d9d99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
 sardana (2.2.0-1) unstable; urgency=medium
 
   * New upstream version 2.2.0
+  * Standards-Version bump to 3.9.8 (nothing to do)
+  * Switched to pybuild build system
+  * compat level 9 -> 10
+  * d/control
+    - Added Build-Depends: python-setuptools
+    - Added Suggests: python-sardana-doc (Closes: #849615)
+      Thanks Ben Finney for the bug report
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Sat, 31 Dec 2016 10:00:54 +0100
 
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 453b2da..da4c603 100644
--- a/debian/control
+++ b/debian/control
@@ -3,21 +3,23 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
 Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>
 Section: science
 Priority: extra
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
                dh-python,
-               dvipng,
-               gir1.2-hkl-5.0,
-               graphviz,
                python-all,
-               python-itango,
-               python-lxml,
-               python-pytango (>= 8.0.3-2),
-               python-sphinx,
-               python-taurus (>= 3.6.0+dfsg-1~),
-               rdfind,
-               symlinks,
-               texlive-latex-base,
-               texlive-latex-extra
+               python-setuptools,
+Build-Depends-Indep: dvipng,
+                     gir1.2-hkl-5.0,
+                     graphviz,
+                     python-itango,
+                     python-lxml,
+                     python-pytango (>= 8.0.3-2),
+                     python-sphinx,
+                     python-sphinx-rtd-theme,
+                     python-taurus (>= 3.6.0+dfsg-1~),
+                     rdfind,
+                     symlinks,
+                     texlive-latex-base,
+                     texlive-latex-extra
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/sardana.git
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/sardana.git
@@ -35,6 +37,7 @@ Depends: ${misc:Depends},
          python-nxs | libnexus0-python,
          python-pytango (>= 8.0.3-2),
          python-taurus (>= 3.6.0+dfsg-1~)
+Suggests: python-sardana-doc
 Breaks: python-taurus (<< 3.3.0+dfsg-2~)
 Provides: ${python:Provides}
 Replaces: python-taurus (<< 3.3.0+dfsg-2~)
diff --git a/debian/python-sardana-doc.docs b/debian/python-sardana-doc.docs
deleted file mode 100644
index 8ed30c1..0000000
--- a/debian/python-sardana-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-build/sphinx/html
\ No newline at end of file
diff --git a/debian/python-sardana.install b/debian/python-sardana.install
deleted file mode 100644
index 8e9eb66..0000000
--- a/debian/python-sardana.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin
-usr/lib
-usr/share/man
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index 80bd5cc..c2b4b39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,20 @@
 #!/usr/bin/make -f
 
-export http_proxy='localhost'
+export PYBUILD_NAME=sardana
 
-# for backport on stable without bpo
-WITH_SPHINXDOC = $(shell if [ -x /usr/bin/dh_sphinxdoc ]; then echo "--with sphinxdoc"; fi)
+%:
+	dh $@ --with python2,sphinxdoc --buildsystem=pybuild
+
+override_dh_installman:
+	dh_installman -p python-sardana doc/man/*.1
 
-override_dh_clean:
-	rm -rf build/sphinx
-	# remove useless file accidentaly forgotten by upstream.
-	# THIS SHOULD BE FIXED FOR THE NEXT UPLOAD > 1.4.2
-	rm -rf src/sardana/taurus/qt/qtgui/extra_macroexecutor/build/
-	dh_clean
+override_dh_sphinxdoc:
+ifeq (,$(findstring nodocs, $(DEB_BUILD_OPTIONS)))
+	PYTHONPATH=. sphinx-build -N -bhtml doc/source build/html # HTML generator
+	dh_installdocs "build/html" -p python-sardana-doc
+	dh_sphinxdoc -O--buildsystem=pybuild
 
-override_dh_auto_install:
-	dh_auto_install -- --install-html=$(CURDIR)/debian/python-sardana-doc/usr/share/doc/python-sardana-doc/html
-	# on squeeze python-sphinx is too old so create a fake documentation for now
-	if [ ! -d build/sphinx ]; then mkdir -p build/sphinx/html; fi
-	# Replace duplicate files with symlinks
 	rdfind -outputname /dev/null -makesymlinks true debian/python-sardana-doc/
 	# Fix those symlinks to make them relative
 	symlinks -r -s -c debian/python-sardana-doc/
-
-%:
-	dh $@ --with python2 $(WITH_SPHINXDOC)
+endif

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