Updates based on review feedback

securedrop-app-code control file is now a template. We don't
need --setuptools in rules file as by default virtualenv will
install the latest setuptools.

Also clean changelog for Focal.

install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/defaults/main.yml

@@ -51,8 +51,6 @@ securedrop_python_version: "{{ '3.8' if securedrop_build_focal_support else '3.5
 securedrop_venv_site_packages: "{{ securedrop_venv }}/lib/python{{ securedrop_python_version }}/site-packages"
 
 securedrop_app_focal_files:
-  - src: control-focal
-    dest: "{{ securedrop_app_code_prep_dir }}/debian/control"
   - src: rules-focal
     dest: "{{ securedrop_app_code_prep_dir }}/debian/rules"
   - src: securedrop-app-code.triggers-focal

install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/files/changelog-focal

@@ -3,81 +3,3 @@ securedrop-app-code (1.5.0~rc1+focal) focal; urgency=medium
   * 
 
  -- SecureDrop Team <[email protected]>  Thu, 18 Jun 2020 21:58:23 +0000
-
-securedrop-app-code (1.4.0+xenial) xenial; urgency=medium
-
-  * See changelog.md 
-
- -- SecureDrop Team <[email protected]>  Wed, 17 Jun 2020 21:35:57 +0000
-
-securedrop-app-code (1.3.0+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Tue, 12 May 2020 18:37:42 +0000
-
-securedrop-app-code (1.2.2+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Fri, 13 Mar 2020 19:43:29 +0000
-
-securedrop-app-code (1.2.1+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Wed, 19 Feb 2020 14:40:43 +0000
-
-securedrop-app-code (1.2.0+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Wed, 20 Nov 2019 16:48:41 +0000
-
-securedrop-app-code (1.1.0+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Mon, 21 Oct 2019 18:09:35 +0000
-
-securedrop-app-code (1.0.0+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Tue, 17 Sep 2019 23:22:22 +0530
-
-securedrop-app-code (0.14.0+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Wed, 10 Jul 2019 15:11:49 +0000
-
-securedrop-app-code (0.13.1+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Tue, 18 Jun 2019 13:48:12 +0000
-
-securedrop-app-code (0.13.0+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Wed, 29 May 2019 20:45:21 +0000
-
-securedrop-app-code (0.12.2+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Thu, 25 Apr 2019 17:54:15 +0000
-
-securedrop-app-code (0.12.1+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Wed, 20 Mar 2019 20:20:40 +0000
-
-securedrop-app-code (0.12.0+xenial) xenial; urgency=medium
-
-  * See changelog.md
-
- -- SecureDrop Team <[email protected]>  Wed, 27 Feb 2019 00:37:02 +0000

install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/tasks/main.yml

@@ -64,6 +64,11 @@
   with_items: "{{ securedrop_app_focal_files }}"
   when: securedrop_build_focal_support
 
+- name: Create the control file based on distribution
+  template:
+    src: "control.j2"
+    dest: "{{ securedrop_app_code_prep_dir }}/debian/control"
+
 - name: Create lib/systemd/services directory in prep directory
   file:
     state: directory

install_files/securedrop-app-code/debian/control → install_files/ansible-base/roles/build-securedrop-app-code-deb-pkg/templates/control.j2

@@ -5,11 +5,14 @@ Maintainer: SecureDrop Team <[email protected]>
 Homepage: https://securedrop.org
 Build-Depends: debhelper (>= 9), dh-python, python3-all, python3-setuptools, dh-systemd, dh-virtualenv
 Standards-Version: 3.9.8
-X-Python3-Version: >= 3.5
 
 Package: securedrop-app-code
 Architecture: amd64
 Conflicts: libapache2-mod-wsgi,supervisor
 Replaces: libapache2-mod-wsgi,supervisor
+{% if securedrop_build_focal_support %}
+Depends: ${dist:Depends}, ${misc:Depends}, ${python3:Depends}, apache2, apparmor-utils, coreutils, gnupg2, haveged, libapache2-mod-xsendfile, libpython3.8, paxctld, python3, redis-server, securedrop-config, securedrop-keyring, sqlite3
+{% else %}
 Depends: ${dist:Depends}, ${misc:Depends}, ${python3:Depends}, apache2, apparmor-utils, coreutils, gnupg2, haveged, libapache2-mod-xsendfile, libpython3.5, paxctld, python3 (>= 3.5), python3 (<< 3.6), redis-server, securedrop-config, securedrop-keyring, sqlite3
+{% endif %}
 Description: SecureDrop application code, dependencies, Apache configuration, systemd services, and AppArmor profiles. This package will put the AppArmor profiles in enforce mode.