From c1e7f15edc9bb13fde18136c88f5382db35be394 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 4 May 2014 22:19:48 -0500 Subject: [PATCH 1/3] Update redmond-default-settings* on Debian and Ubuntu to reflect latest SAK changes --- .../debian/distrospecific/kde-rc-files/kdesktoprc | 15 +++++++++++++++ .../debian/distrospecific/tdmdistrc | 2 +- .../debian/distrospecific/kde-rc-files/kdesktoprc | 15 +++++++++++++++ .../debian/distrospecific/tdmdistrc | 4 ++-- 4 files changed, 33 insertions(+), 3 deletions(-) diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kdesktoprc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kdesktoprc index b36d5b88b..7534ece0e 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kdesktoprc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/kde-rc-files/kdesktoprc @@ -37,3 +37,18 @@ exclude=media/hdd_mounted,media/nfs_mounted,media/floppy5_unmounted,media/cdrom_ [MiniCli] MiniCLIFilesystemAutoComplete=true MiniCLIHistoryAndFilesystemAutoComplete=true + +[ScreenSaver] +DelaySaverStart=true +Enabled=true +HideActiveWindowsFromSaver=true +HideCancelButton=true +Lock=true +LockGrace=1000 +Saver=KBanner.desktop +Timeout=300 +UseTDESAK=true +UseUnmanagedLockWindows=false + +[Version] +KDEVersionMajor=14 diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/tdmdistrc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/tdmdistrc index f71de012c..150ed529e 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/tdmdistrc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/distrospecific/tdmdistrc @@ -302,7 +302,7 @@ Compositor=compton-tde # Default is "twin" WindowManager=twin # SAK -# Default is true +# Default is false UseSAK=true # Admin session # Default is false diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/kdesktoprc b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/kdesktoprc index 32c9da8fd..e64b7ef97 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/kdesktoprc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/kde-rc-files/kdesktoprc @@ -37,3 +37,18 @@ exclude=media/hdd_mounted,media/nfs_mounted,media/floppy5_unmounted,media/cdrom_ [MiniCli] MiniCLIFilesystemAutoComplete=true MiniCLIHistoryAndFilesystemAutoComplete=true + +[ScreenSaver] +DelaySaverStart=true +Enabled=true +HideActiveWindowsFromSaver=true +HideCancelButton=true +Lock=true +LockGrace=1000 +Saver=KBanner.desktop +Timeout=300 +UseTDESAK=true +UseUnmanagedLockWindows=false + +[Version] +KDEVersionMajor=14 diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/tdmdistrc b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/tdmdistrc index dc0a36c78..ec02f7b88 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/tdmdistrc +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/distrospecific/tdmdistrc @@ -302,8 +302,8 @@ ClientLogFile=.xsession-errors-%s # Default is "twin" #WindowManager= # SAK -# Default is true -#UseSAK=false +# Default is false +UseSAK=true # Admin session # Default is false #UseAdminSession=true From 640ac8dfca18319d7e52bc9967fd23c968150527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Wed, 7 May 2014 23:01:30 +0200 Subject: [PATCH 2/3] Update packages in dependencies for metapackages on Debian and Ubuntu --- .../debian/control | 4 +- .../redmond-default-settings/debian/control | 4 +- .../metapackages/kubuntu-meta/debian/control | 4 +- .../debian/distrospecific/desktop | 28 +++-- .../debian/distrospecific/desktop-amd64 | 2 +- .../debian/distrospecific/desktop-hppa | 2 +- .../debian/distrospecific/desktop-i386 | 2 +- .../debian/distrospecific/desktop-ia64 | 2 +- .../debian/distrospecific/desktop-lpia | 81 ------------- .../debian/distrospecific/desktop-powerpc | 2 +- .../distrospecific/desktop-recommends-amd64 | 20 ++-- .../distrospecific/desktop-recommends-hppa | 10 +- .../distrospecific/desktop-recommends-i386 | 20 ++-- .../distrospecific/desktop-recommends-ia64 | 10 +- .../distrospecific/desktop-recommends-lpia | 108 ------------------ .../distrospecific/desktop-recommends-powerpc | 10 +- .../distrospecific/desktop-recommends-sparc | 10 +- .../debian/distrospecific/desktop-sparc | 2 +- .../debian/distrospecific/update.cfg | 3 +- 19 files changed, 81 insertions(+), 243 deletions(-) delete mode 100644 ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-lpia delete mode 100644 ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-lpia diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control index 5150015e3..aa29f908a 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/debian/control @@ -7,8 +7,8 @@ Standards-Version: 3.8.4 Package: redmond-default-settings-ii-trinity Architecture: all -Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity -Recommends: firefox, thunderbird, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, gtk3-tqt-engine-trinity +Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, printer-driver-pnm2ppa | pnm2ppa, tqca-tls, readahead, screen, smbclient, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity +Recommends: firefox | iceweasel, thunderbird | icedove, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, dmz-cursor-theme, dvd+rw-tools, printer-driver-foo2zjs | foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepowersave-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, printer-driver-min12xxw | min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, printer-driver-pxljr | pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, ttf-mscorefonts-installer | msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, gtk3-tqt-engine-trinity, printer-driver-c2esp, printer-driver-ptouch, printer-driver-sag-gdi, printer-driver-splix Suggests: apport-gtk, hplip-gui Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings Description: Redmond II default settings and artwork for the Kubuntu Trinity desktop diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control index 16c5c2cb2..19b119f0f 100644 --- a/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control +++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/debian/control @@ -7,8 +7,8 @@ Standards-Version: 3.8.4 Package: redmond-default-settings-trinity Architecture: all -Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, tqca-tls, readahead, screen, smbclient, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity -Recommends: firefox, thunderbird, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikamdesktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tde-guidance-powermanager-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, gtk3-tqt-engine-trinity +Depends: crystalcursors, tde-style-lipstik-trinity, kcalc-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine, acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libtqt-perl, libsasl2-modules, libxp6, openprinting-ppds, printer-driver-pnm2ppa | pnm2ppa, tqca-tls, readahead, screen, smbclient, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, sudo-trinity, kdbusnotification-trinity +Recommends: firefox | iceweasel, thunderbird | icedove, synaptic, tdeio-apt-trinity, tde-guidance-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, dmz-cursor-theme, dvd+rw-tools, printer-driver-foo2zjs | foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gdebi-tde-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepowersave-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, printer-driver-min12xxw | min12xxw, networkstatus, libreoffice-calc, libreoffice-impress, libreoffice-trinity, libreoffice-writer, pinentry-qt, powernowd, printer-driver-pxljr | pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, ttf-mscorefonts-installer | msttfcorefonts, tdmtheme-trinity, kubuntu-tdm-themes, plymouth-theme-kubuntu-logo-trinity, powermanagement-interface, gtk3-tqt-engine-trinity, printer-driver-c2esp, printer-driver-ptouch, printer-driver-sag-gdi, printer-driver-splix Suggests: apport-gtk, hplip-gui Conflicts: kubuntu-default-settings-trinity, kubuntu-default-settings Description: Redmond default settings and artwork for the Kubuntu Trinity desktop diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control index add6683b2..988561335 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/control +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/control @@ -7,8 +7,8 @@ Build-Depends: debhelper (>= 4), germinate (>= 0.38) Package: kubuntu-desktop-trinity Architecture: any -Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, pnm2ppa, powermanagement-interface, readahead, screen, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, gtk3-tqt-engine-trinity, qt4-tqt-theme-engine -Recommends: tdeio-apt-trinity, tde-guidance-powermanager-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, desktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, min12xxw, networkstatus-trinity, openoffice.org-calc, openoffice.org-impress, openoffice.org-trinity, openoffice.org-writer, pinentry-qt, powernowd, pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde-trinity | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity +Depends: acpi, acpi-support, acpid, alsa-base, alsa-utils, anacron, ark-trinity, arts-trinity, avahi-daemon, bc, ca-certificates, cups, cups-bsd, cups-client, cups-driver-gutenprint, dbus, dc, foomatic-db, foomatic-db-engine,foomatic-filters, genisoimage, ghostscript-x, kcontrol-trinity, kcron-trinity, tde-style-qtcurve-trinity, tde-systemsettings-trinity, tdeadmin-tdefile-plugins-trinity, tdebase-tdeio-plugins-trinity, tdegraphics-tdefile-plugins-trinity, tdemultimedia-tdefile-plugins-trinity, tdemultimedia-tdeio-plugins-trinity, tdenetwork-filesharing-trinity, tdenetwork-tdefile-plugins-trinity, tdepasswd-trinity, tdeprint-trinity, kdesktop-trinity, tdm-trinity, tdednssd-trinity, kghostview-trinity, khelpcenter-trinity, kicker-trinity, tdeio-locate-trinity, kmenuedit-trinity, kmix-trinity, knetworkconf-trinity, konq-plugins-trinity, konsole-trinity, kpdf-trinity, ksmserver-trinity, ksnapshot-trinity, ksvg-trinity, ksystemlog-trinity, twin-trinity, twin-style-crystal-trinity, lftp, libarts1-akode-trinity, libgl1-mesa-glx,libglut3 | freeglut3, libsasl2-modules, libxp6, openprinting-ppds, printer-driver-pnm2ppa | pnm2ppa, powermanagement-interface, readahead, screen, fonts-dejavu-core | ttf-dejavu-core, fonts-freefont-ttf | ttf-freefont, unzip, vorbis-tools, xdg-user-dirs, xkb-data, xorg, zip, ksplash-engine-moodin-trinity, sudo-trinity, libtqt-perl, tqca-tls, kdbusnotification-trinity, gtk-qt-engine-trinity, qt4-tqt-theme-engine +Recommends: tdeio-apt-trinity, tdepowersave-trinity, adept-trinity, akregator-trinity, amarok-trinity, avahi-autoipd, bluez-cups, bluez-utils, bogofilter, brltty, cdparanoia, cdrdao, cups-pdf, desktop-effects-tde-trinity, digikam-trinity, desktop-effects-tde-trinity, dmz-cursor-theme, dvd+rw-tools, printer-driver-foo2zjs | foo2zjs, foomatic-db-gutenprint, fortune-mod, gcc, gtk3-tqt-engine-trinity, gwenview-trinity, hpijs-ppds, hplip, ijsgutenprint, jockey-gtk, k3b-trinity, kaddressbook-trinity, kaffeine-trinity, kamera-trinity, karm-trinity, katapult-trinity, kate-trinity, kbstate-trinity, tdepim-tdeio-plugins-trinity, tdepim-wizards-trinity, tdesudo-trinity, keep-trinity, kfind-trinity, tdeio-umountwrapper-trinity, kipi-plugins-trinity, klipper-trinity, kmag-trinity, kmail-trinity, kmailcvt-trinity, kmilo-trinity, kmousetool-trinity, kmplayer-konq-plugins-trinity, knotes-trinity, konqueror-trinity, konqueror-nsplugins-trinity, kontact-trinity, konversation-trinity, kooka-trinity, kopete-trinity, korganizer-trinity, kpf-trinity, kppp-trinity, krdc-trinity, krfb-trinity, tdescreensaver-trinity, ksysguard-trinity, ktorrent-trinity, kubuntu-default-settings-trinity, kubuntu-docs-trinity, kubuntu-konqueror-shortcuts-trinity, kvkbd-trinity, tdewalletmanager-trinity, landscape-client, laptop-detect, libgl1-mesa-dri, libnss-mdns, linux-headers-generic, make, printer-driver-min12xxw | min12xxw, networkstatus-trinity, libreoffice-calc | openoffice.org-calc, libreoffice-impress | openoffice.org-impress, libreoffice-trinity | openoffice.org-trinity, libreoffice-writer | openoffice.org-writer, pinentry-qt, powernowd, printer-driver-pxljr | pxljr, rdesktop, scim-bridge-agent, scim-bridge-client-qt,scim-qtimm, skim, speedcrunch, splix, strigi-daemon, system-config-printer-tde-trinity, fonts-arabeyes | ttf-arabeyes, fonts-arphic-ukai | ttf-arphic-ukai, fonts-arphic-uming | ttf-arphic-uming, ttf-indic-fonts-core, ttf-kochi-gothic, ttf-kochi-mincho, fonts-lao | ttf-lao, ttf-malayalam-fonts, fonts-thai-tlwg | ttf-thai-tlwg, fonts-unfonts-core | ttf-unfonts-core, wodim, wvdial, xcursor-themes, xdg-utils, smbclient, network-manager-tde | network-manager-gnome, plymouth-theme-kubuntu-logo-trinity, printer-driver-c2esp, printer-driver-ptouch, printer-driver-sag-gdi, printer-driver-splix Suggests: apport-gtk, hplip-gui Description: Kubuntu desktop system, TDE version This package depends on all of the packages in the Kubuntu TDE desktop system diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop index b1016a157..851e3545a 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop @@ -74,11 +74,15 @@ Printing and printer configuration is a real weak spot in Debian, and in Linux i * 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 - * pnm2ppa # several ppds require this + * printer-driver-pnm2ppa|pnm2ppa # several ppds require this + * (hplip) # support for HP all-in-one printers + * (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 + * (printer-driver-ptouch) # support for Brother P-touch label printers + * (printer-driver-sag-gdi) # support for Ricoh Aficio SP 1000s/SP 1100s + * (printer-driver-splix) # support for Samsung and Xerox SPL2 and SPLc laser printers * ghostscript-x - * (hplip) # support for HP all-in-one printers - * min12xxw # support for KonicaMinolta PagePro 1200W, 1300W printers - * foo2zjs # Support for printing to ZjStream-based printers = GUI infrastructure = @@ -200,7 +204,7 @@ We've chosen KDE as our desktop user interface of choice == koffice-trinity == # * (krita-trinity) -# * (kexi-trinity) # instead of openoffice-base +# * (kexi-trinity) # instead of libreoffice-base|openoffice.org-base == everything else KDE == @@ -264,13 +268,13 @@ Accessibility tools: = Other Desktop GUI Apps = - * (openoffice.org-kde) [i386 powerpc amd64] # before OOo to avoid openoffice.org-style-default - * (openoffice.org-writer) [i386 powerpc amd64] - * (openoffice.org-calc) [i386 powerpc amd64] - * (openoffice.org-impress) [i386 powerpc amd64] - * (openoffice.org-draw) [i386 powerpc amd64] - * (openoffice.org-math) [i386 powerpc amd64] - * (openoffice.org-java-common) [i386 powerpc amd64] + * (libreoffice-trinity|openoffice.org-trinity) [i386 powerpc amd64] # before OOo to avoid libreoffice-style-default|openoffice.org-style-default + * (libreoffice-writer|openoffice.org-writer) [i386 powerpc amd64] + * (libreoffice-calc|openoffice.org-calc) [i386 powerpc amd64] + * (libreoffice-impress|openoffice.org-impress) [i386 powerpc amd64] + * (libreoffice-draw|openoffice.org-draw) [i386 powerpc amd64] + * (libreoffice-math|openoffice.org-math) [i386 powerpc amd64] + * (libreoffice-java-common|openoffice.org-java-common) [i386 powerpc amd64] * (tdescreensaver-trinity) = Games = diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64 index 3e5fba0d9..1d34836e0 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64 +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-amd64 @@ -63,8 +63,8 @@ libqt-perl libsasl2-modules libxp6 openprinting-ppds -pnm2ppa powermanagement-interface +printer-driver-pnm2ppa|pnm2ppa qca-tls readahead screen diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa index 030d93618..edea66233 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-hppa @@ -61,7 +61,7 @@ libqt-perl libsasl2-modules libxp6 openprinting-ppds -pnm2ppa +printer-driver-pnm2ppa|pnm2ppa qca-tls readahead screen diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386 index 52cd6a70e..4ca42d5a7 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386 +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-i386 @@ -64,8 +64,8 @@ libqt-perl libsasl2-modules libxp6 openprinting-ppds -pnm2ppa powermanagement-interface +printer-driver-pnm2ppa|pnm2ppa qca-tls readahead screen diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64 index f24d7e4cf..a1cd10879 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64 +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-ia64 @@ -64,8 +64,8 @@ libqt-perl libsasl2-modules libxp6 openprinting-ppds -pnm2ppa powermanagement-interface +printer-driver-pnm2ppa|pnm2ppa qca-tls readahead screen diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-lpia b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-lpia deleted file mode 100644 index 7c8954570..000000000 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-lpia +++ /dev/null @@ -1,81 +0,0 @@ -acpi -acpi-support -acpid -alsa-base -alsa-utils -anacron -ark -arts-trinity -avahi-daemon -bc -ca-certificates -cupsys -cupsys-bsd -cupsys-client -cupsys-driver-gutenprint -dbus -dc -foomatic-db -foomatic-db-engine -foomatic-filters -genisoimage -ghostscript-x -hotkey-setup -kcontrol-trinity -kcron-trinity -tde-guidance-trinity -tde-style-qtcurve-trinity -tdeadmin-tdefile-plugins-trinity -tdebase-tdeio-plugins-trinity -tdegraphics-tdefile-plugins-trinity -tdemultimedia-tdefile-plugins-trinity -tdemultimedia-tdeio-plugins-trinity -tdenetwork-filesharing-trinity -tdenetwork-tdefile-plugins-trinity -kdepasswd-trinity -tdeprint-trinity -kdesktop-trinity -tdm-trinity -tdednssd-trinity -kghostview-trinity -khelpcenter-trinity -kicker-trinity -tdeio-locate-trinity -kmenuedit-trinity -kmix-trinity -knetworkconf-trinity -konq-plugins-trinity -konsole-trinity -kpdf-trinity -ksmserver-trinity -ksnapshot-trinity -ksvg-trinity -ksystemlog-trinity -kubuntu-artwork-usplash -twin-trinity -twin-style-crystal-trinity -language-selector-qt -lftp -libarts1-akode-trinity -libgl1-mesa-glx -libglut3 -libqt-perl -libsasl2-modules -libxp6 -openprinting-ppds -pnm2ppa -qca-tls -readahead -screen -smbclient -software-properties-tde -ttf-bitstream-vera -ttf-dejavu-core -ttf-freefont -unzip -usplash -vorbis-tools -xdg-user-dirs -xkb-data -xorg -zip diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc index 1314826f1..52678746d 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-powerpc @@ -62,8 +62,8 @@ libsasl2-modules libxp6 openprinting-ppds pbbuttonsd -pnm2ppa powermanagement-interface +printer-driver-pnm2ppa|pnm2ppa qca-tls readahead screen diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64 index f3a5065e6..08fe34f44 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64 +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-amd64 @@ -14,7 +14,6 @@ desktop-effects-tde-trinity digikam-trinity dmz-cursor-theme dvd+rw-tools -foo2zjs foomatic-db-gutenprint foomatic-db-hpijs fortune-mod @@ -35,10 +34,10 @@ karm-trinity katapult-trinity kate-trinity kbstate-trinity -tde-guidance-powermanager-trinity tdebluetooth-trinity tdepim-tdeio-plugins-trinity tdepim-wizards-trinity +tdepowersave-trinity tdesudo-trinity keep-trinity kfind-trinity @@ -75,17 +74,22 @@ landscape-client laptop-detect libgl1-mesa-dri libnss-mdns +libreoffice-calc|openoffice.org-calc +libreoffice-impress|openoffice.org-impress +libreoffice-tde|openoffice.org-tde +libreoffice-writer|openoffice.org-writer linux-headers-generic make -min12xxw networkstatus -openoffice.org-calc -openoffice.org-impress -openoffice.org-tde -openoffice.org-writer pinentry-qt powernowd -pxljr +printer-driver-c2esp +printer-driver-foo2zjs|foo2zjs +printer-driver-min12xxw|min12xxw +printer-driver-ptouch +printer-driver-pxljr|pxljr +printer-driver-sag-gdi +printer-driver-splix rdesktop scim-bridge-agent scim-bridge-client-qt diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa index a3e27e409..689d7878e 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-hppa @@ -14,7 +14,6 @@ desktop-effects-kde dmz-cursor-theme dolphin dvd+rw-tools -foo2zjs foomatic-db-gutenprint foomatic-db-hpijs fortune-mod @@ -77,12 +76,17 @@ libnss-mdns linux-headers-hppa32 linux-headers-hppa64 make -min12xxw network-manager-kde networkstatus pinentry-qt powernowd -pxljr +printer-driver-c2esp +printer-driver-foo2zjs|foo2zjs +printer-driver-min12xxw|min12xxw +printer-driver-ptouch +printer-driver-pxljr|pxljr +printer-driver-sag-gdi +printer-driver-splix rdesktop scim-bridge-agent scim-bridge-client-qt diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386 index 781eda9cc..15265d387 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386 +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-i386 @@ -14,7 +14,6 @@ desktop-effects-tde-trinity digikam-trinity dmz-cursor-theme dvd+rw-tools -foo2zjs foomatic-db-gutenprint foomatic-db-hpijs fortune-mod @@ -35,11 +34,11 @@ karm-trinity katapult-trinity kate-trinity kbstate-trinity -tde-guidance-powermanager-trinity tde-icons-mono-trinity tdebluetooth-trinity tdepim-tdeio-plugins-trinity tdepim-wizards-trinity +tdepowersave-trinity tdesudo-trinity keep-trinity kfind-trinity @@ -76,17 +75,22 @@ landscape-client laptop-detect libgl1-mesa-dri libnss-mdns +libreoffice-calc|openoffice.org-calc +libreoffice-impress|openoffice.org-impress +libreoffice-tde|openoffice.org-tde +libreoffice-writer|openoffice.org-writer linux-headers-generic make -min12xxw networkstatus -openoffice.org-calc -openoffice.org-impress -openoffice.org-tde -openoffice.org-writer pinentry-qt powernowd -pxljr +printer-driver-c2esp +printer-driver-foo2zjs|foo2zjs +printer-driver-min12xxw|min12xxw +printer-driver-ptouch +printer-driver-pxljr|pxljr +printer-driver-sag-gdi +printer-driver-splix rdesktop scim-bridge-agent scim-bridge-client-qt diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64 b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64 index 7d6e29a60..198ea3d95 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64 +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-ia64 @@ -14,7 +14,6 @@ desktop-effects-kde dmz-cursor-theme dolphin dvd+rw-tools -foo2zjs foomatic-db-gutenprint foomatic-db-hpijs fortune-mod @@ -77,12 +76,17 @@ libnss-mdns linux-headers-itanium linux-headers-mckinley make -min12xxw network-manager-kde networkstatus pinentry-qt powernowd -pxljr +printer-driver-c2esp +printer-driver-foo2zjs|foo2zjs +printer-driver-min12xxw|min12xxw +printer-driver-ptouch +printer-driver-pxljr|pxljr +printer-driver-sag-gdi +printer-driver-splix rdesktop scim-bridge-agent scim-bridge-client-qt diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-lpia b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-lpia deleted file mode 100644 index f6eec30d2..000000000 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-lpia +++ /dev/null @@ -1,108 +0,0 @@ -adept-trinity -akregator-trinity -amarok-trinity -apport-qt -avahi-autoipd -bluez-cups -bluez-utils -bogofilter -brltty -cdparanoia -cdrdao -cups-pdf -desktop-effects-tde-trinity -digikam-trinity -dmz-cursor-theme -dvd+rw-tools -foo2zjs -foomatic-db-gutenprint -foomatic-db-hpijs -fortune-mod -gcc -gdebi-tde-trinity -gtk-qt-engine-trinity -gwenview-trinity -hpijs-ppds -hplip -hplip-gui -ijsgutenprint -jockey-gtk -k3b-trinity -kaddressbook-trinity -kaffeine-trinity -kamera-trinity -karm-trinity -katapult-trinity -kate-trinity -kbstate-trinity -tde-guidance-powermanager-trinity -tde-icons-mono-trinity -tdebluetooth-trinity -tdepim-tdeio-plugins-trinity -tdepim-wizards-trinity -tdesudo-trinity -keep-trinity -kfind-trinity -tdeio-umountwrapper-trinity -kipi-plugins-trinity -klipper-trinity -kmag-trinity -kmail-trinity -kmailcvt-trinity -kmilo-trinity -kmousetool-trinity -kmplayer-konq-plugins-trinity -knotes-trinity -konqueror-trinity -konqueror-nsplugins-trinity -kontact-trinity -konversation-trinity -kooka-trinity -kopete-trinity -korganizer-trinity -kpf-trinity -kppp-trinity -krdc-trinity -krfb-trinity -tdescreensaver-trinity -ksysguard-trinity -ktorrent-trinity -kubuntu-default-settings-trinity -kubuntu-trinity-docs -kubuntu-konqueror-shortcuts-trinity -kvkbd-trinity -tdewalletmanager-trinity -landscape-client -laptop-detect -libgl1-mesa-dri -libnss-mdns -make -min12xxw -networkstatus -pinentry-qt -powernowd -pxljr -rdesktop -scim-bridge-agent -scim-bridge-client-qt -scim-qtimm -skim -speedcrunch -splix -strigi-applet -strigi-daemon -system-config-printer-tde -ttf-arabeyes -ttf-arphic-ukai -ttf-arphic-uming -ttf-indic-fonts-core -ttf-kochi-gothic -ttf-kochi-mincho -ttf-lao -ttf-malayalam-fonts -ttf-thai-tlwg -ttf-unfonts-core -wodim -wvdial -xcursor-themes -xdg-utils diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc index 14de9515e..66ae309a4 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-powerpc @@ -14,7 +14,6 @@ desktop-effects-kde dmz-cursor-theme dolphin dvd+rw-tools -foo2zjs foomatic-db-gutenprint foomatic-db-hpijs fortune-mod @@ -77,12 +76,17 @@ libnss-mdns linux-headers-powerpc linux-headers-powerpc64-smp make -min12xxw network-manager-kde networkstatus pinentry-qt powernowd -pxljr +printer-driver-c2esp +printer-driver-foo2zjs|foo2zjs +printer-driver-min12xxw|min12xxw +printer-driver-ptouch +printer-driver-pxljr|pxljr +printer-driver-sag-gdi +printer-driver-splix rdesktop scim-bridge-agent scim-bridge-client-qt diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc index 6d67f9eac..fbbf95f9f 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-recommends-sparc @@ -14,7 +14,6 @@ desktop-effects-kde dmz-cursor-theme dolphin dvd+rw-tools -foo2zjs foomatic-db-gutenprint foomatic-db-hpijs fortune-mod @@ -76,12 +75,17 @@ libgl1-mesa-dri libnss-mdns linux-headers-sparc64 make -min12xxw network-manager-kde networkstatus pinentry-qt powernowd -pxljr +printer-driver-c2esp +printer-driver-foo2zjs|foo2zjs +printer-driver-min12xxw|min12xxw +printer-driver-ptouch +printer-driver-pxljr|pxljr +printer-driver-sag-gdi +printer-driver-splix rdesktop scim-bridge-agent scim-bridge-client-qt diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc index 030d93618..edea66233 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/desktop-sparc @@ -61,7 +61,7 @@ libqt-perl libsasl2-modules libxp6 openprinting-ppds -pnm2ppa +printer-driver-pnm2ppa|pnm2ppa qca-tls readahead screen diff --git a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update.cfg b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update.cfg index ee2975a4f..0fc860cbe 100644 --- a/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update.cfg +++ b/ubuntu/maverick/metapackages/kubuntu-meta/debian/distrospecific/update.cfg @@ -4,7 +4,7 @@ dist: hardy [hardy] seeds: desktop seed_map/desktop: desktop-common desktop-kubuntu-common desktop -architectures: i386 amd64 powerpc ia64 sparc hppa lpia +architectures: i386 amd64 powerpc ia64 sparc hppa seed_base: http://people.ubuntu.com/~ubuntu-archive/seeds/ seed_dist: kubuntu.%(dist)s archive_base/default: http://archive.ubuntu.com/ubuntu/ @@ -12,7 +12,6 @@ archive_base/ports: http://ports.ubuntu.com/ubuntu-ports/ archive_base/hppa: %(archive_base/ports)s archive_base/ia64: %(archive_base/ports)s archive_base/powerpc: %(archive_base/ports)s -archive_base/lpia: %(archive_base/ports)s components: main restricted [hardy/bzr] From ab15c5bac861ec758739fa571f846fb8acc372d9 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sat, 10 May 2014 18:22:19 +0900 Subject: [PATCH 3/3] Updated tdenetwork dependencies on Debian/Ubuntu. This resolves bug 2049. --- debian/lenny/tdenetwork/debian/control | 2 +- debian/squeeze/tdenetwork/debian/control | 2 +- ubuntu/maverick/tdenetwork/debian/control | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian/lenny/tdenetwork/debian/control b/debian/lenny/tdenetwork/debian/control index 4269bdb6b..4956afbcd 100644 --- a/debian/lenny/tdenetwork/debian/control +++ b/debian/lenny/tdenetwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Modestas Vainius , Sarah Hobbs , Sune Vuorela -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev, libgnutls-dev Standards-Version: 3.8.4 Package: tdenetwork-trinity diff --git a/debian/squeeze/tdenetwork/debian/control b/debian/squeeze/tdenetwork/debian/control index 4269bdb6b..4956afbcd 100644 --- a/debian/squeeze/tdenetwork/debian/control +++ b/debian/squeeze/tdenetwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Modestas Vainius , Sarah Hobbs , Sune Vuorela -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev, libgnutls-dev Standards-Version: 3.8.4 Package: tdenetwork-trinity diff --git a/ubuntu/maverick/tdenetwork/debian/control b/ubuntu/maverick/tdenetwork/debian/control index b4abe6a1b..46f1d08d3 100644 --- a/ubuntu/maverick/tdenetwork/debian/control +++ b/ubuntu/maverick/tdenetwork/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Timothy Pearson XSBC-Original-Maintainer: Debian Qt/KDE Maintainers Uploaders: Ana Beatriz Guerrero Lopez , Christopher Martin , Modestas Vainius , Sarah Hobbs , Sune Vuorela -Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev +Build-Depends: libasound2-dev, cdbs (>= 0.4.39-0.1), debhelper (>= 5.0.31), quilt, cmake, autotools-dev, docbook-to-man, doxygen, gawk, gettext, tdelibs14-trinity-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libsqlite3-dev, libtiff-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, sharutils, valgrind [!armel !mips !mipsel], libxxf86vm-dev, libv4l-dev, automake, autoconf, libtool, libltdl-dev, libgnutls-dev Standards-Version: 3.8.4 Package: tdenetwork-trinity