[Python-modules-commits] r30178 - in packages/pyopenssl/trunk/debian (5 files)

[morph at users.alioth.debian.org]

    Date: Saturday, August 16, 2014 @ 22:10:11
  Author: morph
Revision: 30178

Build and install doc with Sphinx

Modified:
  packages/pyopenssl/trunk/debian/changelog
  packages/pyopenssl/trunk/debian/control
  packages/pyopenssl/trunk/debian/python-openssl-doc.doc-base
  packages/pyopenssl/trunk/debian/python-openssl-doc.docs
  packages/pyopenssl/trunk/debian/rules

Modified: packages/pyopenssl/trunk/debian/changelog
===================================================================
--- packages/pyopenssl/trunk/debian/changelog	2014-08-16 21:40:35 UTC (rev 30177)
+++ packages/pyopenssl/trunk/debian/changelog	2014-08-16 22:10:11 UTC (rev 30178)
@@ -6,14 +6,13 @@
   * debian/copyright
     - switch to DEP-5 format
     - updated to new upsteam release
-  * debian/rules
-    - install RATIONALE as doc
   * debian/patches/*
     - removed no longer applyable patches, refresh the remaining one
   * debian/README.source
     - removed, long outdated
+  * Build and install doc with Sphinx
 
- -- Sandro Tosi <morph at debian.org>  Sat, 16 Aug 2014 19:34:54 +0100
+ -- Sandro Tosi <morph at debian.org>  Sat, 16 Aug 2014 23:09:55 +0100
 
 pyopenssl (0.13.1-2) unstable; urgency=medium
 

Modified: packages/pyopenssl/trunk/debian/control
===================================================================
--- packages/pyopenssl/trunk/debian/control	2014-08-16 21:40:35 UTC (rev 30177)
+++ packages/pyopenssl/trunk/debian/control	2014-08-16 22:10:11 UTC (rev 30178)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Sandro Tosi <morph at debian.org>
 Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 9), python-all-dev (>= 2.5.4-1~), python-all-dbg (>= 2.5.4-1~), python3-all-dev, python3-all-dbg, dh-python, libssl-dev (>= 0.9.8), tex4ht, w3m, texlive-latex-base, texlive-latex-recommended, openssl, texlive-fonts-recommended
+Build-Depends: debhelper (>= 9), python-all-dev (>= 2.5.4-1~), python-all-dbg (>= 2.5.4-1~), python3-all-dev, python3-all-dbg, dh-python, libssl-dev (>= 0.9.8), openssl, python-sphinx (>= 1.0.7+dfsg)
 Standards-Version: 3.9.5
 Homepage: https://github.com/pyca/pyopenssl
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/pyopenssl/trunk/

Modified: packages/pyopenssl/trunk/debian/python-openssl-doc.doc-base
===================================================================
--- packages/pyopenssl/trunk/debian/python-openssl-doc.doc-base	2014-08-16 21:40:35 UTC (rev 30177)
+++ packages/pyopenssl/trunk/debian/python-openssl-doc.doc-base	2014-08-16 22:10:11 UTC (rev 30178)
@@ -1,10 +1,9 @@
 Document: python-openssl-manual
-Title: Python OpenSSL Manual
-Author: Martin Sjögren
-Abstract: Manual for the pyOpenSSL package.
- This module is a rather thin wrapper around (a subset of) the OpenSSL library. With thin wrapper I mean that a lot of the  object methods do nothing more than calling a corresponding function in the OpenSSL library.
+Title: pyOpenSSL’s documentation
+Author: Jean-Paul Calderone
+Abstract: This module is a rather thin wrapper around (a subset of) the OpenSSL library. With thin wrapper I mean that a lot of the  object methods do nothing more than calling a corresponding function in the OpenSSL library.
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/python-openssl-doc/html/pyOpenSSL.html
+Index: /usr/share/doc/python-openssl-doc/html/index.html
 Files: /usr/share/doc/python-openssl-doc/html/*

Modified: packages/pyopenssl/trunk/debian/python-openssl-doc.docs
===================================================================
--- packages/pyopenssl/trunk/debian/python-openssl-doc.docs	2014-08-16 21:40:35 UTC (rev 30177)
+++ packages/pyopenssl/trunk/debian/python-openssl-doc.docs	2014-08-16 22:10:11 UTC (rev 30178)
@@ -1,3 +1,2 @@
-doc/pyOpenSSL.ps
-doc/pyOpenSSL.txt
-doc/html
+doc/_build/html
+OpenSSL/RATIONALE

Modified: packages/pyopenssl/trunk/debian/rules
===================================================================
--- packages/pyopenssl/trunk/debian/rules	2014-08-16 21:40:35 UTC (rev 30177)
+++ packages/pyopenssl/trunk/debian/rules	2014-08-16 22:10:11 UTC (rev 30178)
@@ -8,7 +8,7 @@
 PYVERS := $(PY2VERS) $(PY3VERS)
 
 %:
-	dh $@ --with python2,python3
+	dh $@ --with python2,python3,sphinxdoc
 
 override_dh_auto_build:
 	set -e; \
@@ -17,7 +17,7 @@
 	    python$$py-dbg setup.py build; \
 	done
 
-	$(MAKE) -C doc all
+	$(MAKE) -C doc html
 
 override_dh_auto_test:
 ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
@@ -66,7 +66,7 @@
 	find debian/python-openssl-dbg -depth -empty -exec rmdir {} \;
 
 override_dh_installchangelogs:
-	dh_installchangelogs ChangeLog OpenSSL/RATIONALE
+	dh_installchangelogs ChangeLog
 
 override_dh_strip:
 	dh_strip -ppython-openssl --dbg-package=python-openssl-dbg