summaryrefslogtreecommitdiff
path: root/packaging
diff options
context:
space:
mode:
authorRick Elrod <rick@elrod.me>2020-05-26 18:13:33 -0500
committerGitHub <noreply@github.com>2020-05-26 18:13:33 -0500
commit1ed5b587c89ba426f1e17611115274dba1895c05 (patch)
tree5394d84113bdcff859c4230935076e2681756695 /packaging
parentfa81cc6a0c44640b54e5513720d7413a762618e1 (diff)
downloadansible-1ed5b587c89ba426f1e17611115274dba1895c05.tar.gz
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 <rick@elrod.me>
Diffstat (limited to 'packaging')
-rw-r--r--packaging/debian/ansible-base.dirs (renamed from packaging/debian/ansible.dirs)2
-rw-r--r--packaging/debian/ansible-base.install (renamed from packaging/debian/ansible.install)4
-rw-r--r--packaging/debian/control2
3 files changed, 4 insertions, 4 deletions
diff --git a/packaging/debian/ansible.dirs b/packaging/debian/ansible-base.dirs
index 0652021412..fba15a432f 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
index 1866ba4601..d2dac7c1a5 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 c02f2c74ab..7a96700f09 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. <info@ansible.com>
-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