From b9d6cb5ba5e3b7e08936e3d15d7a3237f0bf977e Mon Sep 17 00:00:00 2001
From: Christian Kieschnick <christian.kieschnick@hicknhack-software.com>
Date: Mon, 1 Oct 2018 10:27:14 -0400
Subject: [PATCH] Update ci files

* Removed libquazip-headers from trusty ci images
Trusty does not provide libquazip-headers (they are part of
libquazip-dev most likely)
---
 Dockerfile           | 3 +--
 INSTALL.md           | 1 +
 ci/trusty/Dockerfile | 3 +--
 snapcraft.yaml       | 2 ++
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 95c3ed99fa..e7b346d1a6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -53,8 +53,7 @@ RUN set -x \
         zlib1g-dev \
         libxi-dev \
         libxtst-dev \
-	libquazip5-headers \
-	libquazip5-dev \
+        libquazip-dev \
         mesa-common-dev \
         libyubikey-dev \
         libykpers-1-dev
diff --git a/INSTALL.md b/INSTALL.md
index c132639132..5ef8198998 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -27,6 +27,7 @@ The following libraries are required:
 * libxi, libxtst, qtx11extras (optional for auto-type on X11)
 * libsodium (>= 1.0.12, optional for KeePassXC-Browser support)
 * libargon2
+* libquazip5
 
 Prepare the Building Environment
 ================================
diff --git a/ci/trusty/Dockerfile b/ci/trusty/Dockerfile
index 55c604e755..f274c67b84 100644
--- a/ci/trusty/Dockerfile
+++ b/ci/trusty/Dockerfile
@@ -52,8 +52,7 @@ RUN set -x \
         zlib1g-dev \
         libyubikey-dev \
         libykpers-1-dev \
-        libquazip5-headers \
-        libquazip5-dev \
+        libquazip-dev \
         libxi-dev \
         libxtst-dev \
         xvfb
diff --git a/snapcraft.yaml b/snapcraft.yaml
index d9321d7485..ad3dd18d6e 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -48,6 +48,8 @@ parts:
       - libykpers-1-dev
       - libsodium-dev
       - libargon2-0-dev
+      - libquazip5-dev
+      - libquazip5-headers
     stage-packages:
       - dbus
       - qttranslations5-l10n # common translations