From 4ada6b33ccce63587a9e2cfff23b91a86ecd0b93 Mon Sep 17 00:00:00 2001
From: Nick White <git@njw.name>
Date: Mon, 2 Sep 2019 14:45:54 +0100
Subject: Switch to apt to install dependencies, and the debian package names,
 for lept and tess

apt is needed as package: expects aptitude, which we don't use.
---
 roles/tesseractor/tasks/leptonica.yml | 12 +++---------
 roles/tesseractor/tasks/tesseract.yml | 12 +++---------
 2 files changed, 6 insertions(+), 18 deletions(-)

(limited to 'roles/tesseractor')

diff --git a/roles/tesseractor/tasks/leptonica.yml b/roles/tesseractor/tasks/leptonica.yml
index 1c0d010..2aad7a7 100644
--- a/roles/tesseractor/tasks/leptonica.yml
+++ b/roles/tesseractor/tasks/leptonica.yml
@@ -2,15 +2,9 @@
 # Installs leptonica
 
 - name: Install leptonica dependencies
-  package: name={{ item }} state=present
-  with_items:
-    - gcc-c++
-    - git
-    - libjpeg-turbo-devel
-    - libpng12-devel
-    - libtiff-devel
-    - make
-    - zlib-devel
+  apt:
+    name: ['g++', 'git', 'libjpeg62-turbo-dev', 'libpng-dev', 'libtiff-dev', 'make', 'zlib1g-dev']
+    state: present
 
 - name: Clone leptonica repository
   git:
diff --git a/roles/tesseractor/tasks/tesseract.yml b/roles/tesseractor/tasks/tesseract.yml
index 22816ba..802e30a 100644
--- a/roles/tesseractor/tasks/tesseract.yml
+++ b/roles/tesseractor/tasks/tesseract.yml
@@ -2,15 +2,9 @@
 # Installs tesseract
 
 - name: Install tesseract dependencies
-  package: name={{ item }} state=present
-  with_items:
-    - gcc-c++
-    - git
-    - libjpeg-turbo-devel
-    - libpng12-devel
-    - libtiff-devel
-    - make
-    - zlib-devel
+  apt:
+    name: ['g++', 'git', 'libjpeg62-turbo-dev', 'libpng-dev', 'libtiff-dev', 'make', 'zlib1g-dev']
+    state: present
 
 - name: Clone tesseract repository
   git:
-- 
cgit v1.2.1-24-ge1ad