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

[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 5aa42ed1cc38ca3c9836a0a94bcff464a3de67bb
Author: Barry Warsaw <barry at python.org>
Date:   Fri Sep 5 17:08:14 2014 -0400

    update debian/patches directory
---
 debian/.git-dpm                          |  2 +-
 debian/patches/intersphinx_mapping.patch | 22 ++++++++++++++++------
 debian/patches/no-download.patch         | 14 ++++++++++++--
 debian/patches/test-fixes.patch          | 18 ++++++++++++++----
 debian/patches/testenv-deps.patch        | 16 +++++++++++++---
 5 files changed, 56 insertions(+), 16 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 826659d..9f2fa74 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,5 +1,5 @@
 # see git-dpm(1) from git-dpm package
-NONE
+c930efb1c2b57a4dc26f4dab31cad16a1a62052a
 c930efb1c2b57a4dc26f4dab31cad16a1a62052a
 00c56c5cb03f6cbc2523e5dc3146a2ce8a34847c
 00c56c5cb03f6cbc2523e5dc3146a2ce8a34847c
diff --git a/debian/patches/intersphinx_mapping.patch b/debian/patches/intersphinx_mapping.patch
index 7021fe0..f74349a 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 21a3b0d452cf73076435dad797576fe98cf5bd23 Mon Sep 17 00:00:00 2001
+From: Fladischer Michael <FladischerMichael at fladi.at>
+Date: Tue, 20 Aug 2013 21:48:05 -0400
+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 be0411a..668a535 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/no-download.patch b/debian/patches/no-download.patch
index db8d58e..b692200 100644
--- a/debian/patches/no-download.patch
+++ b/debian/patches/no-download.patch
@@ -1,7 +1,17 @@
-Description: Prevent internet access when running tox's own tests.
-Author: Barry Warsaw <barry at debian.org>
+From 866665544cec90d393f9d47cbf23ed9e6c7a9264 Mon Sep 17 00:00:00 2001
+From: Barry Warsaw <barry at debian.org>
+Date: Tue, 20 Aug 2013 21:48:05 -0400
+Subject: Prevent internet access when running tox's own tests.
+
 Forwarded: not-needed
 
+Patch-Name: no-download.patch
+---
+ tox.ini | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tox.ini b/tox.ini
+index 1b9417c..8075dd4 100644
 --- a/tox.ini
 +++ b/tox.ini
 @@ -1,5 +1,6 @@
diff --git a/debian/patches/test-fixes.patch b/debian/patches/test-fixes.patch
index b89ac26..f834288 100644
--- a/debian/patches/test-fixes.patch
+++ b/debian/patches/test-fixes.patch
@@ -1,10 +1,20 @@
-Description: Fix tests by using .realpath() on both sides of the assertion.
-Author: Barry Warsaw <barry at debian.org>
+From c930efb1c2b57a4dc26f4dab31cad16a1a62052a Mon Sep 17 00:00:00 2001
+From: Barry Warsaw <barry at debian.org>
+Date: Tue, 20 Aug 2013 21:48:05 -0400
+Subject: Fix tests by using .realpath() on both sides of the assertion.
+
 Bug: https://bitbucket.org/hpk42/tox/issue/118/test-failures-in-a-debian-build
 
+Patch-Name: test-fixes.patch
+---
+ tests/test_venv.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_venv.py b/tests/test_venv.py
+index e6792ed..56446a9 100644
 --- a/tests/test_venv.py
 +++ b/tests/test_venv.py
-@@ -25,7 +25,8 @@
+@@ -25,7 +25,8 @@ def test_getsupportedinterpreter(monkeypatch, newconfig, mocksession):
      venv = VirtualEnv(config.envconfigs['python'], session=mocksession)
      interp = venv.getsupportedinterpreter()
      # realpath needed for debian symlinks
@@ -14,7 +24,7 @@ Bug: https://bitbucket.org/hpk42/tox/issue/118/test-failures-in-a-debian-build
      monkeypatch.setattr(sys, 'platform', "win32")
      monkeypatch.setattr(venv.envconfig, 'basepython', 'jython')
      py.test.raises(tox.exception.UnsupportedInterpreter,
-@@ -51,7 +52,8 @@
+@@ -51,7 +52,8 @@ def test_create(monkeypatch, mocksession, newconfig):
      assert "virtualenv" in str(args[1])
      if sys.platform != "win32":
          # realpath is needed for stuff like the debian symlinks
diff --git a/debian/patches/testenv-deps.patch b/debian/patches/testenv-deps.patch
index 36dbd52..cd026ac 100644
--- a/debian/patches/testenv-deps.patch
+++ b/debian/patches/testenv-deps.patch
@@ -1,11 +1,21 @@
-Description: Prevent failures due to inability to download pytest.
+From c02695141f926d0e7dd859371b1af8e1aa8c893f Mon Sep 17 00:00:00 2001
+From: Barry Warsaw <barry at debian.org>
+Date: Tue, 20 Aug 2013 21:48:05 -0400
+Subject: Prevent failures due to inability to download pytest.
+
  Just get this from the archive during builds.
-Author: Barry Warsaw <barry at debian.org>
 Forwarded: not-needed
 
+Patch-Name: testenv-deps.patch
+---
+ tox.ini | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/tox.ini b/tox.ini
+index 8075dd4..9e507db 100644
 --- a/tox.ini
 +++ b/tox.ini
-@@ -7,13 +7,11 @@
+@@ -7,13 +7,11 @@ commands=echo {posargs}
  
  [testenv]
  commands=py.test  --junitxml={envlogdir}/junit-{envname}.xml {posargs}

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