Merging debian version 2.16.5-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 45 deletions

diff --git a/debian/patches/0005-use-py3.patch b/debian/patches/0005-use-py3.patch
index 873918f..0db80e1 100644
--- a/debian/patches/0005-use-py3.patch
+++ b/debian/patches/0005-use-py3.patch
@@ -40,21 +40,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  # -*- coding: utf-8 -*-
  
  
---- a/test/integration/targets/group/files/gidget.py
-+++ b/test/integration/targets/group/files/gidget.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- from __future__ import (absolute_import, division, print_function)
- __metaclass__ = type
---- a/test/integration/targets/module_utils/module_utils/foo.py
-+++ b/test/integration/targets/module_utils/module_utils/foo.py
-@@ -1,3 +1,3 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- foo = "FOO FROM foo.py"
 --- a/test/integration/targets/module_utils/module_utils/sub/bam.py
 +++ b/test/integration/targets/module_utils/module_utils/sub/bam.py
 @@ -1,3 +1,3 @@
@@ -69,20 +54,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
 +#!/usr/bin/env python3
  
  bam = "BAM FROM sub/bam/bam.py"
---- a/test/integration/targets/module_utils/module_utils/sub/bar/bam.py
-+++ b/test/integration/targets/module_utils/module_utils/sub/bar/bam.py
-@@ -1,3 +1,3 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- bam = "BAM FROM sub/bar/bam.py"
---- a/test/integration/targets/module_utils/module_utils/sub/bar/bar.py
-+++ b/test/integration/targets/module_utils/module_utils/sub/bar/bar.py
-@@ -1,3 +1,3 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- bar = "BAR FROM sub/bar/bar.py"
 --- a/test/integration/targets/pause/test-pause.py
 +++ b/test/integration/targets/pause/test-pause.py
 @@ -1,4 +1,4 @@
@@ -218,22 +189,6 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
                     assert set(inv['_meta']['hostvars']['test_host']['departments']) == set(['paris'])"
  
  export ANSIBLE_CACHE_PLUGINS=cache_plugins/
---- a/test/units/modules/test_async_wrapper.py
-+++ b/test/units/modules/test_async_wrapper.py
-@@ -22,11 +22,11 @@
-     def test_run_module(self, monkeypatch):
- 
-         def mock_get_interpreter(module_path):
--            return ['/usr/bin/python']
-+            return ['/usr/bin/python3']
- 
-         module_result = {'rc': 0}
-         module_lines = [
--            '#!/usr/bin/python',
-+            '#!/usr/bin/python3',
-             'import sys',
-             'sys.stderr.write("stderr stuff")',
-             "print('%s')" % json.dumps(module_result)
 --- a/bin/ansible-test
 +++ b/bin/ansible-test
 @@ -1,4 +1,4 @@