From 1df25de64f5b48f5333b2e92398ffc6f46f793de Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 21:05:32 -0600 Subject: Update Debian and Ubuntu packaging with latest renames --- .../wheezy/applications/kchmviewer/debian/control | 2 +- debian/wheezy/applications/kmplayer/debian/control | 2 +- debian/wheezy/dependencies/qt3/debian/changelog | 4 +- .../debian/man/kio_media_mounthelper-trinity.1 | 163 --------------------- .../debian/man/kio_system_documenthelper-trinity.1 | 22 --- .../debian/man/tdeio_media_mounthelper-trinity.1 | 163 +++++++++++++++++++++ .../man/tdeio_system_documenthelper-trinity.1 | 22 +++ debian/wheezy/tdelibs/debian/changelog | 4 +- 8 files changed, 191 insertions(+), 191 deletions(-) delete mode 100644 debian/wheezy/tdebase/debian/man/kio_media_mounthelper-trinity.1 delete mode 100644 debian/wheezy/tdebase/debian/man/kio_system_documenthelper-trinity.1 create mode 100644 debian/wheezy/tdebase/debian/man/tdeio_media_mounthelper-trinity.1 create mode 100644 debian/wheezy/tdebase/debian/man/tdeio_system_documenthelper-trinity.1 (limited to 'debian/wheezy') diff --git a/debian/wheezy/applications/kchmviewer/debian/control b/debian/wheezy/applications/kchmviewer/debian/control index 7e5b19c42..f14942fd3 100644 --- a/debian/wheezy/applications/kchmviewer/debian/control +++ b/debian/wheezy/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/debian/wheezy/applications/kmplayer/debian/control b/debian/wheezy/applications/kmplayer/debian/control index 846879cde..da67b2312 100644 --- a/debian/wheezy/applications/kmplayer/debian/control +++ b/debian/wheezy/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/debian/wheezy/dependencies/qt3/debian/changelog b/debian/wheezy/dependencies/qt3/debian/changelog index 018cd497a..f7da260d9 100644 --- a/debian/wheezy/dependencies/qt3/debian/changelog +++ b/debian/wheezy/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/debian/wheezy/tdebase/debian/man/kio_media_mounthelper-trinity.1 b/debian/wheezy/tdebase/debian/man/kio_media_mounthelper-trinity.1 deleted file mode 100644 index 1a6fd6971..000000000 --- a/debian/wheezy/tdebase/debian/man/kio_media_mounthelper-trinity.1 +++ /dev/null @@ -1,163 +0,0 @@ -.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KIO_MEDIA_MOUNTHELPER 1 "June 2006" "K Desktop Environment" "helper program" -.SH NAME -kio_media_mounthelper -\- kio_media_mounthelper -.SH SYNOPSIS -\fBkio_media_mounthelper\fP [Qt\-options] [KDE\-options] [options] URL -.SH DESCRIPTION -\fBkio_media_mounthelper\fP is a helper program to handle the mounting of media in KDE. It is part of the KIO subsystem. -.SH OPTIONS -.SS -.SS Arguments: -.TP -.B URL -media:/ URL to mount/unmount/eject/remove -.SS Options: -.TP -.B \-u -Unmount given URL -.TP -.B \-m -Mount given URL (default) -.TP -.B \-e -Eject given URL via kdeeject -.TP -.B \-s -Unmount and Eject given URL (necessary for some USB devices) -.SS -.SS Generic options: -.TP -.B \-\-help -Show help about options -.TP -.B \-\-help\-qt -Show Qt specific options -.TP -.B \-\-help\-kde -Show KDE specific options -.TP -.B \-\-help\-all -Show all options -.TP -.B \-\-author -Show author information -.TP -.B \-v, \-\-version -Show version information -.TP -.B \-\-license -Show license information -.TP -.B \-\- -End of options -.SS -.SS Qt options: -.TP -.B \-\-display -Use the X-server display 'displayname' -.TP -.B \-\-session -Restore the application for the given 'sessionId' -.TP -.B \-\-cmap -Causes the application to install a private color -map on an 8\-bit display -.TP -.B \-\-ncols -Limits the number of colors allocated in the color -cube on an 8\-bit display, if the application is -using the QApplication::ManyColor color -specification -.TP -.B \-\-nograb -tells Qt to never grab the mouse or the keyboard -.TP -.B \-\-dograb -running under a debugger can cause an implicit -\-nograb, use \-dograb to override -.TP -.B \-\-sync -switches to synchronous mode for debugging -.TP -.B \-\-fn, \-\-font -defines the application font -.TP -.B \-\-bg, \-\-background -sets the default background color and an -application palette (light and dark shades are -calculated) -.TP -.B \-\-fg, \-\-foreground -sets the default foreground color -.TP -.B \-\-btn, \-\-button -sets the default button color -.TP -.B \-\-name -sets the application name -.TP -.B \-\-title -sets the application title (caption) -.TP -.B \-\-visual TrueColor -forces the application to use a TrueColor visual on -an 8\-bit display -.TP -.B \-\-inputstyle <inputstyle> -sets XIM (X Input Method) input style. Possible -values are onthespot, overthespot, offthespot and -root -.TP -.B \-\-im <XIM server> -set XIM server -.TP -.B \-\-noxim -disable XIM -.TP -.B \-\-reverse -mirrors the whole layout of widgets -.SS -.SS KDE options: -.TP -.B \-\-caption <caption> -Use 'caption' as name in the titlebar -.TP -.B \-\-icon <icon> -Use 'icon' as the application icon -.TP -.B \-\-miniicon <icon> -Use 'icon' as the icon in the titlebar -.TP -.B \-\-config <filename> -Use alternative configuration file -.TP -.B \-\-dcopserver <server> -Use the DCOP Server specified by 'server' -.TP -.B \-\-nocrashhandler -Disable crash handler, to get core dumps -.TP -.B \-\-waitforwm -Waits for a WM_NET compatible windowmanager -.TP -.B \-\-style <style> -sets the application GUI style -.TP -.B \-\-geometry <geometry> -sets the client geometry of the main widget \- see man X for the argument format -.SS -.SH AUTHORS -.nf -Waldo Bastian <bastian@kde.org> -.br -Kevin Ottens <ervin@ipsquad.net> - -.br -.fi -Please use http://bugs.kde.org to report bugs; do not mail the authors directly. -.PP -This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. -.PP -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/debian/wheezy/tdebase/debian/man/kio_system_documenthelper-trinity.1 b/debian/wheezy/tdebase/debian/man/kio_system_documenthelper-trinity.1 deleted file mode 100644 index 9779578e6..000000000 --- a/debian/wheezy/tdebase/debian/man/kio_system_documenthelper-trinity.1 +++ /dev/null @@ -1,22 +0,0 @@ -.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH kio_system_documenthelper 1 "June 2006" "K Desktop Environment" "helper script" -.SH NAME -kio_system_documenthelper -\- KDE helper script used by document.desktop -.SH SYNOPSIS -\fBkio_system_documenthelper\fP - -.SH DESCRIPTION -The script is used by document.desktop entry to determine if it must be shown or not. - -.SH AUTHORS -.nf -Kevin Ottens <ervin@ipsquad.net> - -.br -.fi -Please use http://bugs.kde.org to report bugs; do not mail the author directly. -.PP -This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. -.PP -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/debian/wheezy/tdebase/debian/man/tdeio_media_mounthelper-trinity.1 b/debian/wheezy/tdebase/debian/man/tdeio_media_mounthelper-trinity.1 new file mode 100644 index 000000000..1a6fd6971 --- /dev/null +++ b/debian/wheezy/tdebase/debian/man/tdeio_media_mounthelper-trinity.1 @@ -0,0 +1,163 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH KIO_MEDIA_MOUNTHELPER 1 "June 2006" "K Desktop Environment" "helper program" +.SH NAME +kio_media_mounthelper +\- kio_media_mounthelper +.SH SYNOPSIS +\fBkio_media_mounthelper\fP [Qt\-options] [KDE\-options] [options] URL +.SH DESCRIPTION +\fBkio_media_mounthelper\fP is a helper program to handle the mounting of media in KDE. It is part of the KIO subsystem. +.SH OPTIONS +.SS +.SS Arguments: +.TP +.B URL +media:/ URL to mount/unmount/eject/remove +.SS Options: +.TP +.B \-u +Unmount given URL +.TP +.B \-m +Mount given URL (default) +.TP +.B \-e +Eject given URL via kdeeject +.TP +.B \-s +Unmount and Eject given URL (necessary for some USB devices) +.SS +.SS Generic options: +.TP +.B \-\-help +Show help about options +.TP +.B \-\-help\-qt +Show Qt specific options +.TP +.B \-\-help\-kde +Show KDE specific options +.TP +.B \-\-help\-all +Show all options +.TP +.B \-\-author +Show author information +.TP +.B \-v, \-\-version +Show version information +.TP +.B \-\-license +Show license information +.TP +.B \-\- +End of options +.SS +.SS Qt options: +.TP +.B \-\-display <displayname> +Use the X-server display 'displayname' +.TP +.B \-\-session <sessionId> +Restore the application for the given 'sessionId' +.TP +.B \-\-cmap +Causes the application to install a private color +map on an 8\-bit display +.TP +.B \-\-ncols <count> +Limits the number of colors allocated in the color +cube on an 8\-bit display, if the application is +using the QApplication::ManyColor color +specification +.TP +.B \-\-nograb +tells Qt to never grab the mouse or the keyboard +.TP +.B \-\-dograb +running under a debugger can cause an implicit +\-nograb, use \-dograb to override +.TP +.B \-\-sync +switches to synchronous mode for debugging +.TP +.B \-\-fn, \-\-font <fontname> +defines the application font +.TP +.B \-\-bg, \-\-background <color> +sets the default background color and an +application palette (light and dark shades are +calculated) +.TP +.B \-\-fg, \-\-foreground <color> +sets the default foreground color +.TP +.B \-\-btn, \-\-button <color> +sets the default button color +.TP +.B \-\-name <name> +sets the application name +.TP +.B \-\-title <title> +sets the application title (caption) +.TP +.B \-\-visual TrueColor +forces the application to use a TrueColor visual on +an 8\-bit display +.TP +.B \-\-inputstyle <inputstyle> +sets XIM (X Input Method) input style. Possible +values are onthespot, overthespot, offthespot and +root +.TP +.B \-\-im <XIM server> +set XIM server +.TP +.B \-\-noxim +disable XIM +.TP +.B \-\-reverse +mirrors the whole layout of widgets +.SS +.SS KDE options: +.TP +.B \-\-caption <caption> +Use 'caption' as name in the titlebar +.TP +.B \-\-icon <icon> +Use 'icon' as the application icon +.TP +.B \-\-miniicon <icon> +Use 'icon' as the icon in the titlebar +.TP +.B \-\-config <filename> +Use alternative configuration file +.TP +.B \-\-dcopserver <server> +Use the DCOP Server specified by 'server' +.TP +.B \-\-nocrashhandler +Disable crash handler, to get core dumps +.TP +.B \-\-waitforwm +Waits for a WM_NET compatible windowmanager +.TP +.B \-\-style <style> +sets the application GUI style +.TP +.B \-\-geometry <geometry> +sets the client geometry of the main widget \- see man X for the argument format +.SS +.SH AUTHORS +.nf +Waldo Bastian <bastian@kde.org> +.br +Kevin Ottens <ervin@ipsquad.net> + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the authors directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/debian/wheezy/tdebase/debian/man/tdeio_system_documenthelper-trinity.1 b/debian/wheezy/tdebase/debian/man/tdeio_system_documenthelper-trinity.1 new file mode 100644 index 000000000..9779578e6 --- /dev/null +++ b/debian/wheezy/tdebase/debian/man/tdeio_system_documenthelper-trinity.1 @@ -0,0 +1,22 @@ +.\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand +.TH kio_system_documenthelper 1 "June 2006" "K Desktop Environment" "helper script" +.SH NAME +kio_system_documenthelper +\- KDE helper script used by document.desktop +.SH SYNOPSIS +\fBkio_system_documenthelper\fP + +.SH DESCRIPTION +The script is used by document.desktop entry to determine if it must be shown or not. + +.SH AUTHORS +.nf +Kevin Ottens <ervin@ipsquad.net> + +.br +.fi +Please use http://bugs.kde.org to report bugs; do not mail the author directly. +.PP +This manual page was written by Holger Hartmann <Holger_Hartmann@gmx.de> for the Debian Project, but may be used by others. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 2 or any later version published by the Free Software Foundation. +.PP +On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common\-licenses/GPL. diff --git a/debian/wheezy/tdelibs/debian/changelog b/debian/wheezy/tdelibs/debian/changelog index 15ecc465c..fc839a83c 100644 --- a/debian/wheezy/tdelibs/debian/changelog +++ b/debian/wheezy/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 -- cgit v1.2.1