DEB: Move gutenprint from Depends to Recommends

because it will no longer be available on all architectures.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit c9d2d539867026ffe935762dda2940793a34c50a)

5 files changed, 4 insertions, 6 deletions

diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/control b/debian/_base/metapackages/redmond-default-settings-ii/debian/control
index 21dbced1b..7b0a44398 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/control
+++ b/debian/_base/metapackages/redmond-default-settings-ii/debian/control
@@ -64,7 +64,6 @@ Depends: crystalcursors,
  libtqt-perl,
  libsasl2-modules,
  openprinting-ppds,
- printer-driver-gutenprint | cups-driver-gutenprint,
  printer-driver-pnm2ppa | pnm2ppa,
  tqca-tls,
  screen,
@@ -98,7 +97,7 @@ Recommends: firefox | iceweasel,
  dmz-cursor-theme,
  dvd+rw-tools,
  printer-driver-foo2zjs | foo2zjs,
- printer-driver-gutenprint | foomatic-db-gutenprint,
+ printer-driver-gutenprint | cups-driver-gutenprint | foomatic-db-gutenprint,
  fortune-mod,
  gcc,
  gdebi-tde-trinity,
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/control b/debian/_base/metapackages/redmond-default-settings/debian/control
index a857d4a82..1019ce714 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/control
+++ b/debian/_base/metapackages/redmond-default-settings/debian/control
@@ -64,7 +64,6 @@ Depends: crystalcursors,
  libtqt-perl,
  libsasl2-modules,
  openprinting-ppds,
- printer-driver-gutenprint | cups-driver-gutenprint,
  printer-driver-pnm2ppa | pnm2ppa,
  tqca-tls,
  screen,
@@ -98,7 +97,7 @@ Recommends: firefox | iceweasel,
  dmz-cursor-theme,
  dvd+rw-tools,
  printer-driver-foo2zjs | foo2zjs,
- printer-driver-gutenprint | foomatic-db-gutenprint,
+ printer-driver-gutenprint | cups-driver-gutenprint | foomatic-db-gutenprint,
  fortune-mod,
  gcc,
  gdebi-tde-trinity,
diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop
index 677f30fee..eb8489e38 100644
--- a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop
@@ -70,7 +70,7 @@ Printing and printer configuration is a real weak spot in Debian, and in Linux i
  * foomatic-db                  # the foomatic printer driver database
  * foomatic-filters             # converter from postscript to printer-specific formats
  * openprinting-ppds            # Most common drivers we want in desktop; less common are in o-p-extra
- * printer-driver-gutenprint|foomatic-db-gutenprint	# a ton of cups ppds, for real comprehensive printer support
+ * (printer-driver-gutenprint|foomatic-db-gutenprint)	# a ton of cups ppds, for real comprehensive printer support
  * printer-driver-pnm2ppa|pnm2ppa	# several ppds require this
  * (printer-driver-hpcups|hplip)	# support for HP all-in-one printers
  * (printer-driver-hpijs|foomatic-db-hpijs)	# printer drivers from the hp inkjet project
diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all
index 109fbe1b8..4813b0c7a 100644
--- a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all
@@ -41,7 +41,6 @@ libarts1-akode-trinity
 libsasl2-modules
 libtqt-perl
 openprinting-ppds
-printer-driver-gutenprint | foomatic-db-gutenprint
 printer-driver-pnm2ppa | pnm2ppa
 screen
 sudo-trinity
diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all
index 5f60a373c..891392f78 100644
--- a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all
+++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all
@@ -81,6 +81,7 @@ plymouth-theme-kubuntu-logo-trinity
 powernowd
 printer-driver-c2esp
 printer-driver-foo2zjs | foo2zjs
+printer-driver-gutenprint | foomatic-db-gutenprint
 printer-driver-hpcups | hplip
 printer-driver-hpijs | hpijs-ppds
 printer-driver-min12xxw | min12xxw