[Python-modules-commits] [python-fedora] 05/10: Rebasing (and removing) Debian local patches on top of new upstream version.

[Sergio Durigan Junior]

This is an automated email from the git hooks/post-receive script.

sergiodj-guest pushed a commit to branch master
in repository python-fedora.

commit 1c25a850abc4d3da7d54aa3ff45349586211bf7f
Author: Sergio Durigan Junior <sergiodj at sergiodj.net>
Date:   Tue Aug 8 16:14:33 2017 -0400

    Rebasing (and removing) Debian local patches on top of new upstream
    version.
---
 debian/patches/series                     |  1 -
 debian/patches/setuptools_workaround.diff | 31 -------------------------------
 2 files changed, 32 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7b6fe76..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-setuptools_workaround.diff
diff --git a/debian/patches/setuptools_workaround.diff b/debian/patches/setuptools_workaround.diff
deleted file mode 100644
index 6ad1d4a..0000000
--- a/debian/patches/setuptools_workaround.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-From e99bdf1119abce6de9c0ffef8f019087137f70c4 Mon Sep 17 00:00:00 2001
-From: Scott Kitterman <scott at kitterman.com>
-Date: Thu, 8 Oct 2015 12:03:40 -0700
-Subject: Work around broken setuptools
-
-   * Patch setup.py to use distutils setup as a workaround for problems with
-     python-setuptools > 17 (Closes: #789982)
-Bug-Debian: http://bugs.debian.org/789982
-Origin: vendor
-Forwarded: not-needed
-Last-Update: 2015-07-23
-
-Patch-Name: setuptools_workaround.diff
----
- setup.py | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/setup.py b/setup.py
-index be0f27e..f4bd066 100755
---- a/setup.py
-+++ b/setup.py
-@@ -3,7 +3,8 @@ import sys
- 
- exec(compile(open("fedora/release.py").read(), "fedora/release.py", 'exec'))
- 
--from setuptools import find_packages, setup
-+from setuptools import find_packages
-+from distutils.core import setup
- 
- setup(
-     name=NAME,

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-fedora.git