diff options
Diffstat (limited to 'ubuntu/_base/core/tdebase')
5 files changed, 5 insertions, 16 deletions
diff --git a/ubuntu/_base/core/tdebase/debian/control b/ubuntu/_base/core/tdebase/debian/control index 0d88bcb73..6765d61cb 100644 --- a/ubuntu/_base/core/tdebase/debian/control +++ b/ubuntu/_base/core/tdebase/debian/control @@ -4,7 +4,7 @@ Priority: optional 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, 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: 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-Conflicts: nvidia-glx (<< 1.0.8774-6) Standards-Version: 3.8.4 diff --git a/ubuntu/_base/core/tdebase/debian/klipper-trinity.install b/ubuntu/_base/core/tdebase/debian/klipper-trinity.install index 719b878c8..4231a3aae 100644 --- a/ubuntu/_base/core/tdebase/debian/klipper-trinity.install +++ b/ubuntu/_base/core/tdebase/debian/klipper-trinity.install @@ -6,6 +6,7 @@ debian/tmp/opt/trinity/lib/trinity/klipper_panelapplet.so debian/tmp/opt/trinity/lib/trinity/klipper.so debian/tmp/opt/trinity/lib/libtdeinit_klipper.so debian/tmp/opt/trinity/share/applications/tde/klipper.desktop +debian/tmp/opt/trinity/share/apps/konqueror/servicemenus/copy-full-path.desktop debian/tmp/opt/trinity/share/apps/tdeconf_update/klipper-1-2.pl debian/tmp/opt/trinity/share/apps/tdeconf_update/klipper-trinity1.sh debian/tmp/opt/trinity/share/apps/tdeconf_update/klipperrc.upd diff --git a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff index bb1dccd7b..1b53be325 100644 --- a/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff +++ b/ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff @@ -5,5 +5,5 @@ index dd64b58..0af3e44 100644 @@ -12,3 +12,4 @@ Terminal=false X-TDE-InitialPreference=8 X-DCOP-ServiceType=Multi - Categories=Qt;TDE;TextEditor; + Categories=Qt;TDE;Utility;TextEditor; +NoDisplay=true diff --git a/ubuntu/_base/core/tdebase/debian/rules b/ubuntu/_base/core/tdebase/debian/rules index 8cdb710e0..d24d632f0 100755 --- a/ubuntu/_base/core/tdebase/debian/rules +++ b/ubuntu/_base/core/tdebase/debian/rules @@ -64,7 +64,7 @@ DEB_CMAKE_EXTRA_FLAGS := \ -DWITH_UPOWER="ON" \ -DWITH_LIBART="ON" \ -DWITH_LIBCONFIG="ON" \ - -DWITH_PCRE="ON" \ + -DWITH_PCRE2="ON" \ -DWITH_KRB5="ON" DEB_FIXPERMS_EXCLUDE := \ diff --git a/ubuntu/_base/core/tdebase/debian/twin-trinity.install b/ubuntu/_base/core/tdebase/debian/twin-trinity.install index 52c59c4a7..f9b6061d4 100644 --- a/ubuntu/_base/core/tdebase/debian/twin-trinity.install +++ b/ubuntu/_base/core/tdebase/debian/twin-trinity.install @@ -74,19 +74,7 @@ debian/tmp/opt/trinity/share/apps/twin/eventsrc debian/tmp/opt/trinity/share/apps/twin/keramik.desktop debian/tmp/opt/trinity/share/apps/twin/laptop.desktop debian/tmp/opt/trinity/share/apps/twin/modernsystem.desktop -debian/tmp/opt/trinity/share/apps/twin/pics/bluesun.png -debian/tmp/opt/trinity/share/apps/twin/pics/close.png -debian/tmp/opt/trinity/share/apps/twin/pics/fog-grey.png -debian/tmp/opt/trinity/share/apps/twin/pics/fog.png -debian/tmp/opt/trinity/share/apps/twin/pics/greenie.dim.png -debian/tmp/opt/trinity/share/apps/twin/pics/greenie.light.png -debian/tmp/opt/trinity/share/apps/twin/pics/iconify.png -debian/tmp/opt/trinity/share/apps/twin/pics/maximizedown.png -debian/tmp/opt/trinity/share/apps/twin/pics/maximize.png -debian/tmp/opt/trinity/share/apps/twin/pics/menu.png -debian/tmp/opt/trinity/share/apps/twin/pics/pindown.png -debian/tmp/opt/trinity/share/apps/twin/pics/pinup.png -debian/tmp/opt/trinity/share/apps/twin/pics/unknown.png +debian/tmp/opt/trinity/share/apps/twin/pics/* debian/tmp/opt/trinity/share/apps/twin/plastik.desktop debian/tmp/opt/trinity/share/apps/twin/quartz.desktop debian/tmp/opt/trinity/share/apps/twin/redmond.desktop |