diff -u kdebase-3.5.6/debian/changelog kdebase-3.5.6/debian/changelog
--- kdebase-3.5.6/debian/changelog
+++ kdebase-3.5.6/debian/changelog
@@ -1,3 +1,12 @@
+kdebase (4:3.5.6-0ubuntu20.1) feisty-proposed; urgency=low
+
+  * Add kubuntu_96_gdm_logout_moved.diff ; the GDM control socket moved in
+    7.04 and we need to use the new path.  This fix makes the "Reboot" and
+    "Shut down" buttons reappear for people using GDM with KDE.  
+    LP: #64695.
+
+ -- Tollef Fog Heen <tfheen@ubuntu.com>  Sun, 29 Apr 2007 10:54:48 +0200
+
 kdebase (4:3.5.6-0ubuntu20) feisty; urgency=low
 
   * Add kubuntu_95_safely-remove_umount_dialog.diff
only in patch2:
unchanged:
--- kdebase-3.5.6.orig/debian/patches/kubuntu_96_gdm_logout_moved.diff
+++ kdebase-3.5.6/debian/patches/kubuntu_96_gdm_logout_moved.diff
@@ -0,0 +1,11 @@
+--- kdebase-3.5.6/kdmlib/dmctl.cpp.old	2007-04-29 10:51:03.000000000 +0200
++++ kdebase-3.5.6/kdmlib/dmctl.cpp	2007-04-29 10:51:14.000000000 +0200
+@@ -66,7 +66,7 @@
+ 			return;
+ 		sa.sun_family = AF_UNIX;
+ 		if (DMType == GDM)
+-			strcpy( sa.sun_path, "/tmp/.gdm_socket" );
++			strcpy( sa.sun_path, "/var/run/gdm_socket" );
+ 		else {
+ 			if ((ptr = strchr( dpy, ':' )))
+ 				ptr = strchr( ptr, '.' );