[Python-modules-commits] r18892 - in packages/sphinx/branches/1.1/debian (2 files)

[jwilk at users.alioth.debian.org]

    Date: Thursday, October 13, 2011 @ 18:52:01
  Author: jwilk
Revision: 18892

Copy sphinx-apidoc script from upstream VCS.

Modified:
  packages/sphinx/branches/1.1/debian/changelog
  packages/sphinx/branches/1.1/debian/patches/sphinx-apidoc_script.diff

Modified: packages/sphinx/branches/1.1/debian/changelog
===================================================================
--- packages/sphinx/branches/1.1/debian/changelog	2011-10-13 18:45:01 UTC (rev 18891)
+++ packages/sphinx/branches/1.1/debian/changelog	2011-10-13 18:52:01 UTC (rev 18892)
@@ -16,14 +16,14 @@
   * Texinfo output format is now supported (closes: #586747).
   * Update version numbers in the manual pages. Add a build-time warning to be
     emitted if they ever get out of date again.
-  * Reimplement sphinx-apidoc script without using pkg-resources.
+  * Copy sphinx-apidoc script from upstream VCS.
   * Refactor the code responsible for moving data into a private directory.
     Rename some variables to make them lowercase. Don't use CURDIR where it's
     not necessary.
   * Build and install sphinx-apidoc manpage.
   * Run nosetests with --verbose --no-skip.
 
- -- Jakub Wilk <jwilk at debian.org>  Thu, 13 Oct 2011 19:36:32 +0200
+ -- Jakub Wilk <jwilk at debian.org>  Thu, 13 Oct 2011 20:51:34 +0200
 
 sphinx (1.0.8+dfsg-2) unstable; urgency=low
 

Modified: packages/sphinx/branches/1.1/debian/patches/sphinx-apidoc_script.diff
===================================================================
--- packages/sphinx/branches/1.1/debian/patches/sphinx-apidoc_script.diff	2011-10-13 18:45:01 UTC (rev 18891)
+++ packages/sphinx/branches/1.1/debian/patches/sphinx-apidoc_script.diff	2011-10-13 18:52:01 UTC (rev 18892)
@@ -1,12 +1,19 @@
 Description: Provide a stand-alone sphinx-apidoc.py script.
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: no
+Origin: upstream, https://bitbucket.org/birkenfeld/sphinx/src/1.1/sphinx-apidoc.py
 Last-Update: 2011-10-13
 --- /dev/null
 +++ b/sphinx-apidoc.py
-@@ -0,0 +1,7 @@
-+#!/usr/bin/python
+@@ -0,0 +1,15 @@
++#!/usr/bin/env python
++# -*- coding: utf-8 -*-
++"""
++    Sphinx - Python documentation toolchain
++    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 +
++    :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS.
++    :license: BSD, see LICENSE for details.
++"""
++
 +import sys
 +
 +if __name__ == '__main__':