[Python-modules-commits] [pyasn1] 06/11: d/control: add documentation package

[Vincent Bernat]

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

bernat pushed a commit to annotated tag debian/0.4.2-1
in repository pyasn1.

commit e985b0897147f58b812b5fcdd71660f53ca52b2c
Author: Vincent Bernat <vincent at bernat.im>
Date:   Tue Dec 26 07:54:07 2017 +0100

    d/control: add documentation package
---
 debian/changelog                                      |  1 +
 debian/control                                        | 19 +++++++++++++++----
 ...hon-pyasn1.doc-base => python-pyasn1-doc.doc-base} |  4 ++--
 debian/python-pyasn1.docs                             |  1 -
 debian/rules                                          |  7 ++++++-
 5 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f26ab46..be2c594 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ pyasn1 (0.4.2-1) UNRELEASED; urgency=medium
   * New upstream release. Closes: #872724.
   * d/patches: fix test using sys.getsizeof().
   * d/control: bump Standards-Version.
+  * d/control: add documentation package.
 
  -- Vincent Bernat <bernat at debian.org>  Tue, 26 Dec 2017 07:24:19 +0100
 
diff --git a/debian/control b/debian/control
index d0a3056..c885980 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Build-Depends: debhelper (>= 9),
                dh-python,
                pypy,
                python-all (>= 2.6.6-3~),
-               python3-all
+               python3-all,
+               python3-sphinx
 Build-Depends-Indep: pypy-setuptools, python-setuptools, python3-setuptools
 X-Python-Version: >= 2.4
 Homepage: http://pyasn1.sourceforge.net/
@@ -21,7 +22,6 @@ Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/pyasn1.git
 Package: python-pyasn1
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
-Suggests: doc-base
 Description: ASN.1 library for Python (Python 2 module)
  This  is  an implementation  of  ASN.1  types  and codecs  in  Python
  programming language. It has been first written to support particular
@@ -33,7 +33,6 @@ Description: ASN.1 library for Python (Python 2 module)
 Package: python3-pyasn1
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
-Suggests: doc-base
 Description: ASN.1 library for Python (Python 3 module)
  This  is  an implementation  of  ASN.1  types  and codecs  in  Python
  programming language. It has been first written to support particular
@@ -45,7 +44,6 @@ Description: ASN.1 library for Python (Python 3 module)
 Package: pypy-pyasn1
 Architecture: all
 Depends: ${misc:Depends}, ${pypy:Depends}
-Suggests: doc-base
 Description: ASN.1 library for Python (PyPy module)
  This  is  an implementation  of  ASN.1  types  and codecs  in  Python
  programming language. It has been first written to support particular
@@ -53,3 +51,16 @@ Description: ASN.1 library for Python (PyPy module)
  of protocols based on ASN.1 specification.
  .
  This package contains the PyPy module.
+
+Package: python-pyasn1-doc
+Section: doc
+Architecture: all
+Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Suggests: doc-base
+Description: ASN.1 library for Python (documentation)
+ This  is  an implementation  of  ASN.1  types  and codecs  in  Python
+ programming language. It has been first written to support particular
+ protocol (SNMP) but then generalized  to be suitable for a wide range
+ of protocols based on ASN.1 specification.
+ .
+ This package contains the documentation.
diff --git a/debian/python-pyasn1.doc-base b/debian/python-pyasn1-doc.doc-base
similarity index 61%
rename from debian/python-pyasn1.doc-base
rename to debian/python-pyasn1-doc.doc-base
index 08ed000..c5f98f7 100644
--- a/debian/python-pyasn1.doc-base
+++ b/debian/python-pyasn1-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: This manual describes PyASN1 API and how to use it.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/python-pyasn1/pyasn1-tutorial.html
-Files: /usr/share/doc/python-pyasn1/*.html
+Index: /usr/share/doc/python-pyasn1-doc/html/index.html
+Files: /usr/share/doc/python-pyasn1-doc/html/*.html
diff --git a/debian/python-pyasn1.docs b/debian/python-pyasn1.docs
deleted file mode 100644
index 1776ad4..0000000
--- a/debian/python-pyasn1.docs
+++ /dev/null
@@ -1 +0,0 @@
-doc/*.html
diff --git a/debian/rules b/debian/rules
index e8a6ae7..af82b85 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,4 +4,9 @@
 export PYBUILD_NAME=pyasn1
 
 %:
-	dh $@ --with python2,python3,pypy --buildsystem=pybuild
+	dh $@ --with python2,python3,pypy,sphinxdoc --buildsystem=pybuild
+
+override_dh_installdocs:
+	dh_installdocs
+	PYTHONPATH=. sphinx-build -N -q -E -b html docs/source/ \
+                debian/python-pyasn1-doc/usr/share/doc/python-pyasn1-doc/html/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pyasn1.git