[Python-modules-commits] r14078 - in packages/python-docutils/trunk/debian (4 files)

[jwilk at users.alioth.debian.org]

    Date: Thursday, July 29, 2010 @ 09:08:10
  Author: jwilk
Revision: 14078

Drop 14_distutils_setup.diff and build-dependency on python-setuptools, no longer needed.

Modified:
  packages/python-docutils/trunk/debian/changelog
  packages/python-docutils/trunk/debian/control
  packages/python-docutils/trunk/debian/patches/series
Deleted:
  packages/python-docutils/trunk/debian/patches/14_use_setuptools.diff

Modified: packages/python-docutils/trunk/debian/changelog
===================================================================
--- packages/python-docutils/trunk/debian/changelog	2010-07-28 23:30:39 UTC (rev 14077)
+++ packages/python-docutils/trunk/debian/changelog	2010-07-29 09:08:10 UTC (rev 14078)
@@ -1,3 +1,10 @@
+python-docutils (0.7-3) UNRELEASED; urgency=low
+
+  * Drop 14_distutils_setup.diff and build-dependency on python-setuptools, no
+    longer needed.
+
+ -- Jakub Wilk <jwilk at debian.org>  Thu, 29 Jul 2010 09:25:33 +0200
+
 python-docutils (0.7-2) unstable; urgency=low
 
   * Upload to unstable.

Modified: packages/python-docutils/trunk/debian/control
===================================================================
--- packages/python-docutils/trunk/debian/control	2010-07-28 23:30:39 UTC (rev 14077)
+++ packages/python-docutils/trunk/debian/control	2010-07-29 09:08:10 UTC (rev 14078)
@@ -7,7 +7,7 @@
            Simon McVittie <smcv at debian.org>,
            Michael Schutte <michi at uiae.at>,
            Ben Finney <ben+debian at benfinney.id.au>
-Build-Depends: debhelper (>= 7), python-setuptools, python-all (>= 2.3)
+Build-Depends: debhelper (>= 7), python-all (>= 2.3)
 Build-Depends-Indep: python-support (>= 0.6.4),
                      docbook-to-man
 Standards-Version: 3.9.0

Deleted: packages/python-docutils/trunk/debian/patches/14_use_setuptools.diff
===================================================================
--- packages/python-docutils/trunk/debian/patches/14_use_setuptools.diff	2010-07-28 23:30:39 UTC (rev 14077)
+++ packages/python-docutils/trunk/debian/patches/14_use_setuptools.diff	2010-07-29 09:08:10 UTC (rev 14078)
@@ -1,20 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Sun, 6 Dec 2009 23:44:23 +0000
-Subject: [PATCH] Use setuptools to get egg support (Debian #382272)
-
-Bug-Debian: http://bugs.debian.org/382272
----
- setup.py |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
---- a/setup.py
-+++ b/setup.py
-@@ -6,7 +6,7 @@
- import os
- import glob
- try:
--    from distutils.core import setup, Command
-+    from setuptools import setup, Command
-     from distutils.command.build import build
-     from distutils.command.build_py import build_py
-     if sys.version_info >= (3,):

Modified: packages/python-docutils/trunk/debian/patches/series
===================================================================
--- packages/python-docutils/trunk/debian/patches/series	2010-07-28 23:30:39 UTC (rev 14077)
+++ packages/python-docutils/trunk/debian/patches/series	2010-07-29 09:08:10 UTC (rev 14078)
@@ -2,7 +2,6 @@
 10_doc_debian_paths.diff
 12_more_usrbinenv.diff
 13_install_roman.diff
-14_use_setuptools.diff
 emacs-temporary-files.diff
 emacs-shell-quote.diff
 15_emacs_debian_paths.diff