[Python-modules-commits] [python-pex] 02/04: Merge branch 'master' into ubuntu

[Barry Warsaw]

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

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

commit db692626c3c00b76003e5fc3b8c364539ecd77fc
Merge: 371823f 7a3f85c
Author: Barry Warsaw <barry at debian.org>
Date:   Mon Oct 12 16:32:27 2015 -0400

    Merge branch 'master' into ubuntu

 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index d9f4f75,0d96f4a..90fa2a3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -3,18 -3,8 +3,18 @@@ python-pex (1.1.0-1) unstable; urgency=
    * New upstream release.
    * d/control: Added python3-pkg-resources to pex Depends.
  
-  -- Barry Warsaw <barry at debian.org>  Fri, 09 Oct 2015 17:06:43 -0400
+  -- Barry Warsaw <barry at debian.org>  Mon, 12 Oct 2015 16:24:02 -0400
  
 +python-pex (1.0.3-2ubuntu1) wily; urgency=medium
 +
 +  * Merge with Debian.  Remaining changes:
 +    - d/tests/control: Add dependency on ubuntu-drivers-common.  This
 +      generally should not be necessary except for LP: #1485093 in
 +      python3-distupgrade which causes the autopkgtest.ubuntu.com DEP-8
 +      tests to fail.
 +
 + -- Barry Warsaw <barry at ubuntu.com>  Thu, 08 Oct 2015 09:44:19 -0400
 +
  python-pex (1.0.3-2) unstable; urgency=medium
  
    * d/control:

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