From 1ed5b587c89ba426f1e17611115274dba1895c05 Mon Sep 17 00:00:00 2001 From: Rick Elrod Date: Tue, 26 May 2020 18:13:33 -0500 Subject: [PATCH] More fixes for debian ansible-base builds (#69714) Change: Fix files that got missed in 04ec72160 Test Plan: Local Ubuntu 20.04 VM Signed-off-by: Rick Elrod --- packaging/debian/{ansible.dirs => ansible-base.dirs} | 2 +- packaging/debian/{ansible.install => ansible-base.install} | 4 ++-- packaging/debian/control | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename packaging/debian/{ansible.dirs => ansible-base.dirs} (54%) rename packaging/debian/{ansible.install => ansible-base.install} (77%) diff --git a/packaging/debian/ansible.dirs b/packaging/debian/ansible-base.dirs similarity index 54% rename from packaging/debian/ansible.dirs rename to packaging/debian/ansible-base.dirs index 06520214127..fba15a432f1 100644 --- a/packaging/debian/ansible.dirs +++ b/packaging/debian/ansible-base.dirs @@ -1,4 +1,4 @@ etc/ansible etc/ansible/roles -usr/lib/python2.7/dist-packages/ansible +usr/lib/python3/dist-packages/ansible usr/share/ansible diff --git a/packaging/debian/ansible.install b/packaging/debian/ansible-base.install similarity index 77% rename from packaging/debian/ansible.install rename to packaging/debian/ansible-base.install index 1866ba4601e..d2dac7c1a57 100644 --- a/packaging/debian/ansible.install +++ b/packaging/debian/ansible-base.install @@ -11,5 +11,5 @@ debian/tmp/usr/bin/ansible-pull usr/bin debian/tmp/usr/bin/ansible-playbook usr/bin debian/tmp/usr/bin/ansible usr/bin examples/ansible.cfg etc/ansible -debian/tmp/usr/lib/python2.7/dist-packages/ansible usr/lib/python2.7/dist-packages -debian/tmp/usr/lib/python2.7/dist-packages/ansible-*.egg-info +debian/tmp/usr/lib/python3/dist-packages/ansible usr/lib/python3/dist-packages +debian/tmp/usr/lib/python3/dist-packages/ansible_*.egg-info diff --git a/packaging/debian/control b/packaging/debian/control index c02f2c74aba..7a96700f09b 100644 --- a/packaging/debian/control +++ b/packaging/debian/control @@ -3,7 +3,7 @@ Section: admin Priority: optional Standards-Version: 3.9.3 Maintainer: Ansible, Inc. -Build-Depends: cdbs, debhelper (>= 5.0.0), python3-docutils, python3, dh-python | python-support, python3-setuptools, lsb-release +Build-Depends: cdbs, debhelper (>= 5.0.0), python3-docutils, python3, dh-python | python-support, python3-setuptools, lsb-release python3-straight.plugin python3-packaging python3-jinja2 Homepage: https://github.com/ansible/ansible/ Package: ansible-base