[Python-modules-commits] [python-pex] 02/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 f2b3e8698b44d1e28fdd9f778cf8fd7447c3036a
Merge: c78797b cd161fc
Author: Barry Warsaw <barry at debian.org>
Date:   Thu Aug 13 17:54:08 2015 -0400

    merge patched into master

 debian/.git-dpm                                  |  4 ++--
 debian/patches/bump-setuptools-max-version.patch | 19 +++++++++++++++++++
 debian/patches/series                            |  1 +
 pex.egg-info/requires.txt                        |  2 +-
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 13a7f55,0000000..dfeb947
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
- 4d3749d349d7fb866be83614c2dd01b8ee1401ea
- 4d3749d349d7fb866be83614c2dd01b8ee1401ea
++cd161fcfa71f802199bd4013a919eee3c7afe83c
++cd161fcfa71f802199bd4013a919eee3c7afe83c
 +5053627b97fcec5fe41e5714cb6b21529b46d5dd
 +5053627b97fcec5fe41e5714cb6b21529b46d5dd
 +python-pex_1.0.3.orig.tar.gz
 +7a8182da2bc74b8a06a0a00289244fda6586daf6
 +106905
diff --cc debian/patches/bump-setuptools-max-version.patch
index 0000000,0000000..5c5469d
new file mode 100644
--- /dev/null
+++ b/debian/patches/bump-setuptools-max-version.patch
@@@ -1,0 -1,0 +1,19 @@@
++From cd161fcfa71f802199bd4013a919eee3c7afe83c 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(-)
++
++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 --cc debian/patches/series
index 597ac42,0000000..f9a408e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +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