[Pkg-kde-commits] rev 918 - in branches/kde-3.4.0/packages/kdebase/debian: . patches

Christopher Martin chrsmrtn-guest@costa.debian.org
Thu, 24 Mar 2005 19:35:24 +0000


Author: chrsmrtn-guest
Date: 2005-03-24 19:35:22 +0000 (Thu, 24 Mar 2005)
New Revision: 918

Modified:
   branches/kde-3.4.0/packages/kdebase/debian/changelog
   branches/kde-3.4.0/packages/kdebase/debian/patches/11_genkdmconf.diff
Log:
Modify genkdmconf patch so that zsh users can log in.

Also add changelog references to the README.Debian files, so users
who don't read anything else will know where to look for setup
information.


Modified: branches/kde-3.4.0/packages/kdebase/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-03-24 17:53:39 UTC (rev 917)
+++ branches/kde-3.4.0/packages/kdebase/debian/changelog	2005-03-24 19:35:22 UTC (rev 918)
@@ -27,6 +27,10 @@
     set so that members of the plugdev group can make use of the Logitech
     KControl module (under Peripherals/Mouse).
 
+  * Added README.Debian files for kcontrol and kdebase-kio-plugins, explaining
+    how to setup Logitech mouse advanced configuration, and the media
+    kioslave.
+
   * New kdebase-doc-html package, containing doc-base registered HTML versions
     of application handbooks, for users without Konqueror or KHelpCenter.
 

Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/11_genkdmconf.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/11_genkdmconf.diff	2005-03-24 17:53:39 UTC (rev 917)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/11_genkdmconf.diff	2005-03-24 19:35:22 UTC (rev 918)
@@ -90,7 +90,15 @@
  
  static const char def_session[] =
  "#! /bin/sh\n"
-@@ -646,28 +638,8 @@
+@@ -635,6 +627,7 @@
+ "    [ -f $zhome/.zprofile ] && . $zhome/.zprofile\n"
+ "    [ -f $zdir/zlogin ] && . $zdir/zlogin\n"
+ "    [ -f $zhome/.zlogin ] && . $zhome/.zlogin\n"
++"    setopt shwordsplit\n"
+ "    ;;\n"
+ "  */csh|*/tcsh)\n"
+ "    # [t]cshrc is always sourced automatically.\n"
+@@ -646,28 +639,8 @@
  "    [ -f $HOME/.profile ] && . $HOME/.profile\n"
  "    ;;\n"
  "esac\n"