From 17e07ddbce9a9de765d7de9b9bf4c98065e2ab13 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 18:38:31 -0600 Subject: Fix tdebase FTBFS on Debian and Ubuntu --- ubuntu/maverick/tdebase/debian/man/kreadconfig-trinity.1 | 4 ++-- ubuntu/maverick/tdebase/debian/man/kwriteconfig-trinity.1 | 4 ++-- .../maverick/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'ubuntu/maverick/tdebase') diff --git a/ubuntu/maverick/tdebase/debian/man/kreadconfig-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kreadconfig-trinity.1 index 5bd6f869c..30151e789 100644 --- a/ubuntu/maverick/tdebase/debian/man/kreadconfig-trinity.1 +++ b/ubuntu/maverick/tdebase/debian/man/kreadconfig-trinity.1 @@ -1,8 +1,8 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KREADCONFIG 1 "June 2006" "K Desktop Environment" "Read KConfig entries" +.TH KREADCONFIG 1 "June 2006" "K Desktop Environment" "Read TDEConfig entries" .SH NAME kreadconfig -\- Read KConfig entries (for use in shell scripts) +\- Read TDEConfig entries (for use in shell scripts) .SH SYNOPSIS \fBkreadconfig\fP [Qt\-options] [KDE\-options] [options] .SH DESCRIPTION diff --git a/ubuntu/maverick/tdebase/debian/man/kwriteconfig-trinity.1 b/ubuntu/maverick/tdebase/debian/man/kwriteconfig-trinity.1 index c98ebd1d4..266bc5560 100644 --- a/ubuntu/maverick/tdebase/debian/man/kwriteconfig-trinity.1 +++ b/ubuntu/maverick/tdebase/debian/man/kwriteconfig-trinity.1 @@ -1,8 +1,8 @@ .\" This file was generated by (a slightly modified) kdemangen.pl and edited by hand -.TH KWRITECONFIG 1 "June 2006" "K Desktop Environment" "Write KConfig entries" +.TH KWRITECONFIG 1 "June 2006" "K Desktop Environment" "Write TDEConfig entries" .SH NAME kwriteconfig -\- Write KConfig entries (for use in shell scripts) +\- Write TDEConfig entries (for use in shell scripts) .SH SYNOPSIS \fBkwriteconfig\fP [Qt\-options] [KDE\-options] [options] value .SH DESCRIPTION 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 d99e8bf02..baeb8bfd5 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 @@ -4,8 +4,8 @@ { setCaption(i18n("Shutdown TDE")); -- bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false); -+ bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", true); +- bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false); ++ bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", true); TQFrame* lfrm = new TQFrame( this ); TQHBoxLayout* hbuttonbox; @@ -15,8 +15,8 @@ 2 * KDialog::spacingHint() ); // default factor -- bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false); -+ bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", true); +- bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false); ++ bool doUbuntuLogout = TDEConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", true); // slighty more space for the new logout int factor = 2; -- cgit v1.2.3