summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2013-12-20 18:23:08 +0100
committerJonathan Bauer2013-12-20 18:23:08 +0100
commit0f98040ad720b498df612979225e5cd55b479078 (patch)
treedbbfc60f106d4e4a27ef8e9d37d0969a314f36ec
parentMerge branch 'master' of git.openslx.org:openslx-ng/tm-scripts (diff)
downloadtm-scripts-0f98040ad720b498df612979225e5cd55b479078.tar.gz
tm-scripts-0f98040ad720b498df612979225e5cd55b479078.tar.xz
tm-scripts-0f98040ad720b498df612979225e5cd55b479078.zip
[cups] move 'cups-daemon' req to cups.conf.ubuntu.13 as its not there
for ubuntu 12.x
-rw-r--r--remote/modules/cups/cups.conf.ubuntu2
-rw-r--r--remote/modules/cups/cups.conf.ubuntu.1310
2 files changed, 10 insertions, 2 deletions
diff --git a/remote/modules/cups/cups.conf.ubuntu b/remote/modules/cups/cups.conf.ubuntu
index ff5a23d7..da50d242 100644
--- a/remote/modules/cups/cups.conf.ubuntu
+++ b/remote/modules/cups/cups.conf.ubuntu
@@ -1,10 +1,8 @@
REQUIRED_INSTALLED_PACKAGES="
cups
- cups-daemon
ghostscript-cups
"
REQUIRED_CONTENT_PACKAGES="
cups
- cups-daemon
ghostscript-cups
"
diff --git a/remote/modules/cups/cups.conf.ubuntu.13 b/remote/modules/cups/cups.conf.ubuntu.13
new file mode 100644
index 00000000..ff5a23d7
--- /dev/null
+++ b/remote/modules/cups/cups.conf.ubuntu.13
@@ -0,0 +1,10 @@
+REQUIRED_INSTALLED_PACKAGES="
+ cups
+ cups-daemon
+ ghostscript-cups
+"
+REQUIRED_CONTENT_PACKAGES="
+ cups
+ cups-daemon
+ ghostscript-cups
+"