From 7095d0d2624f0b1b3d1f8cb8c985362f52232685 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 27 May 2014 15:20:15 +0200
Subject: [printergui] ghostscript binary fishing

---
 remote/modules/printergui/module.conf.ubuntu | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'remote/modules/printergui')

diff --git a/remote/modules/printergui/module.conf.ubuntu b/remote/modules/printergui/module.conf.ubuntu
index 2f679912..3099f190 100644
--- a/remote/modules/printergui/module.conf.ubuntu
+++ b/remote/modules/printergui/module.conf.ubuntu
@@ -1,7 +1,11 @@
 REQUIRED_INSTALLED_PACKAGES="
-libcups2-dev
-libqt4-dev
+	libcups2-dev
+	libqt4-dev
+	ghostscript
 "
 REQUIRED_CONTENT_PACKAGES="
-libcups2-dev
+	libcups2-dev
+"
+REQUIRED_BINARIES+="
+	gs
 "
-- 
cgit v1.2.3-55-g7522


From aac4359320246c4555deeb6f9289f23e9655afa1 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 27 May 2014 15:24:53 +0200
Subject: [printergui] forgot to explicitly copy 'gs' to build dir

---
 remote/modules/printergui/module.build | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'remote/modules/printergui')

diff --git a/remote/modules/printergui/module.build b/remote/modules/printergui/module.build
index 869e8716..ac8ab7d1 100644
--- a/remote/modules/printergui/module.build
+++ b/remote/modules/printergui/module.build
@@ -21,6 +21,16 @@ build() {
 	pinfo "Running make"
 	make || perror "'make' failed."
 	chmod 0700 "$DESTDIR/printpwgui"	# So picky cupsd won't drop privileges to lp
+
+	# fetch ghostscript binary
+	local BIN_LOCATION="$(which gs)"
+	[ ! -z "${BIN_LOCATION}" ] && BIN_LOCATION=$(readlink -f "$BIN_LOCATION")
+	if [ ! -z "${BIN_LOCATION}" -a -e "${BIN_LOCATION}" ]; then
+		tarcopy "${BIN_LOCATION}" "${MODULE_BUILD_DIR}"
+	else
+		perror "'gs' not found on the system! Please install ghostscript."
+	fi
+
 }
 post_copy() {
 	:
-- 
cgit v1.2.3-55-g7522


From b0c98492cf12ca81874b7f2c6b2684f02db78cf4 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 27 May 2014 15:51:58 +0200
Subject: wrong packages

---
 remote/modules/printergui/module.build       | 9 ---------
 remote/modules/printergui/module.conf.ubuntu | 6 ++----
 2 files changed, 2 insertions(+), 13 deletions(-)

(limited to 'remote/modules/printergui')

diff --git a/remote/modules/printergui/module.build b/remote/modules/printergui/module.build
index ac8ab7d1..4b1b663f 100644
--- a/remote/modules/printergui/module.build
+++ b/remote/modules/printergui/module.build
@@ -22,15 +22,6 @@ build() {
 	make || perror "'make' failed."
 	chmod 0700 "$DESTDIR/printpwgui"	# So picky cupsd won't drop privileges to lp
 
-	# fetch ghostscript binary
-	local BIN_LOCATION="$(which gs)"
-	[ ! -z "${BIN_LOCATION}" ] && BIN_LOCATION=$(readlink -f "$BIN_LOCATION")
-	if [ ! -z "${BIN_LOCATION}" -a -e "${BIN_LOCATION}" ]; then
-		tarcopy "${BIN_LOCATION}" "${MODULE_BUILD_DIR}"
-	else
-		perror "'gs' not found on the system! Please install ghostscript."
-	fi
-
 }
 post_copy() {
 	:
diff --git a/remote/modules/printergui/module.conf.ubuntu b/remote/modules/printergui/module.conf.ubuntu
index 3099f190..af38a728 100644
--- a/remote/modules/printergui/module.conf.ubuntu
+++ b/remote/modules/printergui/module.conf.ubuntu
@@ -1,11 +1,9 @@
 REQUIRED_INSTALLED_PACKAGES="
 	libcups2-dev
 	libqt4-dev
-	ghostscript
+	cups-filters-core-drivers
 "
 REQUIRED_CONTENT_PACKAGES="
 	libcups2-dev
-"
-REQUIRED_BINARIES+="
-	gs
+	cups-filters-core-drivers
 "
-- 
cgit v1.2.3-55-g7522


From 6d7d28048a3bf8fe8409dad2b11552fabf1687ec Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 27 May 2014 16:39:48 +0200
Subject: [printergui] REQUIRED_CONTENT_PACKAGES fetching

---
 remote/modules/printergui/module.build | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'remote/modules/printergui')

diff --git a/remote/modules/printergui/module.build b/remote/modules/printergui/module.build
index 4b1b663f..e7d3864a 100644
--- a/remote/modules/printergui/module.build
+++ b/remote/modules/printergui/module.build
@@ -22,6 +22,13 @@ build() {
 	make || perror "'make' failed."
 	chmod 0700 "$DESTDIR/printpwgui"	# So picky cupsd won't drop privileges to lp
 
+	# get packet files
+	COPYLIST="list_dpkg_output"
+	[ -e "$COPYLIST" ] && rm "$COPYLIST"
+
+	list_packet_files >> "$COPYLIST"
+	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
+
 }
 post_copy() {
 	:
-- 
cgit v1.2.3-55-g7522


From 4097e6ad51e44d848998dd1f5e737dd474406057 Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Tue, 27 May 2014 16:44:53 +0200
Subject: moved cups filter stuff to cups module :) forgot there was one...

---
 remote/modules/cups/module.conf.ubuntu.14.04 | 2 ++
 remote/modules/printergui/module.build       | 7 -------
 remote/modules/printergui/module.conf.ubuntu | 2 --
 3 files changed, 2 insertions(+), 9 deletions(-)

(limited to 'remote/modules/printergui')

diff --git a/remote/modules/cups/module.conf.ubuntu.14.04 b/remote/modules/cups/module.conf.ubuntu.14.04
index a46e5d3d..80a530bb 100644
--- a/remote/modules/cups/module.conf.ubuntu.14.04
+++ b/remote/modules/cups/module.conf.ubuntu.14.04
@@ -3,10 +3,12 @@ REQUIRED_INSTALLED_PACKAGES="
 		cups-daemon
 		cups-filters
 		cups-core-drivers
+		cups-filters-core-drivers
 "
 REQUIRED_CONTENT_PACKAGES="
 		cups
 		cups-daemon
 		cups-filters
 		cups-core-drivers
+		cups-filters-core-drivers
 "
diff --git a/remote/modules/printergui/module.build b/remote/modules/printergui/module.build
index e7d3864a..4b1b663f 100644
--- a/remote/modules/printergui/module.build
+++ b/remote/modules/printergui/module.build
@@ -22,13 +22,6 @@ build() {
 	make || perror "'make' failed."
 	chmod 0700 "$DESTDIR/printpwgui"	# So picky cupsd won't drop privileges to lp
 
-	# get packet files
-	COPYLIST="list_dpkg_output"
-	[ -e "$COPYLIST" ] && rm "$COPYLIST"
-
-	list_packet_files >> "$COPYLIST"
-	tarcopy "$(cat "$COPYLIST" | sort -u)" "${MODULE_BUILD_DIR}"
-
 }
 post_copy() {
 	:
diff --git a/remote/modules/printergui/module.conf.ubuntu b/remote/modules/printergui/module.conf.ubuntu
index af38a728..54123003 100644
--- a/remote/modules/printergui/module.conf.ubuntu
+++ b/remote/modules/printergui/module.conf.ubuntu
@@ -1,9 +1,7 @@
 REQUIRED_INSTALLED_PACKAGES="
 	libcups2-dev
 	libqt4-dev
-	cups-filters-core-drivers
 "
 REQUIRED_CONTENT_PACKAGES="
 	libcups2-dev
-	cups-filters-core-drivers
 "
-- 
cgit v1.2.3-55-g7522