[Python-modules-commits] [python-pex] 02/02: Merge branch 'master' of ssh://git.debian.org/git/python-modules/packages/python-pex

[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 7c83f2564fe343c7234ef9010b044472ae628f72
Merge: 4644e89 365e3d3
Author: Barry Warsaw <barry at python.org>
Date:   Thu Aug 13 18:14:26 2015 -0400

    Merge branch 'master' of ssh://git.debian.org/git/python-modules/packages/python-pex
    
    Fixed in two different places.

 debian/.git-dpm                                    |  4 +--
 debian/changelog                                   |  5 +++
 debian/patches/bump-setuptools-max-version.patch   | 31 ++++++++++++++++++
 .../handle-pkg_resources-devendorization.patch     | 37 ----------------------
 debian/patches/series                              |  2 +-
 debian/rules                                       | 14 --------
 pex.egg-info/requires.txt                          |  2 +-
 pex/pex_bootstrapper.py                            | 14 --------
 pex/version.py                                     |  2 +-
 9 files changed, 41 insertions(+), 70 deletions(-)

diff --cc debian/changelog
index b2b0e8e,5c59e3b..172c5db
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,13 +1,13 @@@
 -python-pex (1.0.3-1) UNRELEASED; urgency=medium
 +python-pex (1.0.3-1) unstable; urgency=medium
  
    * New upstream release.
+   * d/patches/bump-setuptools-max-version.patch: Bump the maximum allowed
+     setuptools version to coincide with what's in Debian, which allows the
+     manpages to be built.
+   * d/rules: Remove the overrides for upstream issue #51, which has been
+     fixed released.
  
 - -- Barry Warsaw <barry at debian.org>  Thu, 13 Aug 2015 17:07:53 -0400
 + -- Barry Warsaw <barry at debian.org>  Thu, 13 Aug 2015 17:16:14 -0400
  
  python-pex (1.0.1-1) unstable; urgency=medium
  

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