From ab5bfc6067b788e6b795923d4f6be2bd007f6ebd Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 8 Oct 2020 10:08:09 +0200
Subject: [PATCH] purge all references to aapt and a specific JDK version

---
 .gitlab-ci.yml | 1 -
 .travis.yml    | 1 -
 README.md      | 5 ++---
 debian/control | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d57016..841ae39 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -28,7 +28,6 @@ variables:
 - *apt-template
 - apt-get install
       curl
-      default-jre-headless
       git
       libmagic1
       python3-bleach
diff --git a/.travis.yml b/.travis.yml
index 03cce22..80774b7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,6 @@ addons:
     - pep8
     - libjpeg-dev
     - zlib1g-dev
-    - aapt
     - fdroidserver
     - npm
 
diff --git a/README.md b/README.md
index c4b1a38..5b7c78d 100644
--- a/README.md
+++ b/README.md
@@ -55,14 +55,13 @@ On Debian, you can simply run this:
 
 * `keytool` from Java Runtime Environment (JRE)
 * `apksigner` or alternatively jarsigner from Java Development Kit (JDK)
-* Android Asset Packaging Tool (`aapt`)
 * `libmagic` for mime-type detection
 * `rsync` to publish repositories
 * `git` to publish repositories to git mirrors
 
 On Debian, you can simply run this:
 
-`sudo apt install openjdk-8-jre-headless apksigner aapt libmagic1 rsync git`
+`sudo apt install default-jre-headless apksigner libmagic1 rsync git`
 
 ### Install into virtual environment
 
@@ -89,7 +88,7 @@ try to install `libssl-dev` with `apt install libssl-dev`.
 
 If starting repomaker fail with the error ```Could not find `keytool` program.```,
 you might run into [this known issue](https://gitlab.com/fdroid/repomaker/issues/192).
-Try if `apt install openjdk-8-jdk-headless` fixes it for you.
+Try if `apt install default-jdk-headless` fixes it for you.
 
 If the graphical user interface fails to start,
 you can try running `repomaker-server` and `repomaker-tasks`.
diff --git a/debian/control b/debian/control
index 8317d5a..09a04f7 100644
--- a/debian/control
+++ b/debian/control
@@ -18,7 +18,6 @@ Package: repomaker
 Architecture: all
 Depends: ${misc:Depends},
          ${python3:Depends},
-         aapt,
          apksigner,
          fdroidserver,
          fonts-materialdesignicons-webfont,