[Python-modules-commits] [python-pika] 06/15: Add documentation package python-pika-doc

Jan Dittberner jandd at moszumanska.debian.org
Wed Dec 30 13:39:27 UTC 2015


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

jandd pushed a commit to branch master
in repository python-pika.

commit 87df458800670e75dfb5641f97fb9e50a1b942e3
Author: Jan Dittberner <jandd at debian.org>
Date:   Wed Dec 30 12:20:57 2015 +0100

    Add documentation package python-pika-doc
---
 debian/.gitignore                                   |  1 +
 debian/changelog                                    |  1 +
 debian/control                                      | 21 +++++++++++++++++----
 debian/python-pika-doc.docs                         |  2 ++
 ...ython-pika.examples => python-pika-doc.examples} |  0
 debian/python-pika-doc.links                        |  1 +
 debian/python-pika.docs                             |  1 -
 debian/python-pika.links                            |  1 -
 debian/{python-pika.docs => python3-pika.docs}      |  1 -
 debian/rules                                        | 16 ++++++++++++++--
 10 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/debian/.gitignore b/debian/.gitignore
new file mode 100644
index 0000000..a01ee28
--- /dev/null
+++ b/debian/.gitignore
@@ -0,0 +1 @@
+.*.swp
diff --git a/debian/changelog b/debian/changelog
index b180b2c..7a2a0b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ python-pika (0.10.0-1) UNRELEASED; urgency=medium
   * New upstream version (Closes: #796543)
   * Update copyright years
   * Add Python 3 support (Closes: #809315)
+  * Add documentation package python-pika-doc
 
  -- Jan Dittberner <jandd at debian.org>  Wed, 30 Dec 2015 11:45:36 +0100
 
diff --git a/debian/control b/debian/control
index 3b6e3a0..620e634 100644
--- a/debian/control
+++ b/debian/control
@@ -6,14 +6,15 @@ Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.o
 Build-Depends: debhelper (>= 9),
                dh-python,
                netbase,
-               python (>= 2.6.5~),
+               python-all,
                python-mock,
                python-nose,
                python-setuptools,
+               python-sphinx | python3-sphinx,
                python-tornado,
                python-twisted,
                python-yaml,
-               python3,
+               python3-all,
                python3-nose,
                python3-setuptools,
                python3-tornado,
@@ -29,7 +30,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-pika
 Package: python-pika
 Architecture: all
 Depends: ${misc:Depends}, ${python:Depends}
-Description: AMQP client library
+Description: AMQP client library for Python 2
  Pika is a pure-Python implementation of the AMQP-0-9-1 protocol that tries to
  stay fairly independent of the underlying network support library. Pika was
  developed primarily for use with RabitMQ, but also works with other
@@ -40,10 +41,22 @@ Description: AMQP client library
 Package: python3-pika
 Architecture: all
 Depends: ${misc:Depends}, ${python3:Depends}
-Description: AMQP client library
+Description: AMQP client library for Python 3
  Pika is a pure-Python implementation of the AMQP-0-9-1 protocol that tries to
  stay fairly independent of the underlying network support library. Pika was
  developed primarily for use with RabitMQ, but also works with other
  AMQP-0-9-1 brokers.
  .
  This is the Python 3 version of the library.
+
+Package: python-pika-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Description: AMQP client library documentation
+ Pika is a pure-Python implementation of the AMQP-0-9-1 protocol that tries to
+ stay fairly independent of the underlying network support library. Pika was
+ developed primarily for use with RabitMQ, but also works with other
+ AMQP-0-9-1 brokers.
+ .
+ This is the library documentation.
diff --git a/debian/python-pika-doc.docs b/debian/python-pika-doc.docs
new file mode 100644
index 0000000..5e13c54
--- /dev/null
+++ b/debian/python-pika-doc.docs
@@ -0,0 +1,2 @@
+README.rst
+docs/.build/html
diff --git a/debian/python-pika.examples b/debian/python-pika-doc.examples
similarity index 100%
rename from debian/python-pika.examples
rename to debian/python-pika-doc.examples
diff --git a/debian/python-pika-doc.links b/debian/python-pika-doc.links
new file mode 100644
index 0000000..e3dbe38
--- /dev/null
+++ b/debian/python-pika-doc.links
@@ -0,0 +1 @@
+usr/share/doc/python-pika-doc/changelog.gz usr/share/doc/python-pika-doc/html/_sources/version_history.txt.gz
diff --git a/debian/python-pika.docs b/debian/python-pika.docs
index e98b31c..a1320b1 100644
--- a/debian/python-pika.docs
+++ b/debian/python-pika.docs
@@ -1,2 +1 @@
 README.rst
-docs/*
diff --git a/debian/python-pika.links b/debian/python-pika.links
deleted file mode 100644
index 984f19f..0000000
--- a/debian/python-pika.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/python-pika/changelog.gz usr/share/doc/python-pika/version_history.rst.gz
diff --git a/debian/python-pika.docs b/debian/python3-pika.docs
similarity index 61%
copy from debian/python-pika.docs
copy to debian/python3-pika.docs
index e98b31c..a1320b1 100644
--- a/debian/python-pika.docs
+++ b/debian/python3-pika.docs
@@ -1,2 +1 @@
 README.rst
-docs/*
diff --git a/debian/rules b/debian/rules
index 8fbcfe3..da3ef72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,27 @@
 #!/usr/bin/make -f
+# -*- makefile -*-
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
 
 PYBUILD_NAME=pika
 
 %:
-	dh $@ --with python2,python3 --buildsystem=pybuild
+	dh $@ --with=python2,python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_installchangelogs:
 	dh_installchangelogs docs/version_history.rst
 
+override_dh_auto_clean:
+	rm -rf docs/.build
+	dh_auto_clean
+
+override_dh_auto_build:
+	PYTHONPATH=. sphinx-build -b html -d docs/.build/.doctrees -N docs docs/.build/html
+	dh_auto_build
+
 override_dh_link:
-	rm $(CURDIR)/debian/python-pika/usr/share/doc/python-pika/version_history.rst
+	rm $(CURDIR)/debian/python-pika-doc/usr/share/doc/python-pika-doc/html/_sources/version_history.txt
 	dh_link
 
 override_dh_compress:

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



More information about the Python-modules-commits mailing list