[Python-modules-commits] [python-pex] 02/04: 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 33bf2ff73227bf79ff2802c06858c3806151359c
Merge: 49625ac 8119654
Author: Barry Warsaw <barry at python.org>
Date:   Thu Sep 22 11:22:09 2016 -0400

    merge patched into master

 debian/.git-dpm                          |  4 ++--
 debian/patches/series                    |  1 +
 debian/patches/update-dependencies.patch | 22 ++++++++++++++++++++++
 pex/version.py                           |  4 ++--
 4 files changed, 27 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 75816d6,0000000..248e708
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
- ecb9787a2bbdbfc8076dd96af47946e21142ffb3
- ecb9787a2bbdbfc8076dd96af47946e21142ffb3
++81196546a2dec229cee10acf058e2b86a7daca1d
++81196546a2dec229cee10acf058e2b86a7daca1d
 +d17165483693016fbaced1cf900a880d70cedc61
 +d17165483693016fbaced1cf900a880d70cedc61
 +python-pex_1.1.14.orig.tar.gz
 +8abf61dead6c2db4da92f2874794333b50164ee9
 +480891
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/series
index 597ac42,0000000..c72e712
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +handle-pkg_resources-devendorization.patch
++update-dependencies.patch
diff --cc debian/patches/update-dependencies.patch
index 0000000,0000000..ef62f6c
new file mode 100644
--- /dev/null
+++ b/debian/patches/update-dependencies.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 81196546a2dec229cee10acf058e2b86a7daca1d Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Thu, 22 Sep 2016 11:21:16 -0400
++Subject: Remove ceiling versions for dependencies.
++
++Patch-Name: update-dependencies.patch
++---
++ pex/version.py | 4 ++--
++ 1 file changed, 2 insertions(+), 2 deletions(-)
++
++diff --git a/pex/version.py b/pex/version.py
++index 38d589a..778c4cb 100644
++--- a/pex/version.py
+++++ b/pex/version.py
++@@ -3,5 +3,5 @@
++ 
++ __version__ = '1.1.14'
++ 
++-SETUPTOOLS_REQUIREMENT = 'setuptools>=2.2,<20.11'
++-WHEEL_REQUIREMENT = 'wheel>=0.24.0,<0.30.0'
+++SETUPTOOLS_REQUIREMENT = 'setuptools>=2.2'
+++WHEEL_REQUIREMENT = 'wheel>=0.24.0'

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