[Python-modules-commits] [tox] 11/69: Import tox 1.4.2-2

[Barry Warsaw]

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

barry pushed a commit to branch master
in repository tox.

commit 14e54c40f9dcedb1c63c315ef959db9a28bf2bc7
Merge: 9cb277c 56cd8a0
Author: Barry Warsaw <barry at python.org>
Date:   Fri Sep 5 17:08:04 2014 -0400

    Import tox 1.4.2-2

 debian/.git-dpm                          |  4 ++--
 debian/changelog                         | 16 ++++++++++++++++
 debian/control                           |  1 +
 debian/patches/fix-doctree.patch         | 16 +++-------------
 debian/patches/intersphinx_mapping.patch | 22 ++++++----------------
 debian/patches/no-download.patch         | 28 ++++++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 debian/patches/test-problems.patch       | 23 +++++------------------
 debian/patches/upstream-issue58.patch    | 14 ++------------
 debian/rules                             |  7 ++++++-
 tox.ini                                  |  9 +++++----
 11 files changed, 75 insertions(+), 66 deletions(-)

diff --cc debian/.git-dpm
index 9234e22,0000000..39de01a
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
- e3f71f107587a63d07171658fa8bc1649e38dc0a
- e3f71f107587a63d07171658fa8bc1649e38dc0a
++NONE
++296dc3dbdda57ca6af2ce32438200fa87a48fcd8
 +8f69a952247455df80b2ae21016c73e630798a9d
 +8f69a952247455df80b2ae21016c73e630798a9d
 +tox_1.4.2.orig.tar.gz
 +18a4df264ed6e98bf7310249ec563dc115d5e5d0
 +58738

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