[Python-modules-commits] [python-pex] 04/05: merge patched into master

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository python-pex.

commit 36c0f626f3ff0b123b7bef09f4107724e26387d5
Merge: f2b3e86 e497a82
Author: Barry Warsaw <barry at debian.org>
Date:   Thu Aug 13 18:06:20 2015 -0400

    merge patched into master

 debian/.git-dpm                                    |  4 +--
 debian/patches/bump-setuptools-max-version.patch   | 16 ++++++++--
 .../handle-pkg_resources-devendorization.patch     | 37 ----------------------
 debian/patches/series                              |  1 -
 pex/pex_bootstrapper.py                            | 14 --------
 pex/version.py                                     |  2 +-
 6 files changed, 17 insertions(+), 57 deletions(-)

diff --cc debian/.git-dpm
index dfeb947,0000000..8805940
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- cd161fcfa71f802199bd4013a919eee3c7afe83c
- cd161fcfa71f802199bd4013a919eee3c7afe83c
++e497a82aa8ffdbd3e1fd5dfb2c976b37d97d9c05
++e497a82aa8ffdbd3e1fd5dfb2c976b37d97d9c05
 +5053627b97fcec5fe41e5714cb6b21529b46d5dd
 +5053627b97fcec5fe41e5714cb6b21529b46d5dd
 +python-pex_1.0.3.orig.tar.gz
 +7a8182da2bc74b8a06a0a00289244fda6586daf6
 +106905
diff --cc debian/patches/bump-setuptools-max-version.patch
index 5c5469d,0000000..6902a4f
mode 100644,000000..100644
--- a/debian/patches/bump-setuptools-max-version.patch
+++ b/debian/patches/bump-setuptools-max-version.patch
@@@ -1,19 -1,0 +1,31 @@@
- From cd161fcfa71f802199bd4013a919eee3c7afe83c Mon Sep 17 00:00:00 2001
++From e497a82aa8ffdbd3e1fd5dfb2c976b37d97d9c05 Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at debian.org>
 +Date: Thu, 13 Aug 2015 17:53:22 -0400
 +Subject: =?UTF-8?q?Bump=20setuptools=20maximum=20requirement=20to=20coinci?=
 + =?UTF-8?q?de=20with=20what's=20available=20in=0ADebian,=20otherwise=20the?=
 + =?UTF-8?q?=20manpage=20won't=20build.?=
 +
 +Patch-Name: bump-setuptools-max-version.patch
 +---
 + pex.egg-info/requires.txt | 2 +-
-  1 file changed, 1 insertion(+), 1 deletion(-)
++ pex/version.py            | 2 +-
++ 2 files changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/pex.egg-info/requires.txt b/pex.egg-info/requires.txt
 +index 00e3615..646aa98 100644
 +--- a/pex.egg-info/requires.txt
 ++++ b/pex.egg-info/requires.txt
 +@@ -1 +1 @@
 +-setuptools>=2.2,<16
 ++setuptools>=2.2,<19
++diff --git a/pex/version.py b/pex/version.py
++index c7d1aea..7e9a8a3 100644
++--- a/pex/version.py
+++++ b/pex/version.py
++@@ -3,5 +3,5 @@
++ 
++ __version__ = '1.0.3'
++ 
++-SETUPTOOLS_REQUIREMENT = 'setuptools>=2.2,<16'
+++SETUPTOOLS_REQUIREMENT = 'setuptools>=2.2,<19'
++ WHEEL_REQUIREMENT = 'wheel>=0.24.0,<0.25.0'
diff --cc debian/patches/series
index f9a408e,0000000..5fcf0cb
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
- handle-pkg_resources-devendorization.patch
 +bump-setuptools-max-version.patch

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