diff -u kdebase-workspace-4.4.2/debian/changelog kdebase-workspace-4.4.2/debian/changelog --- kdebase-workspace-4.4.2/debian/changelog +++ kdebase-workspace-4.4.2/debian/changelog @@ -1,3 +1,10 @@ +kdebase-workspace (4:4.4.2-0ubuntu14) lucid; urgency=low + + * Update kubuntu_101_brightness_fn_keys_and_osd.diff from Felix Geyer, + closes LP: #564433 'Plasma crash at KDE logout' + + -- Jonathan Riddell Fri, 23 Apr 2010 13:17:36 +0200 + kdebase-workspace (4:4.4.2-0ubuntu13) lucid; urgency=low * Bump conflicts/replaces versions from 4.3.3 to 4.3.80 to allow for safe diff -u kdebase-workspace-4.4.2/debian/patches/kubuntu_101_brightness_fn_keys_and_osd.diff kdebase-workspace-4.4.2/debian/patches/kubuntu_101_brightness_fn_keys_and_osd.diff --- kdebase-workspace-4.4.2/debian/patches/kubuntu_101_brightness_fn_keys_and_osd.diff +++ kdebase-workspace-4.4.2/debian/patches/kubuntu_101_brightness_fn_keys_and_osd.diff @@ -62,6 +62,16 @@ Battery::Battery(QObject *parent, const QVariantList &args) : Plasma::PopupApplet(parent, args), +@@ -87,7 +91,8 @@ + m_labelAlpha(0), + m_labelAnimation(0), + m_acAlpha(0), +- m_acAnimation(0) ++ m_acAnimation(0), ++ m_brightnessOSD(0) + { + //kDebug() << "Loading applet battery"; + setAcceptsHoverEvents(true); @@ -315,6 +319,7 @@ Battery::~Battery()