DEB metapackages: Revise dependencies of metapackages for overall settings.

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

2 files changed, 8 insertions, 14 deletions

diff --git a/debian/_base/metapackages/redmond-default-settings-ii/debian/control b/debian/_base/metapackages/redmond-default-settings-ii/debian/control
index e6b2a0da2..0995fbb9f 100644
--- a/debian/_base/metapackages/redmond-default-settings-ii/debian/control
+++ b/debian/_base/metapackages/redmond-default-settings-ii/debian/control
@@ -10,8 +10,7 @@ Architecture: all
 Depends: crystalcursors,
  tde-style-lipstik-trinity,
  kcalc-trinity,
- acpi-support,
- acpid,
+ acpi-support | systemd | elogind,
  alsa-utils,
  anacron,
  ark-trinity,
@@ -100,14 +99,13 @@ Recommends: firefox | iceweasel,
  dmz-cursor-theme,
  dvd+rw-tools,
  printer-driver-foo2zjs | foo2zjs,
- foomatic-db-gutenprint,
+ printer-driver-gutenprint | foomatic-db-gutenprint,
  fortune-mod,
  gcc,
  gdebi-tde-trinity,
  gwenview-trinity,
- hpijs-ppds,
- hplip,
- ijsgutenprint,
+ printer-driver-hpijs | hpijs-ppds,
+ printer-driver-hpcups | hplip,
  jockey-gtk,
  k3b-trinity,
  kaddressbook-trinity,
@@ -192,7 +190,6 @@ Recommends: firefox | iceweasel,
  tdmtheme-trinity,
  kubuntu-tdm-themes,
  plymouth-theme-kubuntu-logo-trinity,
- powermanagement-interface,
  gtk-qt-engine-trinity,
  gtk3-tqt-engine-trinity,
  qt4-tqt-theme-engine,
diff --git a/debian/_base/metapackages/redmond-default-settings/debian/control b/debian/_base/metapackages/redmond-default-settings/debian/control
index 363962817..e5cd8938c 100644
--- a/debian/_base/metapackages/redmond-default-settings/debian/control
+++ b/debian/_base/metapackages/redmond-default-settings/debian/control
@@ -10,8 +10,7 @@ Architecture: all
 Depends: crystalcursors,
  tde-style-lipstik-trinity,
  kcalc-trinity,
- acpi-support,
- acpid,
+ acpi-support | systemd | elogind,
  alsa-utils,
  anacron,
  ark-trinity,
@@ -100,14 +99,13 @@ Recommends: firefox | iceweasel,
  dmz-cursor-theme,
  dvd+rw-tools,
  printer-driver-foo2zjs | foo2zjs,
- foomatic-db-gutenprint,
+ printer-driver-gutenprint | foomatic-db-gutenprint,
  fortune-mod,
  gcc,
  gdebi-tde-trinity,
  gwenview-trinity,
- hpijs-ppds,
- hplip,
- ijsgutenprint,
+ printer-driver-hpijs | hpijs-ppds,
+ printer-driver-hpcups | hplip,
  jockey-gtk,
  k3b-trinity,
  kaddressbook-trinity,
@@ -192,7 +190,6 @@ Recommends: firefox | iceweasel,
  tdmtheme-trinity,
  kubuntu-tdm-themes,
  plymouth-theme-kubuntu-logo-trinity,
- powermanagement-interface,
  gtk-qt-engine-trinity,
  gtk3-tqt-engine-trinity,
  qt4-tqt-theme-engine,