diff options
| author | Timothy Pearson <[email protected]> | 2013-01-24 20:51:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-24 20:51:37 -0600 |
| commit | d1b7b2722a5b20b98fb88d5375f2464d87c7f3a1 (patch) | |
| tree | e16f5b6a9cbbe941c94fbc3c6ee3eb57c1aeb576 | |
| parent | 9fe79a3cf830d9e548514afc407f9f4ec5443ed0 (diff) | |
| download | tde-packaging-d1b7b2722a5b20b98fb88d5375f2464d87c7f3a1.tar.gz tde-packaging-d1b7b2722a5b20b98fb88d5375f2464d87c7f3a1.zip | |
Fix tdebase and kerry FTBFS on Ubuntu
4 files changed, 10 insertions, 10 deletions
diff --git a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_05_shortkey.patch b/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_05_shortkey.patch index d7f3f3649..6881e817e 100644 --- a/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_05_shortkey.patch +++ b/ubuntu/maverick/applications/kerry/debian/patches/kubuntu_05_shortkey.patch @@ -2,7 +2,7 @@ diff -Nur kerry-0.2.1/kerry/src/kerryapp.cpp kerry-0.2.1.new/kerry/src/kerryapp. --- kerry-0.2.1/kerry/src/kerryapp.cpp +++ kerry-0.2.1.new/kerry/src/kerryapp.cpp @@ -122,8 +122,7 @@ - globalKeys = new KGlobalAccel(TQT_TQOBJECT(this)); + globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this)); globalKeys->insert( "Program:kerry", i18n("Kerry Beagle Search") ); - KShortcut showDialogShortcut = KShortcut(ALT+Key_Space); 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 8fb71d7da..d99e8bf02 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(KGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false); -+ bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", true); +- bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false); ++ bool doUbuntuLogout = KConfigGroup(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(KGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false); -+ bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", true); +- bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false); ++ bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", true); // slighty more space for the new logout int factor = 2; diff --git a/ubuntu/precise/applications/kerry/debian/patches/kubuntu_05_shortkey.patch b/ubuntu/precise/applications/kerry/debian/patches/kubuntu_05_shortkey.patch index d7f3f3649..6881e817e 100644 --- a/ubuntu/precise/applications/kerry/debian/patches/kubuntu_05_shortkey.patch +++ b/ubuntu/precise/applications/kerry/debian/patches/kubuntu_05_shortkey.patch @@ -2,7 +2,7 @@ diff -Nur kerry-0.2.1/kerry/src/kerryapp.cpp kerry-0.2.1.new/kerry/src/kerryapp. --- kerry-0.2.1/kerry/src/kerryapp.cpp +++ kerry-0.2.1.new/kerry/src/kerryapp.cpp @@ -122,8 +122,7 @@ - globalKeys = new KGlobalAccel(TQT_TQOBJECT(this)); + globalKeys = new TDEGlobalAccel(TQT_TQOBJECT(this)); globalKeys->insert( "Program:kerry", i18n("Kerry Beagle Search") ); - KShortcut showDialogShortcut = KShortcut(ALT+Key_Space); diff --git a/ubuntu/precise/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff b/ubuntu/precise/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff index 8fb71d7da..d99e8bf02 100644 --- a/ubuntu/precise/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff +++ b/ubuntu/precise/tdebase/debian/patches/kubuntu_89_new_logout_ui.diff @@ -4,8 +4,8 @@ { setCaption(i18n("Shutdown TDE")); -- bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false); -+ bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", true); +- bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Shutdown").readBoolEntry("doUbuntuLogout", false); ++ bool doUbuntuLogout = KConfigGroup(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(KGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false); -+ bool doUbuntuLogout = KConfigGroup(KGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", true); +- bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", false); ++ bool doUbuntuLogout = KConfigGroup(TDEGlobal::config(), "Logout").readBoolEntry("doUbuntuLogout", true); // slighty more space for the new logout int factor = 2; |