New upstream release (1.2.0).

6 files changed, 79 insertions, 17 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index b0ef656..ef44f03 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,8 +1,8 @@
 # see git-dpm(1) from git-dpm package
-77eebd3a4d9a21adeec35e4bd57b5fb6b24c7d30
-77eebd3a4d9a21adeec35e4bd57b5fb6b24c7d30
-c6224cf33fda85bb50c0433138597730ab688f4a
-c6224cf33fda85bb50c0433138597730ab688f4a
-python-tblib_1.1.0.orig.tar.gz
-3f260b278abc7a3504acd4687cee7cdabc9c8802
-11689
+91fd7f2d48eb3677615942a1bcc688e19b1a0368
+91fd7f2d48eb3677615942a1bcc688e19b1a0368
+f8de55537ac15958a980122b4c72f530be93d06a
+f8de55537ac15958a980122b4c72f530be93d06a
+python-tblib_1.2.0.orig.tar.gz
+bc096fcfec21e9e3e9c1f9d22e88d77739c5a3fb
+21801
diff --git a/debian/changelog b/debian/changelog
index b6ba18f..c3ee315 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-tblib (1.2.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Colin Watson <cjwatson@debian.org>  Fri, 18 Dec 2015 11:06:09 +0000
+
 python-tblib (1.1.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/series b/debian/patches/series
index 22efbc2..7654c20 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 tox-sitepackages.patch
+tox-generic.patch
diff --git a/debian/patches/tox-generic.patch b/debian/patches/tox-generic.patch
new file mode 100644
index 0000000..b45318f
--- /dev/null
+++ b/debian/patches/tox-generic.patch
@@ -0,0 +1,55 @@
+From 91fd7f2d48eb3677615942a1bcc688e19b1a0368 Mon Sep 17 00:00:00 2001
+From: Colin Watson <cjwatson@debian.org>
+Date: Fri, 18 Dec 2015 11:31:37 +0000
+Subject: Add {2,3}-{nocov,cover} tox test environments
+
+Forwarded: no
+Last-Update: 2015-12-18
+
+Patch-Name: tox-generic.patch
+---
+ tox.ini | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/tox.ini b/tox.ini
+index 201b55d..e898fda 100644
+--- a/tox.ini
++++ b/tox.ini
+@@ -4,15 +4,17 @@
+ envlist =
+     clean,
+     check,
+-    {2.6,2.7,3.3,3.4,3.5,pypy}-{cover,nocov},
++    {2,2.6,2.7,3,3.3,3.4,3.5,pypy}-{cover,nocov},
+     report,
+     docs
+ 
+ [testenv]
+ basepython =
+     pypy: {env:TOXPYTHON:pypy}
++    2: {env:TOXPYTHON:python}
+     2.6: {env:TOXPYTHON:python2.6}
+     {2.7,docs,spell}: {env:TOXPYTHON:python2.7}
++    3: {env:TOXPYTHON:python3}
+     3.3: {env:TOXPYTHON:python3.3}
+     3.4: {env:TOXPYTHON:python3.4}
+     3.5: {env:TOXPYTHON:python3.5}
+@@ -102,12 +104,18 @@ skip_install = true
+ usedevelop = false
+ deps = coverage
+ 
++[testenv:2-nocov]
++usedevelop = false
++
+ [testenv:2.6-nocov]
+ usedevelop = false
+ 
+ [testenv:2.7-nocov]
+ usedevelop = false
+ 
++[testenv:3-nocov]
++usedevelop = false
++
+ [testenv:3.3-nocov]
+ usedevelop = false
+ 
diff --git a/debian/patches/tox-sitepackages.patch b/debian/patches/tox-sitepackages.patch
index 065a28a..f9a6478 100644
--- a/debian/patches/tox-sitepackages.patch
+++ b/debian/patches/tox-sitepackages.patch
@@ -1,4 +1,4 @@
-From 77eebd3a4d9a21adeec35e4bd57b5fb6b24c7d30 Mon Sep 17 00:00:00 2001
+From 18673302d6f3951580a79d29aafe42fb6759febd Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Tue, 4 Mar 2014 00:06:16 +0000
 Subject: Set sitepackages = True in tox.ini.
@@ -7,7 +7,7 @@ This allows tests to run on systems without network access.
 
 Author: Colin Watson <cjwatson@debian.org>
 Forwarded: no
-Last-Update: 2014-03-04
+Last-Update: 2015-12-18
 
 Patch-Name: tox-sitepackages.patch
 ---
@@ -15,14 +15,14 @@ Patch-Name: tox-sitepackages.patch
  1 file changed, 1 insertion(+)
 
 diff --git a/tox.ini b/tox.ini
-index 81b6a64..c77127f 100644
+index 4ca1361..201b55d 100644
 --- a/tox.ini
 +++ b/tox.ini
-@@ -14,6 +14,7 @@ setenv =
-     WITH_COVERAGE = x
-     PYTHONUNBUFFERED = x
- commands = {envpython} {toxinidir}/tests/test_tblib.py
+@@ -29,6 +29,7 @@ commands =
+     cover: {posargs:coverage run {toxinidir}/tests/test_tblib.py}
+     nocov: {posargs:{envpython} {toxinidir}/tests/test_tblib.py}
+ usedevelop = true
 +sitepackages = True
  
- [base]
- deps =
+ [testenv:spell]
+ setenv =
diff --git a/debian/rules b/debian/rules
index 2f17b1d..7b89f45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ override_dh_auto_build:
 	done
 
 override_dh_auto_test:
-	HOME=$(CURDIR) tox -e py,py3
+	HOME=$(CURDIR) tox -e 2-nocov,3-nocov
 
 override_dh_auto_clean:
 	dh_auto_clean