New upstream release (0.2.0).

9 files changed, 23 insertions, 184 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index ff114c9..9ff7dae 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,8 +1,8 @@
 # see git-dpm(1) from git-dpm package
-6f57fc0eb5f7c50d95a3a44c2acce439de8a6f67
-6f57fc0eb5f7c50d95a3a44c2acce439de8a6f67
-ffb64b3ee265ab1e5169321317fa45cc1e667eba
-ffb64b3ee265ab1e5169321317fa45cc1e667eba
-python-tblib_0.1.0.orig.tar.gz
-1d03980b5e4cf8d93ca5d14c1346affce6d26bd6
-6914
+10cf887b17a033709e8ad5596dc68dd91fe17116
+10cf887b17a033709e8ad5596dc68dd91fe17116
+b39dd4634df3b437319ce2a57aa775830380cf9c
+b39dd4634df3b437319ce2a57aa775830380cf9c
+python-tblib_0.2.0.orig.tar.gz
+849fd1286f1f26867873dde8465ee3b1162bf64a
+8573
diff --git a/debian/changelog b/debian/changelog
index 7166e4b..5a96205 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+python-tblib (0.2.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Colin Watson <cjwatson@debian.org>  Tue, 13 Jan 2015 13:49:55 +0000
+
 python-tblib (0.1.0-5) unstable; urgency=medium
 
   * Update Vcs-Browser URL yet again.
diff --git a/debian/copyright b/debian/copyright
index b088bde..a292ed7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,7 +3,7 @@ Upstream-Name: python-tblib
 Source: https://github.com/ionelmc/python-tblib
 
 Files: *
-Copyright: Copyright (c) 2011, Ionel Cristian Maries
+Copyright: Copyright (c) 2013-2014, Ionel Cristian Mărieș
 License: BSD-2-clause
 
 Files: debian/*
@@ -14,11 +14,12 @@ License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
  .
-     Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer. Redistributions
-     in binary form must reproduce the above copyright notice, this list of
-     conditions and the following disclaimer in the documentation and/or
-     other materials provided with the distribution.
+ 1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
  .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
diff --git a/debian/patches/add-more-ellipses.patch b/debian/patches/add-more-ellipses.patch
deleted file mode 100644
index c8c6f62..0000000
--- a/debian/patches/add-more-ellipses.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a51bd70404bc0479906559a6b281812315526449 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= <contact@ionelmc.ro>
-Date: Tue, 31 Dec 2013 04:31:29 +0200
-Subject: Add more ellipses.
-
-Origin: upstream, https://github.com/ionelmc/python-tblib/commit/a0b79e3f4100627f34ac101dfdb4ecfa26f97487
-Last-Update: 2014-02-26
-
-Patch-Name: add-more-ellipses.patch
----
- README.rst | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/README.rst b/README.rst
-index 3faa2be..eb35db7 100644
---- a/README.rst
-+++ b/README.rst
-@@ -199,9 +199,9 @@ How's this useful ? Imagine you're using multiprocessing like this::
-       File "<doctest README.rst[31]>", line 2, in <module>
-         for i in pool.map(func_a, range(5)):
-       File "/usr/lib/.../multiprocessing/pool.py", line ..., in map
--        return self.map_async(func, iterable, chunksize).get()
-+        ...
-       File "/usr/lib/.../multiprocessing/pool.py", line ..., in get
--        raise self._value
-+        ...
-     Exception: Guessing time !
-     <BLANKLINE>
-     >>> pool.terminate()
diff --git a/debian/patches/py34.patch b/debian/patches/py34.patch
deleted file mode 100644
index 0dd2752..0000000
--- a/debian/patches/py34.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 6f57fc0eb5f7c50d95a3a44c2acce439de8a6f67 Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@debian.org>
-Date: Tue, 4 Mar 2014 11:08:48 +0000
-Subject: Adjust tests to support Python 3.4.
-
-The fix for http://bugs.python.org/issue13831 broke our tests.
-Monkey-patch it out so that we can still see the original problem.
-
-Author: Colin Watson <cjwatson@debian.org>
-Forwarded: https://github.com/ionelmc/python-tblib/pull/3
-Last-Update: 2014-03-04
-
-Patch-Name: py34.patch
----
- README.rst | 8 ++++++--
- tox.ini    | 5 +++++
- 2 files changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/README.rst b/README.rst
-index eb35db7..a99e8aa 100644
---- a/README.rst
-+++ b/README.rst
-@@ -187,7 +187,11 @@ How's this useful ? Imagine you're using multiprocessing like this::
- 
-     >>> import traceback
-     >>> from multiprocessing import Pool
-+    >>> import multiprocessing.pool
-     >>> from examples import func_a
-+    >>> # Undo the fix for http://bugs.python.org/issue13831 so that we can
-+    >>> # see the effects of our change.
-+    >>> multiprocessing.pool.ExceptionWithTraceback = lambda e, t: e
-     >>> pool = Pool()
-     >>> try:
-     ...     for i in pool.map(func_a, range(5)):
-@@ -196,7 +200,7 @@ How's this useful ? Imagine you're using multiprocessing like this::
-     ...     print(traceback.format_exc())
-     ...
-     Traceback (most recent call last):
--      File "<doctest README.rst[31]>", line 2, in <module>
-+      File "<doctest README.rst[33]>", line 2, in <module>
-         for i in pool.map(func_a, range(5)):
-       File "/usr/lib/.../multiprocessing/pool.py", line ..., in map
-         ...
-@@ -221,7 +225,7 @@ Not very useful is it? Let's sort this out::
-     ...     print(traceback.format_exc())
-     ...
-     Traceback (most recent call last):
--      File "<doctest README.rst[36]>", line 4, in <module>
-+      File "<doctest README.rst[38]>", line 4, in <module>
-         i.reraise()
-       File ".../tblib/decorators.py", line ..., in reraise
-         reraise(self.exc_type, self.exc_value, self.traceback)
-diff --git a/tox.ini b/tox.ini
-index 85055d1..c77127f 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -5,6 +5,7 @@ envlist =
-     py3,
-     py3.2,
-     py3.3,
-+    py3.4,
-     pypy
- 
- [testenv]
-@@ -42,6 +43,10 @@ deps =
- basepython = python3.3
- deps =
-     {[base]deps}
-+[testenv:py3.4]
-+basepython = python3.4
-+deps =
-+    {[base]deps}
- [testenv:pypy]
- basepython = pypy
- deps =
diff --git a/debian/patches/remove-debug-print.patch b/debian/patches/remove-debug-print.patch
deleted file mode 100644
index 8a702af..0000000
--- a/debian/patches/remove-debug-print.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ab233b04246aa7ad937c71df53d0e2ffcec2df9a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ionel=20Cristian=20M=C4=83rie=C8=99?= <contact@ionelmc.ro>
-Date: Wed, 26 Feb 2014 15:34:16 +0000
-Subject: Oooops.... remove debug print.
-
-Origin: upstream, https://github.com/ionelmc/python-tblib/commit/a2bd19dcbc197124ef8a213501c5eb2aa1cbf231
-Last-Update: 2014-02-26
-
-Patch-Name: remove-debug-print.patch
----
- src/tblib/decorators.py | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/tblib/decorators.py b/src/tblib/decorators.py
-index c18216e..d2d55ab 100644
---- a/src/tblib/decorators.py
-+++ b/src/tblib/decorators.py
-@@ -39,5 +39,4 @@ def apply_with_return_error(args):
-         apply_with_return_error((func, 1, 2, 3)) - this will call func(1, 2, 3)
- 
-     """
--    print args[0]
-     return args[0](*args[1:])
diff --git a/debian/patches/series b/debian/patches/series
index b251f24..22efbc2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1 @@
-remove-debug-print.patch
-add-more-ellipses.patch
-tox-py3.patch
 tox-sitepackages.patch
-py34.patch
diff --git a/debian/patches/tox-py3.patch b/debian/patches/tox-py3.patch
deleted file mode 100644
index 448b27f..0000000
--- a/debian/patches/tox-py3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From ba6da74544fdd4f6f4cfba7cafe0164932075cb8 Mon Sep 17 00:00:00 2001
-From: Colin Watson <cjwatson@debian.org>
-Date: Wed, 26 Feb 2014 15:41:24 +0000
-Subject: Add a "py3" tox test environment for /usr/bin/python3.
-
-Author: Colin Watson <cjwatson@debian.org>
-Forwarded: https://github.com/ionelmc/python-tblib/pull/2
-Last-Update: 2014-03-04
-
-Patch-Name: tox-py3.patch
----
- tox.ini | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/tox.ini b/tox.ini
-index f1de1e1..080bc13 100644
---- a/tox.ini
-+++ b/tox.ini
-@@ -2,6 +2,7 @@
- envlist =
-     py,
-     py2.7,
-+    py3,
-     py3.2,
-     py3.3,
-     pypy
-@@ -28,6 +29,10 @@ deps =
- basepython = python2.7
- deps =
-     {[base]deps}
-+[testenv:py3]
-+basepython = python3
-+deps =
-+    {[base]deps}
- [testenv:py3.2]
- basepython = python3.2
- deps =
diff --git a/debian/patches/tox-sitepackages.patch b/debian/patches/tox-sitepackages.patch
index ebe4c33..6c74b80 100644
--- a/debian/patches/tox-sitepackages.patch
+++ b/debian/patches/tox-sitepackages.patch
@@ -1,4 +1,4 @@
-From 65769c724dac08f094f2e6752c2080dceef00f94 Mon Sep 17 00:00:00 2001
+From 10cf887b17a033709e8ad5596dc68dd91fe17116 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.
@@ -15,10 +15,10 @@ Patch-Name: tox-sitepackages.patch
  1 file changed, 1 insertion(+)
 
 diff --git a/tox.ini b/tox.ini
-index 080bc13..85055d1 100644
+index 81b6a64..c77127f 100644
 --- a/tox.ini
 +++ b/tox.ini
-@@ -13,6 +13,7 @@ setenv =
+@@ -14,6 +14,7 @@ setenv =
      WITH_COVERAGE = x
      PYTHONUNBUFFERED = x
  commands = {envpython} {toxinidir}/tests/test_tblib.py