[Python-modules-commits] r29303 - in packages/numpydoc/trunk/debian (3 files)

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

    Date: Wednesday, June 11, 2014 @ 19:45:55
  Author: dlax-guest
Revision: 29303

Drop clean-setup.patch applied upstream

Modified:
  packages/numpydoc/trunk/debian/changelog
Deleted:
  packages/numpydoc/trunk/debian/patches/clean-setup.patch
  packages/numpydoc/trunk/debian/patches/series

Modified: packages/numpydoc/trunk/debian/changelog
===================================================================
--- packages/numpydoc/trunk/debian/changelog	2014-06-11 19:45:49 UTC (rev 29302)
+++ packages/numpydoc/trunk/debian/changelog	2014-06-11 19:45:55 UTC (rev 29303)
@@ -5,6 +5,7 @@
 
   [ Denis Laxalde ]
   * New upstream release.
+  * Drop clean-setup patch (included upstream)
 
  -- Denis Laxalde <denis at laxalde.org>  Tue, 10 Jun 2014 21:13:11 +0200
 

Deleted: packages/numpydoc/trunk/debian/patches/clean-setup.patch
===================================================================
--- packages/numpydoc/trunk/debian/patches/clean-setup.patch	2014-06-11 19:45:49 UTC (rev 29302)
+++ packages/numpydoc/trunk/debian/patches/clean-setup.patch	2014-06-11 19:45:55 UTC (rev 29303)
@@ -1,37 +0,0 @@
-Description: Clean setup.py
- Remove obsolete arguments from setup() and use plain distutils not
- setuptools.
-Forwarded: https://github.com/numpy/numpy/pull/298
-Applied-Upstream: https://github.com/numpy/numpy/commit/adddbc72a7aa9faeb61c708f1c2c0568d0398303
---- a/setup.py
-+++ b/setup.py
-@@ -1,13 +1,11 @@
- from distutils.core import setup
--import setuptools
--import sys, os
- 
- version = "0.4"
- 
- setup(
-     name="numpydoc",
-     packages=["numpydoc"],
--    package_dir={"numpydoc": ""},
-+    package_dir={"numpydoc": "."},
-     version=version,
-     description="Sphinx extension to support docstrings in Numpy format",
-     # classifiers from http://pypi.python.org/pypi?%3Aaction=list_classifiers
-@@ -20,12 +18,6 @@
-     author_email="pav at iki.fi",
-     url="http://github.com/numpy/numpy/tree/master/doc/sphinxext",
-     license="BSD",
--    zip_safe=False,
--    install_requires=["Sphinx >= 1.0.1"],
--    package_data={'numpydoc': 'tests', '': ''},
--    entry_points={
--        "console_scripts": [
--            "autosummary_generate = numpydoc.autosummary_generate:main",
--        ],
--    },
-+    requires=["sphinx (>= 1.0.1)"],
-+    package_data={'numpydoc': ['tests/test_*.py']},
- )

Deleted: packages/numpydoc/trunk/debian/patches/series
===================================================================
--- packages/numpydoc/trunk/debian/patches/series	2014-06-11 19:45:49 UTC (rev 29302)
+++ packages/numpydoc/trunk/debian/patches/series	2014-06-11 19:45:55 UTC (rev 29303)
@@ -1 +0,0 @@
-clean-setup.patch