[Python-modules-commits] [python-pynzb] 02/11: merge patched into master

[Carl Suster]

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

arcresu-guest pushed a commit to branch master
in repository python-pynzb.

commit f534872dc46f65357e970e2c328cdce1b24f4dc8
Merge: e0f6254 0102791
Author: Carl Suster <carl at contraflo.ws>
Date:   Wed Jan 11 22:24:13 2017 +1100

    merge patched into master

 debian/.git-dpm                                     |  4 ++--
 .../patches/0002-enable-use_2to3-in-setup.py.patch  | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 setup.py                                            |  3 ++-
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index b634411,0000000..f563988
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
- 0a5a3e9b44be1ec1a150c027a07754a53f039189
- 0a5a3e9b44be1ec1a150c027a07754a53f039189
++01027917584eafdf4228bf0590123dfd47fe14a8
++01027917584eafdf4228bf0590123dfd47fe14a8
 +124074ce42e5d83c71e028a8757afb392cc96548
 +124074ce42e5d83c71e028a8757afb392cc96548
 +python-pynzb_0.1.0.orig.tar.gz
 +cf39d7f32c15f281ab81b0043b4068d101a2cd1f
 +5598
diff --cc debian/patches/0002-enable-use_2to3-in-setup.py.patch
index 0000000,0000000..16f2a85
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-enable-use_2to3-in-setup.py.patch
@@@ -1,0 -1,0 +1,21 @@@
++From 01027917584eafdf4228bf0590123dfd47fe14a8 Mon Sep 17 00:00:00 2001
++From: Carl Suster <carl at contraflo.ws>
++Date: Wed, 11 Jan 2017 22:23:32 +1100
++Subject: enable use_2to3 in setup.py
++
++---
++ setup.py | 3 ++-
++ 1 file changed, 2 insertions(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index 0fd9d51..62f1ff3 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -168,4 +168,5 @@ setup(
++     include_package_data=True,
++     zip_safe=False,
++     install_requires=['setuptools'],
++-)
++\ No newline at end of file
+++    use_2to3=True,
+++)
diff --cc debian/patches/series
index 6e8e20b,0000000..14592c9
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +0001-set-message_id-properly-in-expat-parser.patch
++0002-enable-use_2to3-in-setup.py.patch

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