Add/Update header of /etc/skel/.zshrc and /etc/zsh/zshrc, add debian/NEWS entry

diff --git a/debian/NEWS b/debian/NEWS
index 12a5a2d..4b877d0 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,20 @@
+grml-etc-core (0.3.62) unstable; urgency=low
+
+  * Merged /etc/skel/.zshrc into /etc/zsh/zshrc:
+
+    Starting with grml-etc-core 0.3.62 grml's zsh setup lives only in
+    *one* zshrc file - that is the global one: /etc/zsh/zshrc
+    /etc/skel/.zshrc still exists but provides commented examples only.
+    It is best to leave the /etc/skel/.zshrc file untouched and do
+    personal changes to the setup via ${HOME}/.zshrc.local (as before)
+    which is loaded at the end of the global zshrc.
+
+    That way, we enable people on other operating systems to use our
+    setup, too, just by copying our global zshrc to their ${HOME}/.zshrc.
+    Adjustments would still go to the .zshrc.local file.
+
+ -- Michael Prokop <mika@grml.org>  Fri, 13 Feb 2009 12:40:28 +0100
+
 grml-etc-core (0.3.5) unstable; urgency=low
 
   * Please notice, that the setup of zsh's completion functions has

diff --git a/debian/changelog b/debian/changelog
index 13d9bac..6aad3c6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,7 +10,7 @@ grml-etc-core (0.3.62) unstable; urgency=low
       (thanks, gebi)
 
   [ Frank Terbeck ]
-  * zshrc: Big setup merge: etc/zsh/zshrc + etc/skel/.zshrc into one file
+  * zshrc: Big setup merge: /etc/zsh/zshrc + /etc/skel/.zshrc into one file
     This includes various cleanups.
   * zshrc: provide .. as a possible completion
   * zshrc: Fix status() when $BAUD is unset, thanks to Alexander
@@ -23,7 +23,7 @@ grml-etc-core (0.3.62) unstable; urgency=low
     Jan-Hendrik Zab.
   * zshrc: add '-f' option to xtrename(), thanks esc.
 
- -- Frank Terbeck <ft@grml.org>  Sun, 08 Feb 2009 13:32:29 +0100
+ -- Michael Prokop <mika@grml.org>  Fri, 13 Feb 2009 12:37:17 +0100
 
 grml-etc-core (0.3.61) unstable; urgency=low
 

diff --git a/etc/skel/.zshrc b/etc/skel/.zshrc
index cb5ea8c..9e60f1d 100644 (file)
--- a/etc/skel/.zshrc
+++ b/etc/skel/.zshrc
@@ -1,6 +1,10 @@
-## skel/.zshrc on grml systems
-#
-# Nowadays, grml's zsh setup lives in only in *one* zshrc file.
+# Filename:      /etc/skel/.zshrc
+# Purpose:       config file for zsh (z shell)
+# Authors:       (c) grml-team (grml.org)
+# Bug-Reports:   see http://grml.org/bugs/
+# License:       This file is licensed under the GPL v2 or any later version.
+################################################################################
+# Nowadays, grml's zsh setup lives in only *one* zshrc file.
 # That is the global one: /etc/zsh/zshrc (from grml-etc-core).
 # It is best to leave this file untouched and do personal changes to
 # the setup via ${HOME}/.zshrc.local which is loaded at the end of the
@@ -9,13 +13,11 @@
 # That way, we enable people on other operating systems to use our
 # setup, too, just by copying our global zshrc to their ${HOME}/.zshrc.
 # Adjustments would still go to the .zshrc.local file.
-#
-
+################################################################################
 
 ## Now, we'll give a few examples of what you might want to use in your
 ## .zshrc.local file (just copy'n'paste and uncomment it there):
 
-
 ## ZLE tweaks ##
 
 ## use the vi navigation keys (hjkl) besides cursor keys in menu completion

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 2d29498..f38eb9e 100644 (file)
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -1,4 +1,4 @@
-# Filename:      zshrc
+# Filename:      /etc/zsh/zshrc
 # Purpose:       config file for zsh (z shell)
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/