[Python-modules-commits] [tox] 08/69: update debian/patches directory

Fri Sep 5 23:26:23 UTC 2014

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

barry pushed a commit to branch master
in repository tox.

commit 9cb277c5e7d57464b2fd3b8e283cd0b2794bf053
Author: Barry Warsaw <barry at python.org>
Date:   Fri Sep 5 17:08:02 2014 -0400

    update debian/patches directory
---
 debian/.git-dpm                          |  2 +-
 debian/patches/fix-doctree.patch         | 16 +++++++++++++---
 debian/patches/intersphinx_mapping.patch | 22 ++++++++++++++++------
 debian/patches/test-problems.patch       | 23 ++++++++++++++++++-----
 debian/patches/upstream-issue58.patch    | 14 ++++++++++++--
 5 files changed, 60 insertions(+), 17 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
index ed69fe7..9234e22 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,5 +1,5 @@
 # see git-dpm(1) from git-dpm package
-NONE
+e3f71f107587a63d07171658fa8bc1649e38dc0a
 e3f71f107587a63d07171658fa8bc1649e38dc0a
 8f69a952247455df80b2ae21016c73e630798a9d
 8f69a952247455df80b2ae21016c73e630798a9d
diff --git a/debian/patches/fix-doctree.patch b/debian/patches/fix-doctree.patch
index 6ec2043..1c849f4 100644
--- a/debian/patches/fix-doctree.patch
+++ b/debian/patches/fix-doctree.patch
@@ -1,9 +1,19 @@
-Description: There is no config-v1 document.
-Author: Barry Warsaw <barry at python.org>
+From 71f04b6dfab6b48cff358859654feaf817ba6a72 Mon Sep 17 00:00:00 2001
+From: Barry Warsaw <barry at python.org>
+Date: Mon, 19 Nov 2012 22:17:45 -0500
+Subject: There is no config-v1 document.
+
 Bug: https://bitbucket.org/hpk42/tox/issue/57/doc-indextxt-refers-to-non-existent
+Patch-Name: fix-doctree.patch
+---
+ doc/index.txt | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/doc/index.txt b/doc/index.txt
+index f8ecf34..2a4203c 100644
 --- a/doc/index.txt
 +++ b/doc/index.txt
-@@ -93,7 +93,6 @@
+@@ -93,7 +93,6 @@ Current features
     install
     examples
     config
diff --git a/debian/patches/intersphinx_mapping.patch b/debian/patches/intersphinx_mapping.patch
index 7021fe0..ec060bc 100644
--- a/debian/patches/intersphinx_mapping.patch
+++ b/debian/patches/intersphinx_mapping.patch
@@ -1,16 +1,26 @@
-Description: Use local object inventory files for sphinx
- Use the local object inventory files to prevent sphinx-build from 
+From f4453eeb32a197a79ddc53900083689bc8d8c411 Mon Sep 17 00:00:00 2001
+From: Fladischer Michael <FladischerMichael at fladi.at>
+Date: Mon, 19 Nov 2012 22:17:45 -0500
+Subject: Use local object inventory files for sphinx
+
+ Use the local object inventory files to prevent sphinx-build from
  downloading them during build.
- This patch makes the intersphinx mappings depend on the existence of 
- these files, thus passing Debian Policy 12.3 while still maintaining 
+ This patch makes the intersphinx mappings depend on the existence of
+ these files, thus passing Debian Policy 12.3 while still maintaining
  a level of comfort for the reader of the documentation.
-Author: Fladischer Michael <FladischerMichael at fladi.at>
 Forwarded: not-needed
 Last-Update: 2011-03-03
 
+Patch-Name: intersphinx_mapping.patch
+---
+ doc/conf.py | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/doc/conf.py b/doc/conf.py
+index ac558b4..7192b56 100644
 --- a/doc/conf.py
 +++ b/doc/conf.py
-@@ -253,7 +253,23 @@
+@@ -253,7 +253,23 @@ epub_copyright = u'2010, holger krekel'
  
  
  # Example configuration for intersphinx: refer to the Python standard library.
diff --git a/debian/patches/test-problems.patch b/debian/patches/test-problems.patch
index 02ae0c6..83cf512 100644
--- a/debian/patches/test-problems.patch
+++ b/debian/patches/test-problems.patch
@@ -1,14 +1,25 @@
-Description: Fix various problems in the test suite, which become evident in
- an sbuild and other builder environments. 
+From e3f71f107587a63d07171658fa8bc1649e38dc0a Mon Sep 17 00:00:00 2001
+From: Barry Warsaw <barry at python.org>
+Date: Mon, 19 Nov 2012 22:17:45 -0500
+Subject: Fix various problems in the test suite, which become evident in
+
+ an sbuild and other builder environments.
  + In an sbuild environment, $USER will not match $HOME.
  + argv[0] should not contribute to test string.
-Author: Barry Warsaw <barry at python.org>
 Bug: https://bitbucket.org/hpk42/tox/issue/60/home-does-not-always-equal-user
 Bug: https://bitbucket.org/hpk42/tox/issue/61/test-incorrectly-includes-argv-0
 
+Patch-Name: test-problems.patch
+---
+ tests/test_config.py | 2 +-
+ tests/test_venv.py   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_config.py b/tests/test_config.py
+index 9ad8398..3db2702 100644
 --- a/tests/test_config.py
 +++ b/tests/test_config.py
-@@ -429,7 +429,7 @@
+@@ -429,7 +429,7 @@ class TestConfigTestEnv:
          assert argv[3][0] == conf.envbindir
          assert argv[4][0] == conf.envtmpdir
          assert argv[5][0] == conf.envpython
@@ -17,9 +28,11 @@ Bug: https://bitbucket.org/hpk42/tox/issue/61/test-incorrectly-includes-argv-0
          assert argv[7][0] == config.homedir.join(".tox", "distshare")
          assert argv[8][0] == conf.envlogdir
  
+diff --git a/tests/test_venv.py b/tests/test_venv.py
+index 3db3a6b..1b40f4a 100644
 --- a/tests/test_venv.py
 +++ b/tests/test_venv.py
-@@ -189,7 +189,7 @@
+@@ -189,7 +189,7 @@ def test_install_deps_indexserver(newmocksession):
      venv.install_deps()
      # two different index servers, two calls
      assert len(l) == 2
diff --git a/debian/patches/upstream-issue58.patch b/debian/patches/upstream-issue58.patch
index bff7596..e00db40 100644
--- a/debian/patches/upstream-issue58.patch
+++ b/debian/patches/upstream-issue58.patch
@@ -1,8 +1,18 @@
-Description: Fix typos in the LICENSE file.
-Author: Barry Warsaw <barry at python.org>
+From 56fc3b7dea30fb519fd2a13396ce18db16f3da32 Mon Sep 17 00:00:00 2001
+From: Barry Warsaw <barry at python.org>
+Date: Mon, 19 Nov 2012 22:17:45 -0500
+Subject: Fix typos in the LICENSE file.
+
 Forwarded: not-needed
 Bug: https://bitbucket.org/hpk42/tox/issue/58/typos-in-license-file
 
+Patch-Name: upstream-issue58.patch
+---
+ LICENSE | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/LICENSE b/LICENSE
+index 9246a20..d9cbefc 100644
 --- a/LICENSE
 +++ b/LICENSE
 @@ -1,4 +1,4 @@

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

