[Python-modules-commits] [python-pex] 02/03: 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 1735574b4b8d26ce92954f1e03782ccaa0c91425
Merge: 44af492 bf7414e
Author: Barry Warsaw <barry at debian.org>
Date:   Wed Oct 14 17:04:22 2015 -0400

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 .../patches/bump-wheel-requirement-version.patch   | 22 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 pex/version.py                                     |  2 +-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 34fc2c0,0000000..fd26f3d
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- e85783b61e7928533a56da72b7fc67f7197f7266
- e85783b61e7928533a56da72b7fc67f7197f7266
++bf7414e6aec67f28a078b731320d3c67e6ffa63f
++bf7414e6aec67f28a078b731320d3c67e6ffa63f
 +60f09e69d346fbc81698e9d028dacec68f16639a
 +60f09e69d346fbc81698e9d028dacec68f16639a
 +python-pex_1.1.0.orig.tar.gz
 +6707e0ad83099ef7ab60d26155000aa9792b8de4
 +117355
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/bump-wheel-requirement-version.patch
index 0000000,0000000..7d137c8
new file mode 100644
--- /dev/null
+++ b/debian/patches/bump-wheel-requirement-version.patch
@@@ -1,0 -1,0 +1,22 @@@
++From bf7414e6aec67f28a078b731320d3c67e6ffa63f Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at debian.org>
++Date: Wed, 14 Oct 2015 17:03:39 -0400
++Subject: =?UTF-8?q?Bump=20the=20wheel=20package=20requirement=20versions?=
++ =?UTF-8?q?=20to=20match=20what's=20in=20the=20archive,=20so=0Apex=20won't?=
++ =?UTF-8?q?=20try=20to=20download=20the=20package=20from=20PyPI.?=
++
++Patch-Name: bump-wheel-requirement-version.patch
++---
++ pex/version.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/pex/version.py b/pex/version.py
++index 6e7ac2d..7b2da09 100644
++--- a/pex/version.py
+++++ b/pex/version.py
++@@ -4,4 +4,4 @@
++ __version__ = '1.1.0'
++ 
++ SETUPTOOLS_REQUIREMENT = 'setuptools>=2.2,<19'
++-WHEEL_REQUIREMENT = 'wheel>=0.24.0,<0.25.0'
+++WHEEL_REQUIREMENT = 'wheel>=0.26.0,<0.27.0'
diff --cc debian/patches/series
index ccc0d2e,0000000..4ae1295
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +bump-setuptools-max-version.patch
 +handle-pkg_resources-devendorization.patch
++bump-wheel-requirement-version.patch

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