rev 17210 - in trunk/packages/kdebase-workspace/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2010-02-28 13:52:12 +0000 (Sun, 28 Feb 2010)
New Revision: 17210

Added:
   trunk/packages/kdebase-workspace/debian/patches/22_kdm_xreset_hook_framework.diff
Modified:
   trunk/packages/kdebase-workspace/debian/changelog
   trunk/packages/kdebase-workspace/debian/patches/series
Log:
Add 22_kdm_xreset_hook_framework.diff patch to provide a Xreset hook using
a common framework. (Closes: #571609)


Modified: trunk/packages/kdebase-workspace/debian/changelog
===================================================================
--- trunk/packages/kdebase-workspace/debian/changelog	2010-02-28 13:27:42 UTC (rev 17209)
+++ trunk/packages/kdebase-workspace/debian/changelog	2010-02-28 13:52:12 UTC (rev 17210)
@@ -94,6 +94,8 @@
     Thanks to Petter Reinholdtsen. (Closes: #527896)
   * Use lsb output functions in kdm init script.
     Thanks to Petter Reinholdtsen. (Closes: #567802)
+  * Add 22_kdm_xreset_hook_framework.diff patch to provide a Xreset hook using
+    a common framework. (Closes: #571609)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 25 Feb 2010 01:19:19 +0200
 

Added: trunk/packages/kdebase-workspace/debian/patches/22_kdm_xreset_hook_framework.diff
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/22_kdm_xreset_hook_framework.diff	                        (rev 0)
+++ trunk/packages/kdebase-workspace/debian/patches/22_kdm_xreset_hook_framework.diff	2010-02-28 13:52:12 UTC (rev 17210)
@@ -0,0 +1,19 @@
+Description: Provide a Xreset hook using a common framework.
+Forwarded: not-needed
+Bug-Debian: http://bugs.debian.org/571609
+Author: Fathi Boudra <fabo at debian.org>
+
+--- a/kdm/kfrontend/genkdmconf.c
++++ b/kdm/kfrontend/genkdmconf.c
+@@ -625,6 +625,11 @@ static const char def_reset[] =
+ "      exec sessreg -d -l \"$DISPLAY\" -u /var/run/utmp \\\n"
+ "                   -h \"`echo $DISPLAY | cut -d: -f1`\" \"$USER\"\n"
+ "      # NOTREACHED\n"
++"fi\n"
++"\n"
++"# Use common Xreset framework if it exist\n"
++"if [ -x /etc/X11/Xreset ] ; then\n"
++"   /etc/X11/Xreset\n"
+ "fi\n";
+ #endif /* _AIX */
+ 

Modified: trunk/packages/kdebase-workspace/debian/patches/series
===================================================================
--- trunk/packages/kdebase-workspace/debian/patches/series	2010-02-28 13:27:42 UTC (rev 17209)
+++ trunk/packages/kdebase-workspace/debian/patches/series	2010-02-28 13:52:12 UTC (rev 17210)
@@ -8,6 +8,7 @@
 13_kdm_override_docs.diff
 20_use_dejavu_as_default_font.diff
 21_kdm_doesnt_use_kstandarddirs.diff
+22_kdm_xreset_hook_framework.diff
 23_do_not_depend_on_bindings.diff
 26_run_kaboom_when_starting_kde.diff
 97_fix_target_link_libraries.diff