rev 6782 - in trunk/packages/kdelibs/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2007-07-19 20:53:30 +0000 (Thu, 19 Jul 2007)
New Revision: 6782

Added:
   trunk/packages/kdelibs/debian/patches/01_branch_wait_for_kdeinit_to_finish.diff
Modified:
   trunk/packages/kdelibs/debian/changelog
Log:
make kdeinit_shutdown wait for kdeinit to shutdown


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2007-07-19 20:52:17 UTC (rev 6781)
+++ trunk/packages/kdelibs/debian/changelog	2007-07-19 20:53:30 UTC (rev 6782)
@@ -7,9 +7,10 @@
   * Add patch to fix issue with saving after redo in kate. (Closes: 431920)
   * Better error messages when opening a tty fails. Thanks to Robert Millan.
     (Closes: 334974)
-  * Don't refer to help:/kcmshell in kcmshell manpage (Closes: 408470)
+  * Don't refer to help:/kcmshell in kcmshell manpage. (Closes: 408470)
+  * Make sure kdeinit closes all files before terminating kde. (Closes: 425314)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 19 Jul 2007 22:05:18 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 19 Jul 2007 22:52:17 +0200
 
 kdelibs (4:3.5.7.dfsg.1-1) unstable; urgency=low
 

Added: trunk/packages/kdelibs/debian/patches/01_branch_wait_for_kdeinit_to_finish.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/01_branch_wait_for_kdeinit_to_finish.diff	                        (rev 0)
+++ trunk/packages/kdelibs/debian/patches/01_branch_wait_for_kdeinit_to_finish.diff	2007-07-19 20:53:30 UTC (rev 6782)
@@ -0,0 +1,12 @@
+Index: kdelibs/kinit/wrapper.c
+===================================================================
+--- kdelibs/kinit/wrapper.c	(revision 671952)
++++ kdelibs/kinit/wrapper.c	(revision 671953)
+@@ -351,6 +351,7 @@
+       header.cmd = LAUNCHER_TERMINATE_KDE;
+       header.arg_length = 0;
+       write_socket(sock, (char *) &header, sizeof(header));
++      read_socket(sock, (char *) &header, 1); /* wait for the socket to close */
+       return 0;
+    }
+