summaryrefslogtreecommitdiffstats
path: root/ubuntu/_base/core
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/_base/core')
-rw-r--r--ubuntu/_base/core/tdebase/debian/control4
-rw-r--r--ubuntu/_base/core/tdebase/debian/kcontrol-trinity.install6
-rw-r--r--ubuntu/_base/core/tdebase/debian/klipper-trinity.install1
-rw-r--r--ubuntu/_base/core/tdebase/debian/patches/kubuntu_04_hide_menu_entries.diff2
-rwxr-xr-xubuntu/_base/core/tdebase/debian/rules6
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install8
-rw-r--r--ubuntu/_base/core/tdebase/debian/tdebase-trinity-bin.install3
-rw-r--r--ubuntu/_base/core/tdebase/debian/twin-trinity.install14
-rw-r--r--ubuntu/_base/core/tdebase/debian/usermap.pl6
-rw-r--r--ubuntu/_base/core/tdegames/debian/control4
-rw-r--r--ubuntu/_base/core/tdelibs/debian/control16
-rw-r--r--ubuntu/_base/core/tdenetwork/debian/control2
-rw-r--r--ubuntu/_base/core/tdepim/debian/control2
-rw-r--r--ubuntu/_base/core/tdeutils/debian/control2
-rw-r--r--ubuntu/_base/core/tdevelop/debian/control4
15 files changed, 39 insertions, 41 deletions
diff --git a/ubuntu/_base/core/tdebase/debian/control b/ubuntu/_base/core/tdebase/debian/control
index 0d88bcb73..b44587d01 100644
--- a/ubuntu/_base/core/tdebase/debian/control
+++ b/ubuntu/_base/core/tdebase/debian/control
@@ -4,8 +4,8 @@ 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-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
+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, 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/kcontrol-trinity.install b/ubuntu/_base/core/tdebase/debian/kcontrol-trinity.install
index aa5629dfe..fb1838b85 100644
--- a/ubuntu/_base/core/tdebase/debian/kcontrol-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/kcontrol-trinity.install
@@ -5,9 +5,10 @@ debian/tmp/opt/trinity/bin/keditfiletype
debian/tmp/opt/trinity/bin/tdefontinst
debian/tmp/opt/trinity/bin/tdefontview
debian/tmp/opt/trinity/bin/klocaldomainurifilterhelper
-debian/tmp/opt/trinity/bin/tderandrtray
-debian/tmp/opt/trinity/bin/tdehwdevicetray
debian/tmp/opt/trinity/bin/krdb
+debian/tmp/opt/trinity/bin/tdehwdevicetray
+debian/tmp/opt/trinity/bin/tderandrtray
+debian/tmp/opt/trinity/bin/tdesyndaemon
debian/tmp/opt/trinity/lib/trinity/fontthumbnail.la
debian/tmp/opt/trinity/lib/trinity/fontthumbnail.so
debian/tmp/opt/trinity/lib/trinity/kaccess.la
@@ -195,6 +196,7 @@ debian/tmp/opt/trinity/share/applications/tde/smbstatus.desktop
debian/tmp/opt/trinity/share/applications/tde/sound.desktop
debian/tmp/opt/trinity/share/applications/tde/spellchecking.desktop
debian/tmp/opt/trinity/share/applications/tde/style.desktop
+debian/tmp/opt/trinity/share/applications/tde/touchpad.desktop
debian/tmp/opt/trinity/share/applications/tde/useragent.desktop
debian/tmp/opt/trinity/share/applications/tde/xserver.desktop
debian/tmp/opt/trinity/share/applnk/.hidden/energy.desktop
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..4a5dcee66 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 := \
@@ -116,9 +116,9 @@ binary-install/tdm-trinity::
install -p -D -m644 debian/tdm-trinity.needrestart debian/tdm-trinity/etc/needrestart/conf.d/tdm-trinity.conf
binary-install/kcontrol-trinity::
- mkdir -p debian/kcontrol/etc/udev/rules.d
+ mkdir -p debian/$(cdbs_curpkg)/etc/udev/rules.d
chmod +x debian/usermap.pl
- debian/usermap.pl kcontrol/input/logitechmouse.usermap > debian/kcontrol/etc/udev/logitechmouse.rules
+ debian/usermap.pl kcontrol/input/logitechmouse.usermap > debian/$(cdbs_curpkg)/etc/udev/logitechmouse.rules
install/klipper-trinity::
sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc
diff --git a/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install
index 0ab9bc8a8..2ac5be87f 100644
--- a/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install
+++ b/ubuntu/_base/core/tdebase/debian/tdebase-data-trinity.install
@@ -17,6 +17,10 @@ debian/tmp/opt/trinity/share/apps/kcmcss/template.css
debian/tmp/opt/trinity/share/apps/kcminput/cursor_large_black.pcf.gz
debian/tmp/opt/trinity/share/apps/kcminput/cursor_large_white.pcf.gz
debian/tmp/opt/trinity/share/apps/kcminput/cursor_small_white.pcf.gz
+debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse0.png
+debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse1.png
+debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse2.png
+debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse3.png
debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse_lh.png
debian/tmp/opt/trinity/share/apps/kcminput/pics/mouse_rh.png
debian/tmp/opt/trinity/share/apps/kcminput/pics/doubleclick_1.png
@@ -344,6 +348,9 @@ debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tdehtml/nsplugin.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/tderesources/index.docbook
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/touchpad/common
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/touchpad/index.cache.bz2
+debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/touchpad/index.docbook
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/common
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.cache.bz2
debian/tmp/opt/trinity/share/doc/tde/HTML/en/kcontrol/twindecoration/index.docbook
@@ -520,6 +527,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-desktop-p
debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-desktop-personal.png
debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-desktop.png
debian/tmp/opt/trinity/share/icons/crystalsvg/*/categories/preferences-system.png
+debian/tmp/opt/trinity/share/icons/crystalsvg/*/devices/input-touchpad.png
debian/tmp/opt/trinity/share/icons/crystalsvg/*/devices/laptop.png
debian/tmp/opt/trinity/share/services/searchproviders/acronym.desktop
debian/tmp/opt/trinity/share/services/searchproviders/alexa.desktop
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
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
diff --git a/ubuntu/_base/core/tdebase/debian/usermap.pl b/ubuntu/_base/core/tdebase/debian/usermap.pl
index 9c8c61f26..bd87e2d72 100644
--- a/ubuntu/_base/core/tdebase/debian/usermap.pl
+++ b/ubuntu/_base/core/tdebase/debian/usermap.pl
@@ -34,7 +34,7 @@ sub parse_usermap_line {
my @rule;
while (my ($key, $flag) = each(%flags)) {
- hex($match{match_flags}) & $flag and push @rule, qq(SYSFS{$key}=="$match{$key}",);
+ hex($match{match_flags}) & $flag and push @rule, qq(ATTRS{$key}=="$match{$key}",);
}
push @rule,
(
@@ -47,9 +47,9 @@ sub parse_usermap_line {
print join(' ', @rule) . "\n";
}
-print "BUS!=\"usb\", GOTO=\"kcontrol_rules_end\"\n";
+print "DRIVERS!=\"usb\", GOTO=\"kcontrol_rules_end\"\n";
print "ACTION!=\"add\"\, GOTO=\"kcontrol_rules_end\"\n";
-print "SUBSYSTEM!=\"usb_device\"\, GOTO=\"kcontrol_rules_end\"\n\n";
+print "SUBSYSTEMS!=\"usb\"\, GOTO=\"kcontrol_rules_end\"\n\n";
foreach my $usermap (@ARGV) {
open(my $IN, $usermap . (-x $usermap && "|")) or die "unable to open usermap $usermap";
diff --git a/ubuntu/_base/core/tdegames/debian/control b/ubuntu/_base/core/tdegames/debian/control
index c7c4a74b5..eae630873 100644
--- a/ubuntu/_base/core/tdegames/debian/control
+++ b/ubuntu/_base/core/tdegames/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>, Christopher Martin <chrsmrtn@debian.org>, Daniel Schepler <schepler@debian.org>, Sune Vuorela <debian@pusling.com>
Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdemultimedia-trinity-dev, groff-base, bzip2, libogg-dev
-Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, tdelibs14-trinity-doc
Standards-Version: 3.8.4
Package: tdegames-trinity
@@ -89,7 +89,7 @@ Architecture: all
Section: doc
Replaces: libkdegames-kde3-doc (<< 4:14.0.0~), libkdegames-trinity-doc (<< 4:14.0.0~)
Breaks: libkdegames-kde3-doc (<< 4:14.0.0~), libkdegames-trinity-doc (<< 4:14.0.0~)
-Recommends: tdelibs14-trinity-doc, libtqtinterface-doc
+Recommends: tdelibs14-trinity-doc
Suggests: konqueror-trinity | www-browser, libtdegames-trinity-dev
Description: API documentation for the Trinity games library
This package contains the developers' documentation for libtdegames.
diff --git a/ubuntu/_base/core/tdelibs/debian/control b/ubuntu/_base/core/tdelibs/debian/control
index c2e08704b..1111c4435 100644
--- a/ubuntu/_base/core/tdelibs/debian/control
+++ b/ubuntu/_base/core/tdelibs/debian/control
@@ -11,15 +11,15 @@ Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, sharutil
aspell, libaspell-dev, hspell, libbz2-dev, liblzma-dev, libcupsys2-dev | libcups2-dev,
libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev, libldap2-dev,
liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev,
- libopenexr-dev (>= 1.2.2-4.1), libpcre3-dev,
+ libopenexr-dev (>= 1.2.2-4.1), libpcre2-dev,
libsasl2-dev, libxcomposite-dev, libdbus-1-tqt-dev,
libtiff-dev, libwebp-dev, libavahi-client-dev (>= 0.4), x11-xserver-utils,
libxml2-dev, libxml2-utils, libxslt1-dev, libavahi-tqt-dev,
- texinfo, libogg-dev, libtqtinterface-dev,
+ texinfo, libogg-dev, libtqt3-mt-dev,
lsb-release, base-files, sudo, libr-dev,
libudev-dev, libltdl-dev, libmagic-dev, libpcsclite-dev,
opensc-pkcs11 | opensc (<< 0.13.0-5), libpkcs11-helper1-dev, libcryptsetup-dev
-Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11
Standards-Version: 3.8.3
Package: tdelibs-trinity
@@ -28,7 +28,6 @@ Architecture: all
Replaces: kdelibs-kde3 (<< 4:14.0.0~), kdelibs-trinity (<< 4:14.0.0~)
Breaks: kdelibs-kde3 (<< 4:14.0.0~), kdelibs-trinity (<< 4:14.0.0~)
Provides: tdelibs
-Conflicts: tdelibs
Depends: tdelibs14-trinity (>= ${source:Version}) | tdelibs14t64-trinity (>= ${source:Version}),
tdelibs-data-trinity (>= ${source:Version})
Description: core libraries from the official Trinity release
@@ -46,7 +45,7 @@ Section: libs
Architecture: all
Replaces: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~)
Breaks: kdelibs-data-kde3 (<< 4:14.0.0~), kdelibs-data-trinity (<< 4:14.0.0~)
-Conflicts: tdelibs-data, kdebase-kio-plugins-kde3 (<= 4:14.0.0~), kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~), klinkstatus-trinity (<< 4:14.0.9~)
+Conflicts: kdebase-kio-plugins-kde3 (<= 4:14.0.0~), kdebase-kio-plugins-trinity (<= 4:14.0.0~), ksysv-trinity (<< 4:14.0.6~), kamera-trinity (<< 4:14.0.8~), klinkstatus-trinity (<< 4:14.0.9~)
Depends: hicolor-icon-theme
Provides: tdelibs-data
Description: core shared data for all TDE applications
@@ -67,6 +66,7 @@ Depends: ${shlibs:Depends}, tdelibs-data-trinity,
libart-2.0-2 (>= 4:14.0.0~), perl, xbase-clients
Recommends: hwdata, xdg-user-dirs, systemd | elogind | consolekit
Suggests: fam, perl-suid
+Conflicts: tdelibs4-trinity, tdelibs4c2-trinity (>> 4:1.0.0), tdelibs-bin-trinity (<< 4:3.3.3), tdelibs4-trinity-dev (<< 4:3.5.7.dfsg.1-6)
Description: core libraries and binaries for all TDE applications
This package contains all the shared libraries and common core binaries
used by all TDE applications. You need these libraries and binaries to
@@ -103,11 +103,11 @@ Depends: tdelibs14-trinity (= ${source:Version}), libart-2.0-dev (>= 4:14.0.0~),
libarts1-trinity-dev (>= 1.5.0), ${libasound2-dev}, libacl1-dev, libattr1-dev,
libaspell-dev, hspell, libbz2-dev,
libidn-dev | libidn11-dev, libjasper-dev (>= 1.900.1), libkrb5-dev | heimdal-dev,
- libopenexr-dev (>= 1.2.2-3), libpcre3-dev,
+ libopenexr-dev (>= 1.2.2-3), libpcre2-dev,
liblua5.4-dev | liblua5.3-dev | liblua5.2-dev | liblua5.1-dev | liblualib50-dev,
libsasl2-dev, libxcomposite-dev,
libtiff-dev, libxml2-dev, libxml2-utils, libxslt1-dev,
- libavahi-client-dev (>= 0.4), libavahi-tqt-dev, libtqtinterface-dev,
+ libavahi-client-dev (>= 0.4), libavahi-tqt-dev, libtqt3-mt-dev,
libr-dev, libudev-dev, libdbus-1-tqt-dev, binutils-dev
Recommends: libcupsys2-dev | libcups2-dev
Provides: tdelibs-trinity-dev
@@ -140,7 +140,7 @@ Replaces: kdelibs-kde3-dbg (<< 4:14.0.0~), kdelibs-trinity-dbg (<< 4:14.0.0~)
Breaks: kdelibs-kde3-dbg (<< 4:14.0.0~), kdelibs-trinity-dbg (<< 4:14.0.0~)
Priority: extra
Conflicts: tdelibs4-trinity-dbg, tdelibs4c2-trinity-dbg, tdelibs4c2a-trinity-dbg
-Depends: tdelibs14-trinity (= ${source:Version}), libtqtinterface-dbg, libc6-dbg [amd64]
+Depends: tdelibs14-trinity (= ${source:Version}), libc6-dbg [amd64]
Description: debugging symbols for tdelibs
This package contains the debugging symbols associated with tdelibs.
They will automatically be used by gdb for debugging tdelibs-related
diff --git a/ubuntu/_base/core/tdenetwork/debian/control b/ubuntu/_base/core/tdenetwork/debian/control
index b89afb1bb..33c0e1677 100644
--- a/ubuntu/_base/core/tdenetwork/debian/control
+++ b/ubuntu/_base/core/tdenetwork/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>, Christopher Martin <chrsmrtn@debian.org>, Modestas Vainius <geromanas@mailas.com>, Sarah Hobbs <hobbsee@ubuntu.com>, Sune Vuorela <debian@pusling.com>
-Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, docbook-to-man, doxygen, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, libtqtinterface-doc, valgrind [!armel !mips !mipsel !riscv64], libxxf86vm-dev, libv4l-dev, libssl-dev, libtqca-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, docbook-to-man, doxygen, tdelibs14-trinity-dev, libgnutls-dev | libgadu-dev (>> 1:1.12.0-3), libgcrypt-dev, libgadu-dev, libiw-dev (>> 27+28pre8), libmeanwhile-dev (>= 1.0.2), libslp-dev, libspeex-dev, libsqlite3-dev, libxml2-dev, libxslt1-dev, libxtst-dev, valgrind [!armel !mips !mipsel !riscv64], libxxf86vm-dev, libv4l-dev, libssl-dev, libtqca-dev
Standards-Version: 3.8.4
Package: tdenetwork-trinity
diff --git a/ubuntu/_base/core/tdepim/debian/control b/ubuntu/_base/core/tdepim/debian/control
index 756e22d00..9db5dcfcc 100644
--- a/ubuntu/_base/core/tdepim/debian/control
+++ b/ubuntu/_base/core/tdepim/debian/control
@@ -12,7 +12,7 @@ Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build,
libxpm-dev, libxss-dev, texinfo, dpkg-dev (>= 1.14.4),
libgpg-error-dev (>= 1.4-2), gpgsm, libical-dev,
libcaldav-dev (>= 0.6.5), libcarddav-dev (>= 0.6.2), libcurl4-gnutls-dev
-Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, libtqtinterface-doc, tdelibs14-trinity-doc
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, tdelibs14-trinity-doc
Build-Conflicts: libkleopatra0-trinity-dev
Standards-Version: 3.8.4
diff --git a/ubuntu/_base/core/tdeutils/debian/control b/ubuntu/_base/core/tdeutils/debian/control
index 0edc263b7..c14c24bb2 100644
--- a/ubuntu/_base/core/tdeutils/debian/control
+++ b/ubuntu/_base/core/tdeutils/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>, Christopher Martin <chrsmrtn@debian.org>, Fathi Boudra <fboudra@free.fr>, Josh Metzler <joshdeb@metzlers.org>, Sune Vuorela <debian@pusling.com>
Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdebase-trinity-dev, libkonq4-trinity-dev, libgmp3-dev, libsnmp-dev, libxpm-dev, python3-all-dev, libxtst-dev, xutils
-Build-Depends-Indep: doxygen, libtqtinterface-doc, graphviz, gsfonts-x11, tdelibs14-trinity-doc
+Build-Depends-Indep: doxygen, graphviz, gsfonts-x11, tdelibs14-trinity-doc
Standards-Version: 3.8.4
Package: tdeutils-trinity
diff --git a/ubuntu/_base/core/tdevelop/debian/control b/ubuntu/_base/core/tdevelop/debian/control
index dd8099bc1..91b198b3b 100644
--- a/ubuntu/_base/core/tdevelop/debian/control
+++ b/ubuntu/_base/core/tdevelop/debian/control
@@ -3,7 +3,7 @@ Section: tde
Priority: optional
Maintainer: TDE Debian Team <team-debian@trinitydesktop.org>
XSBC-Original-Maintainer: Jeremy Lain <jeremy.laine@m4x.org>
-Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdelibs14-trinity-doc, libtqtinterface-doc, flex, python3-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev
+Build-Depends: cdbs, debhelper (>= 10~), quilt, tde-cmake, ninja-build, tdelibs14-trinity-dev, tdelibs14-trinity-doc, tqt3-apps-dev, flex, python3-all, libcvsservice-trinity-dev, groff-base, libsvn-dev, libaprutil1-dev, libdb-dev
Standards-Version: 3.8.4
Package: tdevelop-trinity
@@ -12,7 +12,7 @@ Depends: ${shlibs:Depends}, tdevelop-data-trinity (>= ${source:Version}), tdebas
Replaces: kdevelop-kde3 (<< 4:14.0.0~), kdevelop-trinity (<< 4:14.0.0~)
Breaks: kdevelop-kde3 (<< 4:14.0.0~), kdevelop-trinity (<< 4:14.0.0~)
Recommends: tdevelop-trinity-doc, make, libtool, autoconf, automaken, gdb (>= 6.4)
-Suggests: libtqtinterface-dev, tdelibs14-trinity-dev, sgmltools-lite, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, libtqtinterface-doc, konsole-trinity, tde-cmake, ruby, python3-all, g++, kdevdesigner-trinity
+Suggests: tqt3-apps-dev, tdelibs14-trinity-dev, sgmltools-lite, ark-trinity, kbabel-trinity, tdeiconedit-trinity, tdesdk-scripts-trinity, graphviz, tdebase-tdeio-plugins-trinity, exuberant-ctags, khelpcenter-trinity, tdelibs14-trinity-doc, konsole-trinity, tde-cmake, ruby, python3-all, g++, kdevdesigner-trinity
Description: An IDE for Unix/X11
TDevelop is an easy to use Integrated Development Environment
for developing C/C++ applications under X11. It features