summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/core/tdebase/debian
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/_base/core/tdebase/debian')
-rw-r--r--ubuntu/_base/core/tdebase/debian/control2
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install3
2 files changed, 2 insertions, 3 deletions
diff --git a/ubuntu/_base/core/tdebase/debian/control b/ubuntu/_base/core/tdebase/debian/control
index 6765d61cb..b44587d01 100644
--- a/ubuntu/_base/core/tdebase/debian/control
+++ b/ubuntu/_base/core/tdebase/debian/control
@@ -5,7 +5,7 @@ Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>, Fathi Boudra <fboudra@free.fr>, Modestas Vainius <geromanas@mailas.com>, Sune Vuorela <debian@pusling.com>
Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, init, libtirpc-dev, libldap2-dev, libncurses5-dev, libpam0g-dev, libpopt-dev, libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsensors-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386] | libsensors4-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libsmbclient-dev, libusb-dev, libxtst-dev, libfontenc-dev, xscreensaver, xscreensaver-data, xscreensaver-data-extra, rss-glx, libxss-dev, libxcomposite-dev, libxdamage-dev, libxkbfile-dev, xkb-data, xutils, texinfo, htdig, libavahi-compat-libdnssd-dev (>= 0.4), x11proto-kb-dev, xmkmf | xutils-dev, libogg-dev, libavahi-tqt-dev, udev, libudev-dev, libdbus-1-dev, libconfig-dev, libart-2.0-dev (>= 4:14.0.0~), libssl-dev, libssh-dev
-Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, tdelibs14-trinity-doc
Build-Conflicts: nvidia-glx (<< 1.0.8774-6)
Standards-Version: 3.8.4
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install
index 132395ebd..c77323dc1 100644
--- a/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install
+++ b/ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install
@@ -36,8 +36,6 @@ debian/tmp/opt/trinity/lib/trinity/kcminit_startup.la
debian/tmp/opt/trinity/lib/trinity/kcminit_startup.so
debian/tmp/opt/trinity/lib/trinity/kcm_keyboard.la
debian/tmp/opt/trinity/lib/trinity/kcm_keyboard.so
-debian/tmp/opt/trinity/lib/trinity/kcm_khotkeys_init.la
-debian/tmp/opt/trinity/lib/trinity/kcm_khotkeys_init.so
debian/tmp/opt/trinity/lib/trinity/kcm_khotkeys.la
debian/tmp/opt/trinity/lib/trinity/kcm_khotkeys.so
debian/tmp/opt/trinity/lib/trinity/kded_khotkeys.la
@@ -104,6 +102,7 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/layout.png
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/switching.png
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kxkb/xkb.png
debian/tmp/opt/trinity/share/services/kxkb.desktop
+debian/tmp/opt/trinity/share/services/kded/khotkeys.desktop
debian/tmp/opt/trinity/share/man/man1/drkonqi.1
debian/tmp/opt/trinity/share/man/man1/kblankscrn.kss.1
debian/tmp/opt/trinity/share/man/man1/kcheckpass.1