[Python-modules-commits] r16621 - in packages/python-gearman/trunk/debian (3 files)

[oxan-guest at users.alioth.debian.org]

    Date: Monday, April 18, 2011 @ 19:03:00
  Author: oxan-guest
Revision: 16621

Use upstream docs/conf.py now sphinx 1.0 is in unstable

Modified:
  packages/python-gearman/trunk/debian/changelog
  packages/python-gearman/trunk/debian/control
  packages/python-gearman/trunk/debian/patches/01_include_docs_conf

Modified: packages/python-gearman/trunk/debian/changelog
===================================================================
--- packages/python-gearman/trunk/debian/changelog	2011-04-18 14:47:10 UTC (rev 16620)
+++ packages/python-gearman/trunk/debian/changelog	2011-04-18 19:03:00 UTC (rev 16621)
@@ -1,3 +1,10 @@
+python-gearman (2.0.2-2) UNRELEASED; urgency=low
+
+  * Bump dependency on python-sphinx to 1.0 and use the upstream docs/conf.py
+  * Bump standards version to 3.9.2, no changes required.
+
+ -- Oxan van Leeuwen <oxan at oxanvanleeuwen.nl>  Mon, 18 Apr 2011 21:00:29 +0200
+
 python-gearman (2.0.2-1) unstable; urgency=low
 
   * Initial packaging (Closes: #610654)

Modified: packages/python-gearman/trunk/debian/control
===================================================================
--- packages/python-gearman/trunk/debian/control	2011-04-18 14:47:10 UTC (rev 16620)
+++ packages/python-gearman/trunk/debian/control	2011-04-18 19:03:00 UTC (rev 16621)
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Oxan van Leeuwen <oxan at oxanvanleeuwen.nl>
-Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.6-2), python-setuptools, python-sphinx
-Standards-Version: 3.9.1
+Build-Depends: debhelper (>= 7.0.50~), python-all (>= 2.6.6-2), python-setuptools, python-sphinx (>= 1)
+Standards-Version: 3.9.2
 Homepage: http://github.com/Yelp/python-gearman/
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-gearman/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-gearman/trunk/

Modified: packages/python-gearman/trunk/debian/patches/01_include_docs_conf
===================================================================
--- packages/python-gearman/trunk/debian/patches/01_include_docs_conf	2011-04-18 14:47:10 UTC (rev 16620)
+++ packages/python-gearman/trunk/debian/patches/01_include_docs_conf	2011-04-18 19:03:00 UTC (rev 16621)
@@ -1,18 +1,15 @@
-Description: include a modified docs/conf.py file
- Include a modified docs/conf.py file from the git repository. Somehow this file
- isn't in the upstream tarball, but it is required by sphinx to generate the
- documentation.
- . 
- This file is slightly modified to remove the usage of sphinx.ext.viewcode and
- thus the dependency on python-sphinx >= 1 because that version isn't in 
- unstable yet.
-Origin: upstream https://github.com/mtai/python-gearman/blob/master/docs/conf.py
-Forwarded: not-needed
+Description: Include docs/conf.py file
+ Include the docs/conf.py file from the git repository. This file isn't in the 
+ upstream tarball, but it is required by sphinx to generate the documentation.
+Origin: upstream, https://github.com/mtai/python-gearman/blob/master/docs/conf.py
+Bug: https://github.com/Yelp/python-gearman/issues/7
+Forwarded: yes
+Last-Update: 2011-04-18
 
 Index: python-gearman-2.0.2/docs/conf.py
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ python-gearman-2.0.2/docs/conf.py	2011-01-29 17:04:18.009688685 +0100
++++ python-gearman-2.0.2/docs/conf.py	2011-04-18 20:54:04.471145110 +0200
 @@ -0,0 +1,217 @@
 +# -*- coding: utf-8 -*-
 +#
@@ -42,7 +39,7 @@
 +
 +# Add any Sphinx extension module names here, as strings. They can be extensions
 +# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-+extensions = ['sphinx.ext.autodoc']
++extensions = ['sphinx.ext.autodoc', 'sphinx.ext.viewcode']
 +
 +# Add any paths that contain templates here, relative to this directory.
 +templates_path = ['_templates']