From 39a8188b4a0b9ec26c4240df9ba557768ece4c48 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 3 Aug 2020 14:43:37 +0200
Subject: Add support for Ubuntu 20.04 (TODO: systemd)

---
 core/modules/cups/module.conf.ubuntu    | 18 +++++++++++-------
 core/modules/cups/module.conf.ubuntu.18 | 15 ---------------
 2 files changed, 11 insertions(+), 22 deletions(-)
 delete mode 100644 core/modules/cups/module.conf.ubuntu.18

(limited to 'core/modules/cups')

diff --git a/core/modules/cups/module.conf.ubuntu b/core/modules/cups/module.conf.ubuntu
index 5c4d995a..2aa8b5ed 100644
--- a/core/modules/cups/module.conf.ubuntu
+++ b/core/modules/cups/module.conf.ubuntu
@@ -1,11 +1,15 @@
 #!/bin/bash
-REQUIRED_INSTALLED_PACKAGES="
-		cups
-		ghostscript-cups
-		foomatic-filters
-"
 REQUIRED_CONTENT_PACKAGES="
 		cups
-		ghostscript-cups
-		foomatic-filters
+		cups-daemon
+		cups-filters
+		cups-core-drivers
+		cups-filters-core-drivers
+		ghostscript
+		hplip
+		libgs9-common
+"
+REQUIRED_DIRECTORIES+="
+	/usr/share/color
 "
+
diff --git a/core/modules/cups/module.conf.ubuntu.18 b/core/modules/cups/module.conf.ubuntu.18
deleted file mode 100644
index 2aa8b5ed..00000000
--- a/core/modules/cups/module.conf.ubuntu.18
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-REQUIRED_CONTENT_PACKAGES="
-		cups
-		cups-daemon
-		cups-filters
-		cups-core-drivers
-		cups-filters-core-drivers
-		ghostscript
-		hplip
-		libgs9-common
-"
-REQUIRED_DIRECTORIES+="
-	/usr/share/color
-"
-
-- 
cgit v1.2.3-55-g7522