diff options
Diffstat (limited to 'ubuntu/maverick')
88 files changed, 1123 insertions, 1123 deletions
diff --git a/ubuntu/maverick/applications/kdmtheme/debian/README.Debian b/ubuntu/maverick/applications/kdmtheme/debian/README.Debian index 1291b6a32..066828faf 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/README.Debian +++ b/ubuntu/maverick/applications/kdmtheme/debian/README.Debian @@ -1,7 +1,7 @@ -kdmtheme for Debian +tdmtheme for Debian ------------------- -kdmtheme is a KDE Control Module (KCM). To run it, open KDE Control Center and -go to System Administration to find KDM Theme Manager. +tdmtheme is a KDE Control Module (KCM). To run it, open KDE Control Center and +go to System Administration to find TDM Theme Manager. -- Fathi Boudra <[email protected]>, Mon, 31 Jul 2006 18:33:26 +0200 diff --git a/ubuntu/maverick/applications/kdmtheme/debian/changelog b/ubuntu/maverick/applications/kdmtheme/debian/changelog index 120d16cf8..4097b1255 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/changelog +++ b/ubuntu/maverick/applications/kdmtheme/debian/changelog @@ -1,17 +1,17 @@ -kdmtheme-trinity (1.2.2-1ubuntu5) karmic; urgency=low +tdmtheme-trinity (1.2.2-1ubuntu5) karmic; urgency=low * Karmic rebuild * Fixed theme switching problem -- Timothy Pearson <[email protected]> Thu, 02 July 2009 16:08:00 -0600 -kdmtheme-trinity (1.2.2-1ubuntu1) intrepid; urgency=low +tdmtheme-trinity (1.2.2-1ubuntu1) intrepid; urgency=low * Added -trinity suffix -- Timothy Pearson <[email protected]> Mon, 27 Apr 2009 19:00:00 -0600 -kdmtheme (1.2.2-1ubuntu1) intrepid; urgency=low +tdmtheme (1.2.2-1ubuntu1) intrepid; urgency=low [ Sergey Rudchenko ] * Merge from debian unstable, remaining changes: @@ -23,7 +23,7 @@ kdmtheme (1.2.2-1ubuntu1) intrepid; urgency=low -- Harald Sitter <[email protected]> Fri, 06 Jun 2008 00:46:45 +0200 -kdmtheme (1.2.2-1) unstable; urgency=low +tdmtheme (1.2.2-1) unstable; urgency=low * New upstream release: * actually saves theme changes (Closes: #447683) @@ -33,7 +33,7 @@ kdmtheme (1.2.2-1) unstable; urgency=low * Use Homepage field. [ Kel Modderman ] - * Refresh debian/patches/10_kdmtheme-override-warning.diff to apply against + * Refresh debian/patches/10_tdmtheme-override-warning.diff to apply against new upstream release. [ Fathi Boudra ] @@ -41,22 +41,22 @@ kdmtheme (1.2.2-1) unstable; urgency=low -- Fathi Boudra <[email protected]> Sat, 22 Dec 2007 15:36:15 +0100 -kdmtheme (1.2.2-0ubuntu2) hardy; urgency=low +tdmtheme (1.2.2-0ubuntu2) hardy; urgency=low * Re-adds kubuntu_02_confchanges.diff. Patch from Stefan Skotte -- Anthony Mercatante <[email protected]> Fri, 15 Feb 2008 10:25:44 +0100 -kdmtheme (1.2.2-0ubuntu1) hardy; urgency=low +tdmtheme (1.2.2-0ubuntu1) hardy; urgency=low * New upstream release. - * Removed 10_kdmtheme-override-warning.diff. + * Removed 10_tdmtheme-override-warning.diff. * Removed kubuntu_02_confchanges.diff. * Updated Standards-Version to 3.7.3 -- Jonathan Patrick Davies <[email protected]> Mon, 22 Dec 2007 11:48:18 +0100 -kdmtheme (1.2.1-0ubuntu1) hardy; urgency=low +tdmtheme (1.2.1-0ubuntu1) hardy; urgency=low * New upstream release. * Merged new Debian changelog and changes to Ubuntu package. @@ -67,10 +67,10 @@ kdmtheme (1.2.1-0ubuntu1) hardy; urgency=low -- Jonathan Patrick Davies <[email protected]> Mon, 22 Oct 2007 21:18:56 +0200 -kdmtheme (1.2-1) unstable; urgency=low +tdmtheme (1.2-1) unstable; urgency=low * New upstream release. - * Update kdmtheme override warning patch. + * Update tdmtheme override warning patch. * Add patch to replace deprecated qlist.h include. * Add Build-Depends: quilt, automake1.7. * Update copyright file. @@ -78,11 +78,11 @@ kdmtheme (1.2-1) unstable; urgency=low -- Fathi Boudra <[email protected]> Wed, 03 Oct 2007 12:17:40 +0200 -kdmtheme (1.2-0ubuntu2) gutsy; urgency=low +tdmtheme (1.2-0ubuntu2) gutsy; urgency=low [ Stefan Skotte ] - * added support for kdm.d with override files. - * various bugfixes for normal kdmrc usage, including save and apply + * added support for tdm.d with override files. + * various bugfixes for normal tdmrc usage, including save and apply not working, themeDir not set correctly etc. [ Sarah Hobbs ] @@ -91,31 +91,31 @@ kdmtheme (1.2-0ubuntu2) gutsy; urgency=low -- Sarah Hobbs <[email protected]> Fri, 05 Oct 2007 19:09:00 +1000 -kdmtheme (1.2-0ubuntu1) gutsy; urgency=low +tdmtheme (1.2-0ubuntu1) gutsy; urgency=low * New upstream release -- Anthony Mercatante <[email protected]> Sat, 29 Sep 2007 11:17:55 +0200 -kdmtheme (1.1.2-2ubuntu1) feisty; urgency=low +tdmtheme (1.1.2-2ubuntu1) feisty; urgency=low * Added kubuntu_01_kcm_systemsettings.diff for tde-systemsettings inclusion in the Appearance section -- Anthony Mercatante <[email protected]> Tue, 13 Feb 2007 06:18:32 +0100 -kdmtheme (1.1.2-2) unstable; urgency=low +tdmtheme (1.1.2-2) unstable; urgency=low [ Mark Purcell ] * Add debian/rules get-orig-source target for http://buildserver.net. [ Fathi Boudra ] - * Add a patch to warn users about kdm override files introduced with + * Add a patch to warn users about tdm override files introduced with desktop-base. Thanks to Sune Vuorela. -- Fathi Boudra <[email protected]> Wed, 31 Jan 2007 21:11:45 +0100 -kdmtheme (1.1.2-1) unstable; urgency=low +tdmtheme (1.1.2-1) unstable; urgency=low * Initial release (Closes: #380661) diff --git a/ubuntu/maverick/applications/kdmtheme/debian/control b/ubuntu/maverick/applications/kdmtheme/debian/control index 943c0ecf2..c615c56fd 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/control +++ b/ubuntu/maverick/applications/kdmtheme/debian/control @@ -1,4 +1,4 @@ -Source: kdmtheme-trinity +Source: tdmtheme-trinity Section: kde Priority: optional Maintainer: Timothy Pearson <[email protected]> @@ -9,11 +9,11 @@ Build-Depends: cdbs, debhelper (>= 5), quilt, tdelibs4-trinity-dev, automake, au Standards-Version: 3.8.4 Homepage: http://beta.smileaf.org/projects -Package: kdmtheme-trinity +Package: tdmtheme-trinity Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, kdm-trinity -Replaces: kdmtheme-trinity (<< 4:14.0.0) -Breaks: kdmtheme-trinity (<< 4:14.0.0) -Description: theme manager for KDM [Trinity] - kdmtheme is a theme manager for KDM. It provides a KDE Control Module (KCM) - that allows you to easily install, remove and change your KDM themes. +Depends: ${shlibs:Depends}, ${misc:Depends}, tdm-trinity +Replaces: tdmtheme-trinity (<< 4:14.0.0) +Breaks: tdmtheme-trinity (<< 4:14.0.0) +Description: theme manager for TDM [Trinity] + tdmtheme is a theme manager for TDM. It provides a KDE Control Module (KCM) + that allows you to easily install, remove and change your TDM themes. diff --git a/ubuntu/maverick/applications/kdmtheme/debian/copyright b/ubuntu/maverick/applications/kdmtheme/debian/copyright index 23265e2b6..c8d6d972f 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/copyright +++ b/ubuntu/maverick/applications/kdmtheme/debian/copyright @@ -36,7 +36,7 @@ Public License can be found in `/usr/share/common-licenses/GPL'. The Debian packaging is (C) 2007, Kel Modderman <[email protected]> and is licensed under the GPL, see above. -The documentations provided with kdmtheme is distributed under +The documentations provided with tdmtheme is distributed under the GNU Free Documentation License (FDL). They are considered free with regards to the Debian Free Software Guidelines (DFSG) because they don't contain any unmodifiable parts (invariant sections). diff --git a/ubuntu/maverick/applications/kdmtheme/debian/kdmtheme.lintian-overrides b/ubuntu/maverick/applications/kdmtheme/debian/kdmtheme.lintian-overrides index 4932c5f8a..88969d336 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/kdmtheme.lintian-overrides +++ b/ubuntu/maverick/applications/kdmtheme/debian/kdmtheme.lintian-overrides @@ -1,6 +1,6 @@ # provided by tdelibs -kdmtheme: desktop-command-not-in-package ./usr/share/applications/kde/kdmtheme.desktop kcmshell +tdmtheme: desktop-command-not-in-package ./usr/share/applications/kde/tdmtheme.desktop kcmshell # kcontrol module -kdmtheme: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/applications/kde/kdmtheme.desktop -kdmtheme: desktop-entry-lacks-main-category ./usr/share/applications/kde/kdmtheme.desktop +tdmtheme: desktop-entry-invalid-category X-KDE-settings-system ./usr/share/applications/kde/tdmtheme.desktop +tdmtheme: desktop-entry-lacks-main-category ./usr/share/applications/kde/tdmtheme.desktop diff --git a/ubuntu/maverick/applications/kdmtheme/debian/rules b/ubuntu/maverick/applications/kdmtheme/debian/rules index 0049d9a98..0eb4fad95 100755 --- a/ubuntu/maverick/applications/kdmtheme/debian/rules +++ b/ubuntu/maverick/applications/kdmtheme/debian/rules @@ -27,9 +27,9 @@ debian/stamp-bootstrap: make -f admin/Makefile.common cvs touch debian/stamp-bootstrap -install/kdmtheme-trinity:: - install -D -p -m644 debian/kdmtheme.lintian-overrides \ - debian/kdmtheme-trinity/usr/share/lintian/overrides/kdmtheme-trinity +install/tdmtheme-trinity:: + install -D -p -m644 debian/tdmtheme.lintian-overrides \ + debian/tdmtheme-trinity/usr/share/lintian/overrides/tdmtheme-trinity get-orig-source: @@dh_testdir diff --git a/ubuntu/maverick/applications/kdmtheme/debian/watch b/ubuntu/maverick/applications/kdmtheme/debian/watch index 5cf8d8c80..82cebbd47 100644 --- a/ubuntu/maverick/applications/kdmtheme/debian/watch +++ b/ubuntu/maverick/applications/kdmtheme/debian/watch @@ -1,2 +1,2 @@ version=3 -http://beta.smileaf.org/files/kdmtheme/kdmtheme-(.*)\.tar\.bz2 debian svn-upgrade +http://beta.smileaf.org/files/tdmtheme/tdmtheme-(.*)\.tar\.bz2 debian svn-upgrade diff --git a/ubuntu/maverick/applications/tde-guidance/debian/changelog b/ubuntu/maverick/applications/tde-guidance/debian/changelog index ac2f03395..fb3aec362 100644 --- a/ubuntu/maverick/applications/tde-guidance/debian/changelog +++ b/ubuntu/maverick/applications/tde-guidance/debian/changelog @@ -913,7 +913,7 @@ tde-guidance (0.6.4-0ubuntu1) dapper; urgency=low * The screen images in the dualhead widget make better use of available widget space. * Displayconfig: The 40guidance-displayconfig_restore script which is used by - the Xsession script during login via KDM/xdm, has now been fixed to not stop + the Xsession script during login via TDM/xdm, has now been fixed to not stop the login in case of failure. * BUG: Displayconfig was getting confused by unknown graphics cards and crashing. (Malone bug #32915) diff --git a/ubuntu/maverick/tde-i18n/debian/changelog b/ubuntu/maverick/tde-i18n/debian/changelog index a4347a2ca..1b8e2c2ba 100644 --- a/ubuntu/maverick/tde-i18n/debian/changelog +++ b/ubuntu/maverick/tde-i18n/debian/changelog @@ -410,7 +410,7 @@ tde-i18n (4:3.1-1) unstable; urgency=low (closes: Bug#172383) * default charset is now utf-8 (closes: Bug#172361) - * kdm in localized for pt_BR + * tdm in localized for pt_BR (closes: Bug#116046) -- Noel Koethe <[email protected]> Mon, 3 Feb 2003 20:42:00 +0100 diff --git a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES b/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES index 5d776fe2d..6abff5d30 100644 --- a/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES +++ b/ubuntu/maverick/tdebase/debian/KUBUNTU-DEBIAN-CHANGES @@ -13,7 +13,7 @@ remove debian/tmp/share/apps/konqsidebartng/entries/system.desktop remove .svgz from tdebase-data.install -replace 10_kdmrc_defaults.diff with 10_kdmrc_defaults_kubuntu.diff +replace 10_tdmrc_defaults.diff with 10_tdmrc_defaults_kubuntu.diff install/klipper:: sed -i '/X-Ubuntu-Gettext-Domain=/d' debian/tmp/etc/trinity/klipperrc @@ -34,7 +34,7 @@ tdebase-data.install: debian/tmp/etc/xdg/menus/applications-merged/kde-essential in konsole.README.Debian s/fontconfig/fontconfig-config -in kdm.postinst install at s/99/13/ +in tdm.postinst install at s/99/13/ from tdebase-kio-plugins.install remove debian/tmp/usr/share/services/kfile_trash.desktop (that's to remove the trash from the "system applet") @@ -42,7 +42,7 @@ add debian/ubuntu.xmodmap debian/80ubuntu-xmodmap and add install rules to bina control: khelpcenter, suggest don't depend on htdig -kdm.init: Launch usplash_down at the end of the stop section +tdm.init: Launch usplash_down at the end of the stop section Added konqueror dependancy for konqueror-nsplugins. (LP: #139893) diff --git a/ubuntu/maverick/tdebase/debian/NEWS b/ubuntu/maverick/tdebase/debian/NEWS index 49b0bb6d4..226d0b1aa 100644 --- a/ubuntu/maverick/tdebase/debian/NEWS +++ b/ubuntu/maverick/tdebase/debian/NEWS @@ -1,44 +1,44 @@ tdebase (4:3.4.2-3) unstable; urgency=low - *** Changes to KDM conffiles: + *** Changes to TDM conffiles: - * Users upgrading KDM from 3.3.x, will find that KDM no longer uses the - /etc/trinity/kdm/Xservers file, if /etc/trinity/kdm/kdmrc was updated to - the version shipped with KDM 3.4.x. The package upgrade scripts - will not remove Xservers even if kdmrc has been upgraded, if they detect + * Users upgrading TDM from 3.3.x, will find that TDM no longer uses the + /etc/trinity/tdm/Xservers file, if /etc/trinity/tdm/tdmrc was updated to + the version shipped with TDM 3.4.x. The package upgrade scripts + will not remove Xservers even if tdmrc has been upgraded, if they detect local modifications. This should allow administrators to merge their - Xservers changes into kdmrc before themselves removing Xservers. The new - ServerArgsLocal key in kdmrc is where most old Xservers customizations + Xservers changes into tdmrc before themselves removing Xservers. The new + ServerArgsLocal key in tdmrc is where most old Xservers customizations should be placed. * Irrespective of the removal of the Xservers file, we highly recommend that - all administrators accept the installation of the updated kdmrc file - during the package upgrade. Many important changes to KDM's defaults have - been made, and KDM is exceedingly bad at handling anything but the latest - kdmrc format, so the nuissance of re-customizing KDM will likely prove - less than the nuissance of dealing with a KDM that isn't working properly. - If you have already upgraded KDM package without accepting the new kdmrc, + all administrators accept the installation of the updated tdmrc file + during the package upgrade. Many important changes to TDM's defaults have + been made, and TDM is exceedingly bad at handling anything but the latest + tdmrc format, so the nuissance of re-customizing TDM will likely prove + less than the nuissance of dealing with a TDM that isn't working properly. + If you have already upgraded TDM package without accepting the new tdmrc, purging and reinstalling the package should achieve the desired result. *** Changes to user login script handling: - * Another important change that users upgrading from KDM 3.3.x may notice - is that KDM's ability to source personal login scripts, long disabled, has + * Another important change that users upgrading from TDM 3.3.x may notice + is that TDM's ability to source personal login scripts, long disabled, has been restored. The exact files sourced on login will depend on the user's - choice of shell. For users of bash, KDM will source /etc/profile, followed - by ~/.bash_profile or, if that is not present, ~/.profile. Note that KDM + choice of shell. For users of bash, TDM will source /etc/profile, followed + by ~/.bash_profile or, if that is not present, ~/.profile. Note that TDM is NOT spawning a login shell, but is merely mimicking the behaviour that popular shells would exhibit if they were login shells, by manually - sourcing the customary login scripts. /etc/trinity/kdm/Xsession controls this + sourcing the customary login scripts. /etc/trinity/tdm/Xsession controls this behaviour. - * The important downside of the above approach is that KDM will utterly fail + * The important downside of the above approach is that TDM will utterly fail to start a user's session if the newly sourced files contain certain types of commands. For instance, many commands will cause the login attempt to fail because they expect an interactive shell, or because you are trying to "exec" something that cannot provide an X session. For instance, "exec ksmserver" will launch KDE, but "exec bash" will fail. Thus if you - are unsure why KDM is refusing to start your session, try commenting out + are unsure why TDM is refusing to start your session, try commenting out elements of the newly sourced login scripts, and you may find the problem resolved. @@ -47,24 +47,24 @@ tdebase (4:3.4.2-3) unstable; urgency=low tdebase (4:3.3.2-1) unstable; urgency=low * Users upgrading from KDE 3.2 might find that their keyboards seem no longer - to work in KDM. This problem is caused by a change in KDE's handling of - virtual terminals. The setting which puts KDM on vt7, which was contained - in /etc/trinity/kdm/Xservers, has changed, and is also now located in - /etc/trinity/kdm/kdmrc. + to work in TDM. This problem is caused by a change in KDE's handling of + virtual terminals. The setting which puts TDM on vt7, which was contained + in /etc/trinity/tdm/Xservers, has changed, and is also now located in + /etc/trinity/tdm/tdmrc. * Users who, when upgrading to KDE 3.3, opted to replace their Xservers file with the version shipped by the package, but chose to retain their - /etc/trinity/kdm/kdmrc file, will thus have a KDM configuration which nowhere - contains a setting which properly places KDM on vt7. This can result in a + /etc/trinity/tdm/tdmrc file, will thus have a TDM configuration which nowhere + contains a setting which properly places TDM on vt7. This can result in a race condition which has the end effect of breaking the keyboard when using - KDM. + TDM. * The solution to the problem is either to replace both of Xservers and - kdmrc, or neither, when upgrading to KDE 3.3 for the first time. + tdmrc, or neither, when upgrading to KDE 3.3 for the first time. - * Users already stuck can, after killing KDE, purge and re-install the kdm + * Users already stuck can, after killing KDE, purge and re-install the tdm package, ensuring that the latest, fresh copies are installed. - Alternatively, they can edit /etc/trinity/kdm/kdmrc and add the following + Alternatively, they can edit /etc/trinity/tdm/tdmrc and add the following line: ServerVTs=-7 diff --git a/ubuntu/maverick/tdebase/debian/changelog b/ubuntu/maverick/tdebase/debian/changelog index f4c18cd62..fc2c45054 100644 --- a/ubuntu/maverick/tdebase/debian/changelog +++ b/ubuntu/maverick/tdebase/debian/changelog @@ -60,13 +60,13 @@ tdebase-trinity (4:3.5.10-2ubuntu3) karmic; urgency=low tdebase-trinity (4:3.5.10-2ubuntu2) karmic; urgency=low * Added Start menu button icon configuration dialog - * Delayed kdm-trinity startup to allow for graphics device configuration + * Delayed tdm-trinity startup to allow for graphics device configuration -- Timothy Pearson <[email protected]> Sun, 18 Oct 2009 16:21:00 -0600 tdebase-trinity (4:3.5.10-1ubuntu5) karmic; urgency=low - * Added new ICC loading functionality to kcontrol and kdm + * Added new ICC loading functionality to kcontrol and tdm * Added new display output switching functionality to krandrtray * Beginnings of customizable K menu icon @@ -81,7 +81,7 @@ tdebase-trinity (4:3.5.10-1ubuntu4) karmic; urgency=low tdebase-trinity (4:3.5.10-1ubuntu3) karmic; urgency=low - * Default KDM theme set to kubuntu-trinity + * Default TDM theme set to kubuntu-trinity -- Timothy Pearson <[email protected]> Sat, 10 Oct 2009 12:19:00 -0600 @@ -99,7 +99,7 @@ tdebase-trinity (4:3.5.10-1ubuntu0) karmic; urgency=low tdebase-trinity (4:3.5.10-0ubuntu12) karmic; urgency=low - * Repaired kdm looking at the wrong pam.d files + * Repaired tdm looking at the wrong pam.d files -- Timothy Pearson <[email protected]> Thu, 10 Sep 2009 11:20:00 -0600 @@ -171,14 +171,14 @@ tdebase-trinity (4:3.5.10-0ubuntu4~intrepid6) intrepid; urgency=low tdebase-trinity (4:3.5.10-0ubuntu4~intrepid4) intrepid; urgency=low - * Repaired KDM DATAPATH problem + * Repaired TDM DATAPATH problem -- Timothy Pearson <[email protected]> Fri, 20 Mar 2009 10:22:00 -0600 tdebase-trinity (4:3.5.10-0ubuntu4~intrepid2) intrepid; urgency=low * Repaired accidental conflict with /etc/sysguarddrc - * Repared KDM PATH (fixes bug #56) + * Repared TDM PATH (fixes bug #56) -- Timothy Pearson <[email protected]> Mon, 17 Mar 2009 14:03:00 -0600 @@ -190,7 +190,7 @@ tdebase-trinity (4:3.5.10-0ubuntu4~intrepid0) intrepid; urgency=low tdebase-trinity (4:3.5.10-0ubuntu3~intrepid19) intrepid; urgency=low - * Repaired default kdm icons + * Repaired default tdm icons -- Timothy Pearson <[email protected]> Sat, 07 Mar 2009 13:18:00 -0600 @@ -299,7 +299,7 @@ tdebase (4:3.5.10-0ubuntu1~hardy2) hardy-backports; urgency=low tdebase (4:3.5.10-0ubuntu1~hardy1) hardy-backports; urgency=low * New upstream bugfix release (LP: #261366) - - 13_kdm_sessions_fixes.diff freshen patch + - 13_tdm_sessions_fixes.diff freshen patch - kubuntu_9908_nodisplay_opengl.diff freshen patch - Bump version of tdelibs-dev to 3.5.10 @@ -382,14 +382,14 @@ tdebase (4:3.5.9-0ubuntu1) hardy; urgency=low * New upstream release [ Terence Simpson ] - * Fix config script for kdm to detect kdm-kde4 + * Fix config script for tdm to detect tdm-kde4 -- Jonathan Riddell <[email protected]> Thu, 14 Feb 2008 12:27:06 +0000 tdebase (4:3.5.8-2ubuntu21) hardy; urgency=low - * Add kubuntu_9921_kdm_bulletproof_x.diff, adds bulletproof X - feature to KDM. + * Add kubuntu_9921_tdm_bulletproof_x.diff, adds bulletproof X + feature to TDM. -- Eugene Tretyak <[email protected]> Thu, 14 Feb 2008 10:40:12 +0000 @@ -403,15 +403,15 @@ tdebase (4:3.5.8-2ubuntu20) hardy; urgency=low tdebase (4:3.5.8-2ubuntu19) hardy; urgency=low * tdebase-kio-plugins replaces old tdebase-data, closes LP: #189963 - * Remove 70_kdm_consolekit.diff replace with kubuntu_70_kdm_consolekit.diff, + * Remove 70_tdm_consolekit.diff replace with kubuntu_70_tdm_consolekit.diff, updated version from http://bugs.kde.org/show_bug.cgi?id=147790 -- Jonathan Riddell <[email protected]> Fri, 08 Feb 2008 12:32:50 +0000 tdebase (4:3.5.8-2ubuntu18) hardy; urgency=low - * Edited debian/patches/70_kdm_consolekit.diff to fix a crash - when attempting to connect to local kdm via XDMCP (Closes LP: #178242) + * Edited debian/patches/70_tdm_consolekit.diff to fix a crash + when attempting to connect to local tdm via XDMCP (Closes LP: #178242) Thanks to Paul Brook for debbuging this, and to Zoogie for reporting this -- Maxim Levitsky <[email protected]> Tue, 06 Feb 2008 00:39:44 +0000 @@ -461,14 +461,14 @@ tdebase (4:3.5.8-2ubuntu14) hardy; urgency=low tdebase (4:3.5.8-2ubuntu13) hardy; urgency=low - * Added kubuntu_9919_kdm_preferuser.diff, uses the kubuntu-default- + * Added kubuntu_9919_tdm_preferuser.diff, uses the kubuntu-default- settings's settings for facesource if any -- Anthony Mercatante <tonio@kubuntu> Fri, 04 Jan 2008 15:50:02 +0100 tdebase (4:3.5.8-2ubuntu12) hardy; urgency=low - * Really fix kubuntu_9918_kdm_systemlocale.diff + * Really fix kubuntu_9918_tdm_systemlocale.diff -- Jonathan Riddell <[email protected]> Fri, 04 Jan 2008 11:11:38 +0000 @@ -481,8 +481,8 @@ tdebase (4:3.5.8-2ubuntu11) hardy; urgency=low tdebase (4:3.5.8-2ubuntu10) hardy; urgency=low - * Added kubuntu_9918_kdm_systemlocale.diff: - - KDM uses the system locale + * Added kubuntu_9918_tdm_systemlocale.diff: + - TDM uses the system locale -- Anthony Mercatante <tonio@kubuntu> Wed, 02 Jan 2008 12:56:51 +0100 @@ -522,8 +522,8 @@ tdebase (4:3.5.8-2ubuntu6) hardy; urgency=low tdebase (4:3.5.8-2ubuntu5) hardy; urgency=low - * Add kubuntu_9914_kdm_user_image_check.diff from upstream - fixes potential KDM local DoS if users set an invalid image + * Add kubuntu_9914_tdm_user_image_check.diff from upstream + fixes potential TDM local DoS if users set an invalid image Closes LP: #176347 -- Jonathan Riddell <[email protected]> Fri, 14 Dec 2007 12:24:17 +0000 @@ -567,7 +567,7 @@ tdebase (4:3.5.8.dfsg.1-2) unstable; urgency=low +++ Changes by Fathi Boudra: - * Remove /usr/bin/X11 from KDM's default session path. (Closes: 441392) + * Remove /usr/bin/X11 from TDM's default session path. (Closes: 441392) * Add support for ConsoleKit. Thanks to Michael Biebl, William Jon McCann and Kevin Kofler. (Closes: #450603) @@ -614,7 +614,7 @@ tdebase (4:3.5.8.dfsg.1-1) unstable; urgency=low - 24_knotify_arts.diff - 41_nspluginviewer_64bit_fix.diff - 50_several-CVE-konqueror.diff - - 51_CVE-2007-4569-kdm-autologin.diff + - 51_CVE-2007-4569-tdm-autologin.diff - 60_new-debshortcut.diff * Redo buildprep. * Bump build-dependencies and stuff to 3.5.8. @@ -648,7 +648,7 @@ tdebase (4:3.5.7.dfsg.1-1) unstable; urgency=low tdebase (4:3.5.7-4) unstable; urgency=low - * Add patch to fix unauthorized login problem in kdm. + * Add patch to fix unauthorized login problem in tdm. CVE-2007-4569. -- Sune Vuorela <[email protected]> Wed, 19 Sep 2007 20:30:01 +0200 @@ -664,7 +664,7 @@ tdebase (4:3.5.7-3) unstable; urgency=low +++ Changes by Fathi Boudra: - * Add xserver-xorg Recommends to kdm. (Closes: #436573) + * Add xserver-xorg Recommends to tdm. (Closes: #436573) -- Debian Qt/KDE Maintainers <[email protected]> Fri, 27 Jul 2007 16:29:18 +0200 @@ -678,7 +678,7 @@ tdebase (4:3.5.7-2) unstable; urgency=low (Closes: #427843) * Updated nb debconf translation. (Closes: #417942) * Fix typo in starttde manpage. Thanks A. Costa. (Closes: #432062) - * Fix typo in kdmrc. Thanks Greg. (Closes: #422142) + * Fix typo in tdmrc. Thanks Greg. (Closes: #422142) * Updated vi debconf translation. Thanks Clytie Siddall (Closes: #426820) * Updated pt_BR debconf translation. Thanks Eder L. Marques. (Closes: #422285) @@ -735,11 +735,11 @@ tdebase (4:3.5.7-1ubuntu25) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu24) gutsy; urgency=low [ Richard A. Johnson ] - * SECURITY UPDATE: KDM password-less login - * KDM can be tricked into performing a password-less login even for accounts + * SECURITY UPDATE: TDM password-less login + * TDM can be tricked into performing a password-less login even for accounts with a password set under certain circumstances, namely autologin to be configured and "shutdown with password" enabled. - * Add kubuntu_sec_03_kdm_pwless_login.diff for session.c to fix KDM + * Add kubuntu_sec_03_tdm_pwless_login.diff for session.c to fix TDM password-less and autologin configuration. * References: - http://www.kde.org/info/security/advisory-20070919-1.txt @@ -883,15 +883,15 @@ tdebase (4:3.5.7-1ubuntu9) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu8) gutsy; urgency=low - * Fixed debian/kdm.init - set kdm language to the system default. + * Fixed debian/tdm.init + set tdm language to the system default. * Droped pmount dependancy for tdebase. -- Anthony Mercatante <[email protected]> Thu, 14 Jun 2007 17:15:21 +0200 tdebase (4:3.5.7-1ubuntu7) gutsy; urgency=low - * Fixed debian/kdm.init + * Fixed debian/tdm.init Previous code was bash code while the init script is sh -- Anthony Mercatante <[email protected]> Thu, 14 Jun 2007 13:13:22 +0200 @@ -912,8 +912,8 @@ tdebase (4:3.5.7-1ubuntu5) gutsy; urgency=low tdebase (4:3.5.7-1ubuntu4) gutsy; urgency=low - * Removed kubuntu_55_kdm_usplash_down.diff, usplash is now launched - via the kdm.init script, modified to launch usplash_down + * Removed kubuntu_55_tdm_usplash_down.diff, usplash is now launched + via the tdm.init script, modified to launch usplash_down (Fixes LP: #83727 and LP: #34821) * Added kbuntu_97_khotkeys_alt_print_shortcut.diff, capture a window with khotkeys with alt+print @@ -947,7 +947,7 @@ tdebase (4:3.5.7-1ubuntu1) gutsy; urgency=low * Merge with Debian for new upstream release, remaining changes in KUBUNTU-DEBIAN-CHANGES - * Remove kubuntu_62_genkdmconf_fix.diff, applied upstream + * Remove kubuntu_62_gentdmconf_fix.diff, applied upstream * Update kubuntu_68_xinerama.diff * Remove kubuntu_87_kicker_restore_description_parents.diff, obsoleted by upstream changes * Remove kubuntu_94_konqueror_nsplugins_amd64.diff, now part of Debian @@ -1023,9 +1023,9 @@ tdebase (4:3.5.6.dfsg.2-1) unstable; urgency=low +++ Changes by Sune Vuorela: * Support where the frosty furry animals wants their plugins. (Patch 38) - * Better distinguish wether users has modified their kdm theme. (Patch 39) - * Update kdm debconf template, thanks to Christian Perrier. (Closes: #415941) - Also update kdm debconf translations: + * Better distinguish wether users has modified their tdm theme. (Patch 39) + * Update tdm debconf template, thanks to Christian Perrier. (Closes: #415941) + Also update tdm debconf translations: - Norwegian Bokmal - Swedish thanks to Daniel Nylander (Closes: #417875) - Arabic thanks to Ossama Khayat (Closes: #417886) @@ -1061,7 +1061,7 @@ tdebase (4:3.5.6.dfsg.2-1) unstable; urgency=low * Repackage to remove non-free OpenGL logo and update prune-nonfree script. Also, patch 44 to not install the logo. (Closes: #419962) - * Update spanish kdm debconf template translation, thanks to Enrique Matías. + * Update spanish tdm debconf template translation, thanks to Enrique Matías. * Fix changelog typos ;-) * And, as always, upload. @@ -1073,9 +1073,9 @@ tdebase (4:3.5.6.dfsg.1-2) experimental; urgency=low * Don't install gvim desktop file in kappfinder. gvim does it by itself - and much better. (Closes: #408233) - * Improve documentation about styling kdm (thanks to Jeremy Bygott). - This is a note in kdm.init, in kdm.README.Debian and in the - generated kdmrc. (Closes: #408418, #403776, #403797, #406438) + * Improve documentation about styling tdm (thanks to Jeremy Bygott). + This is a note in tdm.init, in tdm.README.Debian and in the + generated tdmrc. (Closes: #408418, #403776, #403797, #406438) * Add portuguese debconf translation. Thanks to Carlos Lisboa. (Closes: #408021) @@ -1171,7 +1171,7 @@ tdebase (4:3.5.6-0ubuntu10) feisty; urgency=low * Add kubuntu_91_ksplash_fork_too_early_cond.diff, closes Malone #46682. Patch from Mark Jenkins - * Removed kubuntu_05_kdm_theme_config.diff, kdm config will now be + * Removed kubuntu_05_tdm_theme_config.diff, tdm config will now be set via kubuntu-default-settings postinst script. Closes Malone #58639 @@ -1297,7 +1297,7 @@ tdebase (4:3.5.5a.dfsg.1-1ubuntu14) feisty; urgency=low tdebase (4:3.5.5a.dfsg.1-1ubuntu13) feisty; urgency=low - * Update kdm init script to stop usplash with "start" + * Update tdm init script to stop usplash with "start" -- Jonathan Riddell <[email protected]> Thu, 4 Jan 2007 23:05:08 +0000 @@ -1389,7 +1389,7 @@ tdebase (4:3.5.5a.dfsg.1-1ubuntu1) feisty; urgency=low tdebase (4:3.5.6.dfsg.1-1) experimental; urgency=low * New upstream release: - * Fixes "kdm does not obey pam_limits". (Closes: #242641) + * Fixes "tdm does not obey pam_limits". (Closes: #242641) * Resolves ksysguard problem that it was not possible to sensor order. (Closes: #350561) * Fixes kdesktop_lock and pam_krb5. (Closes: #374394, #376803) @@ -1443,18 +1443,18 @@ tdebase (4:3.5.5a.dfsg.1-3) unstable; urgency=high * debian-kde_default.png.desktop * 21_default_background_image.diff.uu * 22_default_backgrounds.diff - * Add kdm customization support and update kdm README.Debian. Main changes - can be found in kdm init script: - * use an alternative kdm master configuration file (/var/run/kdm/kdmrc) - and background configuration file (/var/run/kdm/backgroundrc) - * source override file in kdm override directory (/etc/default/kdm.d) + * Add tdm customization support and update tdm README.Debian. Main changes + can be found in tdm init script: + * use an alternative tdm master configuration file (/var/run/tdm/tdmrc) + and background configuration file (/var/run/tdm/backgroundrc) + * source override file in tdm override directory (/etc/default/tdm.d) (Closes: #385839) +++ Changes by Sune Vuorela: * Add tdelibs-dbg to tdebase-dbg dependencies. +++ Changes by Josh Metzler: - * Restore kdm's default user face icon by adding a symlink to kdm.links. + * Restore tdm's default user face icon by adding a symlink to tdm.links. (Closes: #267722) +++ Changes by Modestas Vainius: @@ -1582,7 +1582,7 @@ tdebase (4:3.5.5-1) unstable; urgency=low depends on tdebase, so the kde-desktop task will now pull in hal/pmount as well. (Closes: #384663) - * Fix typo in /etc/pam.d/kdm-np. (Closes: #381908) + * Fix typo in /etc/pam.d/tdm-np. (Closes: #381908) * Remove /usr/share/apps/kappfinder/apps/Office/lyx.desktop, as lyx-qt provides its own better .desktop file. (Closes: #383412) @@ -1663,7 +1663,7 @@ tdebase (4:3.5.4-1) unstable; urgency=low * Add libjessie-java to konqueror's Java Suggests, since it is needed for JSSE in conjunction with GCJ. - * Add a LSB header to the KDM init script, making KDM usable with a parallel + * Add a LSB header to the TDM init script, making TDM usable with a parallel bootscripts setup. Thanks to Carlos Villegas. (Closes: #376958) * 25_khelp_htdig.diff: With the htdig package, searchable indexes should @@ -1741,7 +1741,7 @@ tdebase (4:3.5.4-0ubuntu27) edgy; urgency=low tdebase (4:3.5.4-0ubuntu26) edgy; urgency=low - * Install kdm at init level 13 + * Install tdm at init level 13 -- Jonathan Riddell <[email protected]> Fri, 22 Sep 2006 01:58:38 +0100 @@ -1790,22 +1790,22 @@ tdebase (4:3.5.4-0ubuntu20) edgy; urgency=low tdebase (4:3.5.4-0ubuntu19) edgy; urgency=low - * Added kubuntu_80_kdm_grub.diff (closes #57066) + * Added kubuntu_80_tdm_grub.diff (closes #57066) * Added kubuntu_81_search_engines_config.diff (closes #60058) -- Anthony Mercatante <[email protected]> Tue, 12 Sep 2006 08:26:23 +0200 tdebase (4:3.5.4-0ubuntu18) edgy; urgency=low - * Improved patch kubuntu_79_kdm_halt.diff since kcontrol connection - manager module also hardcodes the setting, instead of reading kdm + * Improved patch kubuntu_79_tdm_halt.diff since kcontrol connection + manager module also hardcodes the setting, instead of reading tdm settings (evil) -- Anthony Mercatante <[email protected]> Mon, 11 Sep 2006 13:19:23 +0200 tdebase (4:3.5.4-0ubuntu17) edgy; urgency=low - * Added patch kubuntu_79_kdm_halt.diff to change the shutdown command + * Added patch kubuntu_79_tdm_halt.diff to change the shutdown command (closes #59134) -- Anthony Mercatante <[email protected]> Mon, 11 Sep 2006 11:50:23 +0200 @@ -1819,7 +1819,7 @@ tdebase (4:3.5.4-0ubuntu16) edgy; urgency=low tdebase (4:3.5.4-0ubuntu15) edgy; urgency=low - * Improved kubuntu_05_kdm_theme_config.diff (closes #57428) + * Improved kubuntu_05_tdm_theme_config.diff (closes #57428) -- Anthony Mercatante <[email protected]> Fri, 8 Sep 2006 15:06:20 +0200 @@ -2034,7 +2034,7 @@ tdebase (4:3.5.3-1) unstable; urgency=low * Update the kate manpage. (Closes: #347883) - * Manually add /usr/bin/X11 to the KDM's default session path, as otherwise + * Manually add /usr/bin/X11 to the TDM's default session path, as otherwise systems still running X11R6.9 won't be able to find X binaries, which can cause the login process to fail under certain circumstances. This bit of cruft (for X11R7 users) should be harmless, and can be removed post-Etch. @@ -2060,23 +2060,23 @@ tdebase (4:3.5.2-2) unstable; urgency=low +++ Changes by Christopher Martin: * Now that menu-xdg+menu can provide xsession .desktop files for window - managers, add /var/lib/menu-xdg/xsessions to kdmrc's default list of + managers, add /var/lib/menu-xdg/xsessions to tdmrc's default list of places to search. Window managers should continue to provide their own .desktop files, however, since they will be more customized and won't force users to install the menu package. This is merely a fallback. (Closes: #360919) - * Make kdm look for /usr/bin/X by default, now that /usr/X11R6 is on its way - out. Adjust other paths in kdmrc as well. kdm should now work better with + * Make tdm look for /usr/bin/X by default, now that /usr/X11R6 is on its way + out. Adjust other paths in tdmrc as well. tdm should now work better with X.Org 7. (Closes: #362924) - * Patch kdm so that if it can't find the X executable in kdmrc (now + * Patch tdm so that if it can't find the X executable in tdmrc (now /usr/bin/X by default), then try /usr/X11R6/bin/X, then finally - /usr/bin/X. This should keep kdm working for users who have a partial or + /usr/bin/X. This should keep tdm working for users who have a partial or botched dist-upgrade, or neglected to permit the installation of an - up-to-date kdmrc. + up-to-date tdmrc. - * Revamp /etc/pam.d/kdm and the other pam files. They should now find the + * Revamp /etc/pam.d/tdm and the other pam files. They should now find the new /etc/default/locale language settings. (Closes: #361089, #361163) * Remove xlibs-static-pic build-dependency, and replace it with @@ -2111,7 +2111,7 @@ tdebase (4:3.5.2-1) unstable; urgency=low * Add a kpersonalizer manpage from Joe Zonker Brockmeier. Thanks. (Closes: #327395) - * Make the KDM option "Restart X Server" visible by default again. + * Make the TDM option "Restart X Server" visible by default again. * Fix the logitechmouse udev rules. Thanks to Henrique de Moraes Holschuh for spotting the problems. (Closes: #359751, #359773) @@ -2156,7 +2156,7 @@ tdebase (4:3.5.0-3) unstable; urgency=low +++ Changes by Christopher Martin: - * Install kdm's NEWS file in all tdebase packages. This ensures that + * Install tdm's NEWS file in all tdebase packages. This ensures that apt-listchanges will display the news to all users. (Closes: #344947) +++ Changes by Adeodato Simó: @@ -2189,11 +2189,11 @@ tdebase (4:3.5.0-2) experimental; urgency=low tdebase (4:3.5.2-0ubuntu27) dapper-security; urgency=low - * SECURITY UPDATE: KDM symlink attack vulnerability - * Add kubuntu_65_kdm_symlink_vunerability.diff - * KDM allows the user to select the session type for login. This + * SECURITY UPDATE: TDM symlink attack vulnerability + * Add kubuntu_65_tdm_symlink_vunerability.diff + * TDM allows the user to select the session type for login. This setting is permanently stored in the user home directory. By - using a symlink attack, KDM can be tricked into allowing the + using a symlink attack, TDM can be tricked into allowing the user to read file content that would otherwise be unreadable to this particular user. * References: @@ -2253,13 +2253,13 @@ tdebase (4:3.5.2-0ubuntu20) dapper; urgency=low tdebase (4:3.5.2-0ubuntu19) dapper; urgency=low - * Add kubuntu_62_genkdmconf_fix.diff, closes Malone #39599 + * Add kubuntu_62_gentdmconf_fix.diff, closes Malone #39599 -- Frode M. Doeving <[email protected]> Mon, 1 May 2006 15:25:48 +0100 tdebase (4:3.5.2-0ubuntu18) dapper; urgency=low - * Fix wallpaper in kubuntu_05_kdm_theme_config.diff + * Fix wallpaper in kubuntu_05_tdm_theme_config.diff * Alter kubuntu_52_gtk_qt_engine_config.diff, don't make use of gtk_qt_engine if gnome or xfce are already installed (Malone #36256) @@ -2275,7 +2275,7 @@ tdebase (4:3.5.2-0ubuntu17) dapper; urgency=low tdebase (4:3.5.2-0ubuntu16) dapper; urgency=low - * Update kubuntu_05_kdm_theme_config.diff for dapper wallpaper + * Update kubuntu_05_tdm_theme_config.diff for dapper wallpaper -- Jonathan Riddell <[email protected]> Thu, 27 Apr 2006 15:45:33 +0100 @@ -2394,13 +2394,13 @@ tdebase (4:3.5.2-0ubuntu1) dapper; urgency=low tdebase (4:3.5.1-0ubuntu14) dapper; urgency=low - * Add kubuntu_55_kdm_usplash_down.diff run usplash on exit from KDM + * Add kubuntu_55_tdm_usplash_down.diff run usplash on exit from TDM -- Jonathan Riddell <[email protected]> Fri, 17 Mar 2006 12:26:58 +0000 tdebase (4:3.5.1-0ubuntu13) dapper; urgency=low - * Update kdm background colour in kubuntu_05_kdm_theme_config.diff + * Update tdm background colour in kubuntu_05_tdm_theme_config.diff to match current artwork -- Jonathan Riddell <[email protected]> Wed, 15 Mar 2006 21:17:36 +0000 @@ -2427,7 +2427,7 @@ tdebase (4:3.5.1-0ubuntu11) dapper; urgency=low tdebase (4:3.5.1-0ubuntu10) dapper; urgency=low * Add kubuntu_50_kate_desktop.diff use existing Kate session - * Add kubuntu_51_kdmrc_options.diff add back restart X option + * Add kubuntu_51_tdmrc_options.diff add back restart X option * Patches by Anthony Mercatante <[email protected]> -- Jonathan Riddell <[email protected]> Mon, 27 Feb 2006 15:18:06 +0000 @@ -2565,9 +2565,9 @@ tdebase (4:3.5.0-0ubuntu8) dapper; urgency=low tdebase (4:3.5.0-0ubuntu7) dapper; urgency=low - * Update 10_kdmrc_defaults_kubuntu.diff changing Debian to Debian - and rename to kubuntu_10_kdmrc_defaults_kubuntu.diff - * Remove kdm dependency on kubuntu-default-settings, setting KDM + * Update 10_tdmrc_defaults_kubuntu.diff changing Debian to Debian + and rename to kubuntu_10_tdmrc_defaults_kubuntu.diff + * Remove tdm dependency on kubuntu-default-settings, setting TDM theme now scripted in kubuntu-default-settings -- Jonathan Riddell <[email protected]> Tue, 10 Jan 2006 00:26:23 +0000 @@ -2629,7 +2629,7 @@ tdebase (4:3.5-rc2-0ubuntu1) dapper; urgency=low * New upstream pre-release * Tighten tdelibs-dev build-dep for libstdc++ transition - * kdm depends on xauth not xbase-clients + * tdm depends on xauth not xbase-clients * Update 18_default_fonts.diff * Generate .pot files * Remove kubuntu_26_starttde.diff, no need to start ivman in 3.5 @@ -2640,9 +2640,9 @@ tdebase (4:3.5-rc1-1ubuntu1) dapper; urgency=low * New upstream pre-release * Sync with Debian - * Update kubuntu_05_kdm_theme_config.diff + * Update kubuntu_05_tdm_theme_config.diff * Update kubuntu_16_hide_kpager_menu_entry.diff - * Update kubuntu_19_kdm_zsh_emulate.diff + * Update kubuntu_19_tdm_zsh_emulate.diff * Update kubuntu_25_kcontrol_only_in_kde.diff * Update kubuntu_30_starttde_background_colour.diff * Update kubuntu_32_usplash_console_font.diff @@ -2691,7 +2691,7 @@ tdebase (4:3.4.3-3) unstable; urgency=low tdelibs4c2. * Add "noextendedglob" to zsh's options when reading the X startup scripts - for kdm. This works around some of its quirks. (Closes: #336305) + for tdm. This works around some of its quirks. (Closes: #336305) * Backport a fix from KDE 3.5 for a bug that caused switching to Administrator mode in KControl to fail on occasion. (Closes: #306951) @@ -2744,8 +2744,8 @@ tdebase (4:3.4.2-3) unstable; urgency=low +++ Changes by Christopher Martin: - * Add a NEWS entry that explains the KDM upgrade process for users moving - from KDM 3.3.x, as well as KDM's new behaviour regarding login scripts. + * Add a NEWS entry that explains the TDM upgrade process for users moving + from TDM 3.3.x, as well as TDM's new behaviour regarding login scripts. (Closes: #326542, #327191) * Add a patch from the "Improving KDE" set that eliminates a superfluous @@ -2783,11 +2783,11 @@ tdebase (4:3.4.2-1) unstable; urgency=low * Bugs reported in the Debian BTS fixed by this release: - - kdm uses /dev/urandom instead of /dev/random as the default source + - tdm uses /dev/urandom instead of /dev/random as the default source of entropy. This solves myriad issues on low-entropy systems. (Closes: #240027, #294267, #298254, #320838) - - "-nolisten tcp" no longer prevents kdm from connecting to remote + - "-nolisten tcp" no longer prevents tdm from connecting to remote hosts. (Closes: #263449) +++ Changes by Pierre Habouzit: @@ -2808,7 +2808,7 @@ tdebase (4:3.4.2-1) unstable; urgency=low * Tighten all package relations between packages in tdebase, preventing many instances of potentially harmful partial upgrades. In particular, ensure - that kdm is upgraded along with tdebase-bin. (Closes: #312358) + that tdm is upgraded along with tdebase-bin. (Closes: #312358) * Fix typos in the kappfinder manpage. Thanks to A Costa. (Closes: #312767) @@ -2817,11 +2817,11 @@ tdebase (4:3.4.2-1) unstable; urgency=low did not work with arts, had arts ever once been unavailable. (Closes: #312217) - * No longer set a random ForgingSeed in the kdmrc conffile, for this caused - each tdebase build to generate a different kdmrc, and therefore made + * No longer set a random ForgingSeed in the tdmrc conffile, for this caused + each tdebase build to generate a different tdmrc, and therefore made updates a nuissance. - * Make kdm Suggest kdepasswd, since the later contains icons that can be + * Make tdm Suggest kdepasswd, since the later contains icons that can be used to provide users with 'face' icons. * Fix formatting of the kdepasswd manpage. (Closes: #313472) @@ -2829,10 +2829,10 @@ tdebase (4:3.4.2-1) unstable; urgency=low * Add the Arabic debconf translation by Mohammed Adnene Trojette. (Closes: #320768) - * Fix kdm session files that contain the incorrent binary names. + * Fix tdm session files that contain the incorrent binary names. (Closes: #320628) - * Change kdm's debconf dependency into a dependency on debconf | + * Change tdm's debconf dependency into a dependency on debconf | debconf-2.0, as this allows the installation of cdebconf. * Move all of konsole's README documentation into /opt/trinity/share/doc/konsole. @@ -2863,7 +2863,7 @@ tdebase (4:3.4.3-0ubuntu5) breezy-updates; urgency=low tdebase (4:3.4.3-0ubuntu4) breezy; urgency=low * Fix typo in kubuntu_18_default_fonts.diff to give anti-aliased - fonts in kdm + fonts in tdm -- Jonathan Riddell <[email protected]> Tue, 11 Oct 2005 22:50:44 +0100 @@ -2895,7 +2895,7 @@ tdebase (4:3.4.2-0ubuntu5) breezy; urgency=low before X is started (ubuntu No 15344 , No 15102) * Ensure kubuntu_27_aboutscreen_searchbar.diff is not applied before upload - * Fix kdm.postinst to move kdm back to S21 + * Fix tdm.postinst to move tdm back to S21 -- Jonathan Riddell <[email protected]> Tue, 27 Sep 2005 12:50:34 +0100 @@ -2937,7 +2937,7 @@ tdebase (4:3.4.2-0ubuntu2) breezy; urgency=low tdebase (4:3.4.2-0ubuntu1) breezy; urgency=low * New upstream release - * Move 10_kdmrc_defaults.diff to kubuntu_10_kdmrc_defaults.diff + * Move 10_tdmrc_defaults.diff to kubuntu_10_tdmrc_defaults.diff and s/Debian/Debian * Add kubuntu_27_aboutscreen_searchbar.diff @@ -2985,7 +2985,7 @@ tdebase (4:3.4.1-0ubuntu2) breezy; urgency=low tdebase (4:3.4.1-0ubuntu1) breezy; urgency=low * Update version number following KDE 3.4.1 release - * Add kde-base conflict with kdm << 3.4.1 + * Add kde-base conflict with tdm << 3.4.1 * Add back ktip to meta package -- Jonathan Riddell <[email protected]> Wed, 1 Jun 2005 00:15:47 +0000 @@ -2999,7 +2999,7 @@ tdebase (4:3.4.1-0ubuntu0pre3) breezy; urgency=low tdebase (4:3.4.1-0ubuntu0pre2) breezy; urgency=low - * Add build-dep on libxau-dev, libxdmcp-dev to let KDM compile + * Add build-dep on libxau-dev, libxdmcp-dev to let TDM compile -- Jonathan Riddell <[email protected]> Tue, 24 May 2005 19:23:39 +0000 @@ -3007,8 +3007,8 @@ tdebase (4:3.4.1-0ubuntu0pre1) breezy; urgency=low * New upstream release. * Sync with Debian - * Change /usr/bin/X11 to /usr/X11R6/bin in kdm.README.Debian and - patches/11_genkdmconf.diff renamed to kubuntu_01_genkdmconf.diff + * Change /usr/bin/X11 to /usr/X11R6/bin in tdm.README.Debian and + patches/11_gentdmconf.diff renamed to kubuntu_01_gentdmconf.diff and alter PATH in debian/rules -- Jonathan Riddell <[email protected]> Tue, 24 May 2005 11:34:02 +0000 @@ -3033,18 +3033,18 @@ tdebase (4:3.4.0-0pre4) alioth; urgency=low +++ Changes by Christopher Martin: * Added a patch to set reasonable default fonts, using the fontconfig - defaults, for kpersonalizer, kcontrol, kdm, and the Plastik theme. We + defaults, for kpersonalizer, kcontrol, tdm, and the Plastik theme. We also use the Debian Blue artwork to provide a standard desktop background. - * KDM no longer shows the Custom session. When it works at all, it simply + * TDM no longer shows the Custom session. When it works at all, it simply duplicates Default's behaviour anyway. (Closes: #251602) - * New KDM patches source /etc/profile and the user's normal shell startup + * New TDM patches source /etc/profile and the user's normal shell startup scripts. (Closes: #173802, #211953, #250645, #250765, #289143) - * KDM once again looks for window manager session definitions in - /usr/share/apps/kdm/sessions by default. (Closes: #293645, #310155) + * TDM once again looks for window manager session definitions in + /usr/share/apps/tdm/sessions by default. (Closes: #293645, #310155) * USB usermap for Logitech mice is now installed, with device permissions set so that members of the plugdev group can make use of the Logitech @@ -3092,7 +3092,7 @@ tdebase (4:3.3.2-1) unstable; urgency=low * Update tdeprint documentation to sync with tdelibs patches. - * Add NEWS.Debian for kdm, explaining the "keyboard doesn't work" + * Add NEWS.Debian for tdm, explaining the "keyboard doesn't work" problem when upgrading to KDE 3.3, and how to deal with it. (Closes: #266106, #267622) @@ -3146,7 +3146,7 @@ tdebase (4:3.4.0-0ubuntu18) hoary; urgency=low tdebase (4:3.4.0-0ubuntu17) hoary; urgency=low - * Changed kdm start from S13 to S21 (Ubuntu: 8029) + * Changed tdm start from S13 to S21 (Ubuntu: 8029) * More Linitian cleanup -- Andreas Mueller <[email protected]> Tue, 5 Apr 2005 16:00:01 +0200 @@ -3173,8 +3173,8 @@ tdebase (4:3.4.0-0ubuntu14) hoary; urgency=low tdebase (4:3.4.0-0ubuntu13) hoary; urgency=low - * Fix kdm login when shell is zsh. Thanks Antti S. Lankila for the hint. - 19_kdm_zsh_emulate.diff (Hoary #7620) + * Fix tdm login when shell is zsh. Thanks Antti S. Lankila for the hint. + 19_tdm_zsh_emulate.diff (Hoary #7620) * Fix init script output (Hoary #7180) -- Chris Halls <[email protected]> Wed, 30 Mar 2005 01:01:26 +0100 @@ -3207,7 +3207,7 @@ tdebase (4:3.4.0-0ubuntu9) hoary; urgency=low tdebase (4:3.4.0-0ubuntu8) hoary; urgency=low - * Make default background colour of kdm match wallpaper + * Make default background colour of tdm match wallpaper * Add kubuntu_17_hide_desktop_trash.diff to hide desktop wastebin * Remove dependency on ktip from tdebase * Change Hidden to OnlyShowIn in knetattach.desktop so it isn't hidden from remote:/ @@ -3216,7 +3216,7 @@ tdebase (4:3.4.0-0ubuntu8) hoary; urgency=low tdebase (4:3.4.0-0ubuntu7) hoary; urgency=low - * Make kdm depend on kubuntu-default-settings + * Make tdm depend on kubuntu-default-settings -- Jonathan Riddell <[email protected]> Thu, 17 Mar 2005 07:11:28 +0000 @@ -3240,16 +3240,16 @@ tdebase (4:3.4.0-0ubuntu4) hoary; urgency=low tdebase (4:3.4.0-0ubuntu3) hoary; urgency=low - * Fix kdm.postinst to correctly update existing S99kdm links to S13kdm + * Fix tdm.postinst to correctly update existing S99tdm links to S13tdm -- Jonathan Riddell <[email protected]> Wed, 16 Mar 2005 23:43:54 +0000 tdebase (4:3.4.0-0ubuntu2) hoary; urgency=low - * Fix kdm.postinst to update existing S99kdm links to S13kdm + * Fix tdm.postinst to update existing S99tdm links to S13tdm * Fix kubuntu_03_ksplash_settings.diff to change all references to icon * Remove depend on tde-style-lipstik while still in universe - * Add kubuntu_05_kdm_theme_config.diff to make kdm use Debian theme + * Add kubuntu_05_tdm_theme_config.diff to make tdm use Debian theme * Add kubuntu_06_hide_home_menu_entry.diff to hide Home from KMenu -- Jonathan Riddell <[email protected]> Wed, 16 Mar 2005 17:26:25 +0000 @@ -3266,7 +3266,7 @@ tdebase (4:3.4.0-0ubuntu1) hoary; urgency=low tdebase (4:3.4.0-0pre1ubuntu6) hoary; urgency=low - * Make kdm start at at S13 rather than S99 (see Ubuntu Bugzilla No 3143 + * Make tdm start at at S13 rather than S99 (see Ubuntu Bugzilla No 3143 for gdm). * Make tdebase-bin depend on gdb for drkonqi * Add patch kubuntu_02_kcontrol_only_kde_menu.diff making KControl only @@ -3313,11 +3313,11 @@ tdebase (4:3.3.2-0pre1) experimental; urgency=low for CAN-2004-1158. * Lower tdeprint's dependency on gv to a Suggests. (Closes: #269590) * twin is now registered as an x-window-manager. (Closes: #249162) - * Added /usr/share/xsessions to KDM's default session path, so + * Added /usr/share/xsessions to TDM's default session path, so .desktop files installed there are found. (Closes: #243770, #247365, #247747, #250384) - * kdm can now be installed while building tdebase, without affecting - the generated kdmrc and other config files. + * tdm can now be installed while building tdebase, without affecting + the generated tdmrc and other config files. * Adjust documentation to reflect the CUPS document path used by Debian. * Incorporate new manpages, for kdepasswd, kappfinder, kfind, @@ -3385,7 +3385,7 @@ tdebase (4:3.3.1-1) unstable; urgency=low * New upstream release. * KDE_3_3_BRANCH update. * ksmserver: only reset x-session-manager on install. (Closes: #247243) - * kdm: remove log files on purge. (Closes: #273542) + * tdm: remove log files on purge. (Closes: #273542) * Correct Danish po-debconf translations. (Closes: #273832) -- Christopher L Cheney <[email protected]> Thu, 4 Nov 2004 04:00:00 -0600 @@ -3396,10 +3396,10 @@ tdebase (4:3.3.0a-1) unstable; urgency=low * KDE_3_3_BRANCH update. * Add Turkish po-debconf translations. (Closes: #248326) * Add German po-deconf translations. (Closes: #264608) - * Correct /etc/trinity/kdm/Xsession file. (Closes: #265795) + * Correct /etc/trinity/tdm/Xsession file. (Closes: #265795) * Correct usage of "its" in konsole description. (Closes: #268517) * Correct Danish po-debconf translations. (Closes: #269575) - * Correct kdm name in /etc/init.d/kdm. (Closes: #272062) + * Correct tdm name in /etc/init.d/tdm. (Closes: #272062) -- Christopher L Cheney <[email protected]> Sat, 25 Sep 2004 20:00:00 -0500 @@ -3422,17 +3422,17 @@ tdebase (4:3.2.2-1) unstable; urgency=low * New upstream release. * Added Build-Depends: libsensors-dev. - * Corrected kdm postinst startup code. (Closes: #195052) + * Corrected tdm postinst startup code. (Closes: #195052) * Removed Debian menu desktop files. (Closes: #198661) * Added a README.linux.console document. (Closes: #218035) - * Remove kdm log files on purge. (Closes: #225157) + * Remove tdm log files on purge. (Closes: #225157) * Corrected kate/konqueror mime nametemplate support. (Closes: #235216) - * Removed "FIXME - observe" lines from kdm scripts. (Closes: #236422) + * Removed "FIXME - observe" lines from tdm scripts. (Closes: #236422) * Added Danish po-debconf translations. (Closes: #236480) * Remove old x-session-manager alternatives. (Closes: #236515, #236795, #237081, #240773) * Removed tdebase and kicker menu-methods. (Closes: #236700) - * Corrected kdm-np PAM service. (Closes: #236750, #238182, #242381) + * Corrected tdm-np PAM service. (Closes: #236750, #238182, #242381) * Added kcontrol Depends: tdebase-data. (Closes: #239297) * Updated GDM session file. (Closes: #240980) * debian/*.menu: remove the obsolete kderemove tag. @@ -3447,8 +3447,8 @@ tdebase (4:3.2.1-1) unstable; urgency=low * Added Japanese po-deconf translations. (Closes: #137940, #210431) * Updated kate Recommends: kregexpeditor. (Closes: #227677) * Added konqueror Depends: tdebase-kio-plugins. (Closes: #230203) - * Added kdm Provides: x-display-manager. (Closes: #231442) - * Added tdebase-bin/kdm Depends libpam-runtime. (Closes: #233562, #236078) + * Added tdm Provides: x-display-manager. (Closes: #231442) + * Added tdebase-bin/tdm Depends libpam-runtime. (Closes: #233562, #236078) * Added kate/konqueror mime nametemplate support. (Closes: #235216) -- Christopher L Cheney <[email protected]> Fri, 5 Mar 2004 04:00:00 -0600 @@ -3486,8 +3486,8 @@ tdebase (4:3.1.4-2) unstable; urgency=low * Corrected konqueror gs mime tests. (Closes: #160428) * kdesktop Recommends eject. (Closes: #223642) * konqueror Provides info-browser. (Closes: #223913) - * Added '|| true' to db_input lines in kdm debconf support. (Closes: #224548) - * Corrected typo in kdm.config script. (Closes: #224578) + * Added '|| true' to db_input lines in tdm debconf support. (Closes: #224548) + * Corrected typo in tdm.config script. (Closes: #224578) -- Christopher L Cheney <[email protected]> Mon, 5 Jan 2004 23:00:00 -0600 @@ -3506,7 +3506,7 @@ tdebase (4:3.1.4-1) unstable; urgency=low * Update pam support to use new common module fragments. (Closes: #206958) * Update package descriptions. (Closes: #209532, #209856) * Strip SUID root from kcheckpass since its not needed. (Closes: #212212) - * Update kdm debconf and use po-debconf. (Closes: #218731) + * Update tdm debconf and use po-debconf. (Closes: #218731) * Make kicker depend on tdebase-data. (Closes: #223407) -- Christopher L Cheney <[email protected]> Thu, 18 Dec 2003 13:30:00 -0600 @@ -3544,8 +3544,8 @@ tdebase (4:3.1.2-1) unstable; urgency=low * Add kfind to konqueror Depends. (Closes: #192859) * Fix KDE GDM Session file. (Closes: #144206, #154519, #188560, #189438, #193274) - * Add log rotation for KDM logfile. (Closes: #145345, #153728) - * Add screen number to KDM Xservers file. (Closes: #182708, #184737, #187257) + * Add log rotation for TDM logfile. (Closes: #145345, #153728) + * Add screen number to TDM Xservers file. (Closes: #182708, #184737, #187257) * Moved xfonts-konsole fonts to /usr/X11R6/lib/X11/fonts/misc/ (Closes: #184548) @@ -3554,13 +3554,13 @@ tdebase (4:3.1.2-1) unstable; urgency=low tdebase (4:3.1.1-1) unstable; urgency=low * New upstream release. (Closes: #180816, #181309) - * Corrected kdm-update-menu.sh kdm.options path. (Closes: #180355) - * Added xbase-clients depend to kdm. (Closes: #180536) + * Corrected tdm-update-menu.sh tdm.options path. (Closes: #180355) + * Added xbase-clients depend to tdm. (Closes: #180536) * Added xutils depend to xfonts-konsole. (Closes: #180695) * Improved xfonts-konsole description. (Closes: #180696) * Remove upgrade from alternatives removal prerm script. (Closes: #180927) * Change Xservers to launch /usr/X11R6/bin/X. (Closes: #182037) - * Add entries for kdm reserve xserver feature. (Closes: #182708) + * Add entries for tdm reserve xserver feature. (Closes: #182708) * Add kcontrol depends to konqueror (Closes: #182724) * Change konqueror menu entry to allow execution. (Closes: #183225) * Make konqueror provide www-browser. (Closes: #183391) @@ -3600,7 +3600,7 @@ tdebase (4:2.2.2-14.5) stable-security; urgency=high * Non-maintainer upload by the Security Team * Apply patch from KDE advisory 20030908 to fix local root vulnerability in - PAM authentication in KDM + PAM authentication in TDM -- Matt Zimmerman <[email protected]> Sun, 31 Aug 2003 04:39:47 -0400 @@ -3653,7 +3653,7 @@ tdebase (4:2.2.2-13) unstable; urgency=low * debian/rules, debian/konsole.dirs: - Make symlinks in the X fonts directory to Konsole fonts in /usr/share/fonts in the install target. (closes: #127871) - * debian/kdmrc: + * debian/tdmrc: - Disallow remote users from shutting down the machine. (Yeah, yeah, I know - dodgy grammar). (closes: #127616) * debian/control: @@ -3739,7 +3739,7 @@ tdebase (4:2.2.2-4) unstable; urgency=low * Build cleanup * Build with xinerama support for i386 * Another update for Nedit.ad to work with newer Nedit - * Cleanup kdmrc for release..default to security + * Cleanup tdmrc for release..default to security * Update documentation for freeze -- Ivan E. Moore II <[email protected]> Fri, 30 Nov 2001 02:30:00 -0700 @@ -3747,7 +3747,7 @@ tdebase (4:2.2.2-4) unstable; urgency=low tdebase (4:2.2.2-3) unstable; urgency=low * Update Brazilian Portuguese debconf entries (Closes: #120841) - * Remove kdmrc debconf note + * Remove tdmrc debconf note * Add in replaces to fix those people using testing who don't know how to use --force-overwrite or don't know how to let dpkg fix things on the second go around. What a waste of disk space. @@ -3767,14 +3767,14 @@ tdebase (4:2.2.2-2) unstable; urgency=low tdebase (4:2.2.2-1) unstable; urgency=low * new upstream version - * Add in suggests for libpam-krb/heimdel to kdm so we can get rid of the - kdm-krb package + * Add in suggests for libpam-krb/heimdel to tdm so we can get rid of the + tdm-krb package * Update Nedit.ad (Closes: #117881) - * Apply kdm cleanup patch by Branden (Closes: #118217) + * Apply tdm cleanup patch by Branden (Closes: #118217) * Fix mime checks (Closes: #117747) * Fix kate syntax highlights (Closes: #113773) * Add kate undocumented manpage - * Run lilo query for kdm with -w + * Run lilo query for tdm with -w * Fix konsole crashes (Closes: #119480) -- Ivan E. Moore II <[email protected]> Wed, 21 Nov 2001 16:18:00 -0700 @@ -3867,9 +3867,9 @@ tdebase (4:2.2.1-3) unstable; urgency=low tdebase (4:2.2.1-2) unstable; urgency=low - * fix kdm preinst (Closes: #112900) + * fix tdm preinst (Closes: #112900) * fix overwrite (Closes: #112903) - * A couple kdm fixes and on keditbookmarks fix from upstream + * A couple tdm fixes and on keditbookmarks fix from upstream * Use usbutils's usb.ids if it exists (Closes: #112879) * konsole save fixes (Closes: #112982, 112943) @@ -3905,8 +3905,8 @@ tdebase (4:2.2.0.20010822-1) unstable; urgency=low * Remove gvim.desktop and gvim.png files so there is no confliction with new vim package. * sync with upstream - * Fix kdm not allowing typing after the first boot - * kdm now uses new x-display-manager bits + * Fix tdm not allowing typing after the first boot + * tdm now uses new x-display-manager bits * Fix typos and update script bits from Branden -- Ivan E. Moore II <[email protected]> Wed, 22 Aug 2001 00:01:00 -0700 @@ -3922,10 +3922,10 @@ tdebase (4:2.2.0-final-3) unstable; urgency=low tdebase (4:2.2.0-final-2) unstable; urgency=low * Re-Add the *proper* Xsession script that will use the one provided - by Debian's X rather than the one provided by kdm which is broken. + by Debian's X rather than the one provided by tdm which is broken. The one provided by Debian works better anyways. (Closes: #108736) * Fix klipperrc (Closes: #108856) - * Add a debconf note to kdm about SessionTypes being auto-generated. This + * Add a debconf note to tdm about SessionTypes being auto-generated. This is now noted in 3 locations. -- Ivan E. Moore II <[email protected]> Tue, 14 Aug 2001 16:53:00 -0700 @@ -3964,7 +3964,7 @@ tdebase (4:2.2.0-0.2beta1-1) unstable; urgency=low * Update Build-Depends and Depends * Fix pdf viewing problem (Closes: #88006) * Fix reference to woody's version in userguide (Closes: #105301) - * kdm Brazilian debconf translations (Closes: #105374) + * tdm Brazilian debconf translations (Closes: #105374) * Fix kde-update-menu script so that it can be run as a normal user (Closes: #105786) * sync with upstream @@ -4003,22 +4003,22 @@ tdebase (4:2.2.0-0beta1-3) unstable; urgency=low tdebase (4:2.2.0-0beta1-2) unstable; urgency=low - * Fix kdm preinst + * Fix tdm preinst -- Ivan E. Moore II <[email protected]> Fri, 29 Jun 2001 09:51:00 -0700 tdebase (4:2.2.0-0beta1-1) unstable; urgency=low - * Update path info in kdm files...these were in the comments so + * Update path info in tdm files...these were in the comments so it wasn't a big deal - * Add a comment to default kdmrc about SessionType generation - * Re-hash kdm README + * Add a comment to default tdmrc about SessionType generation + * Re-hash tdm README * KDE 2.2 beta1 * Sync with upstream * Fix typo in Xsetup * Fix dup dependencies (Closes: #99690) * Fix other replaces and whatnot (Closes: #101187) - * Add filterproxy,freenet user to kdmrc (Closes: #96707, #98746) + * Add filterproxy,freenet user to tdmrc (Closes: #96707, #98746) * Upstream reports these bugs fixed (Closes: #77151) * Adding in a note about kwrited (Closes: #97245) * Add w3m to klipperrc @@ -4032,7 +4032,7 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low date listed in the version number states when the initial pull was made however updates may and most likely will have taken place since that date. Look at it as a >= cvs{date} - * Generate SessionTypes line in kdmrc during kdm postinst. + * Generate SessionTypes line in tdmrc during tdm postinst. * Change KDE logo's in konq's about:konqueror to Debian powered-by logo with link to debian.org instead of kde.org * Remove old menu debian xpm files and use existing debian png mimetype @@ -4049,11 +4049,11 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low we were using. * Fix description of kate...oops..thanks Oswald. :) * More menu clean...full pathing - * ton of kdm updates...basically syncing conffiles with those from + * ton of tdm updates...basically syncing conffiles with those from the xdm from 4.0.3 * More build-deps: libogg-dev, libvorbis-dev (For auidocd:/ support) - * Provide man link from kdm to chooser + * Provide man link from tdm to chooser * More build cleanup..take more of the automation out to make sure things are constant * Remove custom starttde @@ -4085,9 +4085,9 @@ tdebase (4:2.2.0-0beta1-1) unstable; urgency=low * New man pages for: konqueror * More debconf cleanup * Adding in suggests for xearth - * Add in Dependency for x-window-manager | x-session-manager to kdm + * Add in Dependency for x-window-manager | x-session-manager to tdm * Add icons to debian sub menus - * kdm auto-generation of session list + * tdm auto-generation of session list * Merging Debian and KDE menus a bit * Add lynx and links to default klipperc * Fixed communicator entry in klipperrc so that it will actually launch @@ -4123,7 +4123,7 @@ tdebase (4:2.1.1-4) unstable; urgency=low tdebase (4:2.1.1-3) unstable; urgency=low - * Fix kdmrc file (Closes: #92415) + * Fix tdmrc file (Closes: #92415) * Update XftConfig example * Fix kfmclient and kicker crashes (Closes: #89146, #88647) * More upstream fixes @@ -4156,7 +4156,7 @@ tdebase (4:2.1.0.1-5) unstable; urgency=low tdebase (4:2.1.0.1-4) unstable; urgency=low - * pam_env fixes for kdm as well as a ton of other updates to kdm + * pam_env fixes for tdm as well as a ton of other updates to tdm * Fixing a problem with the default AA settings. It looks like I "fixed" the wrong bit when I first fixed this. (Closes: #89741) @@ -4165,14 +4165,14 @@ tdebase (4:2.1.0.1-4) unstable; urgency=low tdebase (4:2.1.0.1-3) unstable; urgency=low * Adding in debconf note for systems that have a /.kde directory - * Adding debconf dependency to kdm + * Adding debconf dependency to tdm * More upstream fixes -- Ivan E. Moore II <[email protected]> Tue, 13 Mar 2001 18:20:00 -0700 tdebase (4:2.1.0.1-2) unstable; urgency=low - * Fix kdm init script. actually stop when we tell you to stop (Closes: #89235) + * Fix tdm init script. actually stop when we tell you to stop (Closes: #89235) * More documentation added to the QT AA Font Howto * Fix for K Menu restarts and other funky behaviour * XftConfig example included @@ -4253,19 +4253,19 @@ tdebase (4:2.1.0-1) unstable; urgency=low tdebase (4:2.1-final-1) unstable; urgency=low * New upstream version - * Fix kdm init.d script + * Fix tdm init.d script * Upping standards version - * Fix for "chooser not running from kdm" (Closes: #76586) + * Fix for "chooser not running from tdm" (Closes: #76586) * Fix graphics display (Closes: #85166) * Fix bg clear issue (Closes: #77649) - * Fix kdm and expiring passwords + * Fix tdm and expiring passwords * Fix for konq crash on startup and other crashes (Closes: 84472, #77151, #80102) * Moving task-kde* packages out of tdebase source * Fixes for khelpcenter hangs (Closes: #81683) * konq provides ftp-client as well * Update /usr/bin/kde2 script * Compile ldap kioslave - * Updated kdm init.d script + * Updated tdm init.d script * Fix these rendering issues (Closes: #87183) -- Ivan E. Moore II <[email protected]> Mon, 19 Feb 2001 02:31:00 -0700 @@ -4301,7 +4301,7 @@ tdebase (4:2.1-beta2-2) unstable; urgency=low * Updating menu entries (Closes: #83216) * Fixes form content memory in konq (Closes: #77317) * Fixes problem with version numbers not showing - * Adding Build-Depends for xutils as it seems kdm needs imake + * Adding Build-Depends for xutils as it seems tdm needs imake * Applied patch for konq template (Closes: #83355) -- Ivan E. Moore II <[email protected]> Tue, 23 Jan 2001 12:36:00 -0700 @@ -4333,8 +4333,8 @@ tdebase (4:2.1-20010115-1) unstable; urgency=low * ask where the mozilla bookmarks are (Closes: #81710) * tip that was annoying to some seems to be gone (Closes: #82253) * Adding in kscreensaver pam file - * Updating kdmrc to match current features and all - * Add a link in /etc/X11/kdm to kdmrc (Closes: #82643) + * Updating tdmrc to match current features and all + * Add a link in /etc/X11/tdm to tdmrc (Closes: #82643) * Updated kde2 start script that fixes overwriting of gtk confs * This version fixes smb problems...you just need to make sure you have smbclient installed. Added that as a Recommend (Closes: #82612) @@ -4384,7 +4384,7 @@ tdebase (4:2.1-20001218-1) unstable; urgency=low * More upstream fixes * Fix for GDM Session (Closes: #79987) - * Update to kdm man page and README + * Update to tdm man page and README * Adding /usr/bin/kde2 as a x-session-manager * Adding new menu hints (Closes: #80022, #80020) * Fixing menu-method to handle new hints @@ -4406,13 +4406,13 @@ tdebase (4:2.1-20001213-1) unstable; urgency=low * New upstream beta * Fixing alternative priority for konsole * Adding in a session for gdm (Closes: #74678) - * new x4 port of xdm -> kdm (Closes: #79196, #79509) + * new x4 port of xdm -> tdm (Closes: #79196, #79509) * Fix whatis typo (Closes: #78178) * Fix segfaults (Closes: #78903) * Adding in a Recommend for kview to konqueror (Closes: #79201) * Changing x-window-manager alternative from kde2 to twin - * KDM init.d script cleanup (Closes: #79320) - * Fixed default kdmrc script to show new options + * TDM init.d script cleanup (Closes: #79320) + * Fixed default tdmrc script to show new options * Adding in a kwm script for non-session launches * Adding new users to NoUsers (Closes: #79617) @@ -4457,21 +4457,21 @@ tdebase (4:2.0-final-4) unstable; urgency=low * more tdebase-libs work now properly handles pop3 and other services correctly now allows for email configuration without tdebase installed - * more dependency work with kdm (Closes: #76565) + * more dependency work with tdm (Closes: #76565) -- Ivan E. Moore II <[email protected]> Wed, 08 Nov 2000 17:30:00 -0700 tdebase (4:2.0-final-3.1) unstable; urgency=low * applying i18n patch (Closes: #75831) - * more kdmrc default setting updates + * more tdmrc default setting updates -- Ivan E. Moore II <[email protected]> Sun, 05 Nov 2000 23:00:00 -0700 tdebase (4:2.0-final-3) unstable; urgency=low * more upstream fixes - * more kdmrc default setting updates + * more tdmrc default setting updates * build against new xlibs and updating depends -- Ivan E. Moore II <[email protected]> Sat, 04 Nov 2000 01:00:00 -0700 @@ -4509,7 +4509,7 @@ tdebase (4:2.0-20001015-0) unstable; urgency=low tdebase (4:2.0-20001013-0) unstable; urgency=low - * kdmdesktop fixes from upstream + * tdmdesktop fixes from upstream * more i18n work * applying i18n patche * more fixes for konqueror @@ -4533,7 +4533,7 @@ tdebase (4:2.0-20001009-0) unstable; urgency=low * KDE 2.0 RC2 * more upstream fixes - * minor kdmdekstop fix + * minor tdmdekstop fix -- Ivan E. Moore II <[email protected]> Mon, 09 Oct 2000 08:00:00 -0700 @@ -4561,8 +4561,8 @@ tdebase (4:2.0-20001004-0) unstable; urgency=low * More upstream fixes * No longer depend on versioned tdelibs - * Fixing up kdm's postinst to better handle kdmrc - * More spice for kdm + * Fixing up tdm's postinst to better handle tdmrc + * More spice for tdm * Fixes the following: (Closes: #73057, #73015, #73002, #72921, #72989, #72919, #72638) -- Ivan E. Moore II <[email protected]> Mon, 02 Oct 2000 01:00:00 -0700 @@ -4647,14 +4647,14 @@ tdebase (4:2.0-20000912-0) unstable; urgency=low tdebase (4:2.0-20000910-2) unstable; urgency=low * Fixing Debian menu graphic problem - * More cleanup of kdm settings + * More cleanup of tdm settings * More dependency fixes -- Ivan E. Moore II <[email protected]> Sun, 10 Sep 2000 23:00:00 -0700 tdebase (4:2.0-20000910-0) unstable; urgency=low - * Changing kdm banner graphic to be the Debian swirl + * Changing tdm banner graphic to be the Debian swirl * Fixing start script so that kde actually starts with the desktop functional. (sorry) @@ -4663,7 +4663,7 @@ tdebase (4:2.0-20000910-0) unstable; urgency=low tdebase (4:2.0-20000909-0) unstable; urgency=low * More upstream updates - * More kdm cleanup (star'd password option added) + * More tdm cleanup (star'd password option added) * Migrating binary-indep build pieces into their own area -- Ivan E. Moore II <[email protected]> Sat, 09 Sep 2000 01:00:00 -0700 @@ -4693,9 +4693,9 @@ tdebase (4:2.0-20000901-0) unstable; urgency=low tdebase (4:2.0-20000825-0) unstable; urgency=low * New upstream fixes - * Updating kdm init script to match current xdm one - * Typo fixes in kdmrc - * Turning off xconsole by default for kdm + * Updating tdm init script to match current xdm one + * Typo fixes in tdmrc + * Turning off xconsole by default for tdm * Some work on menus -- Ivan E. Moore II <[email protected]> Fri, 25 Aug 2000 21:30:00 -0700 @@ -4703,9 +4703,9 @@ tdebase (4:2.0-20000825-0) unstable; urgency=low tdebase (4:2.0-20000821-1.0) experimental; urgency=low * New upstream fixes - * changed xdm.options to kdm.options to seperate from xdm - * cleaned up pre/post scripts for kdm to handle proper upgrade from - kdm1. Forcing a restart (if possible and without killing the upgrade) + * changed xdm.options to tdm.options to seperate from xdm + * cleaned up pre/post scripts for tdm to handle proper upgrade from + tdm1. Forcing a restart (if possible and without killing the upgrade) during an upgrade. -- Ivan E. Moore II <[email protected]> Mon, 21 Aug 2000 22:45:00 -0700 @@ -4727,7 +4727,7 @@ tdebase-cvs (4:2.0-20000521-1.0) experimental; urgency=low * Adding in a conflict for man2html since we provide it * Fixing ln issues with documentation * Fixing file permissions in CVS tree - * Fixing some kdm issues + * Fixing some tdm issues * Changing suggest to depend for tde-i18n since some documentation, etc resides in that package now. (including english) @@ -4755,9 +4755,9 @@ tdebase-cvs (4:2.0-20000306-1.1) experimental; urgency=low tdebase-cvs (4:2.0-20000302-1.0) experimental; urgency=low * New upstream CVS fixes - * Migrating chooser over to kdm-cvs package - * Updating kdm config files to match current versions of xdm - * Fixing kdm init.d scripts to handle now missing parser script + * Migrating chooser over to tdm-cvs package + * Updating tdm config files to match current versions of xdm + * Fixing tdm init.d scripts to handle now missing parser script * Fixing kicker applet issues (required -dev to be installed to work) -- Ivan E. Moore II <[email protected]> Thu, 02 Mar 2000 22:00:00 -0700 @@ -4773,7 +4773,7 @@ tdebase-cvs (4:2.0-20000223-1.0) experimental; urgency=low * New upstream CVS fixes * Fixing pathing for kde help files - * Adding in md5 options to pam.d file for kdm + * Adding in md5 options to pam.d file for tdm -- Ivan E. Moore II <[email protected]> Wed, 23 Feb 2000 22:00:36 -0700 @@ -4833,7 +4833,7 @@ tdebase-cvs (4:2.0-19990825-1) experimental; urgency=low tdebase-cvs (4:2.0-19990823-1) experimental; urgency=low * New upstream CVS changes - * Fixes bug with init.d script for kdm2 + * Fixes bug with init.d script for tdm2 -- Ivan E. Moore II <[email protected]> Mon, 23 Aug 1999 07:00:56 -0400 @@ -4877,12 +4877,12 @@ tdebase-cvs (4:2.0-19990601-1) experimental; urgency=low tdebase-cvs (4:2.0-19990531-1) experimental; urgency=low - * Making kdm not require xdm + * Making tdm not require xdm * Fixing some pam stuff which includes a /etc/pam.d/kde file, making the pam name=kde so that it uses the /etc/pam.d/kde file instead of - xdm, kdm, or whatever. + xdm, tdm, or whatever. * Fixing the linux fonts for konsole. - * Fixing the /var/state/kdm issue + * Fixing the /var/state/tdm issue -- Ivan E. Moore II <[email protected]> Mon, 31 May 1999 19:30:29 -0400 @@ -4940,7 +4940,7 @@ tdebase (4:1.1-19990217-1) unstable; urgency=low tdebase (4:1.1-19990214-2) unstable; urgency=low * move the link from /var/ to /usr, since /usr may be read only - * patch Xserver_0 to run kdmgreeter if kdm runs + * patch Xserver_0 to run tdmgreeter if tdm runs -- Stephan Kulow <[email protected]> Tue, 16 Feb 1999 18:52:03 +0100 @@ -4952,7 +4952,7 @@ tdebase (4:1.1-19990214-1) unstable; urgency=low tdebase (4:1.1-19990207-3) unstable; urgency=low - * new kdmrc handling + * new tdmrc handling -- Stephan Kulow <[email protected]> Fri, 12 Feb 1999 11:03:56 +0100 @@ -4990,7 +4990,7 @@ tdebase (2:980312-5) unstable; urgency=low tdebase (2:980312-4) frozen; urgency=low * added undocumented man page - * renamed kdmconfig to switchdm. This name existed twice + * renamed tdmconfig to switchdm. This name existed twice * new compile with latest tdelibs shlibs -- Stephan Kulow <[email protected]> Tue, 31 Mar 1998 20:26:23 +0200 @@ -5001,7 +5001,7 @@ tdebase (2:980312-3) unstable; urgency=low * changed the directory for debian apps to /var/spool/applnk * set the correct UTMP file * test prefix() before removing it. This should avoid a rm -rf /, when possible - * new kdm (with bugfixes and new location for configuration files) + * new tdm (with bugfixes and new location for configuration files) -- Stephan Kulow <[email protected]> Fri, 27 Mar 1998 16:07:37 +0100 diff --git a/ubuntu/maverick/tdebase/debian/control b/ubuntu/maverick/tdebase/debian/control index b09008614..b8196072b 100644 --- a/ubuntu/maverick/tdebase/debian/control +++ b/ubuntu/maverick/tdebase/debian/control @@ -15,7 +15,7 @@ Architecture: all Replaces: kdebase-trinity (<< 4:14.0.0) Breaks: kdebase-trinity (<< 4:14.0.0) Depends: kappfinder-trinity (>= ${Source-Version}), kate-trinity (>= ${Source-Version}), kcontrol-trinity (>= ${Source-Version}), tdebase-trinity-bin (>= ${Source-Version}), tdebase-data-trinity (>= ${Source-Version}), tdebase-kio-plugins-trinity (>= ${Source-Version}), kdepasswd-trinity (>= ${Source-Version}), tdeprint-trinity (>= ${Source-Version}), kdesktop-trinity (>= ${Source-Version}), kfind-trinity (>= ${Source-Version}), khelpcenter-trinity (>= ${Source-Version}), kicker-trinity (>= ${Source-Version}), klipper-trinity (>= ${Source-Version}), kmenuedit-trinity (>= ${Source-Version}), konqueror-nsplugins-trinity (>= ${Source-Version}), konqueror-trinity (>= ${Source-Version}), konsole-trinity (>= ${Source-Version}), kpager-trinity (>= ${Source-Version}), kpersonalizer-trinity (>= ${Source-Version}), ksmserver-trinity (>= ${Source-Version}), ksplash-trinity (>= ${Source-Version}), ksysguard-trinity (>= ${Source-Version}), ktip-trinity (>= ${Source-Version}), twin-trinity (>= ${Source-Version}), libkonq4-trinity (>= ${Source-Version}), hal-trinity | kfreebsd-gnu | hurd, xcalib -Recommends: kdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity +Recommends: tdm-trinity (>= ${Source-Version}), tdebase-runtime-data-common-trinity, libtqt3-integration-trinity Suggests: tdebase-trinity-doc-html (>= ${Source-Version}) Description: base components from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -114,7 +114,7 @@ Replaces: kdebase-trinity-bin (<< 4:14.0.0) Breaks: kdebase-trinity-bin (<< 4:14.0.0) Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter-trinity, gdb -Conflicts: tdebase-libs-trinity (<< 4:3.0.0), kdm-trinity (<< 4:3.4.1-2), tdebase-workspace-data-trinity (<< 7:3.5.0) +Conflicts: tdebase-libs-trinity (<< 4:3.0.0), tdm-trinity (<< 4:3.4.1-2), tdebase-workspace-data-trinity (<< 7:3.5.0) Description: core binaries for the KDE base module This package contains miscellaneous programs needed by other KDE applications, particularly those in the KDE base module. @@ -248,20 +248,20 @@ Description: miscellaneous binaries and files for the KDE desktop This package is part of KDE, and a component of the KDE base module. See the 'kde-trinity' and 'tdebase-trinity' packages for more information. -Package: kdm-trinity +Package: tdm-trinity Section: kde Architecture: any -Replaces: kdm-trinity (<< 4:14.0.0) -Breaks: kdm-trinity (<< 4:14.0.0) +Replaces: tdm-trinity (<< 4:14.0.0) +Breaks: tdm-trinity (<< 4:14.0.0) Depends: ${shlibs:Depends}, tdebase-trinity-bin (= ${Source-Version}), tdebase-data-trinity (>> ${KDE-Version3}), tdebase-data-trinity (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients Recommends: logrotate, xserver-xorg Suggests: khelpcenter-trinity, ksmserver-trinity (= ${Source-Version}), kdepasswd-trinity (= ${Source-Version}), menu Provides: x-display-manager Description: X display manager for KDE - kdm manages a collection of X servers, which may be on the local host or + tdm manages a collection of X servers, which may be on the local host or remote machines. It provides services similar to those provided by init, getty, and login on character-based terminals: prompting for login name and - password, authenticating the user, and running a session. kdm supports XDMCP + password, authenticating the user, and running a session. tdm supports XDMCP (X Display Manager Control Protocol) and can also be used to run a chooser process which presents the user with a menu of possible hosts that offer XDMCP display management. @@ -269,8 +269,8 @@ Description: X display manager for KDE A collection of icons to associate with individual users is included with KDE, but as part of the kdepasswd package. . - The menu package will help to provide KDM with a list of window managers - that can be launched, if the window manager does not register with KDM + The menu package will help to provide TDM with a list of window managers + that can be launched, if the window manager does not register with TDM already. Most users won't need this. . This package is part of KDE, and a component of the KDE base module. diff --git a/ubuntu/maverick/tdebase/debian/control.in b/ubuntu/maverick/tdebase/debian/control.in index 58861a14d..64def508c 100644 --- a/ubuntu/maverick/tdebase/debian/control.in +++ b/ubuntu/maverick/tdebase/debian/control.in @@ -14,7 +14,7 @@ Package: tdebase Section: kde Architecture: all Depends: kappfinder (>= ${Source-Version}), kate (>= ${Source-Version}), kcontrol (>= ${Source-Version}), tdebase-bin (>= ${Source-Version}), tdebase-data (>= ${Source-Version}), tdebase-kio-plugins (>= ${Source-Version}), kdepasswd (>= ${Source-Version}), tdeprint (>= ${Source-Version}), kdesktop (>= ${Source-Version}), kfind (>= ${Source-Version}), khelpcenter (>= ${Source-Version}), kicker (>= ${Source-Version}), klipper (>= ${Source-Version}), kmenuedit (>= ${Source-Version}), konqueror-nsplugins (>= ${Source-Version}), konqueror (>= ${Source-Version}), konsole (>= ${Source-Version}), kpager (>= ${Source-Version}), kpersonalizer (>= ${Source-Version}), ksmserver (>= ${Source-Version}), ksplash (>= ${Source-Version}), ksysguard (>= ${Source-Version}), ktip (>= ${Source-Version}), twin (>= ${Source-Version}), libkonq4 (>= ${Source-Version}), hal | kfreebsd-gnu | hurd, pmount | kfreebsd-gnu | hurd -Recommends: kdm (>= ${Source-Version}) +Recommends: tdm (>= ${Source-Version}) Suggests: tdebase-doc-html (>= ${Source-Version}) Description: base components from the official KDE release KDE (the K Desktop Environment) is a powerful Open Source graphical @@ -97,8 +97,8 @@ Section: kde Architecture: any Depends: ${shlibs:Depends}, libpam-runtime (>= 0.76-14) Suggests: khelpcenter, gdb -Conflicts: tdebase-libs (<< 4:3.0.0), kdm (<< 4:3.4.1-2) -Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), kdm (= 4:3.3.2-1b) +Conflicts: tdebase-libs (<< 4:3.0.0), tdm (<< 4:3.4.1-2) +Replaces: kcontrol (<< 4:3.3.0), tdebase (<< 4:3.0.0), tdebase-doc (<< 4:3.0.0), tdebase-libs (<< 4:3.0.0), kscreensaver (<< 4:3.0.0), tdm (= 4:3.3.2-1b) Description: core binaries for the KDE base module This package contains miscellaneous programs needed by other KDE applications, particularly those in the KDE base module. @@ -222,7 +222,7 @@ Description: miscellaneous binaries and files for the KDE desktop This package is part of KDE, and a component of the KDE base module. See the 'kde' and 'tdebase' packages for more information. -Package: kdm +Package: tdm Section: kde Architecture: any Depends: ${shlibs:Depends}, tdebase-bin (= ${Source-Version}), tdebase-data (>> ${KDE-Version3}), tdebase-data (<< ${KDE-Next-Version3}), debconf (>= 1.2.9) | debconf-2.0, libpam-runtime (>= 0.76-14), xbase-clients @@ -230,10 +230,10 @@ Recommends: logrotate, xserver-xorg Suggests: khelpcenter, ksmserver (= ${Source-Version}), kdepasswd (= ${Source-Version}), menu Provides: x-display-manager Description: X display manager for KDE - kdm manages a collection of X servers, which may be on the local host or + tdm manages a collection of X servers, which may be on the local host or remote machines. It provides services similar to those provided by init, getty, and login on character-based terminals: prompting for login name and - password, authenticating the user, and running a session. kdm supports XDMCP + password, authenticating the user, and running a session. tdm supports XDMCP (X Display Manager Control Protocol) and can also be used to run a chooser process which presents the user with a menu of possible hosts that offer XDMCP display management. @@ -241,8 +241,8 @@ Description: X display manager for KDE A collection of icons to associate with individual users is included with KDE, but as part of the kdepasswd package. . - The menu package will help to provide KDM with a list of window managers - that can be launched, if the window manager does not register with KDM + The menu package will help to provide TDM with a list of window managers + that can be launched, if the window manager does not register with TDM already. Most users won't need this. . This package is part of KDE, and a component of the KDE base module. diff --git a/ubuntu/maverick/tdebase/debian/copyright b/ubuntu/maverick/tdebase/debian/copyright index 3d683d411..6455b1216 100644 --- a/ubuntu/maverick/tdebase/debian/copyright +++ b/ubuntu/maverick/tdebase/debian/copyright @@ -24,7 +24,7 @@ drkonqi, kaddressbook, kicker, ksmserver, ksplash, twin, legacyimport GPL --- -kappfinder, kate, kcheckpass, tdeprint, kdm, kfind, khelpcenter, kmenuedit, +kappfinder, kate, kcheckpass, tdeprint, tdm, kfind, khelpcenter, kmenuedit, konqueror, konsole, kpager, kpersonalizer, kreadconfig, kstart, ksysguard, ktip LGPL diff --git a/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu b/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu index 1bcc196b8..99b1e61f2 100644 --- a/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu +++ b/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-compact_flash_unmount_encrypt.png.uu @@ -205,7 +205,7 @@ MU?^>>^ZYYYY[9$)56T>^W(PM6[9LV;(E<.+$B1,G3LCK]_3ITZ=/GY8C!BGK M%/CHHX\^^N@CV4BIM`EX5Q8:/YY^Q5=I,78/LG>@Z>!/"8!T^>CHCAT[=NS8 M<?%B>L`E2W@:>(*(L^;FT@X?&DJ$[]EMS7NB?>GR:A]&[7ALK,%@-@/WWY^2 MLG\_,&A0>'A^/A$<[92-V]D;J^LK2V#Q3B\GN]2=]FH_K=D?N`TH'(W]2:\# -MKDM#2M+6`=%2RATM$X#8RUM<$Y\"1$1$1(2$R"*U9^U`LYEVT(H*(._@Z:0S +MTDM#2M+6`=%2RATM$X#8RUM<$Y\"1$1$1(2$R"*U9^U`LYEVT(H*(._@Z:0S M1X'\_J?&9+\*N(<777?T32!FG37@]R>!V,>EBLSG`'-^2.?T9P%L&/W@BSN` MSN^.N/W&54#4%5%=HHWRCFB\W'BY\7*@RE9EJ[(!$"#@*\#O<K_+C>,!;8HV M17LUX+C/<9_3#W!&."/<^P"WP^T0!P+N%NX68K!<HHL9&1OKF`#,9K/9:@4L diff --git a/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu b/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu index 53ba3286d..edc1cc809 100644 --- a/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu +++ b/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-sd_mmc_unmount_encrypt.png.uu @@ -226,7 +226,7 @@ M9`ANV!`;F<4P#*/7&PP\7UY.0H>!Y.2DI-@TV5,UUX\')5B;P2S@%:#SM,XW MI"9KA"%)FI&/&,_J;VM3!8V05!60_R'_`P#D#<H8;`#4>_`]`T`=ITYA[@68 ME<Q*YDD`*[&2>2JF;2&:96@_*@HV`-($>9BBT^Y+5>G:?%HD'BWB6;\E*C=M ME1_5*>K3`%:B`V,$]/.%BYBW@58_'6BM1("L^ZKN4G8!NGNY=.9SH"'!UR?H -MA@1?GS'$,HC8XS3(IU4KDMY-02,S#0:3R6QNJ.%8K293UZXC1@!DF39R5E86 +MA@1?GS'$,HC8XS3(IU4TDMY-02,S#0:3R6QNJ.%8K293UZXC1@!DF39R5E86 M:6-C64\OG+8,@(+4?*NO"=!BD`QS_ODLRW$,$XFDI!`_>DMQLC0#:O4VWFNZ M5S<-8/R,GXEJ12EC";^^U5\C?,H(ZA6S'*9V4#L`>%A]&`#41:K*C`70%FV8 MV0!N0[TY/VV/%\.3OY&^EGV`^J.Z#NLUB5C?I*DMEJK=?_WG^T-OZ*W\QLP% diff --git a/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu b/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu index 95cd850b0..b989c74df 100644 --- a/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu +++ b/ubuntu/maverick/tdebase/debian/img/medialuks/cr128-device-usbpendrive_unmount_encrypt.png.uu @@ -301,7 +301,7 @@ MZ`\>/'"@ID8I:LH:G]QQQQUW7'ZYDCQ%])>_D&T@+^_LW7G7I#KY2Q!16N6. M'?2@[[Q#$V+.G)T[=^TZ?)AJNA45`11;U[F99R3O;J^O'.MY"]!=[4)&1J/! M0`+7NQJ'L050V-58]N'6K=NV554!%17EY7EYM$)$QN;+T^2IF`9P5:)+/%^Y M3FSY;V;E9X(?VW69V3)"5\A3Y#%`:)[\,1\",%$8J&X'PL.$%,U'@-2FOD-S -M!<`]J59IC@+B<,&BK@?\YW$K>"<@NR@KDM5B8(5;`P%ZLF"0M5/_+K;>(EOY +M!<`]J59IC@+B<,&BK@?\YW$K>"<@NR@TDM5B8(5;`P%ZLF"0M5/_+K;>(EOY M?$#:P6TP)`*N]P2]IAH(5$O[<#^@&A0.AP<H]\L$WN?S^7P^Q3VHT5!1U=C< M!?%IZ6GI:4!Z4GR:TP#2'"E#\@!2H50J^0%YC;Q!?@O`Y9B*A-,G$"83N0'3 MTM+367-<:O22D9&:"J2F4E?DV/MGE)9&G]]VVVVW77()\/CCCS_^VFL&`P'Z diff --git a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install index 71527a0c5..66058e33b 100644 --- a/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install +++ b/ubuntu/maverick/tdebase/debian/kcontrol-trinity.install @@ -54,8 +54,8 @@ debian/tmp/opt/trinity/lib/trinity/kcm_joystick.la debian/tmp/opt/trinity/lib/trinity/kcm_joystick.so debian/tmp/opt/trinity/lib/trinity/kcm_kded.la debian/tmp/opt/trinity/lib/trinity/kcm_kded.so -debian/tmp/opt/trinity/lib/trinity/kcm_kdm.la -debian/tmp/opt/trinity/lib/trinity/kcm_kdm.so +debian/tmp/opt/trinity/lib/trinity/kcm_tdm.la +debian/tmp/opt/trinity/lib/trinity/kcm_tdm.so debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.so debian/tmp/opt/trinity/lib/trinity/kcm_kdnssd.la debian/tmp/opt/trinity/lib/trinity/kcm_keys.la @@ -168,7 +168,7 @@ debian/tmp/opt/trinity/share/applications/kde/kcmtaskbar.desktop debian/tmp/opt/trinity/share/applications/kde/kcmusb.desktop debian/tmp/opt/trinity/share/applications/kde/kcmview1394.desktop debian/tmp/opt/trinity/share/applications/kde/KControl.desktop -debian/tmp/opt/trinity/share/applications/kde/kdm.desktop +debian/tmp/opt/trinity/share/applications/kde/tdm.desktop debian/tmp/opt/trinity/share/applications/kde/keys.desktop debian/tmp/opt/trinity/share/applications/kde/kfontview.desktop debian/tmp/opt/trinity/share/applications/kde/khtml_behavior.desktop diff --git a/ubuntu/maverick/tdebase/debian/kdepasswd-trinity.install b/ubuntu/maverick/tdebase/debian/kdepasswd-trinity.install index cbf6a5ed1..1850960ec 100644 --- a/ubuntu/maverick/tdebase/debian/kdepasswd-trinity.install +++ b/ubuntu/maverick/tdebase/debian/kdepasswd-trinity.install @@ -3,33 +3,33 @@ debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.la debian/tmp/opt/trinity/lib/trinity/kcm_useraccount.so debian/tmp/opt/trinity/share/applications/kde/kcm_useraccount.desktop debian/tmp/opt/trinity/share/applications/kde/kdepasswd.desktop -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Apple.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/BeachBall.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Blowfish.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Bug.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Butterfly.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Car.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Cow.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Daemon.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Dog.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Elephant.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Flower.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Frog.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Ghost.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Guitar.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Heart.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Konqui.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Lion.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Monkey.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Penguin.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Pig.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Rabbit.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Ring.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Scream.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Shark.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Splash.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Star.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Teddybear.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/Turtle.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Apple.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/BeachBall.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Blowfish.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Bug.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Butterfly.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Car.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Cow.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Daemon.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Dog.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Elephant.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Flower.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Frog.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Ghost.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Guitar.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Heart.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Konqui.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Lion.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Monkey.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Penguin.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Pig.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Rabbit.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Ring.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Scream.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Shark.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Splash.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Star.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Teddybear.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/Turtle.png debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount.kcfg debian/tmp/opt/trinity/share/config.kcfg/kcm_useraccount_pass.kcfg diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity-np.pam b/ubuntu/maverick/tdebase/debian/kdm-trinity-np.pam index a13232b98..4cada235b 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity-np.pam +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity-np.pam @@ -1,5 +1,5 @@ # -# /etc/pam.d/kdm-np - specify the PAM behaviour of kdm for passwordless logins +# /etc/pam.d/tdm-np - specify the PAM behaviour of tdm for passwordless logins # auth required pam_nologin.so auth required pam_env.so readenv=1 diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.README.Debian b/ubuntu/maverick/tdebase/debian/kdm-trinity.README.Debian index ce2e68020..60a81e267 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.README.Debian +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.README.Debian @@ -1,23 +1,23 @@ -KDM in Debian +TDM in Debian ============= -This package comes with a copy of the KDM handbook in docbook format. -To read it, run "khelpcenter help:/kdm" from a command-line or go to the -URL "help:/kdm" in konqueror. +This package comes with a copy of the TDM handbook in docbook format. +To read it, run "khelpcenter help:/tdm" from a command-line or go to the +URL "help:/tdm" in konqueror. -By default, the use of special graphical themes with KDM is disabled. -If you wish to use the 'Circles' theme that comes with the kdm package, or +By default, the use of special graphical themes with TDM is disabled. +If you wish to use the 'Circles' theme that comes with the tdm package, or any other theme that you have installed, you should research the -'UseTheme' and 'Theme' fields in /etc/trinity/kdm/kdmrc. This can be done +'UseTheme' and 'Theme' fields in /etc/trinity/tdm/tdmrc. This can be done by browsing this URL in Konqueror: -help:/kdm/kdm-files.html#kdmrc-greeter +help:/tdm/tdm-files.html#tdmrc-greeter -KDM Customization +TDM Customization ================= We provide a way to override theme-related values normally set in the -master configuration file (kdmrc): +master configuration file (tdmrc): * USEBACKGROUND * BACKGROUNDCFG * USETHEME @@ -31,7 +31,7 @@ and background configuration file (backgroundrc): * WALLPAPER You just need to create a file with overridden value(s) and put it in -kdm override directory (default is /etc/default/kdm.d). +tdm override directory (default is /etc/default/tdm.d). ================================================ Below this is direct from the xdm package README diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.conf b/ubuntu/maverick/tdebase/debian/kdm-trinity.conf index 95c0fcd67..7ea5ac479 100755 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.conf +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.conf @@ -1,4 +1,4 @@ -# kdm-trinity - K Display Manager +# tdm-trinity - K Display Manager # # The display manager service manages the X servers running on the # system, providing login and auto-login services @@ -18,7 +18,7 @@ emits starting-dm respawn script - [ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/opt/trinity/bin/kdm" ] + [ ! -f /etc/X11/default-display-manager -o "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/opt/trinity/bin/tdm" ] # Check kernel command-line for inhibitors for ARG in $(cat /proc/cmdline) @@ -41,8 +41,8 @@ script TDEDIRS=/opt/trinity/ PATH=/opt/trinity/bin:/bin:/usr/bin:/sbin:/usr/sbin - initctl emit starting-dm DM=kdm-trinity + initctl emit starting-dm DM=tdm-trinity - exec /opt/trinity/bin/kdm + exec /opt/trinity/bin/tdm end script diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.config b/ubuntu/maverick/tdebase/debian/kdm-trinity.config index 3525d7740..1d73249f7 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.config +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.config @@ -1,5 +1,5 @@ #!/bin/sh -# Debian kdm package configuration script +# Debian tdm package configuration script # stolen from the xdm scripts # Copyright 2000--2003 Branden Robinson. # Licensed under the GNU General Public License, version 2. See the file @@ -10,7 +10,7 @@ set -e # source debconf library . /usr/share/debconf/confmodule -THIS_PACKAGE=kdm-trinity +THIS_PACKAGE=tdm-trinity # set default display manager DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager @@ -38,9 +38,9 @@ if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then CURRENT_DEFAULT=$(grep -v '^[[:space:]]*#' \ "$DEFAULT_DISPLAY_MANAGER_FILE" | head -n 1) - # both the binaries for kdm and kdm-kde4 share the same basename - # so we need to check if it's kdm-kde4 or another display manager - if [ "$CURRENT_DEFAULT" = "/usr/lib/kde4/bin/kdm" ]; then + # both the binaries for tdm and tdm-kde4 share the same basename + # so we need to check if it's tdm-kde4 or another display manager + if [ "$CURRENT_DEFAULT" = "/usr/lib/kde4/bin/tdm" ]; then CURRENT_DEFAULT=${THIS_PACKAGE}-kde4 else CURRENT_DEFAULT=$(basename $CURRENT_DEFAULT) diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.dirs b/ubuntu/maverick/tdebase/debian/kdm-trinity.dirs index 5a4196df0..2060b348d 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.dirs +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.dirs @@ -1,2 +1,2 @@ -etc/default/kdm-trinity.d -var/lib/kdm-trinity +etc/default/tdm-trinity.d +var/lib/tdm-trinity diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.install b/ubuntu/maverick/tdebase/debian/kdm-trinity.install index e6c7325eb..289fa03af 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.install +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.install @@ -1,51 +1,51 @@ -debian/local/kdm.options etc/trinity/kdm/ -debian/tmp/etc/trinity/kdm/kdmrc -debian/tmp/etc/trinity/kdm/Xaccess -debian/tmp/etc/trinity/kdm/Xreset -debian/tmp/etc/trinity/kdm/Xsession -debian/tmp/etc/trinity/kdm/Xsetup -debian/tmp/etc/trinity/kdm/Xstartup -debian/tmp/etc/trinity/kdm/Xwilling -debian/tmp/opt/trinity/bin/genkdmconf -debian/tmp/opt/trinity/bin/kdm -debian/tmp/opt/trinity/bin/kdm_config -debian/tmp/opt/trinity/bin/kdmctl -debian/tmp/opt/trinity/bin/kdm_greet +debian/local/tdm.options etc/trinity/tdm/ +debian/tmp/etc/trinity/tdm/tdmrc +debian/tmp/etc/trinity/tdm/Xaccess +debian/tmp/etc/trinity/tdm/Xreset +debian/tmp/etc/trinity/tdm/Xsession +debian/tmp/etc/trinity/tdm/Xsetup +debian/tmp/etc/trinity/tdm/Xstartup +debian/tmp/etc/trinity/tdm/Xwilling +debian/tmp/opt/trinity/bin/gentdmconf +debian/tmp/opt/trinity/bin/tdm +debian/tmp/opt/trinity/bin/tdm_config +debian/tmp/opt/trinity/bin/tdmctl +debian/tmp/opt/trinity/bin/tdm_greet debian/tmp/opt/trinity/bin/krootimage -debian/tmp/opt/trinity/share/apps/kdm/pics/kdelogo-crystal.png -debian/tmp/opt/trinity/share/apps/kdm/pics/kdelogo.png -debian/tmp/opt/trinity/share/apps/kdm/pics/shutdown.jpg -debian/tmp/opt/trinity/share/apps/kdm/pics/users/default1.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/default2.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/default3.png -debian/tmp/opt/trinity/share/apps/kdm/pics/users/root1.png -debian/tmp/opt/trinity/share/apps/kdm/sessions/9wm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/aewm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/amaterus.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/asclassic.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/ctwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/evilwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/flwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/lwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/matchbox.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/mwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/olvwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/olwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/oroborus.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/pwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/twm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/ude.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/vtwm.desktop -debian/tmp/opt/trinity/share/apps/kdm/sessions/wm2.desktop -debian/tmp/opt/trinity/share/apps/kdm/themes/circles/background.svg -debian/tmp/opt/trinity/share/apps/kdm/themes/circles/circles.xml -debian/tmp/opt/trinity/share/apps/kdm/themes/circles/flower.png -debian/tmp/opt/trinity/share/apps/kdm/themes/circles/GdmGreeterTheme.desktop -debian/tmp/opt/trinity/share/apps/kdm/themes/circles/help.png -debian/tmp/opt/trinity/share/apps/kdm/themes/circles/options.png -debian/tmp/opt/trinity/share/apps/kdm/themes/circles/screenshot.png -debian/tmp/opt/trinity/share/apps/kdm/themes/o2_enterprise -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdm/common -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdm/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdm/index.docbook -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kdm/kdmrc-ref.docbook +debian/tmp/opt/trinity/share/apps/tdm/pics/kdelogo-crystal.png +debian/tmp/opt/trinity/share/apps/tdm/pics/kdelogo.png +debian/tmp/opt/trinity/share/apps/tdm/pics/shutdown.jpg +debian/tmp/opt/trinity/share/apps/tdm/pics/users/default1.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/default2.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/default3.png +debian/tmp/opt/trinity/share/apps/tdm/pics/users/root1.png +debian/tmp/opt/trinity/share/apps/tdm/sessions/9wm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/aewm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/amaterus.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/asclassic.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/ctwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/evilwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/flwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/lwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/matchbox.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/mwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/olvwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/olwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/oroborus.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/pwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/twm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/ude.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/vtwm.desktop +debian/tmp/opt/trinity/share/apps/tdm/sessions/wm2.desktop +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/background.svg +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/circles.xml +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/flower.png +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/GdmGreeterTheme.desktop +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/help.png +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/options.png +debian/tmp/opt/trinity/share/apps/tdm/themes/circles/screenshot.png +debian/tmp/opt/trinity/share/apps/tdm/themes/o2_enterprise +debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/common +debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/index.docbook +debian/tmp/opt/trinity/share/doc/kde/HTML/en/tdm/tdmrc-ref.docbook diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.links b/ubuntu/maverick/tdebase/debian/kdm-trinity.links index 6c0a7dd8b..d39f29e96 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.links +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.links @@ -1 +1 @@ -opt/trinity/share/apps/kdm/pics/users/default1.png opt/trinity/share/apps/kdm/faces/.default.face +opt/trinity/share/apps/tdm/pics/users/default1.png opt/trinity/share/apps/tdm/faces/.default.face diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.logrotate b/ubuntu/maverick/tdebase/debian/kdm-trinity.logrotate index 0c7bd75ef..990e7c479 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.logrotate +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.logrotate @@ -1,4 +1,4 @@ -/var/log/kdm-trinity.log { +/var/log/tdm-trinity.log { rotate 7 daily compress diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.manpages b/ubuntu/maverick/tdebase/debian/kdm-trinity.manpages index fcbc540f0..690a0f462 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.manpages +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.manpages @@ -1,6 +1,6 @@ -debian/man/genkdmconf-trinity.1 -debian/man/kdm-trinity.1 -debian/man/kdm_config-trinity.1 -debian/man/kdmctl-trinity.1 -debian/man/kdm_greet-trinity.1 +debian/man/gentdmconf-trinity.1 +debian/man/tdm-trinity.1 +debian/man/tdm_config-trinity.1 +debian/man/tdmctl-trinity.1 +debian/man/tdm_greet-trinity.1 debian/man/krootimage-trinity.1 diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.pam b/ubuntu/maverick/tdebase/debian/kdm-trinity.pam index 444884767..d40a52277 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.pam +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.pam @@ -1,5 +1,5 @@ # -# /etc/pam.d/kdm-trinity - specify the PAM behaviour of kdm +# /etc/pam.d/tdm-trinity - specify the PAM behaviour of tdm # auth required pam_nologin.so auth required pam_env.so readenv=1 diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.postinst b/ubuntu/maverick/tdebase/debian/kdm-trinity.postinst index 0c9b05b4a..5f1aab168 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.postinst +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.postinst @@ -47,9 +47,9 @@ fi # restarting the daemon may cause output to stdout db_stop -# don't start kdm if we are upgrading without stopping it +# don't start tdm if we are upgrading without stopping it NOSTART= -if [ -e /var/run/kdm-trinity.upgrade ]; then +if [ -e /var/run/tdm-trinity.upgrade ]; then NOSTART=yes fi # or if we're currently in X on the display it attempts to manage by default @@ -63,11 +63,11 @@ for HOST in "" \ fi done # or if it's already running -if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/kdm.pid --name kdm-trinity; then +if start-stop-daemon --stop --quiet --signal 0 --pid /var/run/tdm.pid --name tdm-trinity; then NOSTART=yes fi # or if the options file says not to -if ! grep -qs ^restart-on-upgrade /etc/trinity/kdm/kdm.options; then +if ! grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options; then NOSTART=yes fi @@ -75,40 +75,40 @@ fi # md5sum of the stock Xservers shipped with KDE 3.3.2, which shipped with Sarge SARGEXSERVERS=d3ab063f564492e0e31830f56ccd350e -CONFIGLEVEL=`grep -s ^ConfigVersion= /etc/trinity/kdm/kdmrc | sed s/^ConfigVersion=//` +CONFIGLEVEL=`grep -s ^ConfigVersion= /etc/trinity/tdm/tdmrc | sed s/^ConfigVersion=//` -if [ -e /etc/trinity/kdm/kdmrc ]; then +if [ -e /etc/trinity/tdm/tdmrc ]; then if dpkg --compare-versions "$CONFIGLEVEL" ge "2.3"; then - KDMRCUPDATED=yes + TDMRCUPDATED=yes fi fi -if [ -e /etc/trinity/kdm/Xservers ]; then - if [ `md5sum /etc/trinity/kdm/Xservers | sed s/\ .*$//` = $SARGEXSERVERS ]; then +if [ -e /etc/trinity/tdm/Xservers ]; then + if [ `md5sum /etc/trinity/tdm/Xservers | sed s/\ .*$//` = $SARGEXSERVERS ]; then XSERVERSUNCHANGED=yes fi fi -# With KDE 3.4, /etc/trinity/kdm/Xservers is no longer required, so we remove it, if -# the user has updated their kdmrc (if they haven't, kdm notices and keeps using +# With KDE 3.4, /etc/trinity/tdm/Xservers is no longer required, so we remove it, if +# the user has updated their tdmrc (if they haven't, tdm notices and keeps using # Xservers), and if it wasn't touched, i.e. there are no local changes the user -# will want to merge into kdmrc. +# will want to merge into tdmrc. case "$1" in configure) - if [ ! -z $KDMRCUPDATED ] && [ ! -z $XSERVERSUNCHANGED ]; then - echo "Removing obsolete /etc/trinity/kdm/Xservers (detected no user changes)." - rm -f /etc/trinity/kdm/Xservers - elif [ ! -z $KDMRCUPDATED ] && [ -e /etc/trinity/kdm/Xservers ]; then - echo "Note that /etc/trinity/kdm/Xservers is no longer used by KDM." - echo "You must merge your changes (if any) into /etc/trinity/kdm/kdmrc manually." - echo "Otherwise, /etc/trinity/kdm/Xservers is safe to remove." + if [ ! -z $TDMRCUPDATED ] && [ ! -z $XSERVERSUNCHANGED ]; then + echo "Removing obsolete /etc/trinity/tdm/Xservers (detected no user changes)." + rm -f /etc/trinity/tdm/Xservers + elif [ ! -z $TDMRCUPDATED ] && [ -e /etc/trinity/tdm/Xservers ]; then + echo "Note that /etc/trinity/tdm/Xservers is no longer used by TDM." + echo "You must merge your changes (if any) into /etc/trinity/tdm/tdmrc manually." + echo "Otherwise, /etc/trinity/tdm/Xservers is safe to remove." fi - rm -f /etc/init.d/kdm-trinity - ln -s /lib/init/upstart-job /etc/init.d/kdm-trinity + rm -f /etc/init.d/tdm-trinity + ln -s /lib/init/upstart-job /etc/init.d/tdm-trinity ;; diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.postrm b/ubuntu/maverick/tdebase/debian/kdm-trinity.postrm index b5719fadd..3dfb32123 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.postrm +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.postrm @@ -2,7 +2,7 @@ case "$1" in purge) - rm -rf /var/log/kdm-trinity.log* + rm -rf /var/log/tdm-trinity.log* ;; remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear) @@ -25,12 +25,12 @@ if [ "$1" = "abort-install" -o "$1" = "abort-upgrade" ]; then fi if [ "$1" = "purge" ]; then - for DIR in /var/lib/kdm-trinity; do + for DIR in /var/lib/tdm-trinity; do if [ -d "$DIR" ]; then rm -rf "$DIR" fi done - rm -f /var/log/kdm-trinity.log* + rm -f /var/log/tdm-trinity.log* fi #DEBHELPER# diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.preinst b/ubuntu/maverick/tdebase/debian/kdm-trinity.preinst index 0e6a2f68b..09163c460 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.preinst +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.preinst @@ -3,12 +3,12 @@ case "$1" in upgrade) - rm -f /etc/trinity/debian/kdm-update-menu.sh - rm -f /etc/trinity/debian/kdm.options - rm -f /etc/trinity/kdm/pixmaps/XFree86bw.xpm - rm -f /etc/trinity/kdm/pixmaps/XFree86.xpm - rm -f /etc/trinity/kdm/Xresources - rm -f /etc/menu-methods/kdm + rm -f /etc/trinity/debian/tdm-update-menu.sh + rm -f /etc/trinity/debian/tdm.options + rm -f /etc/trinity/tdm/pixmaps/XFree86bw.xpm + rm -f /etc/trinity/tdm/pixmaps/XFree86.xpm + rm -f /etc/trinity/tdm/Xresources + rm -f /etc/menu-methods/tdm ;; install) diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.prerm b/ubuntu/maverick/tdebase/debian/kdm-trinity.prerm index 640da5602..1ca8de60e 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.prerm +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.prerm @@ -1,5 +1,5 @@ #! /bin/sh -# prerm script for kdm-trinity +# prerm script for tdm-trinity # # see: dh_installdeb(1) @@ -24,14 +24,14 @@ if [ -e /usr/share/debconf/confmodule ]; then fi case "$1" in - # we NEVER want to unconditionally stop kdm; see below + # we NEVER want to unconditionally stop tdm; see below upgrade|failed-upgrade) REMOVING= ;; remove|deconfigure) REMOVING=yes - rm -f /etc/init.d/kdm-trinity + rm -f /etc/init.d/tdm-trinity ;; *) @@ -41,14 +41,14 @@ case "$1" in esac STOP= -# are we supposed to restart on upgrade? if REMOVING kdm, we don't care what +# are we supposed to restart on upgrade? if REMOVING tdm, we don't care what # the user says, we have to stop the daemon -if grep -qs ^restart-on-upgrade /etc/trinity/kdm/kdm.options || +if grep -qs ^restart-on-upgrade /etc/trinity/tdm/tdm.options || [ -n "$REMOVING" ]; then - # is there an kdm process running? - if start-stop-daemon --stop --quiet --signal 0 --name kdm-trinity; then + # is there an tdm process running? + if start-stop-daemon --stop --quiet --signal 0 --name tdm-trinity; then # any children? - PARENTS=$(pidof /usr/bin/kdm-trinity || true) + PARENTS=$(pidof /usr/bin/tdm-trinity || true) CHILDREN= if [ -n "$PARENTS" ]; then for PROCESS in $PARENTS; do @@ -65,11 +65,11 @@ if grep -qs ^restart-on-upgrade /etc/trinity/kdm/kdm.options || if [ -n "$CHILDREN" ]; then if [ -n "$HAVE_DEBCONF" ]; then # ask the question - db_input high kdm/stop_running_server_with_children || true + db_input high tdm/stop_running_server_with_children || true db_go # what did the user say? ANSWER= - if db_get kdm/stop_running_server_with_children; then + if db_get tdm/stop_running_server_with_children; then ANSWER="$RET" fi if [ "$ANSWER" = "true" ]; then @@ -77,7 +77,7 @@ if grep -qs ^restart-on-upgrade /etc/trinity/kdm/kdm.options || fi # forget that we have seen the question; this is the sort of # non-configuration question that should be asked every time - db_fset kdm/stop_running_server_with_children seen false + db_fset tdm/stop_running_server_with_children seen false fi else STOP=yes @@ -88,13 +88,13 @@ fi if [ -n "$STOP" ]; then if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then - invoke-rc.d kdm-trinity stop || true + invoke-rc.d tdm-trinity stop || true else - /etc/init.d/kdm-trinity stop || true + /etc/init.d/tdm-trinity stop || true fi else if [ "$1" = "upgrade" -o "$1" = "failed-upgrade" ]; then - touch /var/run/kdm-trinity.upgrade + touch /var/run/tdm-trinity.upgrade fi fi @@ -117,7 +117,7 @@ if [ "$1" = "remove" -o "$1" = "deconfigure" ]; then fi # are we removing the currently selected display manager? if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then - if [ "kdm-trinity" = "$DEFAULT_DISPLAY_MANAGER" ]; then + if [ "tdm-trinity" = "$DEFAULT_DISPLAY_MANAGER" ]; then if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then if db_get "$DEFAULT_DISPLAY_MANAGER/daemon_name"; then # does the display manager file reference the current default? if diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.templates b/ubuntu/maverick/tdebase/debian/kdm-trinity.templates index 8c8e3866e..564181f78 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.templates +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.templates @@ -14,19 +14,19 @@ _Description: Default display manager: accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager. -Template: kdm-trinity/daemon_name +Template: tdm-trinity/daemon_name Type: string -Default: /opt/trinity/bin/kdm +Default: /opt/trinity/bin/tdm Description: internal use only This template is never shown to the user and does not require translation. -Template: kdm-trinity/stop_running_server_with_children +Template: tdm-trinity/stop_running_server_with_children Type: boolean Default: false -_Description: Stop the kdm-trinity daemon? - The K Desktop manager (kdm-trinity) daemon is typically stopped on package upgrade +_Description: Stop the tdm-trinity daemon? + The K Desktop manager (tdm-trinity) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session. . - If kdm is stopped now, any X sessions it manages will be terminated. + If tdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted. diff --git a/ubuntu/maverick/tdebase/debian/kdm-trinity.txt b/ubuntu/maverick/tdebase/debian/kdm-trinity.txt index a1940a4d8..c51d4aa73 100644 --- a/ubuntu/maverick/tdebase/debian/kdm-trinity.txt +++ b/ubuntu/maverick/tdebase/debian/kdm-trinity.txt @@ -1,6 +1,6 @@ #!/bin/sh ### BEGIN INIT INFO -# Provides: x-display-manager kdm-trinity +# Provides: x-display-manager tdm-trinity # Required-Start: $local_fs $remote_fs # Required-Stop: $local_fs $remote_fs # Should-Start: console-screen @@ -8,40 +8,40 @@ # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: X display manager for Trinity -# Description: KDM manages a collection of X servers, which may be on the local host or remote machines. +# Description: TDM manages a collection of X servers, which may be on the local host or remote machines. ### END INIT INFO -# /etc/init.d/kdm-trinity: start or stop the X display manager +# /etc/init.d/tdm-trinity: start or stop the X display manager # Script originally stolen from the xdm package # # description: K Display Manager # set -e -# To start kdm-trinity even if it is not the default display manager, change +# To start tdm-trinity even if it is not the default display manager, change # HEED_DEFAULT_DISPLAY_MANAGER to "false." HEED_DEFAULT_DISPLAY_MANAGER=true DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager TDEDIRS=/opt/trinity/ PATH=/opt/trinity/bin:/bin:/usr/bin:/sbin:/usr/sbin -DAEMON=/opt/trinity/bin/kdm -PIDFILE=/var/run/kdm.pid -UPGRADEFILE=/var/run/kdm.upgrade +DAEMON=/opt/trinity/bin/tdm +PIDFILE=/var/run/tdm.pid +UPGRADEFILE=/var/run/tdm.upgrade -# parameters to support kdm customization -KDMRC=/etc/trinity/kdm/kdmrc -BACKGROUNDRC=/etc/trinity/kdm/backgroundrc +# parameters to support tdm customization +TDMRC=/etc/trinity/tdm/tdmrc +BACKGROUNDRC=/etc/trinity/tdm/backgroundrc -#if configuration is changed by kdmtheme or other tools, don't do magick -if grep -q "Theme=@@@ToBeReplacedByDesktopBase@@@" ${KDMRC} && grep -q "Wallpaper=default_blue.jpg" ${BACKGROUNDRC} +#if configuration is changed by tdmtheme or other tools, don't do magick +if grep -q "Theme=@@@ToBeReplacedByDesktopBase@@@" ${TDMRC} && grep -q "Wallpaper=default_blue.jpg" ${BACKGROUNDRC} then -KDMOVERRIDEDIR=/etc/default/kdm-trinity.d -KDMCFGDIR=/var/run/kdm-trinity -KDMCFG=$KDMCFGDIR/kdmrc -BACKGROUNDCFG=$KDMCFGDIR/backgroundrc +TDMOVERRIDEDIR=/etc/default/tdm-trinity.d +TDMCFGDIR=/var/run/tdm-trinity +TDMCFG=$TDMCFGDIR/tdmrc +BACKGROUNDCFG=$TDMCFGDIR/backgroundrc test -x $DAEMON || exit 0 @@ -52,36 +52,36 @@ test -x $DAEMON || exit 0 # uncomment, if you want tons of debug info in your syslog #ARG="$ARG -debug 255" -# we use an alternative kdm master configuration file -ARG="$ARG -config $KDMCFG" +# we use an alternative tdm master configuration file +ARG="$ARG -config $TDMCFG" # we source overrides. run-parts sorts the list in a predictable order -if [ -d "$KDMOVERRIDEDIR" ]; then - for part in $(run-parts --list "$KDMOVERRIDEDIR" 2>/dev/null || true); do +if [ -d "$TDMOVERRIDEDIR" ]; then + for part in $(run-parts --list "$TDMOVERRIDEDIR" 2>/dev/null || true); do . "$part" done fi -# we generate kdm configuration files -genkdmconf --in $KDMCFGDIR 1> /dev/null +# we generate tdm configuration files +gentdmconf --in $TDMCFGDIR 1> /dev/null -# we update kdm configuration files (only overridden values) -[ -n "$USEBACKGROUND" ] && sed -i "s|^#\?UseBackground=.*|UseBackground=$USEBACKGROUND|" $KDMCFG -[ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $KDMCFG -[ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $KDMCFG -[ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $KDMCFG +# we update tdm configuration files (only overridden values) +[ -n "$USEBACKGROUND" ] && sed -i "s|^#\?UseBackground=.*|UseBackground=$USEBACKGROUND|" $TDMCFG +[ -n "$BACKGROUNDCFG" ] && sed -i "s|^#\?BackgroundCfg=.*|BackgroundCfg=$BACKGROUNDCFG|" $TDMCFG +[ -n "$USETHEME" ] && sed -i "s|^#\?UseTheme=.*|UseTheme=$USETHEME|" $TDMCFG +[ -n "$THEME" ] && sed -i "s|^#\?Theme=.*|Theme=$THEME|" $TDMCFG [ -n "$WALLPAPER" ] && sed -i "s|^#\?Wallpaper=.*|Wallpaper=`readlink -f $WALLPAPER`|" $BACKGROUNDCFG fi # autologin overrides are useful for live debian environment if [ -n "$AUTOLOGINUSER" ]; then - sed -i "s|^#\?AutoLoginEnable=.*|AutoLoginEnable=true|" $KDMCFG - sed -i "s|^#\?AutoLoginUser=.*|AutoLoginUser=$AUTOLOGINUSER|" $KDMCFG + sed -i "s|^#\?AutoLoginEnable=.*|AutoLoginEnable=true|" $TDMCFG + sed -i "s|^#\?AutoLoginUser=.*|AutoLoginUser=$AUTOLOGINUSER|" $TDMCFG fi -[ -n "$AUTOLOGINDELAY" ] && sed -i "s|^#\?AutoLoginDelay=.*|AutoLoginDelay=$AUTOLOGINDELAY|" $KDMCFG -[ -n "$AUTOLOGINAGAIN" ] && sed -i "s|^#\?AutoLoginAgain=.*|AutoLoginAgain=$AUTOLOGINAGAIN|" $KDMCFG -[ -n "$AUTOLOGINLOCKED" ] && sed -i "s|^#\?AutoLoginLocked=.*|AutoLoginLocked=$AUTOLOGINLOCKED|" $KDMCFG +[ -n "$AUTOLOGINDELAY" ] && sed -i "s|^#\?AutoLoginDelay=.*|AutoLoginDelay=$AUTOLOGINDELAY|" $TDMCFG +[ -n "$AUTOLOGINAGAIN" ] && sed -i "s|^#\?AutoLoginAgain=.*|AutoLoginAgain=$AUTOLOGINAGAIN|" $TDMCFG +[ -n "$AUTOLOGINLOCKED" ] && sed -i "s|^#\?AutoLoginLocked=.*|AutoLoginLocked=$AUTOLOGINLOCKED|" $TDMCFG # If we upgraded the daemon, we can't use the --exec argument to # start-stop-daemon since the inode will have changed. The risk here is that @@ -110,22 +110,22 @@ case "$1" in if [ -e $DEFAULT_DISPLAY_MANAGER_FILE ] && [ "$HEED_DEFAULT_DISPLAY_MANAGER" = "true" ] && [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then - echo "Not starting K Display Manager (kdm-trinity); it is not the default display manager." + echo "Not starting K Display Manager (tdm-trinity); it is not the default display manager." else - echo -n "Starting K Display Manager: kdm-trinity" + echo -n "Starting K Display Manager: tdm-trinity" start-stop-daemon --start --quiet $SSD_ARGS -- $ARG || echo -n " already running" echo "." fi ;; restart) - /etc/init.d/kdm-trinity stop + /etc/init.d/tdm-trinity stop if [ -f $PIDFILE ]; then if stillrunning; then exit 1 fi fi - /etc/init.d/kdm-trinity start + /etc/init.d/tdm-trinity start ;; reload) @@ -133,16 +133,16 @@ case "$1" in if start-stop-daemon --stop --signal 1 --quiet $SSD_ARGS; then echo "done." else - echo "kdm-trinity not running." + echo "tdm-trinity not running." fi ;; force-reload) - /etc/init.d/kdm-trinity reload + /etc/init.d/tdm-trinity reload ;; stop) - echo -n "Stopping K Display Manager: kdm-trinity" + echo -n "Stopping K Display Manager: tdm-trinity" if [ ! -f $PIDFILE ]; then echo " not running ($PIDFILE not found)." exit 0 @@ -151,7 +151,7 @@ case "$1" in KILLCOUNT=1 if [ ! -e $UPGRADEFILE ]; then if start-stop-daemon --stop --quiet $SSD_ARGS; then - # give kdm's signal handler a second to catch its breath + # give tdm's signal handler a second to catch its breath sleep 1 else echo -n " not running" @@ -181,7 +181,7 @@ case "$1" in ;; *) - echo "Usage: /etc/init.d/kdm-trinity {start|stop|restart|reload|force-reload}" + echo "Usage: /etc/init.d/tdm-trinity {start|stop|restart|reload|force-reload}" exit 1 ;; esac diff --git a/ubuntu/maverick/tdebase/debian/local/kdm.options b/ubuntu/maverick/tdebase/debian/local/kdm.options index 61e4c04a0..05725ae34 100644 --- a/ubuntu/maverick/tdebase/debian/local/kdm.options +++ b/ubuntu/maverick/tdebase/debian/local/kdm.options @@ -1,7 +1,7 @@ -# /etc/trinity/kdm/kdm.options +# /etc/trinity/tdm/tdm.options # -# configuration options for kdm -# See kdm.options(5) for an explanation of the available options. +# configuration options for tdm +# See tdm.options(5) for an explanation of the available options. no-ignore-nologin no-restart-on-upgrade diff --git a/ubuntu/maverick/tdebase/debian/local/kdm.options.5 b/ubuntu/maverick/tdebase/debian/local/kdm.options.5 index e1ccaef2f..446271273 100644 --- a/ubuntu/maverick/tdebase/debian/local/kdm.options.5 +++ b/ubuntu/maverick/tdebase/debian/local/kdm.options.5 @@ -1,4 +1,4 @@ -.\" $Id: kdm.options.5,v 1.2 2004/02/27 22:45:20 ccheney Exp $ +.\" $Id: tdm.options.5,v 1.2 2004/02/27 22:45:20 ccheney Exp $ .\" .\" Copyright 1998, 2002, 2003 Branden Robinson <[email protected]>. .\" @@ -15,16 +15,16 @@ .\" the Debian operating system, in /usr/share/common-licenses/GPL; if .\" not, write to the Free Software Foundation, Inc., 59 Temple Place, .\" Suite 330, Boston, MA 02111-1307 USA -.TH kdm.options 5 "2003\-09\-18" "Debian Project" +.TH tdm.options 5 "2003\-09\-18" "Debian Project" .SH NAME -kdm.options \- configuration options for X display manager +tdm.options \- configuration options for X display manager .SH DESCRIPTION -.I /etc/trinity/kdm/kdm.options +.I /etc/trinity/tdm/tdm.options contains a set of flags that determine some of the behavior of the X display manager -.BR kdm (1). +.BR tdm (1). .PP -.I /etc/trinity/kdm/kdm.options +.I /etc/trinity/tdm/tdm.options may contain comments, which begin with a hash mark and end at the next newline, just like comments in shell scripts. The rest of the file consists of options which are expressed as words separated by hyphens, with @@ -38,50 +38,50 @@ Normally, the contents of the /etc/nologin file will be displayed using .BR xmessage (1x) (if .B xmessage -is available), and the user will be returned to the kdm login screen after -the xmessage is dismissed. If this option is enabled, kdm starts a session +is available), and the user will be returned to the tdm login screen after +the xmessage is dismissed. If this option is enabled, tdm starts a session as usual (after the xmessage is dismissed, if xmessage is available). .TP .B restart\-on\-upgrade Enable this option with caution on \(oqproduction\(cq machines; it causes -the kdm daemon to be stopped and restarted on upgrade, even if the process +the tdm daemon to be stopped and restarted on upgrade, even if the process has children (which means it is managing X sessions). Typically when a package that contains a daemon is being installed or upgraded, its maintainer scripts stop a running daemon process before installing the new -binary, and restart it after the new binary is installed. Stopping kdm +binary, and restart it after the new binary is installed. Stopping tdm causes immediate termination of any sessions it manages; in some situations -this could be an unwelcome surprise (for instance, for remote kdm users who +this could be an unwelcome surprise (for instance, for remote tdm users who had no idea the administrator was performing system maintenance). On the other hand, for machines that stay up for long periods of time, leaving the old daemon running can be a bad idea if the new version has, for instance, -a fix for a security vulnerability (overwriting kdm's executable on the -file system has no effect on the copy of kdm in memory). The kdm -pre\-removal script checks to see if the kdm process has any children; if +a fix for a security vulnerability (overwriting tdm's executable on the +file system has no effect on the copy of tdm in memory). The tdm +pre\-removal script checks to see if the tdm process has any children; if it does, it is possible that someone's session would be killed by stopping -kdm, so a warning is issued and an opportunity to abort the upgrade of kdm -is provided. If this option is disabled (the Debian default), kdm will be +tdm, so a warning is issued and an opportunity to abort the upgrade of tdm +is provided. If this option is disabled (the Debian default), tdm will be not be stopped or started during an install or upgrade; the administrator -will have to do so by hand (with \(oq/etc/init.d/kdm restart\(cq, or by -rebooting the system) before the newly installed kdm binary is used. +will have to do so by hand (with \(oq/etc/init.d/tdm restart\(cq, or by +rebooting the system) before the newly installed tdm binary is used. .TP .B use\-sessreg If this option is enabled (the Debian default), the sessreg program will be -invoked to register X sessions managed by kdm in the utmp and wtmp files. +invoked to register X sessions managed by tdm in the utmp and wtmp files. Otherwise, it is not, and the utmp and wtmp files will have no record of -kdm sessions. +tdm sessions. .PP Users of older versions of the Debian system should note that the \(oqrun\-xconsole\(cq option has been removed. Shell scripts named -.I /etc/trinity/kdm/Xsetup +.I /etc/trinity/tdm/Xsetup and -.I /etc/trinity/kdm/Xreset -can be edited to disable or modify the running of xconsole on the kdm +.I /etc/trinity/tdm/Xreset +can be edited to disable or modify the running of xconsole on the tdm greeter screen; see the -.B kdm +.B tdm manual page for more information. .SH AUTHOR This manpage was written by Branden Robinson for the Debian Project. .SH SEE ALSO .BR sessreg (1x), .BR xmessage (1x), -.BR kdm (1x) +.BR tdm (1x) diff --git a/ubuntu/maverick/tdebase/debian/man/genkdmconf-trinity.1 b/ubuntu/maverick/tdebase/debian/man/genkdmconf-trinity.1 index e23122b89..ce3c46d8b 100644 --- a/ubuntu/maverick/tdebase/debian/man/genkdmconf-trinity.1 +++ b/ubuntu/maverick/tdebase/debian/man/genkdmconf-trinity.1 @@ -1,12 +1,12 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH GENKDMCONF 1 "June 2006" "K Desktop Environment" "generate configuration files for kdm" +.TH GENTDMCONF 1 "June 2006" "K Desktop Environment" "generate configuration files for tdm" .SH NAME -genkdmconf -\- generate configuration files for kdm +gentdmconf +\- generate configuration files for tdm .SH SYNOPSIS -\fBgenkdmconf\fP +\fBgentdmconf\fP .RB [ \-\-in -.IR /path/to/new/kdm\-config\-dir ] +.IR /path/to/new/tdm\-config\-dir ] .RS 11 .RB [ \-\-old\-xdm .IR /path/to/old/xdm\-dir ] @@ -27,49 +27,49 @@ genkdmconf .RE .SH DESCRIPTION -\fBgenkdmconf\fP is used to generate configuration files for \fBkdm\fP. +\fBgentdmconf\fP is used to generate configuration files for \fBtdm\fP. .br -If an older xdm/kdm configuration is found, its config files are "absorbed"; +If an older xdm/tdm configuration is found, its config files are "absorbed"; if it lives in the new target directory, its scripts are reused (and possibly modified) as well, otherwise the scripts are ignored and default scripts are installed. .SH OPTIONS .TP -.BI \-\-in \ /path/to/new/kdm\-config\-dir +.BI \-\-in \ /path/to/new/tdm\-config\-dir In which directory to put the new configuration. You can use this to support a $(DESTDIR), but not to change the final location of the installation \- the paths inside the files are not affected. .br -Default is \fI/etc/trinity/kdm\fP. +Default is \fI/etc/trinity/tdm\fP. .TP .BI \-\-old\-xdm \ /path/to/old/xdm\-dir -Where to look for the config files of an \fBxdm\fP / older \fBkdm\fP. Default is to scan -.IR /etc/X11/kdm , \ $XLIBDIR/kdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ; -there in turn look for \fIkdm\-config\fP and \fIxdm\-config\fP. +Where to look for the config files of an \fBxdm\fP / older \fBtdm\fP. Default is to scan +.IR /etc/X11/tdm , \ $XLIBDIR/tdm , \ /etc/X11/xdm , \ $XLIBDIR/xdm ; +there in turn look for \fItdm\-config\fP and \fIxdm\-config\fP. .br Note that you possibly need to use \fB\-\-no\-old\-kde\fP to make this take effect. .TP .BI \-\-old\-kde \ /path/to/old/kde\-config\-dir -Where to look for the \fIkdmrc\fP of an older \fBkdm\fP. +Where to look for the \fItdmrc\fP of an older \fBtdm\fP. .br .RI Default\ is\ to\ scan\ /etc/trinity \ and\ { /usr,/usr/local , .RI { /opt,/usr/local }{ trinity,kde,kde2,kde1 }} /share/config . .TP .B \-\-no\-old -Don't look at older xdm/kdm configurations, just create default config. +Don't look at older xdm/tdm configurations, just create default config. .TP .B \-\-no\-old\-xdm Don't look at older xdm configurations. .TP .B \-\-no\-old\-kde -Don't look at older kdm configurations. +Don't look at older tdm configurations. .TP .B \-\-old\-scripts -Directly use all scripts from the older xdm/kdm configuration. +Directly use all scripts from the older xdm/tdm configuration. .TP .B \-\-no\-old\-scripts -Don't use scripts from the older xdm/kdm configuration even if it lives in the new target directory. +Don't use scripts from the older xdm/tdm configuration even if it lives in the new target directory. .TP .B \-\-old\-confs -Directly use all ancillary config files from the older xdm/kdm configuration. This is usually a bad idea. +Directly use all ancillary config files from the older xdm/tdm configuration. This is usually a bad idea. .TP .B \-\-no\-backup Overwrite/delete old config files instead of backing them up. @@ -77,7 +77,7 @@ Overwrite/delete old config files instead of backing them up. .B \-\-no\-in\-notice Don't put the notice about \fB\-\-in\fP being used into the generated README. .SH SEE ALSO -.BR kdm (1) +.BR tdm (1) .SH AUTHORS .nf Oswald Buddenhagen <[email protected]> diff --git a/ubuntu/maverick/tdebase/debian/man/kdm-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kdm-trinity.1 index e6c7a0b19..4add90a82 100644 --- a/ubuntu/maverick/tdebase/debian/man/kdm-trinity.1 +++ b/ubuntu/maverick/tdebase/debian/man/kdm-trinity.1 @@ -1,16 +1,16 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDM 1 "June 2006" "K Desktop Environment" "KDE Display Manager" +.TH TDM 1 "June 2006" "K Desktop Environment" "KDE Display Manager" .SH NAME -kdm +tdm \- KDE Display Manager .SH SYNOPSIS -\fBkdm\fP [options] [tty] +\fBtdm\fP [options] [tty] .SH DESCRIPTION -\fBkdm\fP is the KDE display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session. +\fBtdm\fP is the KDE display manager also known as login manager. It shows a graphical login screen for username and password. After authenticating the user it starts a session. .br -\fBkdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network. +\fBtdm\fP can be configured for remote login via XDMCP. XDMCP is the "X Display Manager Control Protocol" which is used to set up connections between remote systems over the network. .sp 1 -\fBkdm\fP is a derivative of \fBxdm\fP. \fBman 1 xdm\fP may provide useful information (requires installed \fBxdm\fP). For X-related problems try \fBman 7x X\fP and \fBman 1 startx\fP. +\fBtdm\fP is a derivative of \fBxdm\fP. \fBman 1 xdm\fP may provide useful information (requires installed \fBxdm\fP). For X-related problems try \fBman 7x X\fP and \fBman 1 startx\fP. .SH OPTIONS .TP .B \-daemon @@ -55,48 +55,48 @@ Debug option bitfield: .RE .SH FILES .TP -.I /etc/trinity/kdm/backgroundrc +.I /etc/trinity/tdm/backgroundrc configuration file with background settings .TP -.I /etc/trinity/kdm/kdm.options -options for X display manager kdm +.I /etc/trinity/tdm/tdm.options +options for X display manager tdm .TP -.I /etc/trinity/kdm/kdmrc -the kdm configuration file +.I /etc/trinity/tdm/tdmrc +the tdm configuration file .TP -.I /etc/trinity/kdm/Xaccess +.I /etc/trinity/tdm/Xaccess access control file for XDMCP connections .TP -.I /etc/trinity/kdm/Xservers +.I /etc/trinity/tdm/Xservers list of local X-servers .TP -.I /etc/trinity/kdm/Xreset +.I /etc/trinity/tdm/Xreset script to run as root after session exits .TP -.I /etc/trinity/kdm/Xsession +.I /etc/trinity/tdm/Xsession script to run as user after login of user .TP -.I /etc/trinity/kdm/Xsetup +.I /etc/trinity/tdm/Xsetup script to run as root before the login dialog appears .sp 1 -this script can be edited to disable or modify the running of \fBxconsole\fP on the kdm greeter screen +this script can be edited to disable or modify the running of \fBxconsole\fP on the tdm greeter screen .TP -.I /etc/trinity/kdm/Xstartup +.I /etc/trinity/tdm/Xstartup script to run as root before session starts .TP -.I /etc/trinity/kdm/Xwilling +.I /etc/trinity/tdm/Xwilling output of this script is displayed in the chooser window .SH SEE ALSO -.BR kdm.options (5),\ kdmctl (1),\ kdm_config (1),\ kdm_greet (1),\ startx (1),\ X (7x),\ xconsole (1),\ xdm (1) +.BR tdm.options (5),\ tdmctl (1),\ tdm_config (1),\ tdm_greet (1),\ startx (1),\ X (7x),\ xconsole (1),\ xdm (1) .TP -.I /opt/trinity/share/doc/kdm/README.gz -Information about \fBkdm\fP and its options +.I /opt/trinity/share/doc/tdm/README.gz +Information about \fBtdm\fP and its options .sp 1 .RE Full user documentation is available through the KDE Help Center. You can also enter the URL -.BR help:/kdm/ +.BR help:/tdm/ directly into konqueror or you can run -.BR "khelpcenter help:/kdm/" +.BR "khelpcenter help:/tdm/" from the command\-line. .br .SH AUTHORS diff --git a/ubuntu/maverick/tdebase/debian/man/kdm_config-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kdm_config-trinity.1 index d1cbfea1d..d9325214a 100644 --- a/ubuntu/maverick/tdebase/debian/man/kdm_config-trinity.1 +++ b/ubuntu/maverick/tdebase/debian/man/kdm_config-trinity.1 @@ -1,14 +1,14 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDM_CONFIG 1 "June 2006" "K Desktop Environment" "helper program" +.TH TDM_CONFIG 1 "June 2006" "K Desktop Environment" "helper program" .SH NAME -kdm_config -\- helper programm for kdm to read configuration files +tdm_config +\- helper programm for tdm to read configuration files .SH SYNOPSIS -\fBkdm_config\fP +\fBtdm_config\fP .SH DESCRIPTION -\fBkdm_config\fP is a helper program for \fBkdm\fP to read configuration files. +\fBtdm_config\fP is a helper program for \fBtdm\fP to read configuration files. .SH SEE ALSO -\fBkdm\fP(1) +\fBtdm\fP(1) .SH AUTHORS .nf Oswald Buddenhagen <[email protected]> diff --git a/ubuntu/maverick/tdebase/debian/man/kdm_greet-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kdm_greet-trinity.1 index f1607e2b1..c33f57d5f 100644 --- a/ubuntu/maverick/tdebase/debian/man/kdm_greet-trinity.1 +++ b/ubuntu/maverick/tdebase/debian/man/kdm_greet-trinity.1 @@ -1,14 +1,14 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDM_GREET 1 "June 2006" "K Desktop Environment" "KDE greeter module" +.TH TDM_GREET 1 "June 2006" "K Desktop Environment" "KDE greeter module" .SH NAME -kdm_greet -\- KDE greeter module for kdm +tdm_greet +\- KDE greeter module for tdm .SH SYNOPSIS -\fBkdm_greet\fP +\fBtdm_greet\fP .SH DESCRIPTION -\fBkdm_greet\fP is a KDE greeter module for \fBkdm\fP. It shows the login dialog. +\fBtdm_greet\fP is a KDE greeter module for \fBtdm\fP. It shows the login dialog. .SH SEE ALSO -.BR kdm (1) +.BR tdm (1) .SH AUTHORS .nf Oswald Buddenhagen <[email protected]> diff --git a/ubuntu/maverick/tdebase/debian/man/kdmctl-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kdmctl-trinity.1 index b05f09407..a1a0bb622 100644 --- a/ubuntu/maverick/tdebase/debian/man/kdmctl-trinity.1 +++ b/ubuntu/maverick/tdebase/debian/man/kdmctl-trinity.1 @@ -1,12 +1,12 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KDMCTL 1 "June 2006" "K Desktop Environment" "KDM remote control application" +.TH TDMCTL 1 "June 2006" "K Desktop Environment" "TDM remote control application" .SH NAME -kdmctl -\- kdm remote control application +tdmctl +\- tdm remote control application .SH SYNOPSIS -\fBkdmctl\fP [options] [command [command arguments]] +\fBtdmctl\fP [options] [command [command arguments]] .SH DESCRIPTION -\fBkdmctl\fP is an application to remote\-control \fBkdm\fP. It makes use of UNIX domain sockets. +\fBtdmctl\fP is an application to remote\-control \fBtdm\fP. It makes use of UNIX domain sockets. .sp 1 There are two types of sockets: the global one (dmctl) and the per\-display ones (dmctl\-<display>). The global one's subdir is owned by root, the subdirs of the per\-display ones' are owned by the user currently owning the session (root or the logged in user). .sp 1 @@ -16,7 +16,7 @@ The directory in which the sockets are located is determined this way: .br \- the $DM_CONTROL variable is examined .br -\- the kdm config file is searched for the FifoDir key +\- the tdm config file is searched for the FifoDir key .br .RI \- /var/run/xdmctl \ and\ /var/run \ are\ tried .RE @@ -28,7 +28,7 @@ Tokens in the command and the reply are tab\-separated. Command arguments can be specified as separate command line parameters, in which case they are simply concatenated with tabs in between. .sp 1 -If the command is '\-', \fBkdmctl\fP reads commands from stdin. +If the command is '\-', \fBtdmctl\fP reads commands from stdin. The default command is 'caps'. .SH OPTIONS .SS @@ -47,7 +47,7 @@ Override $DISPLAY Override $DM_CONTROL .TP .B \-c \-config -Use alternative kdm config file +Use alternative tdm config file .SS Commands: .br .SS Global commands: @@ -72,8 +72,8 @@ The currently running session is forcibly terminated. No auto\-relogin is attemp .TP .B caps Returns a list of this socket's capabilities: -.IP " \- kdm" -identifies kdm, in case some other DM implements this protocol, too. +.IP " \- tdm" +identifies tdm, in case some other DM implements this protocol, too. .IP " \- list, activate, lock, suicide, login" the respective command is supported. .IP " \- bootoptions" @@ -155,7 +155,7 @@ Shutdowns requested from per\-display sockets are executed when the current sess .sp 1 start is the time for which the shutdown is scheduled. If it starts with a plus\-sign, the current time is added. Zero means immediately. .sp 1 -end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus\-sign, the start time is added. Minus one means wait infinitely. If end is through and active sessions are still running, \fBKDM\fP can do one of the following: +end is the latest time at which the shutdown should be performed if active sessions are still running. If it starts with a plus\-sign, the start time is added. Minus one means wait infinitely. If end is through and active sessions are still running, \fBTDM\fP can do one of the following: .RS 3 - "cancel" \- give up the shutdown. .br @@ -203,10 +203,10 @@ The entries are comma\-separated tuples of: \- New fields might be added later. .RE .SH SEE ALSO -.BR kdm (1) +.BR tdm (1) .TP -.I /opt/trinity/share/doc/kdm/README.gz -Information about the command sockets (and \fBkdm\fP) +.I /opt/trinity/share/doc/tdm/README.gz +Information about the command sockets (and \fBtdm\fP) .SH AUTHORS .nf Oswald Buddenhagen <[email protected]> diff --git a/ubuntu/maverick/tdebase/debian/man/krootimage-trinity.1 b/ubuntu/maverick/tdebase/debian/man/krootimage-trinity.1 index 2b683c19e..66464cf62 100644 --- a/ubuntu/maverick/tdebase/debian/man/krootimage-trinity.1 +++ b/ubuntu/maverick/tdebase/debian/man/krootimage-trinity.1 @@ -2,11 +2,11 @@ .TH KROOTIMAGE 1 "June 2006" "K Desktop Environment" "helper program" .SH NAME krootimage -\- set desktop background for kdm +\- set desktop background for tdm .SH SYNOPSIS \fBkrootimage\fP [Qt\-options] [KDE\-options] config .SH DESCRIPTION -\fBkrootimage\fP is a helper program for \fBkdm\fP to set the desktop background. +\fBkrootimage\fP is a helper program for \fBtdm\fP to set the desktop background. .SH OPTIONS .SS .SS Arguments: @@ -135,7 +135,7 @@ sets the application GUI style sets the client geometry of the main widget \- see man X for the argument format .SS .SH SEE ALSO -.BR kdm (1) +.BR tdm (1) .SH AUTHORS .nf Matthias Hoelzer\-Kluepfel <[email protected]> diff --git a/ubuntu/maverick/tdebase/debian/man/starttde-trinity.1 b/ubuntu/maverick/tdebase/debian/man/starttde-trinity.1 index 76c31c9ba..5ce70f453 100644 --- a/ubuntu/maverick/tdebase/debian/man/starttde-trinity.1 +++ b/ubuntu/maverick/tdebase/debian/man/starttde-trinity.1 @@ -12,7 +12,7 @@ This manual page was written for the Debian distribution because the original program does not have a manual page. .PP The \fBstarttde\fP script starts up the K Desktop Environment and -is typically executed by your login manager (e.g. xdm, gdm, kdm, wdm or from +is typically executed by your login manager (e.g. xdm, gdm, tdm, wdm or from your X startup scripts). \fBstarttde\fP in turn launches ksmserver, which will load your last session, or a default session that includes the standard KDE programs if no saved session is available. diff --git a/ubuntu/maverick/tdebase/debian/not-installed.list b/ubuntu/maverick/tdebase/debian/not-installed.list index dad970345..bbc3e466f 100644 --- a/ubuntu/maverick/tdebase/debian/not-installed.list +++ b/ubuntu/maverick/tdebase/debian/not-installed.list @@ -1,12 +1,12 @@ The following files are not installed in any binary package. This is deliberate. -/usr/share/apps/kdm/sessions/*.desktop +/usr/share/apps/tdm/sessions/*.desktop - many .desktop files are not included since they either do not have Debian packages, or their Debian packages include their own .desktop session - files for gdm/kdm, or they're not intended to be stand-alone window + files for gdm/tdm, or they're not intended to be stand-alone window managers. Eventually, these should ALL be dropped, since they aren't - really maintained upstream, and kdm isn't the correct place to ship these + really maintained upstream, and tdm isn't the correct place to ship these anyway. Here's the current list of those dropped: aewm++ @@ -38,7 +38,7 @@ This is deliberate. xfce4 xfce -/etc/trinity/kdm/README +/etc/trinity/tdm/README - useless comments, not intended for the end user. /usr/share/fonts/override/fonts.dir diff --git a/ubuntu/maverick/tdebase/debian/patches/disable_default_kdm_theme.diff b/ubuntu/maverick/tdebase/debian/patches/disable_default_kdm_theme.diff index 9f439d657..20cb49429 100644 --- a/ubuntu/maverick/tdebase/debian/patches/disable_default_kdm_theme.diff +++ b/ubuntu/maverick/tdebase/debian/patches/disable_default_kdm_theme.diff @@ -1,5 +1,5 @@ ---- kdm/config.def -+++ kdm/config.def +--- tdm/config.def ++++ tdm/config.def @@ -2614,8 +2614,8 @@ Key: UseTheme diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff index 52fa6a4d5..2c106549e 100644 --- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff +++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff @@ -1,5 +1,5 @@ ---- kdm/kfrontend/kdmshutdown.cpp -+++ kdm/kfrontend/kdmshutdown.cpp +--- tdm/kfrontend/tdmshutdown.cpp ++++ tdm/kfrontend/tdmshutdown.cpp @@ -467,7 +467,7 @@ , targetList( 0 ) { diff --git a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff b/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff index 781faa9fc..c312b6fb7 100644 --- a/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff +++ b/ubuntu/maverick/tdebase/debian/patches/kubuntu_9921_kdm_bulletproof_x.diff @@ -1,5 +1,5 @@ ---- tdebase-3.5.8/kdm/backend/dm.c 2008-02-13 23:59:17.000000000 +0200 -+++ tdebase-3.5.8/kdm/backend/dm.c 2008-02-14 11:22:41.000000000 +0200 +--- tdebase-3.5.8/tdm/backend/dm.c 2008-02-13 23:59:17.000000000 +0200 ++++ tdebase-3.5.8/tdm/backend/dm.c 2008-02-14 11:22:41.000000000 +0200 @@ -996,9 +996,14 @@ ReapChildren( void ) /* don't kill again */ break; @@ -18,8 +18,8 @@ StartServerFailed(); break; } ---- tdebase-3.5.8/kdm/backend/server.c 2008-02-13 23:59:17.000000000 +0200 -+++ tdebase-3.5.8/kdm/backend/server.c 2008-02-14 11:41:20.000000000 +0200 +--- tdebase-3.5.8/tdm/backend/server.c 2008-02-13 23:59:17.000000000 +0200 ++++ tdebase-3.5.8/tdm/backend/server.c 2008-02-14 11:41:20.000000000 +0200 @@ -48,6 +48,10 @@ from the copyright holder. struct display *startingServer; time_t serverTimeout = TO_INF; diff --git a/ubuntu/maverick/tdebase/debian/po/POTFILES.in b/ubuntu/maverick/tdebase/debian/po/POTFILES.in index 416e5f394..1f7bb4d7d 100644 --- a/ubuntu/maverick/tdebase/debian/po/POTFILES.in +++ b/ubuntu/maverick/tdebase/debian/po/POTFILES.in @@ -1 +1 @@ -[type: gettext/rfc822deb] kdm.templates +[type: gettext/rfc822deb] tdm.templates diff --git a/ubuntu/maverick/tdebase/debian/po/ar.po b/ubuntu/maverick/tdebase/debian/po/ar.po index 6153b4301..357d6e241 100644 --- a/ubuntu/maverick/tdebase/debian/po/ar.po +++ b/ubuntu/maverick/tdebase/debian/po/ar.po @@ -28,13 +28,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "مدير العرض الافتراضي:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -44,7 +44,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -56,7 +56,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -70,29 +70,29 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "هل تود إيقاف تشغيل عفريت kdm؟" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "هل تود إيقاف تشغيل عفريت tdm؟" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"يكون عفريت مدير سطح مكتب كي (kdm) عادة موقفاً عند ترقية الحزمة " +"يكون عفريت مدير سطح مكتب كي (tdm) عادة موقفاً عند ترقية الحزمة " "وإزالتها، ولكن يبدو أنه يدير على الأقل جلسة X واحدة تعمل حالياً." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"إن تم إيقاف kdm الآن، فستنهى أي جلسات X يقوم بإدارتها. " +"إن تم إيقاف tdm الآن، فستنهى أي جلسات X يقوم بإدارتها. " "عدى ذلك، سيسري مفعول النسخة الجديدة في المرة التالية التي " "يتم فيها إعادة تشغيل العفريت." diff --git a/ubuntu/maverick/tdebase/debian/po/ca.po b/ubuntu/maverick/tdebase/debian/po/ca.po index 8115f5910..79fbf80a5 100644 --- a/ubuntu/maverick/tdebase/debian/po/ca.po +++ b/ubuntu/maverick/tdebase/debian/po/ca.po @@ -39,13 +39,13 @@ msgstr "" #. Type: select
#. Description
-#: ../kdm.templates:1001
+#: ../tdm.templates:1001
msgid "Default display manager:"
msgstr "Escolliu el gestor de pantalla:"
#. Type: select
#. Description
-#: ../kdm.templates:1001
+#: ../tdm.templates:1001
msgid ""
"A display manager is a program that provides graphical login capabilities "
"for the X Window System."
@@ -55,7 +55,7 @@ msgstr "" #. Type: select
#. Description
-#: ../kdm.templates:1001
+#: ../tdm.templates:1001
msgid ""
"Only one display manager can manage a given X server, but multiple display "
"manager packages are installed. Please select which display manager should "
@@ -67,7 +67,7 @@ msgstr "" #. Type: select
#. Description
-#: ../kdm.templates:1001
+#: ../tdm.templates:1001
msgid ""
"Multiple display managers can run simultaneously if they are configured to "
"manage different servers; to achieve this, configure the display managers "
@@ -82,39 +82,39 @@ msgstr "" #. Type: boolean
#. Description
-#: ../kdm.templates:3001
-msgid "Stop the kdm daemon?"
-msgstr "Voleu detenir el dimoni «kdm»?"
+#: ../tdm.templates:3001
+msgid "Stop the tdm daemon?"
+msgstr "Voleu detenir el dimoni «tdm»?"
#. Type: boolean
#. Description
-#: ../kdm.templates:3001
+#: ../tdm.templates:3001
msgid ""
-"The K Desktop manager (kdm) daemon is typically stopped on package upgrade "
+"The K Desktop manager (tdm) daemon is typically stopped on package upgrade "
"and removal, but it appears to be managing at least one running X session."
msgstr ""
-"El dimoni gestor de pantalla de KDE, (kdm), sol ser detingut en actualitzar-ne "
+"El dimoni gestor de pantalla de KDE, (tdm), sol ser detingut en actualitzar-ne "
"i eliminar-ne el paquet, però sembla que ara està gestionant almenys una "
"sessió X activa."
#. Type: boolean
#. Description
-#: ../kdm.templates:3001
+#: ../tdm.templates:3001
msgid ""
-"If kdm is stopped now, any X sessions it manages will be terminated. "
+"If tdm is stopped now, any X sessions it manages will be terminated. "
"Otherwise, the new version will take effect the next time the daemon is "
"restarted."
msgstr ""
-"Si es deté «kdm» ara, terminaran totes les sessions X que està gestionant. "
-"Altrament, podeu deixar corrent «kdm», i la nova versió surtirà efecte a la "
+"Si es deté «tdm» ara, terminaran totes les sessions X que està gestionant. "
+"Altrament, podeu deixar corrent «tdm», i la nova versió surtirà efecte a la "
"següent volta que el dimoni es reinicie."
msgid ""
-"The X display manager (kdm) daemon is typically stopped on package "
+"The X display manager (tdm) daemon is typically stopped on package "
"upgrade and removal, but it appears to be managing at least one running X "
"session."
msgstr ""
-"El dimoni gestor de pantalla d’X, «kdm», sol ser detingut en actualitzar‐ne"
+"El dimoni gestor de pantalla d’X, «tdm», sol ser detingut en actualitzar‐ne"
"i eliminar‐ne el paquet, però sembla que ara està gestionant almenys "
"una sessió X activa."
diff --git a/ubuntu/maverick/tdebase/debian/po/cs.po b/ubuntu/maverick/tdebase/debian/po/cs.po index cf3406f97..942d5d31d 100644 --- a/ubuntu/maverick/tdebase/debian/po/cs.po +++ b/ubuntu/maverick/tdebase/debian/po/cs.po @@ -1,4 +1,4 @@ -# debconf templates for kdm package +# debconf templates for tdm package # Czech translation # # $Id: cs.po 1042 2006-01-09 07:55:08Z ender $ @@ -24,7 +24,7 @@ # msgid "" msgstr "" -"Project-Id-Version: kdm\n" +"Project-Id-Version: tdm\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2007-03-23 07:15+0100\n" "PO-Revision-Date: 2007-04-10 18:15+0200\n" @@ -36,13 +36,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Výchozí správce obrazovky:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -52,7 +52,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -63,7 +63,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -77,38 +77,38 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Zastavit démona kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Zastavit démona tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Démon kdm (K Desktop manager) je obvykle při aktualizaci nebo odstranění " +"Démon tdm (K Desktop manager) je obvykle při aktualizaci nebo odstranění " "balíku zastaven, ale zdá se, že spravuje minimálně jedno X sezení." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Pokud by byl kdm zastaven nyní, všechna jím spravovaná X sezení by se " -"ukončila. V opačném případě zůstane kdm běžet a nová verze se spustí s " +"Pokud by byl tdm zastaven nyní, všechna jím spravovaná X sezení by se " +"ukončila. V opačném případě zůstane tdm běžet a nová verze se spustí s " "příštím restartem démona." #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "Démon kdm (X display manager) je obvykle při aktualizaci nebo odstranění " +#~ "Démon tdm (X display manager) je obvykle při aktualizaci nebo odstranění " #~ "balíku zastaven, ale zdá se, že spravuje minimálně jedno X sezení." #~ msgid "Select the desired default display manager." @@ -134,18 +134,18 @@ msgstr "" #~ "nakonfigurovat, upravit jejich spouštěcí skripty v /etc/init.d a zakázat " #~ "kontrolu standardního správce obrazovky.)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "Chcete zastavit daemona kdm?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "Chcete zastavit daemona tdm?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "Daemon kdm (K Desktop manager) je obvykle při aktualizaci nebo odstranění " +#~ "Daemon tdm (K Desktop manager) je obvykle při aktualizaci nebo odstranění " #~ "balíku zastaven, ale zdá se, že právě spravuje minimálně jedno X sezení. " -#~ "Pokud by byl kdm zastaven nyní, všechna jím spravovaná X sezení by byla " -#~ "ukončena. V opačném případě můžene nechat kdm běžet a nová verze se " +#~ "Pokud by byl tdm zastaven nyní, všechna jím spravovaná X sezení by byla " +#~ "ukončena. V opačném případě můžene nechat tdm běžet a nová verze se " #~ "spustí s příštím restartem daemona." diff --git a/ubuntu/maverick/tdebase/debian/po/da.po b/ubuntu/maverick/tdebase/debian/po/da.po index 3cf989ee0..d4b081f65 100644 --- a/ubuntu/maverick/tdebase/debian/po/da.po +++ b/ubuntu/maverick/tdebase/debian/po/da.po @@ -29,13 +29,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standard logind-h�ndtering:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -57,7 +57,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -71,30 +71,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Stop kdm-d�monen?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Stop tdm-d�monen?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Skrivebordsh�ndterings-d�monen kdm stoppes typisk ved opgradering og " +"Skrivebordsh�ndterings-d�monen tdm stoppes typisk ved opgradering og " "fjernelse af pakken, men den lader til at v�re besk�ftiget med mindst �n " "k�rende X-session." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Hvis kdm stoppes nu, vil de X-sessioner, den h�ndterer, " -"blive afsluttet. Ellers kan du lade kdm k�re. S� vil den nye version f�rst " +"Hvis tdm stoppes nu, vil de X-sessioner, den h�ndterer, " +"blive afsluttet. Ellers kan du lade tdm k�re. S� vil den nye version f�rst " "tage over n�r d�monen genstartes." diff --git a/ubuntu/maverick/tdebase/debian/po/de.po b/ubuntu/maverick/tdebase/debian/po/de.po index aecfcd91c..eb1ff7a00 100644 --- a/ubuntu/maverick/tdebase/debian/po/de.po +++ b/ubuntu/maverick/tdebase/debian/po/de.po @@ -45,13 +45,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standardmäßiger Display-Manager:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -61,7 +61,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -73,7 +73,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -88,30 +88,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Soll der kdm-Dienst gestoppt werden?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Soll der tdm-Dienst gestoppt werden?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Der K Display Manager (kdm) Dienst wird meist beim Aktualisieren oder " +"Der K Display Manager (tdm) Dienst wird meist beim Aktualisieren oder " "Entfernen eines Pakets gestoppt, aber er scheint mindestens eine laufende X-" "Sitzung zu verwalten." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Wenn kdm jetzt gestoppt wird, werden alle Sitzungen beendet, die er gerade " -"verwaltet. Alternativ können Sie kdm weiter laufen lassen, die neue Version " +"Wenn tdm jetzt gestoppt wird, werden alle Sitzungen beendet, die er gerade " +"verwaltet. Alternativ können Sie tdm weiter laufen lassen, die neue Version " "wird dann aktiv, sobald der Dienst das nächste Mal gestartet wird." diff --git a/ubuntu/maverick/tdebase/debian/po/el.po b/ubuntu/maverick/tdebase/debian/po/el.po index c4a73a75a..e34782d24 100644 --- a/ubuntu/maverick/tdebase/debian/po/el.po +++ b/ubuntu/maverick/tdebase/debian/po/el.po @@ -36,14 +36,14 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "Default display manager:" msgstr "Επιλέξτε τον επιθυμητό διαχειριστή οθόνης." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -53,7 +53,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Only one display manager can manage a given X server, but multiple display " @@ -66,7 +66,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Multiple display managers can run simultaneously if they are configured to " @@ -82,54 +82,54 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy -msgid "Stop the kdm daemon?" -msgstr "Θέλετε να σταματήσετε να χρησιμοποιείτε τον δαίμονα kdm;" +msgid "Stop the tdm daemon?" +msgstr "Θέλετε να σταματήσετε να χρησιμοποιείτε τον δαίμονα tdm;" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Κανονικά, η λειτουργία του δαίμονα του διαχειριστή οθόνης των X (kdm) " +"Κανονικά, η λειτουργία του δαίμονα του διαχειριστή οθόνης των X (tdm) " "διακόπτεται με κάθε αναβάθμιση και διαγραφή του πακέτου, αλλά στη " "συγκεκριμένη περίπτωση φαίνεται ότι διαχειρίζεται ήδη τουλάχιστον μια " -"συνεδρία των X (X session). Αν ο kdm τερματιστεί τώρα, οποιεσδήποτε " +"συνεδρία των X (X session). Αν ο tdm τερματιστεί τώρα, οποιεσδήποτε " "συνεδρίες των X χειρίζεται θα τερματιστούν επίσης. Διαφορετικά, μπορείτε να " -"αφήσετε τον kdm να συνεχίσει τη λειτουργία του και η νέα έκδοση να " +"αφήσετε τον tdm να συνεχίσει τη λειτουργία του και η νέα έκδοση να " "χρησιμοποιηθεί την επόμενη φορά που θα τρέξει ο δαίμονας." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Κανονικά, η λειτουργία του δαίμονα του διαχειριστή οθόνης των X (kdm) " +"Κανονικά, η λειτουργία του δαίμονα του διαχειριστή οθόνης των X (tdm) " "διακόπτεται με κάθε αναβάθμιση και διαγραφή του πακέτου, αλλά στη " "συγκεκριμένη περίπτωση φαίνεται ότι διαχειρίζεται ήδη τουλάχιστον μια " -"συνεδρία των X (X session). Αν ο kdm τερματιστεί τώρα, οποιεσδήποτε " +"συνεδρία των X (X session). Αν ο tdm τερματιστεί τώρα, οποιεσδήποτε " "συνεδρίες των X χειρίζεται θα τερματιστούν επίσης. Διαφορετικά, μπορείτε να " -"αφήσετε τον kdm να συνεχίσει τη λειτουργία του και η νέα έκδοση να " +"αφήσετε τον tdm να συνεχίσει τη λειτουργία του και η νέα έκδοση να " "χρησιμοποιηθεί την επόμενη φορά που θα τρέξει ο δαίμονας." #, fuzzy #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "Κανονικά, η λειτουργία του δαίμονα του διαχειριστή οθόνης των X (kdm) " +#~ "Κανονικά, η λειτουργία του δαίμονα του διαχειριστή οθόνης των X (tdm) " #~ "διακόπτεται με κάθε αναβάθμιση και διαγραφή του πακέτου, αλλά στη " #~ "συγκεκριμένη περίπτωση φαίνεται ότι διαχειρίζεται ήδη τουλάχιστον μια " -#~ "συνεδρία των X (X session). Αν ο kdm τερματιστεί τώρα, οποιεσδήποτε " +#~ "συνεδρία των X (X session). Αν ο tdm τερματιστεί τώρα, οποιεσδήποτε " #~ "συνεδρίες των X χειρίζεται θα τερματιστούν επίσης. Διαφορετικά, μπορείτε " -#~ "να αφήσετε τον kdm να συνεχίσει τη λειτουργία του και η νέα έκδοση να " +#~ "να αφήσετε τον tdm να συνεχίσει τη λειτουργία του και η νέα έκδοση να " #~ "χρησιμοποιηθεί την επόμενη φορά που θα τρέξει ο δαίμονας." diff --git a/ubuntu/maverick/tdebase/debian/po/es.po b/ubuntu/maverick/tdebase/debian/po/es.po index 5956f734f..b5f64326b 100644 --- a/ubuntu/maverick/tdebase/debian/po/es.po +++ b/ubuntu/maverick/tdebase/debian/po/es.po @@ -40,13 +40,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Gestor de sesiones predefinido:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -56,7 +56,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -65,7 +65,7 @@ msgstr "Cada servidor X s�lo puede ser gestionado por un �nico gestor de ses #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -77,24 +77,24 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "�Desea detener el daemon kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "�Desea detener el daemon tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." -msgstr "Normalmente se detiene el daemon del gestor de sesiones de KDE (kdm) al actualizar o borrar el paquete, pero parece que est� gestionando al menos una sesi�n X activa." +msgstr "Normalmente se detiene el daemon del gestor de sesiones de KDE (tdm) al actualizar o borrar el paquete, pero parece que est� gestionando al menos una sesi�n X activa." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." -msgstr "Si detiene kdm ahora, se finalizar�n todas las sesiones X que est� gestionando. La otra posibilidad es mantener kdm en ejecuci�n, con lo que la nueva versi�n no se activar� hasta la pr�xima vez que se reinicie el daemon." +msgstr "Si detiene tdm ahora, se finalizar�n todas las sesiones X que est� gestionando. La otra posibilidad es mantener tdm en ejecuci�n, con lo que la nueva versi�n no se activar� hasta la pr�xima vez que se reinicie el daemon." diff --git a/ubuntu/maverick/tdebase/debian/po/eu.po b/ubuntu/maverick/tdebase/debian/po/eu.po index eec7f49fb..52a0de5ab 100644 --- a/ubuntu/maverick/tdebase/debian/po/eu.po +++ b/ubuntu/maverick/tdebase/debian/po/eu.po @@ -39,13 +39,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Lehenetsiriko pantaila kudeatzailea:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -55,7 +55,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -67,7 +67,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -81,30 +81,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" msgstr "Kdm deabrua gelditu?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"K Pantaila Kudeatzaile (kdm) deabrua arruntean gelditu egiten da pakete " +"K Pantaila Kudeatzaile (tdm) deabrua arruntean gelditu egiten da pakete " "bertsio berritze edo ezabaketa egiterakoan, baina dirudienez martxan dagoen " "X saio bat behintzat kudeatzen ari da." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"kdm orain gelditu ezkero, kudeatzen ari den edozein X saio itxi egingo da. " -"Bestela kdm martxan utz dezakezu eta bertsio berria deabrua abiarazten den " +"tdm orain gelditu ezkero, kudeatzen ari den edozein X saio itxi egingo da. " +"Bestela tdm martxan utz dezakezu eta bertsio berria deabrua abiarazten den " "hurrengo aldian erabiliko da." diff --git a/ubuntu/maverick/tdebase/debian/po/fi.po b/ubuntu/maverick/tdebase/debian/po/fi.po index 9c318dc35..d5a51c9d7 100644 --- a/ubuntu/maverick/tdebase/debian/po/fi.po +++ b/ubuntu/maverick/tdebase/debian/po/fi.po @@ -14,43 +14,43 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Oletusnäytönhallintaohjelma:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "A display manager is a program that provides graphical login capabilities for the X Window System." msgstr "Näytönhallintaohjelma on ohjelma, joka tarjoaa graafisen sisäänkirjautumisruudun X-ikkunointijärjestelmään." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Only one display manager can manage a given X server, but multiple display manager packages are installed. Please select which display manager should run by default." msgstr "Kutakin X-palvelinta voi hoitaa vain yksi näytönhallintaohjelma, mutta useampia näytönhallintaohjelmapaketteja on asennettuna. Valitse mikä näytönhallintaohjelma tulisi ajaa oletuksena." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Multiple display managers can run simultaneously if they are configured to manage different servers; to achieve this, configure the display managers accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager." msgstr "Useampi näytönhallintaohjelma voi olla ajossa yhtäaikaisesti, jos ne on asetettu hoitamaan eri palvelimia. Saadaksesi tämän aikaan, aseta näytönhallintaohjelmat tämän mukaisesti, muokkaa kunkin niistä alustustiedostoja hakemistossa /etc/init.d ja poista oletusnäytönhallintaohjelman tarkistus käytöstä." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Pysäytetäänkö kdm-taustaohjelma?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Pysäytetäänkö tdm-taustaohjelma?" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "The K Desktop manager (kdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." -msgstr "K Desktop manager (kdm) -taustaohjelma pysäytetään yleensä päivitettäessä tai poistettaessa pakettia, mutta se näyttää hoitavan ainakin yhtä ajossa olevaa X-istuntoa." +#: ../tdm.templates:3001 +msgid "The K Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." +msgstr "K Desktop manager (tdm) -taustaohjelma pysäytetään yleensä päivitettäessä tai poistettaessa pakettia, mutta se näyttää hoitavan ainakin yhtä ajossa olevaa X-istuntoa." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "If kdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." -msgstr "Jos kdm pysäytetään nyt, kaikki sen hoitamat X-istunnot lopetetaan. Muussa tapauksessa uusi versio otetaan käyttöön ensi kerralla, kun taustaohjelma käynnistetään uudelleen." +#: ../tdm.templates:3001 +msgid "If tdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." +msgstr "Jos tdm pysäytetään nyt, kaikki sen hoitamat X-istunnot lopetetaan. Muussa tapauksessa uusi versio otetaan käyttöön ensi kerralla, kun taustaohjelma käynnistetään uudelleen." diff --git a/ubuntu/maverick/tdebase/debian/po/fr.po b/ubuntu/maverick/tdebase/debian/po/fr.po index 764b3dd7d..15eabf815 100644 --- a/ubuntu/maverick/tdebase/debian/po/fr.po +++ b/ubuntu/maverick/tdebase/debian/po/fr.po @@ -44,13 +44,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Gestionnaire graphique de session par défaut :" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -60,7 +60,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -72,7 +72,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -86,30 +86,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Faut-il arrêter le démon kdm ?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Faut-il arrêter le démon tdm ?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Le gestionnaire de sessions KDE (kdm) est généralement arrêté lors de la mise " +"Le gestionnaire de sessions KDE (tdm) est généralement arrêté lors de la mise " "à jour ou de la suppression du paquet. Cependant, il semble qu'il gère " "actuellement encore au moins une session X." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Si kdm est arrêté maintenant, toutes les sessions X qu'il gère seront " -"terminées. L'autre possibilité est de laisser fonctionner kdm, la nouvelle " +"Si tdm est arrêté maintenant, toutes les sessions X qu'il gère seront " +"terminées. L'autre possibilité est de laisser fonctionner tdm, la nouvelle " "version ne devenant active qu'au prochain redémarrage du démon." diff --git a/ubuntu/maverick/tdebase/debian/po/gl.po b/ubuntu/maverick/tdebase/debian/po/gl.po index 3fa731c4b..d40bb853c 100644 --- a/ubuntu/maverick/tdebase/debian/po/gl.po +++ b/ubuntu/maverick/tdebase/debian/po/gl.po @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Xestor de pantalla por defecto:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -34,7 +34,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -46,7 +46,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -60,38 +60,38 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "¿Deter o servizo de kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "¿Deter o servizo de tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Adoita se deter o servizo do xestor de pantalla de KDE (kdm) ao actualizar " +"Adoita se deter o servizo do xestor de pantalla de KDE (tdm) ao actualizar " "ou eliminar o paquete, pero semella que está a xestionar alomenos unha " "sesión X en execución." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Se se detén kdm agora, hase cortar calquera sesión X que xestione. Se non, a " +"Se se detén tdm agora, hase cortar calquera sesión X que xestione. Se non, a " "nova versión ha tomar efecto a próxima vez que reinicie o servizo." #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "Adoita se deter o servizo do xestor de pantalla de X (kdm) ao actualizar " +#~ "Adoita se deter o servizo do xestor de pantalla de X (tdm) ao actualizar " #~ "ou eliminar o paquete, pero semella que está a xestionar alomenos unha " #~ "sesión X en execución." @@ -118,18 +118,18 @@ msgstr "" #~ "xestores de pantalla, edite os seus scripts de inicio de /etc/init.d e " #~ "desactive a comprobación do xestor de pantalla por defecto)." -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "¿Quere deter o daemon de kdm?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "¿Quere deter o daemon de tdm?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "Normalmente adóitase deter o daemon do xestor de pantalla de KDE (kdm) ao " +#~ "Normalmente adóitase deter o daemon do xestor de pantalla de KDE (tdm) ao " #~ "actualizar ou eliminar o paquete, pero semella que está a xestionar " -#~ "alomenos unha sesión X en execución. Se se detén kdm agora, hase cortar " -#~ "calquera sesión X que xestione. Se non, pode deixar kdm a se executar, e " +#~ "alomenos unha sesión X en execución. Se se detén tdm agora, hase cortar " +#~ "calquera sesión X que xestione. Se non, pode deixar tdm a se executar, e " #~ "a nova versión ha tomar efecto a próxima vez que reinicie o daemon." diff --git a/ubuntu/maverick/tdebase/debian/po/it.po b/ubuntu/maverick/tdebase/debian/po/it.po index 420476257..531d420ce 100644 --- a/ubuntu/maverick/tdebase/debian/po/it.po +++ b/ubuntu/maverick/tdebase/debian/po/it.po @@ -39,13 +39,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Display manager predefinito." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -55,7 +55,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -67,7 +67,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -82,29 +82,29 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Arrestare il demone kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Arrestare il demone tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Il demone del display manager KDE (kdm) viene tipicamente fermato in fase " +"Il demone del display manager KDE (tdm) viene tipicamente fermato in fase " "di aggiornamento o rimozione del pacchetto, ma pare che al momento stia " "gestendo almeno una sessione attiva di X." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Se kdm viene arrestato ora, anche tutte le sessioni di X che gestisce " +"Se tdm viene arrestato ora, anche tutte le sessioni di X che gestisce " "verranno terminate. In alternativa, la nuova versione sarà usata a partire " "dal prossimo avvio del demone." diff --git a/ubuntu/maverick/tdebase/debian/po/ja.po b/ubuntu/maverick/tdebase/debian/po/ja.po index 10cfb98c4..e749468fc 100644 --- a/ubuntu/maverick/tdebase/debian/po/ja.po +++ b/ubuntu/maverick/tdebase/debian/po/ja.po @@ -39,13 +39,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "デフォルトのディスプレイマネージャ:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -55,7 +55,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -67,7 +67,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -81,37 +81,37 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "kdm デーモンを停止しますか?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "tdm デーモンを停止しますか?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." -msgstr "K デスクトップマネージャ (kdm) デーモンは、普通、パッケージの更新や削除の際に停止させられます。しかし kdm は現在動作中の X セッションを最低ひとつは管理しているようです。" +msgstr "K デスクトップマネージャ (tdm) デーモンは、普通、パッケージの更新や削除の際に停止させられます。しかし tdm は現在動作中の X セッションを最低ひとつは管理しているようです。" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"いま kdm を停止すると、この kdm が管理している X セッションは停止します。ある" -"いは次にデーモンをリスタートしたときに新しいバージョンの kdm を有効にすること" +"いま tdm を停止すると、この tdm が管理している X セッションは停止します。ある" +"いは次にデーモンをリスタートしたときに新しいバージョンの tdm を有効にすること" "もできます。" #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "X ディスプレイマネージャ (kdm) デーモンは、普通、パッケージの更新や削除の" -#~ "際に停止させられます。しかし kdm は現在動作中の X セッションを最低ひとつは" +#~ "X ディスプレイマネージャ (tdm) デーモンは、普通、パッケージの更新や削除の" +#~ "際に停止させられます。しかし tdm は現在動作中の X セッションを最低ひとつは" #~ "管理しているようです。" #~ msgid "Select the desired default display manager." @@ -139,18 +139,18 @@ msgstr "" #~ "切に設定して、/etc/init.d にある各 init スクリプトを編集し、デフォルトの" #~ "ディスプレイマネージャの確認を無効にしてください。)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "kdm デーモンを停止したいですか?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "tdm デーモンを停止したいですか?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "K Desktop manager (kdm) デーモンは通常、パッケージの更新および削除時に停止" +#~ "K Desktop manager (tdm) デーモンは通常、パッケージの更新および削除時に停止" #~ "しますが、少なくとも 1 つの動作中の X セッションを管理しているようです。" -#~ "kdm を今停止すると、これが管理する X セッションは殺されます。その代わり" -#~ "に、kdm を動作しているままにしておき、新しいバージョンは次回のデーモンの再" +#~ "tdm を今停止すると、これが管理する X セッションは殺されます。その代わり" +#~ "に、tdm を動作しているままにしておき、新しいバージョンは次回のデーモンの再" #~ "起動時に効果を表すようにできます。" diff --git a/ubuntu/maverick/tdebase/debian/po/ko.po b/ubuntu/maverick/tdebase/debian/po/ko.po index 6200caa12..6bde61a03 100644 --- a/ubuntu/maverick/tdebase/debian/po/ko.po +++ b/ubuntu/maverick/tdebase/debian/po/ko.po @@ -19,13 +19,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "기본 화면관리자:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -35,7 +35,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -46,7 +46,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -59,27 +59,27 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "kdm 데몬을 중지시킬까요?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "tdm 데몬을 중지시킬까요?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"K 데스크탑 관리자(kdm) 데몬은 일반적으로 꾸러미를 설치하고 업그레이드할 때 " +"K 데스크탑 관리자(tdm) 데몬은 일반적으로 꾸러미를 설치하고 업그레이드할 때 " "중지되지만 현재 하나 이상의 X 세션을 관리하는 중인 것 같습니다." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"kdm을 지금 중지시키면 kdm이 관리하고 있는 X 세션은 모두 중단됩니다. 지금 중지" +"tdm을 지금 중지시키면 tdm이 관리하고 있는 X 세션은 모두 중단됩니다. 지금 중지" "시키지 않으면 새로 설치한 버전은 데몬을 다시 시작할 때부터 사용됩니다." diff --git a/ubuntu/maverick/tdebase/debian/po/ml.po b/ubuntu/maverick/tdebase/debian/po/ml.po index b4b07f9b2..9e28db764 100644 --- a/ubuntu/maverick/tdebase/debian/po/ml.po +++ b/ubuntu/maverick/tdebase/debian/po/ml.po @@ -1,11 +1,11 @@ -# Malayalam translation of kdm debconf template. +# Malayalam translation of tdm debconf template. # Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the kdm package. +# This file is distributed under the same license as the tdm package. # Praveen|പ്രവീണ് A|എ <[email protected]>, Anivar|അനിവര് Aravind|അരവിന്ദ് <[email protected]> 2007. # msgid "" msgstr "" -"Project-Id-Version: kdm 1.0\n" +"Project-Id-Version: tdm 1.0\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2007-03-23 07:15+0100\n" "PO-Revision-Date: 2007-03-23 09:46+0530\n" @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "ഡിഫാള്ട്ടായി വേണ്ട പ്രദര്ശന മാനേജര്:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -33,7 +33,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -59,29 +59,29 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "kdm ഡീമണെ നിര്ത്തിക്കോട്ടെ?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "tdm ഡീമണെ നിര്ത്തിക്കോട്ടെ?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"കെ പ്രദര്ശന മാനേജര് (kdm) ഡീമണ് സാധാരണയായി പാക്കേജ് പുതുക്കലിന്റേയും നീക്കം " +"കെ പ്രദര്ശന മാനേജര് (tdm) ഡീമണ് സാധാരണയായി പാക്കേജ് പുതുക്കലിന്റേയും നീക്കം " "ചെയ്യലിന്റേയും സമയത്താണ് നിര്ത്താറുള്ളത്, പക്ഷേ പ്രവര്ത്തിച്ചുകൊണ്ടിരിക്കുന്ന ഒരു എക്സ് " "സെഷനെയെങ്കിലും ഇപ്പോള് ഇത് നിയന്ത്രിച്ചുകൊണ്ടിരിക്കുന്നത് പോലെ തോന്നുന്നു." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"kdm ഇപ്പോള് നിര്ത്തുകയാണെങ്കില്, ഇത് നിയന്ത്രിച്ചുകൊണ്ടിരിക്കുന്ന എക്സ് സെഷനുകളും " +"tdm ഇപ്പോള് നിര്ത്തുകയാണെങ്കില്, ഇത് നിയന്ത്രിച്ചുകൊണ്ടിരിക്കുന്ന എക്സ് സെഷനുകളും " "അവസാനിപ്പിക്കുന്നതായിരിക്കും. അല്ലെങ്കില്, അടുത്ത തവണ ഡീമണ് വീണ്ടും തുടങ്ങുമ്പോള് പുതിയ ലക്കം " "നിലവില് വരും." diff --git a/ubuntu/maverick/tdebase/debian/po/nb.po b/ubuntu/maverick/tdebase/debian/po/nb.po index c0b33f89c..b61dde1bb 100644 --- a/ubuntu/maverick/tdebase/debian/po/nb.po +++ b/ubuntu/maverick/tdebase/debian/po/nb.po @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standard skjermstyrer:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -34,7 +34,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -59,26 +59,26 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Stoppe kdm-nissen?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Stoppe tdm-nissen?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Nissen K Desktop Manager (kdm) stoppes normalt når dens pakke fjernes eller " +"Nissen K Desktop Manager (tdm) stoppes normalt når dens pakke fjernes eller " "oppgraderes, men det ser ut til at den styrer minst en pågående X-økt." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." -msgstr "Hvis kdm stoppes nå blir alle X-økter den styrer avbrutt. Ellers vil den nye versjonen blir tatt i bruk neste gang nissen startes." +msgstr "Hvis tdm stoppes nå blir alle X-økter den styrer avbrutt. Ellers vil den nye versjonen blir tatt i bruk neste gang nissen startes." diff --git a/ubuntu/maverick/tdebase/debian/po/nl.po b/ubuntu/maverick/tdebase/debian/po/nl.po index 9d693cc23..cd8cbc401 100644 --- a/ubuntu/maverick/tdebase/debian/po/nl.po +++ b/ubuntu/maverick/tdebase/debian/po/nl.po @@ -25,7 +25,7 @@ # msgid "" msgstr "" -"Project-Id-Version: kdm\n" +"Project-Id-Version: tdm\n" "Report-Msgid-Bugs-To: [email protected]\n" "POT-Creation-Date: 2007-03-23 07:15+0100\n" "PO-Revision-Date: 2007-04-05 17:35+0100\n" @@ -38,52 +38,52 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standaard beeldschermbeheerder:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "A display manager is a program that provides graphical login capabilities for the X Window System." msgstr "Een beeldschermbeheerder is een programma waarmee u zich grafisch op het systeem kunt aanmelden, waarna u in de grafische omgeving (het X Window System) terecht komt." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Only one display manager can manage a given X server, but multiple display manager packages are installed. Please select which display manager should run by default." msgstr "Elke X-server kan door slechts één beeldschermbeheerder beheerd worden, hoewel er meerdere beeldschermbeheerders geïnstalleerd kunnen zijn. Welke beeldschermbeheerder dient standaard gebruikt te worden?" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Multiple display managers can run simultaneously if they are configured to manage different servers; to achieve this, configure the display managers accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager." msgstr "Het is mogelijk om meerdere beeldschermbeheerders tegelijk te draaien zolang deze verschillende servers beheren. Om dat te bereiken dient u de beeldschermbeheerders overeenkomstig in te stellen door in hun init-scripts (in /etc/init.d) de controle of ze de standaard beeldschermbeheerder zijn uit te schakelen." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Wilt u de kdm-achtergronddienst stoppen?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Wilt u de tdm-achtergronddienst stoppen?" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "The K Desktop manager (kdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." -msgstr "Normaal wordt de kdm-achtergronddienst gestopt bij opwaardering en verwijdering van het pakket kdm; momenteel blijkt deze echter minstens 1 X-sessie te beheren." +#: ../tdm.templates:3001 +msgid "The K Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." +msgstr "Normaal wordt de tdm-achtergronddienst gestopt bij opwaardering en verwijdering van het pakket tdm; momenteel blijkt deze echter minstens 1 X-sessie te beheren." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "If kdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." -msgstr "Als kdm nu gestopt wordt, worden alle door kdm beheerde X-sessies afgesloten. Als u kdm nu laat draaien wordt de nieuwe versie pas actief de eerstvolgende keer dat de achtergronddienst herstart wordt. " +#: ../tdm.templates:3001 +msgid "If tdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." +msgstr "Als tdm nu gestopt wordt, worden alle door tdm beheerde X-sessies afgesloten. Als u tdm nu laat draaien wordt de nieuwe versie pas actief de eerstvolgende keer dat de achtergronddienst herstart wordt. " #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "Normaal wordt de beeldschermbeheerder (kdm) gestopt bij opwaardering en " +#~ "Normaal wordt de beeldschermbeheerder (tdm) gestopt bij opwaardering en " #~ "verwijdering van dit pakket; momenteel is er echter minstens één lopende " #~ "X-sessie actief." #~ msgid "Select the desired default display manager." @@ -107,19 +107,19 @@ msgstr "Als kdm nu gestopt wordt, worden alle door kdm beheerde X-sessies afgesl #~ "bereiken, configureert u de weergavebeheerders op de gepaste wijze, " #~ "bewerkt u hun startscripts in /etc/init.d en schakelt u de controle voor " #~ "een standaard weergavebeheerder uit.)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "Wilt u de kdm-achtergronddienst stoppen?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "Wilt u de tdm-achtergronddienst stoppen?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "De K Desktop manager (kdm) achtergronddienst wordt typisch gestopt bij " +#~ "De K Desktop manager (tdm) achtergronddienst wordt typisch gestopt bij " #~ "pakketopwaarderingen en -verwijderingen, maar het blijkt minstens één " -#~ "actieve X-sessie te beheren. Als kdm nu wordt gestopt, dan zullen alle X-" -#~ "sessies die het beheert worden beëindigd. Anders kunt u kdm laten draaien " +#~ "actieve X-sessie te beheren. Als tdm nu wordt gestopt, dan zullen alle X-" +#~ "sessies die het beheert worden beëindigd. Anders kunt u tdm laten draaien " #~ "en zal de nieuwe versie gebruikt worden wanneer de achtergronddienst de " #~ "volgende keer wordt gestart." diff --git a/ubuntu/maverick/tdebase/debian/po/pl.po b/ubuntu/maverick/tdebase/debian/po/pl.po index e2f253da7..991400113 100644 --- a/ubuntu/maverick/tdebase/debian/po/pl.po +++ b/ubuntu/maverick/tdebase/debian/po/pl.po @@ -26,14 +26,14 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "Default display manager:" msgstr "Wybierz domy�lny display manager." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -43,7 +43,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Only one display manager can manage a given X server, but multiple display " @@ -56,7 +56,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Multiple display managers can run simultaneously if they are configured to " @@ -71,21 +71,21 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy -msgid "Stop the kdm daemon?" -msgstr "Czy chcesz zatrzyma� daemona kdm?" +msgid "Stop the tdm daemon?" +msgstr "Czy chcesz zatrzyma� daemona tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" "Daemon K Desktop manager jest zazwyczaj zatrzymywany w czasie aktualizacji i " -"usuwania pakietu kdm, ale wygl�da na to, �e w tej chwili zarz�dza on " +"usuwania pakietu tdm, ale wygl�da na to, �e w tej chwili zarz�dza on " "conajmniej jedn� sesj� X Window. Je�li zostanie on teraz zatrzymany, " "wszystkie zarz�dzane przez niego sesje zostan� przerwane. Mo�na jednak nie " "zatrzymywa� teraz tego daemona -- nowa wersja zacznie dzia�a� przy jego " @@ -93,15 +93,15 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" "Daemon K Desktop manager jest zazwyczaj zatrzymywany w czasie aktualizacji i " -"usuwania pakietu kdm, ale wygl�da na to, �e w tej chwili zarz�dza on " +"usuwania pakietu tdm, ale wygl�da na to, �e w tej chwili zarz�dza on " "conajmniej jedn� sesj� X Window. Je�li zostanie on teraz zatrzymany, " "wszystkie zarz�dzane przez niego sesje zostan� przerwane. Mo�na jednak nie " "zatrzymywa� teraz tego daemona -- nowa wersja zacznie dzia�a� przy jego " diff --git a/ubuntu/maverick/tdebase/debian/po/pt.po b/ubuntu/maverick/tdebase/debian/po/pt.po index 9720aa0f0..7526913c8 100644 --- a/ubuntu/maverick/tdebase/debian/po/pt.po +++ b/ubuntu/maverick/tdebase/debian/po/pt.po @@ -20,13 +20,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Gestor de ecrã por omissão:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -36,7 +36,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -48,7 +48,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -63,39 +63,39 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Deseja parar o daemon kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Deseja parar o daemon tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"O daemon do gestor de ecrã X (kdm) é tipicamente parado na actualização ou " +"O daemon do gestor de ecrã X (tdm) é tipicamente parado na actualização ou " "remoção de pacotes, mas parece que este está a gerir pelo menos uma sessão X " "activa." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Se o kdm for parado agora, todas as sessões X que este estiver a gerir serão " +"Se o tdm for parado agora, todas as sessões X que este estiver a gerir serão " "terminadas. Caso contrário, a nova versão terá efeito da próxima vez que o " "daemon for reiniciado." #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "O daemon do gestor de ecrã X (kdm) é tipicamente parado na actualização " +#~ "O daemon do gestor de ecrã X (tdm) é tipicamente parado na actualização " #~ "ou remoção de pacotes, mas parece que este está a gerir pelo menos uma " #~ "sessão X activa." @@ -122,18 +122,18 @@ msgstr "" #~ "e edite um dos seus 'init scripts' em /etc/init.d, e desligue a " #~ "verificação do gestor de ecrã por omissão.)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "Deseja desligar o daemon kdm?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "Deseja desligar o daemon tdm?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "O daemon K Destop manager (kdm) é normalmente parado quando ocorre um " +#~ "O daemon K Destop manager (tdm) é normalmente parado quando ocorre um " #~ "upgrade ou remoção do pacote, no entanto parece que se encontra pelo " -#~ "menos uma sessão X em andamento. Se o kdm for parado agora, todas as " -#~ "sessões X serão terminadas. Por outro lado, pode deixar o kdm a correr e " +#~ "menos uma sessão X em andamento. Se o tdm for parado agora, todas as " +#~ "sessões X serão terminadas. Por outro lado, pode deixar o tdm a correr e " #~ "a nova versão irá ser usada na próxima vez que o daemon for reiniciado." diff --git a/ubuntu/maverick/tdebase/debian/po/pt_BR.po b/ubuntu/maverick/tdebase/debian/po/pt_BR.po index b8ce278ee..ddb8d98fa 100644 --- a/ubuntu/maverick/tdebase/debian/po/pt_BR.po +++ b/ubuntu/maverick/tdebase/debian/po/pt_BR.po @@ -22,13 +22,13 @@ msgstr "pt_BR utf-8\n" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Gerenciador de sessão padrão:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -38,7 +38,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -50,7 +50,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -65,28 +65,28 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Deseja parar o daemon kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Deseja parar o daemon tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." -msgstr "O K Desktop manager (kdm) é tipicamente parado em atualizações e " +msgstr "O K Desktop manager (tdm) é tipicamente parado em atualizações e " "remoções de pacotes, mas parece que ele está gerenciando pelo menos uma " "seção X em execução." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Caso o kdm seja parado agora, quaisquer sessões X que ele esteja gerenciando " +"Caso o tdm seja parado agora, quaisquer sessões X que ele esteja gerenciando " "serão encerradas. Caso contrário a nova versão terá efeito na próxima vez " "que o daemon for reiniciado." diff --git a/ubuntu/maverick/tdebase/debian/po/ro.po b/ubuntu/maverick/tdebase/debian/po/ro.po index 2f619d326..c438c8661 100644 --- a/ubuntu/maverick/tdebase/debian/po/ro.po +++ b/ubuntu/maverick/tdebase/debian/po/ro.po @@ -20,14 +20,14 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "Default display manager:" msgstr "Alegeţi administratorul de ecran implicit, pe care îl doriţi." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -37,7 +37,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Only one display manager can manage a given X server, but multiple display " @@ -50,7 +50,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Multiple display managers can run simultaneously if they are configured to " @@ -66,36 +66,36 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy -msgid "Stop the kdm daemon?" -msgstr "Doriţi să opriţi demonul kdm?" +msgid "Stop the tdm daemon?" +msgstr "Doriţi să opriţi demonul tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Demonul K Desktop manager (kdm) este oprit de obicei la actualizarea " +"Demonul K Desktop manager (tdm) este oprit de obicei la actualizarea " "pachetuluişi la eliminarea sa, dar se pare că acum administrează o sesiune X " -"de lucru.Dacă demonul kdm este oprit acum, orice sesiune X pe care o " -"administrează va fi oprită. O alternativă ar fi să lăsaţi kdm să ruleze, iar " +"de lucru.Dacă demonul tdm este oprit acum, orice sesiune X pe care o " +"administrează va fi oprită. O alternativă ar fi să lăsaţi tdm să ruleze, iar " "noua versiune va ruladata viitoare când demonul va fi repornit." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Demonul K Desktop manager (kdm) este oprit de obicei la actualizarea " +"Demonul K Desktop manager (tdm) este oprit de obicei la actualizarea " "pachetuluişi la eliminarea sa, dar se pare că acum administrează o sesiune X " -"de lucru.Dacă demonul kdm este oprit acum, orice sesiune X pe care o " -"administrează va fi oprită. O alternativă ar fi să lăsaţi kdm să ruleze, iar " +"de lucru.Dacă demonul tdm este oprit acum, orice sesiune X pe care o " +"administrează va fi oprită. O alternativă ar fi să lăsaţi tdm să ruleze, iar " "noua versiune va ruladata viitoare când demonul va fi repornit." diff --git a/ubuntu/maverick/tdebase/debian/po/ru.po b/ubuntu/maverick/tdebase/debian/po/ru.po index af8d3fb9d..1bf9445de 100644 --- a/ubuntu/maverick/tdebase/debian/po/ru.po +++ b/ubuntu/maverick/tdebase/debian/po/ru.po @@ -42,13 +42,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Менеджер дисплеев по умолчанию:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -58,7 +58,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -70,7 +70,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -84,30 +84,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Остановить сервер-демон kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Остановить сервер-демон tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Сервер-демон менеджера K Desktop (kdm) обычно останавливают при обновлении " -"или удалении пакета, но, кажется, что kdm сейчас управляет по крайней мере " +"Сервер-демон менеджера K Desktop (tdm) обычно останавливают при обновлении " +"или удалении пакета, но, кажется, что tdm сейчас управляет по крайней мере " "одним X-сеансом." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Если сейчас остановить kdm, то все управляемые им X-сеансы будут прерваны. " -"Или вы можете не останавливать kdm, и тогда новая версия будет загружена " -"тогда, когда kdm снова перезапустят." +"Если сейчас остановить tdm, то все управляемые им X-сеансы будут прерваны. " +"Или вы можете не останавливать tdm, и тогда новая версия будет загружена " +"тогда, когда tdm снова перезапустят." diff --git a/ubuntu/maverick/tdebase/debian/po/sk.po b/ubuntu/maverick/tdebase/debian/po/sk.po index e7b350961..4c6241e4a 100644 --- a/ubuntu/maverick/tdebase/debian/po/sk.po +++ b/ubuntu/maverick/tdebase/debian/po/sk.po @@ -21,13 +21,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Zvoľte predvoleného správcu obrazovky:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -37,7 +37,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -48,7 +48,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -62,30 +62,30 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Zastaviť správcu obrazovky kdm?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Zastaviť správcu obrazovky tdm?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"Správca obrazovky K desktop manager (kdm) sa zvykne zastaviť pri " +"Správca obrazovky K desktop manager (tdm) sa zvykne zastaviť pri " "aktualizácii alebo odstraňovaní balíka, lenže teraz to vyzerá tak, že má na " "starosti aspoň jedno ďalšie spustené X sedenie." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"Ak by sa teraz kdm zastavil, všetky ním ovládané X sedenia by sa ukončili. V " -"opačnom prípade môžete nechať kdm spustený, pričom nová verzia sa spustí pri " -"ďalšom reštarte kdm." +"Ak by sa teraz tdm zastavil, všetky ním ovládané X sedenia by sa ukončili. V " +"opačnom prípade môžete nechať tdm spustený, pričom nová verzia sa spustí pri " +"ďalšom reštarte tdm." diff --git a/ubuntu/maverick/tdebase/debian/po/sv.po b/ubuntu/maverick/tdebase/debian/po/sv.po index 07d0cc914..e83a6926a 100644 --- a/ubuntu/maverick/tdebase/debian/po/sv.po +++ b/ubuntu/maverick/tdebase/debian/po/sv.po @@ -41,52 +41,52 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Standarddisplayhanterare:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "A display manager is a program that provides graphical login capabilities for the X Window System." msgstr "En displayhanterare är ett program som tillhandahåller grafiska inloggningsmöjligheter för X Window System." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Only one display manager can manage a given X server, but multiple display manager packages are installed. Please select which display manager should run by default." msgstr "Endast en displayhanterare kan hantera en angiven X-server men flera displayhanterarpaket är installerade. Välj vilken displayhanterare som skall köras som standard." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Multiple display managers can run simultaneously if they are configured to manage different servers; to achieve this, configure the display managers accordingly, edit each of their init scripts in /etc/init.d, and disable the check for a default display manager." msgstr "Flera displayhanterare kan köras samtidigt om de är konfigurerade att hantera olika servrar. För att uppnå detta ska du konfigurera displayhanterarnas på lämpligt sätt, redigera dess init-skript under /etc/init.d och inaktivera kontrollen efter en standarddisplayhanterare." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Stoppa kdm-demonen?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Stoppa tdm-demonen?" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "The K Desktop manager (kdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." -msgstr "K Desktop manager-demonen (kdm) stoppas vanligtvis vid paketuppgradering och borttagning men det verkar som om den hanterar åtminstone en körande X-session." +#: ../tdm.templates:3001 +msgid "The K Desktop manager (tdm) daemon is typically stopped on package upgrade and removal, but it appears to be managing at least one running X session." +msgstr "K Desktop manager-demonen (tdm) stoppas vanligtvis vid paketuppgradering och borttagning men det verkar som om den hanterar åtminstone en körande X-session." #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "If kdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." -msgstr "Om kdm stoppas nu kommer de X-sessioner som den hanterar att avslutas. Om inte kommer den nya versionen att bli aktiverad nästa gång som demonen startas om." +#: ../tdm.templates:3001 +msgid "If tdm is stopped now, any X sessions it manages will be terminated. Otherwise, the new version will take effect the next time the daemon is restarted." +msgstr "Om tdm stoppas nu kommer de X-sessioner som den hanterar att avslutas. Om inte kommer den nya versionen att bli aktiverad nästa gång som demonen startas om." #~ msgid "" -#~ "The X display manager (kdm) daemon is typically stopped on package " +#~ "The X display manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " #~ "session." #~ msgstr "" -#~ "X-displayhanterardemonen (kdm) stoppas vanligtvis vid paketuppgradering " +#~ "X-displayhanterardemonen (tdm) stoppas vanligtvis vid paketuppgradering " #~ "och borttagning men det verkar som om den hanterar åtminstone en körande " #~ "X-session." #~ msgid "Select the desired default display manager." @@ -109,18 +109,18 @@ msgstr "Om kdm stoppas nu kommer de X-sessioner som den hanterar att avslutas. O #~ "hantera olika servrar, för att göra detta, konfigurera fönsterhanterarna " #~ "genom att ändra respektives init-skript i /etc/init.d och stäng av " #~ "kontrollen för standard fönsterhanterare.)" -#~ msgid "Do you wish to stop the kdm daemon?" -#~ msgstr "Vill du stoppa kdm-daemonen?" +#~ msgid "Do you wish to stop the tdm daemon?" +#~ msgstr "Vill du stoppa tdm-daemonen?" #~ msgid "" -#~ "The K Desktop manager (kdm) daemon is typically stopped on package " +#~ "The K Desktop manager (tdm) daemon is typically stopped on package " #~ "upgrade and removal, but it appears to be managing at least one running X " -#~ "session. If kdm is stopped now, any X sessions it manages will be " -#~ "terminated. Otherwise you may leave kdm running, and the new version will " +#~ "session. If tdm is stopped now, any X sessions it manages will be " +#~ "terminated. Otherwise you may leave tdm running, and the new version will " #~ "take effect the next time the daemon is restarted." #~ msgstr "" -#~ "Daemonen (kdm) för skrivbordsmiljön KDE stoppas normalt vid uppgradering " +#~ "Daemonen (tdm) för skrivbordsmiljön KDE stoppas normalt vid uppgradering " #~ "och avinstallation av paketet men det verkar som om den hanterar " -#~ "åtminstone en körande X-session. Om kdm stoppas nu kommer de X-sessioner " -#~ "den hanterar att avslutas. Annars kan du lämna kdm körande och den nya " +#~ "åtminstone en körande X-session. Om tdm stoppas nu kommer de X-sessioner " +#~ "den hanterar att avslutas. Annars kan du lämna tdm körande och den nya " #~ "versioner blir aktiverad nästa gång daemonen startas om." diff --git a/ubuntu/maverick/tdebase/debian/po/ta.po b/ubuntu/maverick/tdebase/debian/po/ta.po index 993ae3933..eb68492d6 100644 --- a/ubuntu/maverick/tdebase/debian/po/ta.po +++ b/ubuntu/maverick/tdebase/debian/po/ta.po @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "முன்னிருப்பு காட்சி மேலாளர்:" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -34,7 +34,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -59,15 +59,15 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "கேடிஎம் கிங்கரனை (kdm daemon) நிறுத்தவா?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "கேடிஎம் கிங்கரனை (tdm daemon) நிறுத்தவா?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" "கே மேல்மேசை மேலாளர் (கேடிஎம்) கிங்கரன் வழக்கமாக பொதி மேலாக்கம் அல்லது நீக்கம் நிகழும் போது நிறுத்தப் படும். " @@ -75,9 +75,9 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" diff --git a/ubuntu/maverick/tdebase/debian/po/templates.pot b/ubuntu/maverick/tdebase/debian/po/templates.pot index f8b19923e..42689d3b2 100644 --- a/ubuntu/maverick/tdebase/debian/po/templates.pot +++ b/ubuntu/maverick/tdebase/debian/po/templates.pot @@ -18,13 +18,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -32,7 +32,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -41,7 +41,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -51,23 +51,23 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" diff --git a/ubuntu/maverick/tdebase/debian/po/tr.po b/ubuntu/maverick/tdebase/debian/po/tr.po index c59be129c..189791bc4 100644 --- a/ubuntu/maverick/tdebase/debian/po/tr.po +++ b/ubuntu/maverick/tdebase/debian/po/tr.po @@ -16,14 +16,14 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "Default display manager:" msgstr "Kullanmak istediğiniz öntanımlı ekran yöneticisini seçin." #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -32,7 +32,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Only one display manager can manage a given X server, but multiple display " @@ -45,7 +45,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 #, fuzzy msgid "" "Multiple display managers can run simultaneously if they are configured to " @@ -60,38 +60,38 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy -msgid "Stop the kdm daemon?" -msgstr "kdm servisini durdurmak istiyor musunuz?" +msgid "Stop the tdm daemon?" +msgstr "tdm servisini durdurmak istiyor musunuz?" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"K Masaüstü yöneticisi (kdm) servisi, paket güncelleme ve kaldırma sırasında " -"genellikle durdurulur. Fakat öyle görünüyor ki kdm, çalışan (en az) bir X " -"oturumunu yönetiyor. Eğer kdm şimdi durdurulursa, yönetilen X oturumları da " -"sonlandırılacaktır. Böyle yapmak yerine kdm'i çalışır vaziyette " -"bırakabilirsiniz. Yeni sürüm, kdm servisinin bir sonraki çalıştırılışında " +"K Masaüstü yöneticisi (tdm) servisi, paket güncelleme ve kaldırma sırasında " +"genellikle durdurulur. Fakat öyle görünüyor ki tdm, çalışan (en az) bir X " +"oturumunu yönetiyor. Eğer tdm şimdi durdurulursa, yönetilen X oturumları da " +"sonlandırılacaktır. Böyle yapmak yerine tdm'i çalışır vaziyette " +"bırakabilirsiniz. Yeni sürüm, tdm servisinin bir sonraki çalıştırılışında " "etkin olacaktır." #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 #, fuzzy msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"K Masaüstü yöneticisi (kdm) servisi, paket güncelleme ve kaldırma sırasında " -"genellikle durdurulur. Fakat öyle görünüyor ki kdm, çalışan (en az) bir X " -"oturumunu yönetiyor. Eğer kdm şimdi durdurulursa, yönetilen X oturumları da " -"sonlandırılacaktır. Böyle yapmak yerine kdm'i çalışır vaziyette " -"bırakabilirsiniz. Yeni sürüm, kdm servisinin bir sonraki çalıştırılışında " +"K Masaüstü yöneticisi (tdm) servisi, paket güncelleme ve kaldırma sırasında " +"genellikle durdurulur. Fakat öyle görünüyor ki tdm, çalışan (en az) bir X " +"oturumunu yönetiyor. Eğer tdm şimdi durdurulursa, yönetilen X oturumları da " +"sonlandırılacaktır. Böyle yapmak yerine tdm'i çalışır vaziyette " +"bırakabilirsiniz. Yeni sürüm, tdm servisinin bir sonraki çalıştırılışında " "etkin olacaktır." diff --git a/ubuntu/maverick/tdebase/debian/po/vi.po b/ubuntu/maverick/tdebase/debian/po/vi.po index db44f6290..778d8ca82 100644 --- a/ubuntu/maverick/tdebase/debian/po/vi.po +++ b/ubuntu/maverick/tdebase/debian/po/vi.po @@ -18,13 +18,13 @@ msgstr "Project-Id-Version: tdebase_4-3.5.7-1\n" #.Type: select #.Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "Bộ quản lý trình bày mặc định:" #.Type: select #.Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -32,7 +32,7 @@ msgstr "Bộ quản lý trình bày là chương trình cung cấp khả năng � #.Type: select #.Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -41,7 +41,7 @@ msgstr "Chỉ một bộ quản lý trình bày có quyền quản lý trình ph #.Type: select #.Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -51,23 +51,23 @@ msgstr "Nhiều bộ quản lý trình bày vẫn có thể chạy đồng thờ #.Type: boolean #.Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "Thôi trình nền kdm không?" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "Thôi trình nền tdm không?" #.Type: boolean #.Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." -msgstr "Trình nền quản lý màn hình nền K (kdm) thường bị thôi khi nâng cấp/gỡ bỏ gói, nhưng hiện thời có vẻ là nó quản lý ít nhất một phiên chạy X đang hoạt động." +msgstr "Trình nền quản lý màn hình nền K (tdm) thường bị thôi khi nâng cấp/gỡ bỏ gói, nhưng hiện thời có vẻ là nó quản lý ít nhất một phiên chạy X đang hoạt động." #.Type: boolean #.Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." -msgstr "Thôi chạy kdm ngay bây giờ thì phiên chạy X nào được quản lý bởi nó sẽ bị chấm dứt. Không thì phiên bản mới sẽ có tác động lần tới khởi chạy lại trình nền." +msgstr "Thôi chạy tdm ngay bây giờ thì phiên chạy X nào được quản lý bởi nó sẽ bị chấm dứt. Không thì phiên bản mới sẽ có tác động lần tới khởi chạy lại trình nền." diff --git a/ubuntu/maverick/tdebase/debian/po/zh_CN.po b/ubuntu/maverick/tdebase/debian/po/zh_CN.po index 86f2299b5..89c59509d 100644 --- a/ubuntu/maverick/tdebase/debian/po/zh_CN.po +++ b/ubuntu/maverick/tdebase/debian/po/zh_CN.po @@ -6,7 +6,7 @@ # Carlos Z.F. Liu <[email protected]>, 2005 # Ming Hua <[email protected]>, 2005,2007 # -# This file is distributed under the same license as the kdm package. +# This file is distributed under the same license as the tdm package. # Please see debian/copyright. # # Translators, if you are not familiar with the PO format, gettext @@ -36,13 +36,13 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "Default display manager:" msgstr "默认显示管理器：" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "A display manager is a program that provides graphical login capabilities " "for the X Window System." @@ -50,7 +50,7 @@ msgstr "显示管理器是为 X 窗口系统提供图形界面登录模式的程 #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Only one display manager can manage a given X server, but multiple display " "manager packages are installed. Please select which display manager should " @@ -61,7 +61,7 @@ msgstr "" #. Type: select #. Description -#: ../kdm.templates:1001 +#: ../tdm.templates:1001 msgid "" "Multiple display managers can run simultaneously if they are configured to " "manage different servers; to achieve this, configure the display managers " @@ -74,27 +74,27 @@ msgstr "" #. Type: boolean #. Description -#: ../kdm.templates:3001 -msgid "Stop the kdm daemon?" -msgstr "停止 kdm 守护进程吗？" +#: ../tdm.templates:3001 +msgid "Stop the tdm daemon?" +msgstr "停止 tdm 守护进程吗？" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"The K Desktop manager (kdm) daemon is typically stopped on package upgrade " +"The K Desktop manager (tdm) daemon is typically stopped on package upgrade " "and removal, but it appears to be managing at least one running X session." msgstr "" -"K 桌面管理器 (kdm) 守护进程通常会在软件包升级和卸载时被停止，但看起来它目前在" +"K 桌面管理器 (tdm) 守护进程通常会在软件包升级和卸载时被停止，但看起来它目前在" "管理一个或多个正在运行的 X 会话。" #. Type: boolean #. Description -#: ../kdm.templates:3001 +#: ../tdm.templates:3001 msgid "" -"If kdm is stopped now, any X sessions it manages will be terminated. " +"If tdm is stopped now, any X sessions it manages will be terminated. " "Otherwise, the new version will take effect the next time the daemon is " "restarted." msgstr "" -"如果 kdm 现在就被停止，它所管理的全部 X 会话都会被中止。如果不停止 kdm，新安" +"如果 tdm 现在就被停止，它所管理的全部 X 会话都会被中止。如果不停止 tdm，新安" "装的版本将会在守护进程下次重新启动时生效。" diff --git a/ubuntu/maverick/tdebase/debian/rules b/ubuntu/maverick/tdebase/debian/rules index 6e5e8fb05..282910347 100755 --- a/ubuntu/maverick/tdebase/debian/rules +++ b/ubuntu/maverick/tdebase/debian/rules @@ -20,7 +20,7 @@ DEB_KDE_APIDOX := yes CXXFLAGS := -DSMB_CTX_FLAG_USE_KERBEROS -DSMB_CTX_FLAG_FALLBACK_AFTER_KERBEROS -g -Wall $(DEB_OPT_FLAG) DEB_CMAKE_EXTRA_FLAGS := -DLIB_SUFFIX="" -DCMAKE_INSTALL_PREFIX="/opt/trinity" -DCONFIG_INSTALL_DIR="/etc/trinity" -DSYSCONF_INSTALL_DIR="/etc/trinity" -DXDG_MENU_INSTALL_DIR="/etc/xdg/menus" -DCMAKE_LIBRARY_PATH="/opt/trinity/lib" -DCMAKE_INCLUDE_PATH="/opt/trinity/include/" -DAUTODETECT_QT_DIRS="ON" -DCMAKE_VERBOSE_MAKEFILE="ON" -DBUILD_ALL="ON" -DCMAKE_SKIP_RPATH="OFF" -DWITH_GCC_VISIBILITY="ON" \ --DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DKDM_PAM_SERVICE="kdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ +-DKCHECKPASS_PAM_SERVICE="kcheckpass-trinity" -DTDM_PAM_SERVICE="tdm-trinity" -DKSCREENSAVER_PAM_SERVICE="kscreensaver-trinity" -DWITH_USBIDS="/usr/share/misc/usb.ids" \ -DWITH_ARTS="ON" -DWITH_SHADOW="ON" -DWITH_PAM="ON" -DWITH_SASL="ON" -DWITH_SUDO_TDESU_BACKEND="ON" -DWITH_LDAP="ON" -DWITH_SAMBA="ON" -DWITH_LIBRAW1394="ON" -DWITH_OPENEXR="ON" -DWITH_XCOMPOSITE="ON" -DWITH_XCURSOR="ON" -DWITH_XFIXES="ON" -DWITH_XRANDR="ON" -DWITH_XINERAMA="ON" -DWITH_HAL="ON" -DWITH_XDMCP="ON" -DWITH_XRENDER="ON" -DWITH_XDAMAGE="ON" -DWITH_XEXT="ON" -DWITH_XTEST="ON" # Honour "parallel=N" option of DEB_BUILD_OPTIONS. Comment out to @@ -29,7 +29,7 @@ DEB_BUILD_PARALLEL = true DEB_FIXPERMS_EXCLUDE := \ opt/trinity/bin/tdesud \ - opt/trinity/bin/kdmtsak + opt/trinity/bin/tdmtsak DEB_DH_STRIP_ARGS := --dbg-package=tdebase-trinity-dbg @@ -233,15 +233,15 @@ binary-install/tdebase-data-trinity:: rm -rf debian/tmp/etc/xdg/* rm -rf debian/tdebase-data-trinity/etc/xdg/* -install/kdm-trinity:: - sed -i 's/#UseTheme=true/UseTheme=true/g' debian/tmp/etc/trinity/kdm/kdmrc - sed -i 's/Theme=@@@ToBeReplacedByDesktopBase@@@/Theme=\/opt\/trinity\/share\/apps\/kdm\/themes\/kubuntu-trinity/g' debian/tmp/etc/trinity/kdm/kdmrc +install/tdm-trinity:: + sed -i 's/#UseTheme=true/UseTheme=true/g' debian/tmp/etc/trinity/tdm/tdmrc + sed -i 's/Theme=@@@ToBeReplacedByDesktopBase@@@/Theme=\/opt\/trinity\/share\/apps\/tdm\/themes\/kubuntu-trinity/g' debian/tmp/etc/trinity/tdm/tdmrc -binary-install/kdm-trinity:: - mkdir -p debian/kdm-trinity/etc/init - install -p -D -m644 debian/kdm-trinity.conf debian/kdm-trinity/etc/init/kdm-trinity.conf - install -p -D -m644 debian/kdm-trinity.pam debian/kdm-trinity/etc/pam.d/kdm-trinity - install -p -D -m644 debian/kdm-trinity-np.pam debian/kdm-trinity/etc/pam.d/kdm-trinity-np +binary-install/tdm-trinity:: + mkdir -p debian/tdm-trinity/etc/init + install -p -D -m644 debian/tdm-trinity.conf debian/tdm-trinity/etc/init/tdm-trinity.conf + install -p -D -m644 debian/tdm-trinity.pam debian/tdm-trinity/etc/pam.d/tdm-trinity + install -p -D -m644 debian/tdm-trinity-np.pam debian/tdm-trinity/etc/pam.d/tdm-trinity-np binary-install/kcontrol-trinity:: mkdir -p debian/kcontrol/etc/udev/rules.d @@ -270,6 +270,6 @@ binary-install/tdebase-trinity-bin:: chmod +s debian/tdebase-trinity-bin/opt/trinity/bin/kcheckpass binary-install/ksmserver-trinity:: - install -p -D -m644 debian/tmp/opt/trinity/share/apps/kdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop + install -p -D -m644 debian/tmp/opt/trinity/share/apps/tdm/sessions/tde.desktop debian/ksmserver-trinity/usr/share/xsessions/trinity.desktop install -p -D -m755 debian/plasma.autodetect debian/ksmserver-trinity/usr/bin/plasma.autodetect install -p -D -m755 debian/plasma-desktop.autodetect debian/ksmserver-trinity/usr/bin/plasma-desktop.autodetect diff --git a/ubuntu/maverick/tdebase/debian/source.lintian-overrides b/ubuntu/maverick/tdebase/debian/source.lintian-overrides index 3aa3a0f59..06e452243 100644 --- a/ubuntu/maverick/tdebase/debian/source.lintian-overrides +++ b/ubuntu/maverick/tdebase/debian/source.lintian-overrides @@ -1,2 +1,2 @@ -tdebase source: maintainer-script-lacks-debhelper-token debian/kdm-trinity.postinst -tdebase source: maintainer-script-lacks-debhelper-token debian/kdm-trinity.prerm +tdebase source: maintainer-script-lacks-debhelper-token debian/tdm-trinity.postinst +tdebase source: maintainer-script-lacks-debhelper-token debian/tdm-trinity.prerm diff --git a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install index 68d02cf06..540e8059a 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-data-trinity.install @@ -214,9 +214,9 @@ debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmstyle/index.docbook debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/common debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/index.cache.bz2 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kcmtaskbar/index.docbook -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kdm/common -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kdm/index.cache.bz2 -debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/kdm/index.docbook +debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/tdm/common +debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/tdm/index.cache.bz2 +debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/tdm/index.docbook debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/keyboard/common debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/keyboard/index.cache.bz2 debian/tmp/opt/trinity/share/doc/kde/HTML/en/kcontrol/keyboard/index.docbook @@ -354,7 +354,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kcmmemory.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kcmpartitions.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kcmpci.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kcontrol.png -debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kdmconfig.png +debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/128x128/apps/kscreensaver.png @@ -455,7 +455,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmsound.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmsystem.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcmx.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kcontrol.png -debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/kdmconfig.png +debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/16x16/apps/keyboard.png @@ -560,7 +560,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmdevices.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmkicker.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmkwm.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kcmx.png -debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kdmconfig.png +debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/keyboard.png debian/tmp/opt/trinity/share/icons/crystalsvg/22x22/apps/kscreensaver.png @@ -642,7 +642,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmsound.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmsystem.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcmx.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kcontrol.png -debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/kdmconfig.png +debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/32x32/apps/keyboard.png @@ -786,7 +786,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmscsi.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmsystem.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcmx.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kcontrol.png -debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/kdmconfig.png +debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard_layout.png debian/tmp/opt/trinity/share/icons/crystalsvg/48x48/apps/keyboard.png @@ -884,7 +884,7 @@ debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kcmpartitions.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kcmpci.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kcmx.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kcontrol.png -debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kdmconfig.png +debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/tdmconfig.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/key_bindings.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/kfm_home.png debian/tmp/opt/trinity/share/icons/crystalsvg/64x64/apps/knotify.png diff --git a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdm b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdm index 8012c2f85..4be02569c 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdm +++ b/ubuntu/maverick/tdebase/debian/tdebase-doc-html.doc-base.kdm @@ -1,10 +1,10 @@ -Document: tdebase-doc-html-kdm -Title: KDM Handbook +Document: tdebase-doc-html-tdm +Title: TDM Handbook Author: Oswald Buddenhagen -Abstract: This document describes KDM, the KDE Display Manager, an X session manager. +Abstract: This document describes TDM, the KDE Display Manager, an X session manager. Section: System Format: HTML -Index: /opt/trinity/share/doc/kde/HTML/en/kdm/index.html -Files: /opt/trinity/share/doc/kde/HTML/en/kdm/*.html +Index: /opt/trinity/share/doc/kde/HTML/en/tdm/index.html +Files: /opt/trinity/share/doc/kde/HTML/en/tdm/*.html diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install index fd0d3ac41..8549b03b9 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install +++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity-bin.install @@ -1,5 +1,5 @@ debian/tmp/opt/trinity/bin/krootbacking -debian/tmp/opt/trinity/bin/kdmtsak +debian/tmp/opt/trinity/bin/tdmtsak debian/tmp/opt/trinity/bin/tsak debian/tmp/opt/trinity/bin/kdebugdialog debian/tmp/opt/trinity/bin/kreadconfig diff --git a/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian b/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian index a275a318f..f3189b2c5 100644 --- a/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian +++ b/ubuntu/maverick/tdebase/debian/tdebase-trinity.README.Debian @@ -1,7 +1,7 @@ Kdm === -For notes on kdm, read: /opt/trinity/share/doc/kdm/README.Debian +For notes on tdm, read: /opt/trinity/share/doc/tdm/README.Debian KDE and media kioslave support diff --git a/ubuntu/maverick/tdeedu/debian/copyright b/ubuntu/maverick/tdeedu/debian/copyright index 7d67a2bfe..a7ca45956 100644 --- a/ubuntu/maverick/tdeedu/debian/copyright +++ b/ubuntu/maverick/tdeedu/debian/copyright @@ -30,7 +30,7 @@ Upstream Authors: KLettres: Anne-Marie Mahfouf <[email protected]> and many others KMathTool: Birgit Schulz <[email protected]>, Marco Wegner <[email protected]> - KmPlot: Klaus-Dieter M�ller <[email protected]>, + KmPlot: Klaus-Dieter M�ller <[email protected]>, Matthias Messmer <[email protected]>, Fredrik Edemar <[email protected]> KPercentage: Matthias Messmer <[email protected]>, diff --git a/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1 b/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1 index 427e97137..257190530 100644 --- a/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1 +++ b/ubuntu/maverick/tdeedu/debian/man/kmplot-trinity.1 @@ -51,7 +51,7 @@ If the KDE Help Centre is not installed then you can install the package \fItdeedu-doc-html\fP and read this documentation in HTML format from \fI/opt/trinity/share/doc/kde/HTML/en/kmplot/\fP. .SH AUTHOR -KmPlot was written by Klaus-Dieter Moeller <[email protected]>, +KmPlot was written by Klaus-Dieter Moeller <[email protected]>, Matthias Messmer <[email protected]> and Fredrik Edemar <[email protected]>. .br This manual page was prepared by Ben Burton <[email protected]> diff --git a/ubuntu/maverick/tdelibs/debian/changelog b/ubuntu/maverick/tdelibs/debian/changelog index a3b13e8a4..dd416c496 100644 --- a/ubuntu/maverick/tdelibs/debian/changelog +++ b/ubuntu/maverick/tdelibs/debian/changelog @@ -520,7 +520,7 @@ tdelibs (4:3.5.7-1ubuntu9) gutsy; urgency=low [ Sarah Hobbs ] * Added kubuntu_93_tdelibs-tdesudo-support-wflags-and-kab-fix.diff. Thankyou to Stefan Skotte for this patch - * Removed kubuntu_28_fix_sudo.diff to fix KDM memory corruption + * Removed kubuntu_28_fix_sudo.diff to fix TDM memory corruption (LP: #47455, KDE bug #147454) -- Sarah Hobbs <[email protected]> Sat, 14 Jul 2007 01:51:38 +1000 |
