summaryrefslogtreecommitdiffstats
path: root/ubuntu/maverick
diff options
context:
space:
mode:
Diffstat (limited to 'ubuntu/maverick')
-rw-r--r--ubuntu/maverick/applications/kchmviewer/debian/control2
-rw-r--r--ubuntu/maverick/applications/kmplayer/debian/control2
-rw-r--r--ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdeio_httprc (renamed from ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kio_httprc)0
-rw-r--r--ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdeio_httprc (renamed from ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kio_httprc)0
-rw-r--r--ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdeio_httprc (renamed from ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kio_httprc)0
-rw-r--r--ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdeio_httprc (renamed from ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kio_httprc)0
-rw-r--r--ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdeio_httprc (renamed from ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kio_httprc)0
-rw-r--r--ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdeio_httprc (renamed from ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kio_httprc)0
-rw-r--r--ubuntu/maverick/dependencies/qt3/debian/changelog4
-rw-r--r--ubuntu/maverick/tdebase/debian/man/tdeio_media_mounthelper-trinity.1 (renamed from ubuntu/maverick/tdebase/debian/man/kio_media_mounthelper-trinity.1)0
-rw-r--r--ubuntu/maverick/tdebase/debian/man/tdeio_system_documenthelper-trinity.1 (renamed from ubuntu/maverick/tdebase/debian/man/kio_system_documenthelper-trinity.1)0
-rw-r--r--ubuntu/maverick/tdelibs/debian/changelog4
12 files changed, 6 insertions, 6 deletions
diff --git a/ubuntu/maverick/applications/kchmviewer/debian/control b/ubuntu/maverick/applications/kchmviewer/debian/control
index 7e5b19c42..f14942fd3 100644
--- a/ubuntu/maverick/applications/kchmviewer/debian/control
+++ b/ubuntu/maverick/applications/kchmviewer/debian/control
@@ -17,7 +17,7 @@ Description: CHM viewer for Trinity
KchmViewer is a chm (MS HTML help file format) viewer, written in C++.
Unlike most existing CHM viewers for Unix, it uses Trolltech Qt widget
library, and does not depend on KDE or GNOME. However, it may be compiled
- with full Trinity support, including Trinity widgets and KIO/KHTML.
+ with full Trinity support, including Trinity widgets and KIO/TDEHTML.
.
The main advantage of KchmViewer is non-English language support. Unlike
others, KchmViewer in most cases correctly detects help file encoding,
diff --git a/ubuntu/maverick/applications/kmplayer/debian/control b/ubuntu/maverick/applications/kmplayer/debian/control
index 846879cde..da67b2312 100644
--- a/ubuntu/maverick/applications/kmplayer/debian/control
+++ b/ubuntu/maverick/applications/kmplayer/debian/control
@@ -51,7 +51,7 @@ Section: tde
Replaces: kmplayer-konq-plugins-trinity (<< 4:14.0.0)
Breaks: kmplayer-konq-plugins-trinity (<< 4:14.0.0)
Depends: ${shlibs:Depends}, kmplayer-base-trinity (= ${binary:Version}), konqueror-trinity
-Description: KMPlayer plugin for KHTML/Konqueror [Trinity]
+Description: KMPlayer plugin for TDEHTML/Konqueror [Trinity]
This plugin enables audio/video playback inside konqueror, using Xine (with
*kxineplayer) or GStreamer (with *kgstplayer), such as movie trailers, web
tv or radio. It mimics QuickTime, MS Media Player and RealPlayer plugin
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kio_httprc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/kio_httprc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde-rc-files/tdeio_httprc
diff --git a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kio_httprc b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/kio_httprc
+++ b/ubuntu/maverick/defaultsettings/kubuntu-default-settings/kde4/kde-rc-files/tdeio_httprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kio_httprc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/kio_httprc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde-rc-files/tdeio_httprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kio_httprc b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/kio_httprc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings-ii/kde4/kde-rc-files/tdeio_httprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kio_httprc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/kio_httprc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde-rc-files/tdeio_httprc
diff --git a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kio_httprc b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdeio_httprc
index b7cdb08ee..b7cdb08ee 100644
--- a/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/kio_httprc
+++ b/ubuntu/maverick/defaultsettings/redmond-default-settings/kde4/kde-rc-files/tdeio_httprc
diff --git a/ubuntu/maverick/dependencies/qt3/debian/changelog b/ubuntu/maverick/dependencies/qt3/debian/changelog
index 018cd497a..f7da260d9 100644
--- a/ubuntu/maverick/dependencies/qt3/debian/changelog
+++ b/ubuntu/maverick/dependencies/qt3/debian/changelog
@@ -523,7 +523,7 @@ qt-x11-free (3:3.3.7-1) unstable; urgency=medium
* New upstream release. Includes the fix to CVE-2006-4811, an integer
overflow that might (in theory) lead to the arbitrary execution of
- code, particularly for those using KHTML (Konqueror's page rendering
+ code, particularly for those using TDEHTML (Konqueror's page rendering
engine). Urgency is medium as this is a security problem.
(Closes: #394313)
@@ -722,7 +722,7 @@ qt-x11-free (3:3.3.4-8) unstable; urgency=low
+ 29_qtc_fix_rotated_randr: Improve height/width calculations for rotated
screens.
+ 30_qtc_qtoolbar_77047: Fix for the toolbar extension menu.
- + 33_qtc_qlistbox-crash: Fixes a crash that shows up in KHTML.
+ + 33_qtc_qlistbox-crash: Fixes a crash that shows up in TDEHTML.
+ 34_qtc_dnd_optimization: Massive DND speedups.
+ 35_qtc_dnd_active_window_fix: Fixes DND when windows are changing focus.
+ 36_qtc_dnd-timestamp-fix: Suppresses needless popups when using DND.
diff --git a/ubuntu/maverick/tdebase/debian/man/kio_media_mounthelper-trinity.1 b/ubuntu/maverick/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
index 1a6fd6971..1a6fd6971 100644
--- a/ubuntu/maverick/tdebase/debian/man/kio_media_mounthelper-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/tdeio_media_mounthelper-trinity.1
diff --git a/ubuntu/maverick/tdebase/debian/man/kio_system_documenthelper-trinity.1 b/ubuntu/maverick/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
index 9779578e6..9779578e6 100644
--- a/ubuntu/maverick/tdebase/debian/man/kio_system_documenthelper-trinity.1
+++ b/ubuntu/maverick/tdebase/debian/man/tdeio_system_documenthelper-trinity.1
diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog
index 15ecc465c..fc839a83c 100644
--- a/ubuntu/maverick/tdelibs/debian/changelog
+++ b/ubuntu/maverick/tdelibs/debian/changelog
@@ -2303,7 +2303,7 @@ tdelibs (4:3.3.2-2) unstable; urgency=high
* KDE_3_3_BRANCH update.
- * Include patch from CVS to fix XMLHttpRequest POST being broken in KHTML
+ * Include patch from CVS to fix XMLHttpRequest POST being broken in TDEHTML
due to a blank line in headers. (Closes: #292765)
+++ Changes by Christopher Martin:
@@ -2697,7 +2697,7 @@ tdelibs (4:2.2.2-13.woody.4) stable-security; urgency=high
tdelibs (4:2.2.2-13.woody.3) stable-security; urgency=high
* Non-maintainer upload authored by security team (Joey)
- * Fixes cross-site scripting vulnerability in KHTML.
+ * Fixes cross-site scripting vulnerability in TDEHTML.
(http://www.kde.org/info/security/advisory-20020908-2.txt)
-- Daniel Stone <dstone@trinity.unimelb.edu.au> Wed, 11 Sep 2002 22:24:35 +1000