From 85bab4ebda008936fab76bb314c940261a0e0ed4 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Thu, 4 Sep 2014 15:27:53 +0200
Subject: [cups] Fix ghostscript dependencies for Ubuntu 14.04

---
 remote/modules/cups/module.build          | 5 +++++
 remote/modules/cups/module.conf           | 2 ++
 remote/modules/cups/module.conf.ubuntu.14 | 2 ++
 3 files changed, 9 insertions(+)

(limited to 'remote/modules')

diff --git a/remote/modules/cups/module.build b/remote/modules/cups/module.build
index 0238f1bd..0128c3e6 100644
--- a/remote/modules/cups/module.build
+++ b/remote/modules/cups/module.build
@@ -5,12 +5,17 @@ fetch_source() {
 }
 
 build() {
+	local COPYLIST file
 	COPYLIST="list_dpkg_output"
 	[ -e "$COPYLIST" ] && rm "$COPYLIST"
 
 	list_packet_files >> "$COPYLIST"
 	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
 
+	# cups insists on overriding PATH, so we need to fix any scripts
+	for file in "${MODULE_BUILD_DIR}"/usr/lib/cups/{filter,backend}/*; do
+		head -n 1 "$file" | grep -q '^#!/' && sed -i '/^#!\//a . \/etc\/environment' "$file"
+	done
 }
 
 post_copy() {
diff --git a/remote/modules/cups/module.conf b/remote/modules/cups/module.conf
index 2b904358..513389b5 100644
--- a/remote/modules/cups/module.conf
+++ b/remote/modules/cups/module.conf
@@ -6,5 +6,7 @@ REQUIRED_BINARIES="
 REQUIRED_DIRECTORIES="
 	/usr/lib/cups/
 	/usr/share/cups/
+	/usr/share/ghostscript/
+	/usr/bin/
 "
 REQUIRED_FILES=""
diff --git a/remote/modules/cups/module.conf.ubuntu.14 b/remote/modules/cups/module.conf.ubuntu.14
index 23dcf226..23207e5b 100644
--- a/remote/modules/cups/module.conf.ubuntu.14
+++ b/remote/modules/cups/module.conf.ubuntu.14
@@ -5,6 +5,7 @@ REQUIRED_INSTALLED_PACKAGES="
 		cups-core-drivers
 		cups-filters-core-drivers
 		ghostscript
+		libgs9-common
 "
 REQUIRED_CONTENT_PACKAGES="
 		cups
@@ -13,4 +14,5 @@ REQUIRED_CONTENT_PACKAGES="
 		cups-core-drivers
 		cups-filters-core-drivers
 		ghostscript
+		libgs9-common
 "
-- 
cgit v1.2.3-55-g7522