[Python-modules-commits] r33456 - in packages/python-fedora/trunk/debian (5 files)

[kitterman at users.alioth.debian.org]

    Date: Thursday, July 23, 2015 @ 05:47:45
  Author: kitterman
Revision: 33456

* Team upload.
* Patch setup.py to use distutils setup as a workaround for problems with
  python-setuptools > 17 (Closes: #789982)
* Add missing Vcs-* to debian/control

Added:
  packages/python-fedora/trunk/debian/patches/
  packages/python-fedora/trunk/debian/patches/series
  packages/python-fedora/trunk/debian/patches/setuptools_workaround.diff
Modified:
  packages/python-fedora/trunk/debian/changelog
  packages/python-fedora/trunk/debian/control

Modified: packages/python-fedora/trunk/debian/changelog
===================================================================
--- packages/python-fedora/trunk/debian/changelog	2015-07-22 20:40:35 UTC (rev 33455)
+++ packages/python-fedora/trunk/debian/changelog	2015-07-23 05:47:45 UTC (rev 33456)
@@ -1,3 +1,12 @@
+python-fedora (0.3.36-2) unstable; urgency=medium
+
+  * Team upload.
+  * Patch setup.py to use distutils setup as a workaround for problems with
+    python-setuptools > 17 (Closes: #789982)
+  * Add missing Vcs-* to debian/control
+
+ -- Scott Kitterman <scott at kitterman.com>  Thu, 23 Jul 2015 01:43:36 -0400
+
 python-fedora (0.3.36-1) unstable; urgency=medium
 
   * New upstream release

Modified: packages/python-fedora/trunk/debian/control
===================================================================
--- packages/python-fedora/trunk/debian/control	2015-07-22 20:40:35 UTC (rev 33455)
+++ packages/python-fedora/trunk/debian/control	2015-07-23 05:47:45 UTC (rev 33456)
@@ -14,6 +14,8 @@
                python-setuptools
 Standards-Version: 3.9.5
 X-Python-Version: >= 2.7
+Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-fedora/trunk/
+Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-fedora/trunk/
 Homepage: https://fedorahosted.org/python-fedora/
 
 Package: python-fedora

Added: packages/python-fedora/trunk/debian/patches/series
===================================================================
--- packages/python-fedora/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-fedora/trunk/debian/patches/series	2015-07-23 05:47:45 UTC (rev 33456)
@@ -0,0 +1 @@
+setuptools_workaround.diff

Added: packages/python-fedora/trunk/debian/patches/setuptools_workaround.diff
===================================================================
--- packages/python-fedora/trunk/debian/patches/setuptools_workaround.diff	                        (rev 0)
+++ packages/python-fedora/trunk/debian/patches/setuptools_workaround.diff	2015-07-23 05:47:45 UTC (rev 33456)
@@ -0,0 +1,35 @@
+Description: Work around broken setuptools
+   * Patch setup.py to use distutils setup as a workaround for problems with
+     python-setuptools > 17 (Closes: #789982)
+Author: Scott Kitterman <scott at kitterman.com>
+Bug-Debian: http://bugs.debian.org/789982
+Origin: vendor
+Forwarded: not-needed
+Last-Update: 2015-07-23
+
+--- python-fedora-0.3.36.orig/setup.py
++++ python-fedora-0.3.36/setup.py
+@@ -1,7 +1,7 @@
+ #!/usr/bin/python -tt
+ 
+ # Work around setuptools multi-version silliness
+-try:
++"""try:
+     __requires__ = ['CherryPy < 3', 'Sphinx >= 1.0']
+     import pkg_resources
+ except:
+@@ -9,11 +9,12 @@ except:
+     # *sigh*  setuptools is such a broken implementation
+     # When setuptools is imported later, it will see the CherryPy requirement
+     # and barf.  So we have to delete it here.
+-    del __requires__
++    del __requires__"""
+ 
+ execfile("fedora/release.py")
+ 
+-from setuptools import find_packages, setup
++from setuptools import find_packages
++from distutils.core import setup
+ 
+ setup(
+     name=NAME,