diff options
Diffstat (limited to 'ubuntu/maverick/tdelibs/debian')
7 files changed, 13 insertions, 27 deletions
diff --git a/ubuntu/maverick/tdelibs/debian/man/dcop-trinity.sgml b/ubuntu/maverick/tdelibs/debian/man/dcop-trinity.sgml index 0c80c88a1..7c4342c05 100644 --- a/ubuntu/maverick/tdelibs/debian/man/dcop-trinity.sgml +++ b/ubuntu/maverick/tdelibs/debian/man/dcop-trinity.sgml @@ -141,14 +141,14 @@ manpage.1: manpage.sgml <para><example> <title>Return number of the current desktop, e.g. 2</title> <blockquote><literallayout> -dcop kwin KWinInterface currentDesktop +dcop twin KWinInterface currentDesktop </literallayout></blockquote> </example></para> <para><example> <title>Jump to the next dektop</title> <blockquote><literallayout> -dcop kwin KWinInterface nextDesktop +dcop twin KWinInterface nextDesktop </literallayout></blockquote> </example></para> diff --git a/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1 index dca82fb5e..57ae12c1d 100644 --- a/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1 +++ b/ubuntu/maverick/tdelibs/debian/man/kstartupconfig-trinity.1 @@ -8,7 +8,7 @@ kstartupconfig, kdostartupconfig .sp 1 \fBkdostartupconfig\fP .SH DESCRIPTION -\fBkstartupconfig\fP loads configuration options for use in \fBstartkde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables. +\fBkstartupconfig\fP loads configuration options for use in \fBstarttde\fP. It saves loading time as there is no need to launch programs linked to KDE libraries. \fBstartupconfig\fP uses a cache of some Kconfig options that are updated by \fBkdostartupconfig\fP. The cache is implemented as script file that is sourced and provides the options as shell variables. .sp 1 The configuration options to load are stored in \fIstartupconfigkeys\fP as one option per line. They follow the format <file> <group> <key> <default>. A complete group is addressed as <file> [<group>]. The configuration options are processed in the specified order so the missing default values for groups can be specified as single options after the group option. .sp 1 @@ -42,7 +42,7 @@ configuration options and files they belong to .I $KDEHOME/share/config/startupconfigkeys configuration options to load .SH SEE ALSO -.BR kconf_update (1),\ startkde (1) +.BR kconf_update (1),\ starttde (1) .SH AUTHORS .nf Lubos Lunak <l.lunak@kde.org> diff --git a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml b/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml index c40c64520..d4a7162d1 100644 --- a/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml +++ b/ubuntu/maverick/tdelibs/debian/man/lnusertemp-trinity.sgml @@ -105,7 +105,7 @@ manpage.1: manpage.sgml attacks. </para> <para><command>&dhpackage;</command> is usually called by the - <command>startkde</command> script.</para> + <command>starttde</command> script.</para> </refsect1> <refsect1> diff --git a/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1 b/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1 index 1c3861783..63c5935b6 100644 --- a/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1 +++ b/ubuntu/maverick/tdelibs/debian/man/tdeinit-trinity.1 @@ -10,7 +10,7 @@ tdeinit .sp 1 \fBtdeinit\fP is used to start all other KDE programs. It can start binary program files as well as tdeinit loadable modules (KLMs). .sp 1 -When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstartkde\fP script (normally \fBkcminit\fP and \fBknotify\fP). +When \fBtdeinit\fP starts for the first time it launches \fBdcopserver\fP, \fBklauncher\fP, \fBkded\fP and some additional programs specified on its command line in the \fBstarttde\fP script (normally \fBkcminit\fP and \fBknotify\fP). .sp 1 The \fBtdeinit\fP master process can be used to start additional KDE programs via \fBtdeinit_wrapper\fP, \fBkshell\fP and \fBkwrapper\fP. .sp 1 @@ -29,7 +29,7 @@ Terminate when no KDE applications are left running .I /usr/lib/trinity directory with KLMs (tdeinit loadable modules) .SH SEE ALSO -.BR dcopserver (1),\ kded (1),\ kcminit (1),\ tdeinit_wrapper (1),\ klauncher (1),\ kshell (1),\ kwrapper (1),\ startkde (1) +.BR dcopserver (1),\ kded (1),\ kcminit (1),\ tdeinit_wrapper (1),\ klauncher (1),\ kshell (1),\ kwrapper (1),\ starttde (1) .SH AUTHORS .nf Waldo Bastian <bastian@kde.org> diff --git a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff deleted file mode 100644 index 06bd685ca..000000000 --- a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_38_no_generate_kdepot.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- tdelibs/Makefile.am.in 2006-06-26 16:14:54.000000000 +0000 -+++ tdelibs/Makefile.am.in 2006-06-26 16:16:33.000000000 +0000 -@@ -54,10 +54,8 @@ - find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\ - find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\ - echo ./tdecore/kde-config.cpp.in >> files ;\ -- $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; \ -- : > kde.pot ;\ -+ $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_kdnssd.kcfg > rc.cpp; - $(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/tdelibs.pot -- $(XGETTEXT) common_texts.cpp -o kde.pot - rm -f dirs - - EXTRA_DIST = admin kde.pot \ diff --git a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff index a0db3e5c7..b224a4d11 100644 --- a/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff +++ b/ubuntu/maverick/tdelibs/debian/patches/kubuntu_64_rosetta_translation.diff @@ -5,7 +5,7 @@ "<p>For more information on KDE internationalization " "visit <a href=\"http://l10n.kde.org\">http://l10n.kde.org</a></p>" - ); -+ ) + i18n("<p>Debian includes additions and alterations to the KDE translation from <a href=\"https://translations.launchpad.net/\">Launchpad</a>.</p>"); ++ ) + i18n("<p>Debian includes additions and alterations to the TDE translation from <a href=\"https://translations.launchpad.net/\">Launchpad</a>.</p>"); } TQString diff --git a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install index 8f84589d6..eeb111f96 100644 --- a/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install +++ b/ubuntu/maverick/tdelibs/debian/tdelibs4-trinity-dev.install @@ -232,7 +232,7 @@ debian/tmp/opt/trinity/include/tdesu/ssh.h debian/tmp/opt/trinity/include/tdesu/stub.h debian/tmp/opt/trinity/include/tdesu/su.h debian/tmp/opt/trinity/include/kde_terminal_interface.h -debian/tmp/opt/trinity/include/kdeversion.h +debian/tmp/opt/trinity/include/tdeversion.h debian/tmp/opt/trinity/include/kdialogbase.h debian/tmp/opt/trinity/include/kdialog.h debian/tmp/opt/trinity/include/kdirlister.h @@ -668,10 +668,10 @@ debian/tmp/opt/trinity/include/kuserprofile.h debian/tmp/opt/trinity/include/kvmallocator.h debian/tmp/opt/trinity/include/kwallet.h debian/tmp/opt/trinity/include/kwallettypes.h -debian/tmp/opt/trinity/include/kwindowinfo.h -debian/tmp/opt/trinity/include/kwindowlistmenu.h -debian/tmp/opt/trinity/include/kwin.h -debian/tmp/opt/trinity/include/kwinmodule.h +debian/tmp/opt/trinity/include/twindowinfo.h +debian/tmp/opt/trinity/include/twindowlistmenu.h +debian/tmp/opt/trinity/include/twin.h +debian/tmp/opt/trinity/include/twinmodule.h debian/tmp/opt/trinity/include/kwizard.h debian/tmp/opt/trinity/include/kwordwrap.h debian/tmp/opt/trinity/include/kxerrorhandler.h |