diff options
| author | Carl Suster <carl@contraflo.ws> | 2017-01-11 22:24:13 +1100 |
|---|---|---|
| committer | Carl Suster <carl@contraflo.ws> | 2017-01-11 22:24:13 +1100 |
| commit | f534872dc46f65357e970e2c328cdce1b24f4dc8 (patch) | |
| tree | 4c9ca7884027901952c91953c5ec14ff8a570c2c | |
| parent | e0f62544412feef9fececf736685d280a0ec95e0 (diff) | |
| parent | 01027917584eafdf4228bf0590123dfd47fe14a8 (diff) | |
merge patched into master
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/0002-enable-use_2to3-in-setup.py.patch | 21 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rw-r--r-- | setup.py | 3 |
4 files changed, 26 insertions, 3 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index b634411..f563988 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -0a5a3e9b44be1ec1a150c027a07754a53f039189 -0a5a3e9b44be1ec1a150c027a07754a53f039189 +01027917584eafdf4228bf0590123dfd47fe14a8 +01027917584eafdf4228bf0590123dfd47fe14a8 124074ce42e5d83c71e028a8757afb392cc96548 124074ce42e5d83c71e028a8757afb392cc96548 python-pynzb_0.1.0.orig.tar.gz diff --git a/debian/patches/0002-enable-use_2to3-in-setup.py.patch b/debian/patches/0002-enable-use_2to3-in-setup.py.patch new file mode 100644 index 0000000..16f2a85 --- /dev/null +++ b/debian/patches/0002-enable-use_2to3-in-setup.py.patch @@ -0,0 +1,21 @@ +From 01027917584eafdf4228bf0590123dfd47fe14a8 Mon Sep 17 00:00:00 2001 +From: Carl Suster <carl@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 --git a/debian/patches/series b/debian/patches/series index 6e8e20b..14592c9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ 0001-set-message_id-properly-in-expat-parser.patch +0002-enable-use_2to3-in-setup.py.patch @@ -168,4 +168,5 @@ setup( include_package_data=True, zip_safe=False, install_requires=['setuptools'], -)
\ No newline at end of file + use_2to3=True, +) |