[Python-modules-commits] r22250 - in packages/python-netaddr/trunk/debian (8 files)

[bernat at users.alioth.debian.org]

    Date: Saturday, June 23, 2012 @ 15:01:24
  Author: bernat
Revision: 22250

Build the documentation with sphinx (and fix it with dh_sphinxdoc)

Added:
  packages/python-netaddr/trunk/debian/python-netaddr-docs.doc-base
  packages/python-netaddr/trunk/debian/python-netaddr-docs.docs
  packages/python-netaddr/trunk/debian/python-netaddr.install
Modified:
  packages/python-netaddr/trunk/debian/changelog
  packages/python-netaddr/trunk/debian/control
  packages/python-netaddr/trunk/debian/python-netaddr.docs
  packages/python-netaddr/trunk/debian/rules
Deleted:
  packages/python-netaddr/trunk/debian/python-netaddr.doc-base

Modified: packages/python-netaddr/trunk/debian/changelog
===================================================================
--- packages/python-netaddr/trunk/debian/changelog	2012-06-23 14:38:39 UTC (rev 22249)
+++ packages/python-netaddr/trunk/debian/changelog	2012-06-23 15:01:24 UTC (rev 22250)
@@ -1,6 +1,8 @@
 python-netaddr (0.7.7-1) unstable; urgency=low
 
   * New upstream release.
+  * Generate documentation with Sphinx instead of epydoc. Also, ship the
+    documentation in a separate package.
 
  -- Vincent Bernat <bernat at debian.org>  Sat, 23 Jun 2012 16:21:19 +0200
 

Modified: packages/python-netaddr/trunk/debian/control
===================================================================
--- packages/python-netaddr/trunk/debian/control	2012-06-23 14:38:39 UTC (rev 22249)
+++ packages/python-netaddr/trunk/debian/control	2012-06-23 15:01:24 UTC (rev 22250)
@@ -6,8 +6,9 @@
 Standards-Version: 3.9.3
 Build-Depends: debhelper (>= 5.0.37.2),
 	       cdbs (>= 0.4.90~),
-	       python (>= 2.6.5), python-setuptools (>= 0.6b3),
-               python-epydoc
+	       python (>= 2.6.5),
+	       python-setuptools (>= 0.6b3),
+               python-sphinx
 Homepage: https://github.com/drkjam/netaddr/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-netaddr/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-netaddr/trunk/
@@ -31,3 +32,17 @@
   - IP version 4
   - IP version 6
   - CIDR (Classless Inter-Domain Routing)
+
+Package: python-netaddr-docs
+Architecture: all
+Section: doc
+Depends: ${sphinxdoc:Depends}, ${misc:Depends}
+Description: manipulation of various common network address notations (documentation)
+ netaddr is a Python library for the manipulation of various common
+ network address notations and representations.
+ .
+ It takes the hassle out of fiddling with enumerable variations of
+ network addresses presenting a consistent, extensible, easy-to-use
+ and (above all) Pythonic API.
+ .
+ This package contains the documentation.

Added: packages/python-netaddr/trunk/debian/python-netaddr-docs.doc-base
===================================================================
--- packages/python-netaddr/trunk/debian/python-netaddr-docs.doc-base	                        (rev 0)
+++ packages/python-netaddr/trunk/debian/python-netaddr-docs.doc-base	2012-06-23 15:01:24 UTC (rev 22250)
@@ -0,0 +1,10 @@
+Document: python-netaddr
+Title: Python netaddr API documentation
+Author: David P. D. Moss
+Abstract: Autogenerated API for netaddr Python package, a network
+ address manipulation library, done Pythonically.
+Section: Programming/Python
+
+Format: html
+Index: /usr/share/doc/python-netaddr-docs/api/index.html
+Files: /usr/share/doc/python-netaddr-docs/api/*.html

Added: packages/python-netaddr/trunk/debian/python-netaddr-docs.docs
===================================================================
--- packages/python-netaddr/trunk/debian/python-netaddr-docs.docs	                        (rev 0)
+++ packages/python-netaddr/trunk/debian/python-netaddr-docs.docs	2012-06-23 15:01:24 UTC (rev 22250)
@@ -0,0 +1 @@
+docs/api

Deleted: packages/python-netaddr/trunk/debian/python-netaddr.doc-base
===================================================================
--- packages/python-netaddr/trunk/debian/python-netaddr.doc-base	2012-06-23 14:38:39 UTC (rev 22249)
+++ packages/python-netaddr/trunk/debian/python-netaddr.doc-base	2012-06-23 15:01:24 UTC (rev 22250)
@@ -1,10 +0,0 @@
-Document: python-netaddr
-Title: Python netaddr API documentation
-Author: David P. D. Moss
-Abstract: Autogenerated API for netaddr Python package, a network
- address manipulation library, done Pythonically.
-Section: Programming/Python
-
-Format: html
-Index: /usr/share/doc/python-netaddr/api/index.html
-Files: /usr/share/doc/python-netaddr/api/*.html

Modified: packages/python-netaddr/trunk/debian/python-netaddr.docs
===================================================================
--- packages/python-netaddr/trunk/debian/python-netaddr.docs	2012-06-23 14:38:39 UTC (rev 22249)
+++ packages/python-netaddr/trunk/debian/python-netaddr.docs	2012-06-23 15:01:24 UTC (rev 22250)
@@ -1,3 +1,2 @@
-docs/api
 README
 PKG-INFO

Added: packages/python-netaddr/trunk/debian/python-netaddr.install
===================================================================
--- packages/python-netaddr/trunk/debian/python-netaddr.install	                        (rev 0)
+++ packages/python-netaddr/trunk/debian/python-netaddr.install	2012-06-23 15:01:24 UTC (rev 22250)
@@ -0,0 +1 @@
+debian/tmp/usr

Modified: packages/python-netaddr/trunk/debian/rules
===================================================================
--- packages/python-netaddr/trunk/debian/rules	2012-06-23 14:38:39 UTC (rev 22249)
+++ packages/python-netaddr/trunk/debian/rules	2012-06-23 15:01:24 UTC (rev 22250)
@@ -7,11 +7,13 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
-DEB_COMPRESS_EXCLUDE := .js
+# Documentation
+build/python-netaddr-docs::
+	PYTHONPATH=$(CURDIR) sphinx-build -q docs/source docs/api
+binary-fixup/python-netaddr-docs::
+	dh_sphinxdoc -p$(cdbs_curpkg)
 
-build/python-netaddr::
-	epydoc --config=./docs/epydoc.cfg
-
+# Tests
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 install/python-netaddr::
 	$(call cdbs_python_binary,python$(cdbs_python_compile_version)) \