diff options
Diffstat (limited to 'ubuntu/_base/metapackages/kubuntu-meta/debian')
5 files changed, 13 insertions, 26 deletions
diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/compat b/ubuntu/_base/metapackages/kubuntu-meta/debian/compat index ec635144f..f599e28b8 100644 --- a/ubuntu/_base/metapackages/kubuntu-meta/debian/compat +++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/control b/ubuntu/_base/metapackages/kubuntu-meta/debian/control index a3b436fe6..97afd7339 100644 --- a/ubuntu/_base/metapackages/kubuntu-meta/debian/control +++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/control @@ -3,7 +3,7 @@ Section: tde Priority: optional Maintainer: TDE Debian Team <team-debian@trinitydesktop.org> Standards-Version: 3.8.3 -Build-Depends: debhelper (>= 9~) +Build-Depends: debhelper (>= 10~) Package: kubuntu-desktop-trinity Architecture: any diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop index 66762e775..677f30fee 100644 --- a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop +++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop @@ -12,9 +12,7 @@ Task-Key: kubuntu-desktop Power management: - * acpi-support * (powernowd) - * powermanagement-interface [i386 amd64 powerpc ia64] Bluetooth: @@ -24,7 +22,7 @@ Bluetooth: == i386, i686, amd64 == * acpi - * acpid + * acpi-support | systemd | elogind * apmd [i386] == ppc32, ppc64 == @@ -65,17 +63,17 @@ These packages help with system integration Printing and printer configuration is a real weak spot in Debian, and in Linux in general. We will need to stay at the front of the curve here. - * cupsys # our preferred printer management infrastructure - * cupsys-bsd # gives us lpc, lpq, lpr, lprm - * cupsys-client # gives us cancel, cupstestppd, lp, lpoptions, lppasswd, lpstat, cupsaddsmb, accept, lpadmin, lpinfo, lpmove + * cups # our preferred printer management infrastructure + * cups-bsd # gives us lpc, lpq, lpr, lprm + * cups-client # gives us cancel, cupstestppd, lp, lpoptions, lppasswd, lpstat, cupsaddsmb, accept, lpadmin, lpinfo, lpmove * foomatic-db-engine # integrate the foomatic printer driver engine * foomatic-db # the foomatic printer driver database * foomatic-filters # converter from postscript to printer-specific formats - * foomatic-db-hpijs # printer drivers from the hp inkjet project - * cupsys-driver-gutenprint # a ton of cupsys ppds, for real comprehensive printer support * 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-pnm2ppa|pnm2ppa # several ppds require this - * (hplip) # support for HP all-in-one printers + * (printer-driver-hpcups|hplip) # support for HP all-in-one printers + * (printer-driver-hpijs|foomatic-db-hpijs) # printer drivers from the hp inkjet project * (printer-driver-min12xxw|min12xxw) # support for KonicaMinolta PagePro 1200W, 1300W printers * (printer-driver-foo2zjs|foo2zjs) # support for printing to ZjStream-based printers * (printer-driver-c2esp) # support for Kodak ESP AiO color inkjet Series @@ -323,8 +321,3 @@ to compile a driver. -mdz # * (example-content) # dholbach: dapper feature goal (wiki.ubuntu.com/ExampleContent) * (landscape-client) * readahead - -= Germinate workarounds = - - * libglut3 # depended upon by freeglut3 - * libgl1-mesa-glx # depended upon by freeglut3 diff --git a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all index 77cb3dd4c..109fbe1b8 100644 --- a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all +++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-all @@ -1,5 +1,4 @@ -acpid -acpi-support +acpi-support | systemd | elogind alsa-utils anacron ark-trinity @@ -39,13 +38,10 @@ ksvg-trinity ksystemlog-trinity lftp libarts1-akode-trinity -libgl1-mesa-glx -libglut3 | freeglut3 libsasl2-modules libtqt-perl openprinting-ppds -powermanagement-interface -printer-driver-gutenprint | cups-driver-gutenprint +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 94566224e..5f60a373c 100644 --- a/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all +++ b/ubuntu/_base/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-all @@ -22,15 +22,11 @@ fonts-takao-gothic | ttf-takao-gothic fonts-takao-mincho | ttf-takao-mincho fonts-thai-tlwg | ttf-thai-tlwg fonts-unfonts-core | ttf-unfonts-core -foomatic-db-gutenprint fortune-mod gcc gtk-qt-engine-trinity gtk3-tqt-engine-trinity gwenview-trinity -hpijs-ppds -hplip -ijsgutenprint jockey-gtk k3b-trinity kaddressbook-trinity @@ -85,6 +81,8 @@ plymouth-theme-kubuntu-logo-trinity powernowd printer-driver-c2esp printer-driver-foo2zjs | foo2zjs +printer-driver-hpcups | hplip +printer-driver-hpijs | hpijs-ppds printer-driver-min12xxw | min12xxw printer-driver-ptouch printer-driver-pxljr | pxljr |