diff -u kdebase-3.5.9/debian/patches/kubuntu_85_language_selector.diff kdebase-3.5.9/debian/patches/kubuntu_85_language_selector.diff --- kdebase-3.5.9/debian/patches/kubuntu_85_language_selector.diff +++ kdebase-3.5.9/debian/patches/kubuntu_85_language_selector.diff @@ -1,7 +1,15 @@ -diff -ur kdebase-3.5.5a.dfsg.1/kcontrol/locale/kcmlocale.cpp kdebase-3.5.5a.dfsg.1/kcontrol/locale/kcmlocale.cpp ---- kdebase-3.5.5a.dfsg.1/kcontrol/locale/kcmlocale.cpp 2005-10-10 16:03:47.000000000 +0100 -+++ kdebase-3.5.5a.dfsg.1/kcontrol/locale/kcmlocale.cpp 2007-01-08 19:37:16.000000000 +0000 -@@ -47,7 +47,7 @@ +diff -Nru kdebase-3.5.10.orig/kcontrol/locale/kcmlocale.cpp kdebase-3.5.10/kcontrol/locale/kcmlocale.cpp +--- kdebase-3.5.10.orig/kcontrol/locale/kcmlocale.cpp 2008-10-07 11:56:03.000000000 +0100 ++++ kdebase-3.5.10/kcontrol/locale/kcmlocale.cpp 2008-10-07 12:09:59.000000000 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -47,7 +48,7 @@ : QWidget (parent, name), m_locale(locale) { @@ -10,7 +18,7 @@ KDialog::marginHint(), KDialog::spacingHint()); -@@ -99,6 +99,65 @@ +@@ -99,6 +100,71 @@ lay->setColStretch(1, 1); lay->setColStretch(2, 1); @@ -30,6 +38,12 @@ + connect( uninstallLanguage, SIGNAL(clicked()), this, SLOT(slotUninstallLanguage()) ); + connect( selectLanguage, SIGNAL(clicked()), this, SLOT(slotSelectLanguage()) ); + ++ if(!QFile::exists("/usr/bin/qt-language-selector") { ++ installLanguage->hide(); ++ uninstallLanguage->hide(); ++ selectLanguage->hide(); ++ } ++ +} + +void KLocaleConfig::slotInstallLanguage() @@ -76,10 +90,9 @@ } void KLocaleConfig::slotAddLanguage(const QString & code) -Only in kdebase-3.5.5a.dfsg.1/kcontrol/locale/: kcmlocale.cpp~ -diff -ur kdebase-3.5.5a.dfsg.1/kcontrol/locale/kcmlocale.h kdebase-3.5.5a.dfsg.1/kcontrol/locale/kcmlocale.h ---- kdebase-3.5.5a.dfsg.1/kcontrol/locale/kcmlocale.h 2005-10-10 16:03:47.000000000 +0100 -+++ kdebase-3.5.5a.dfsg.1/kcontrol/locale/kcmlocale.h 2007-01-08 19:09:33.000000000 +0000 +diff -Nru kdebase-3.5.10.orig/kcontrol/locale/kcmlocale.h kdebase-3.5.10/kcontrol/locale/kcmlocale.h +--- kdebase-3.5.10.orig/kcontrol/locale/kcmlocale.h 2008-10-07 11:56:03.000000000 +0100 ++++ kdebase-3.5.10/kcontrol/locale/kcmlocale.h 2008-10-07 11:57:23.000000000 +0100 @@ -75,6 +75,11 @@ void slotLanguageDown(); void slotCheckButtons(); diff -u kdebase-3.5.9/debian/changelog kdebase-3.5.9/debian/changelog --- kdebase-3.5.9/debian/changelog +++ kdebase-3.5.9/debian/changelog @@ -1,3 +1,10 @@ +kdebase (4:3.5.9-0ubuntu7.4) hardy-proposed; urgency=low + + * Edit kubuntu_85_language_selector.diff: + - Do not run qt-language-selector when not installed. (LP: #27953) + + -- Terence Simpson Tue, 07 Oct 2008 12:57:58 +0100 + kdebase (4:3.5.9-0ubuntu7.3) hardy-proposed; urgency=low * Update 25_khelp_htdig.diff, fixes LP: #241916