diff -Nru /tmp/rK5vWz0ZMk/kdebase-3.5.5/debian/changelog /tmp/ZRDX0vozGD/kdebase-3.5.5/debian/changelog --- /tmp/rK5vWz0ZMk/kdebase-3.5.5/debian/changelog 2006-11-05 21:12:28.000000000 -0800 +++ /tmp/ZRDX0vozGD/kdebase-3.5.5/debian/changelog 2006-11-05 21:12:34.000000000 -0800 @@ -1,3 +1,11 @@ +kdebase (4:3.5.5-0ubuntu4) edgy; urgency=low + + * Fix kubuntu_76_ksmserver_suspend.diff to not crash due to uninitialized + HAL context pointer if shutdown options are disabled in logout dialog. + Closes LP #67889 + + -- Luka Renko Tue, 24 Oct 2006 22:09:44 +0200 + kdebase (4:3.5.5-0ubuntu3) edgy; urgency=low * Update kubuntu_73_nomediaioslave_mounthelper.diff to change diff -Nru /tmp/rK5vWz0ZMk/kdebase-3.5.5/debian/patches/kubuntu_76_ksmserver_suspend.diff /tmp/ZRDX0vozGD/kdebase-3.5.5/debian/patches/kubuntu_76_ksmserver_suspend.diff --- /tmp/rK5vWz0ZMk/kdebase-3.5.5/debian/patches/kubuntu_76_ksmserver_suspend.diff 2006-11-05 21:12:28.000000000 -0800 +++ /tmp/ZRDX0vozGD/kdebase-3.5.5/debian/patches/kubuntu_76_ksmserver_suspend.diff 2006-11-05 21:12:34.000000000 -0800 @@ -1,6 +1,6 @@ -diff -Nur kdebase-3.5.4/ksmserver/Makefile.am kdebase-3.5.4.new/ksmserver/Makefile.am ---- kdebase-3.5.4/ksmserver/Makefile.am 2006-01-19 18:01:08.000000000 +0100 -+++ kdebase-3.5.4.new/ksmserver/Makefile.am 2006-09-14 21:23:56.000000000 +0200 +diff -Nur kdebase-3.5.5/ksmserver/Makefile.am kdebase-3.5.5.new/ksmserver/Makefile.am +--- kdebase-3.5.5/ksmserver/Makefile.am 2006-01-19 18:01:08.000000000 +0100 ++++ kdebase-3.5.5.new/ksmserver/Makefile.am 2006-10-24 21:42:17.000000000 +0200 @@ -17,7 +17,7 @@ SUBDIRS = . @@ -28,9 +28,9 @@ messages: $(XGETTEXT) *.cpp -o $(podir)/ksmserver.pot -diff -Nur kdebase-3.5.4/ksmserver/Makefile.in kdebase-3.5.4.new/ksmserver/Makefile.in ---- kdebase-3.5.4/ksmserver/Makefile.in 2006-09-14 21:07:42.000000000 +0200 -+++ kdebase-3.5.4.new/ksmserver/Makefile.in 2006-09-14 21:23:56.000000000 +0200 +diff -Nur kdebase-3.5.5/ksmserver/Makefile.in kdebase-3.5.5.new/ksmserver/Makefile.in +--- kdebase-3.5.5/ksmserver/Makefile.in 2006-10-04 21:49:36.000000000 +0200 ++++ kdebase-3.5.5.new/ksmserver/Makefile.in 2006-10-24 21:42:17.000000000 +0200 @@ -655,7 +655,7 @@ xdg_directorydir = @xdg_directorydir@ xdg_menudir = @xdg_menudir@ @@ -58,9 +58,9 @@ #>+ 2 libkdeinit_ksmserver_la_LDFLAGS = -no-undefined -avoid-version $(all_libraries) -diff -Nur kdebase-3.5.4/ksmserver/shutdowndlg.cpp kdebase-3.5.4.new/ksmserver/shutdowndlg.cpp ---- kdebase-3.5.4/ksmserver/shutdowndlg.cpp 2006-03-17 11:17:10.000000000 +0100 -+++ kdebase-3.5.4.new/ksmserver/shutdowndlg.cpp 2006-09-14 21:24:22.000000000 +0200 +diff -Nur kdebase-3.5.5/ksmserver/shutdowndlg.cpp kdebase-3.5.5.new/ksmserver/shutdowndlg.cpp +--- kdebase-3.5.5/ksmserver/shutdowndlg.cpp 2006-03-17 11:17:10.000000000 +0100 ++++ kdebase-3.5.5.new/ksmserver/shutdowndlg.cpp 2006-10-24 21:50:43.000000000 +0200 @@ -38,6 +38,9 @@ #include #include @@ -71,7 +71,16 @@ #include #include #include -@@ -167,6 +170,80 @@ +@@ -130,6 +133,8 @@ + buttonlay->addWidget( btnLogout ); + connect(btnLogout, SIGNAL(clicked()), SLOT(slotLogout())); + ++ m_halCtx = NULL; ++ + if (maysd) { + + // Shutdown +@@ -167,6 +172,80 @@ btnReboot->setPopup(targets); connect( targets, SIGNAL(activated(int)), SLOT(slotReboot(int)) ); } @@ -152,7 +161,7 @@ } buttonlay->addStretch( 1 ); -@@ -181,6 +258,17 @@ +@@ -181,6 +260,17 @@ } @@ -170,7 +179,7 @@ void KSMShutdownDlg::slotLogout() { -@@ -213,6 +301,48 @@ +@@ -213,6 +303,48 @@ accept(); } @@ -219,9 +228,9 @@ bool KSMShutdownDlg::confirmShutdown( bool maysd, KApplication::ShutdownType& sdtype, QString& bootOption ) { -diff -Nur kdebase-3.5.4/ksmserver/shutdowndlg.h kdebase-3.5.4.new/ksmserver/shutdowndlg.h ---- kdebase-3.5.4/ksmserver/shutdowndlg.h 2006-01-19 18:01:08.000000000 +0100 -+++ kdebase-3.5.4.new/ksmserver/shutdowndlg.h 2006-09-14 21:23:56.000000000 +0200 +diff -Nur kdebase-3.5.5/ksmserver/shutdowndlg.h kdebase-3.5.5.new/ksmserver/shutdowndlg.h +--- kdebase-3.5.5/ksmserver/shutdowndlg.h 2006-01-19 18:01:08.000000000 +0100 ++++ kdebase-3.5.5.new/ksmserver/shutdowndlg.h 2006-10-24 21:42:17.000000000 +0200 @@ -17,6 +17,11 @@ #include