refactor(dependencies): install gsfonts on all debian based distros

ghostscript isn't needed on debian, but at least gsfonts is also needed on ubuntu.
saltstack-formulas · Nov 3, 2020 · 0423466 · 0423466
1 parent 0ea714d
commit 0423466
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 19 deletions.
diff --git a/diaspora/osfamilymap.yaml b/diaspora/osfamilymap.yaml
@@ -22,7 +22,7 @@ Debian:
     - libxslt1-dev
     - imagemagick
     - libmagickwand-dev
-    - ghostscript
+    - gsfonts
     - nodejs
     - tzdata
     - libjemalloc2

diff --git a/diaspora/osfingermap.yaml b/diaspora/osfingermap.yaml
@@ -24,7 +24,7 @@ Debian-9:
     - libxslt1-dev
     - imagemagick
     - libmagickwand-dev
-    - ghostscript
+    - gsfonts
     - nodejs
     - tzdata
     - libjemalloc1
@@ -44,6 +44,7 @@ Ubuntu-18.04:
     - libxslt1-dev
     - imagemagick
     - libmagickwand-dev
+    - gsfonts
     - nodejs
     - tzdata
     - libjemalloc1

diff --git a/diaspora/osmap.yaml b/diaspora/osmap.yaml
@@ -11,21 +11,7 @@
 # osmap: {}
 ---
 # os_family: Debian
-Ubuntu:
-  dependencies:
-    - build-essential
-    - git
-    - curl
-    - libcurl4-openssl-dev
-    - libidn11-dev
-    - libssl-dev
-    - libxml2-dev
-    - libxslt1-dev
-    - imagemagick
-    - libmagickwand-dev
-    - nodejs
-    - tzdata
-    - libjemalloc2
+Ubuntu: {}
 
 # os_family: RedHat
 CentOS: {}
diff --git a/test/integration/_mapdata/files/_mapdata/debian-10.yaml b/test/integration/_mapdata/files/_mapdata/debian-10.yaml
@@ -27,7 +27,7 @@ dependencies:
 - libxslt1-dev
 - imagemagick
 - libmagickwand-dev
-- ghostscript
+- gsfonts
 - nodejs
 - tzdata
 - libjemalloc2

diff --git a/test/integration/_mapdata/files/_mapdata/debian-9.yaml b/test/integration/_mapdata/files/_mapdata/debian-9.yaml
@@ -27,7 +27,7 @@ dependencies:
 - libxslt1-dev
 - imagemagick
 - libmagickwand-dev
-- ghostscript
+- gsfonts
 - nodejs
 - tzdata
 - libjemalloc1

diff --git a/test/integration/_mapdata/files/_mapdata/ubuntu-18.yaml b/test/integration/_mapdata/files/_mapdata/ubuntu-18.yaml
@@ -27,6 +27,7 @@ dependencies:
 - libxslt1-dev
 - imagemagick
 - libmagickwand-dev
+- gsfonts
 - nodejs
 - tzdata
 - libjemalloc1

diff --git a/test/integration/_mapdata/files/_mapdata/ubuntu-20.yaml b/test/integration/_mapdata/files/_mapdata/ubuntu-20.yaml
@@ -27,6 +27,7 @@ dependencies:
 - libxslt1-dev
 - imagemagick
 - libmagickwand-dev
+- gsfonts
 - nodejs
 - tzdata
 - libjemalloc2