[arch-commits] Commit in tcsh/repos (5 files)

Wed Jun 24 02:38:25 UTC 2009

Date: Tuesday, June 23, 2009 @ 22:38:25
  Author: eric
Revision: 43446

Merged revisions 43444 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/tcsh/trunk

........
  r43444 | eric | 2009-06-23 22:31:24 -0400 (Tue, 23 Jun 2009) | 2 lines
  
  upgpkg: tcsh 6.16.00-4
      Removed obsolete skel file (close FS#14967)
........

Modified:
  tcsh/repos/extra-i686/	(properties)
  tcsh/repos/extra-i686/ChangeLog
  tcsh/repos/extra-i686/PKGBUILD
  tcsh/repos/extra-i686/csh.cshrc
Deleted:
  tcsh/repos/extra-i686/tcsh.config.skel

------------------+
 ChangeLog        |    5 ++++
 PKGBUILD         |   13 ++++------
 csh.cshrc        |   37 +-----------------------------
 tcsh.config.skel |   65 -----------------------------------------------------
 4 files changed, 12 insertions(+), 108 deletions(-)


Property changes on: tcsh/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /tcsh/trunk:1-39868
   + /tcsh/trunk:1-43445

Modified: extra-i686/ChangeLog
===================================================================

--- extra-i686/ChangeLog	2009-06-24 02:31:40 UTC (rev 43445)
+++ extra-i686/ChangeLog	2009-06-24 02:38:25 UTC (rev 43446)
@@ -1,3 +1,8 @@
+2009-06-23  Eric Belanger  <eric at archlinux.org>
+
+	* tcsh 6.16.00-4
+	* Removed obsolete skel file (close FS#14967)
+
 2009-05-21  Eric Belanger  <eric at archlinux.org>
 
 	* tcsh 6.16.00-3

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-06-24 02:31:40 UTC (rev 43445)
+++ extra-i686/PKGBUILD	2009-06-24 02:38:25 UTC (rev 43446)
@@ -4,7 +4,7 @@
 
 pkgname=tcsh
 pkgver=6.16.00
-pkgrel=3
+pkgrel=4
 pkgdesc="Enhanced version of the Berkeley C shell"
 arch=('i686' 'x86_64')
 url="http://www.tcsh.org/Welcome"
@@ -12,16 +12,14 @@
 depends=('ncurses')
 install=tcsh.install
 source=(ftp://ftp.astron.com/pub/${pkgname}/${pkgname}-${pkgver}.tar.gz csh.cshrc \
-        tcsh-6.15.00-ls-colors-var.patch csh.login tcsh.config.skel usr_csh.sh usr_tcsh.sh)
-md5sums=('55f1a41512250168ec4bf1db0e246db4' '299cd79eb3cbc2a3caeac1c3a0309556'\
+        tcsh-6.15.00-ls-colors-var.patch csh.login usr_csh.sh usr_tcsh.sh)
+md5sums=('55f1a41512250168ec4bf1db0e246db4' '7ca0fe6d1a1b9a0093f632499d4fb112'\
          'e744f5c31fc8009e7977aa50bbd9d0ae' '4869b9da87c79854e2cc97241f125853'\
-         '6bd69d3c815412ada4579ac8f8cc9c45' '2b672c67b5e08ab81fbb03d8588d25e3'\
-         '8758b20326f00a1057bd95a300c28355')
+         '2b672c67b5e08ab81fbb03d8588d25e3' '8758b20326f00a1057bd95a300c28355')
 sha1sums=('3d3536bbb9201abdf39b8b364b95e0a218970a5c'
-          '8ebcee4e6c934481a46fe40c15d52a53ed5744bb'
+          'f156f79f67c2cc1d96617095230dc90e75ea1e43'
           'e61fb09bd20d5af0cdb000de4972acf926521de8'
           'dbbcfacc078789104f75cbf5a99640ce7251c99e'
-          '73a0ae17f2e3dcf2d3ae871982e8591379e1800e'
           '7668da494d053a00199f8e2c857bf3998c74f0be'
           '31da3a6aaa00cd8d66a6c1fba42e19fbc99f2c7c')
 
@@ -34,7 +32,6 @@
 
   install -D -m644 "${srcdir}/csh.cshrc" "${pkgdir}/etc/csh.cshrc" || return 1
   install -D -m644 "${srcdir}/csh.login" "${pkgdir}/etc/csh.login" || return 1
-  install -D -m644 "${srcdir}/tcsh.config.skel" "${pkgdir}/etc/skel/.tcsh.config" || return 1
   ln -s tcsh "${pkgdir}/bin/csh" || return 1
   install -D -m 755 "${srcdir}/usr_tcsh.sh" "${pkgdir}/usr/bin/tcsh" || return 1
   install -D -m 755 "${srcdir}/usr_csh.sh" "${pkgdir}/usr/bin/csh" || return 1

Modified: extra-i686/csh.cshrc
===================================================================
--- extra-i686/csh.cshrc	2009-06-24 02:31:40 UTC (rev 43445)
+++ extra-i686/csh.cshrc	2009-06-24 02:38:25 UTC (rev 43446)
@@ -15,38 +15,7 @@
 onintr -
 ##
 
-
 ##
-## Start by unsetting all our variables.  This is needed to prevent inheritance
-## from the shell that started us -- e.g. when performing a 'su'.
-##
-unsetenv TCSH_SHELL_CTRLD
-unsetenv TCSH_SHELL_SAFEHISTORY
-unsetenv TCSH_SHELL_AUTOLOGOUT
-unsetenv TCSH_SHELL_SAFETY
-unsetenv TCSH_SHELL_DOS
-unsetenv TCSH_SHELL_CDALIAS
-unsetenv TCSH_SHELL_COMPLETION
-
-
-##
-## Get our own settings.  Make sure they exist in the user's directory.
-##
-if ( ! -e ~/.tcsh.config ) then
-    if ( -e /etc/skel/.tcsh.config ) then
-        echo ">>> Copying /etc/skel/.tcsh.config to your home directory ..."
-        cp /etc/skel/.tcsh.config ~/.tcsh.config
-        echo ">>> Please edit it to fine-tune the TCSH behaviour."
-    else
-        echo "### Missing .tcsh.config!"
-    endif
-endif
-if ( -e ~/.tcsh.config ) then
-    source ~/.tcsh.config
-endif
-
-
-##
 ## Load the environment defaults.
 ##
 if ( -r /etc/csh.env ) then
@@ -115,10 +84,8 @@
 ##
 ## Load our command completions -- for interactive shells only
 ##
-if ( $?TCSH_SHELL_COMPLETION ) then
-    if ( -e /etc/profile.d/tcsh-complete ) then
-        source /etc/profile.d/tcsh-complete
-    endif
+if ( -e /etc/profile.d/tcsh-complete ) then
+    source /etc/profile.d/tcsh-complete
 endif
 
 

Deleted: extra-i686/tcsh.config.skel
===================================================================
--- extra-i686/tcsh.config.skel	2009-06-24 02:31:40 UTC (rev 43445)
+++ extra-i686/tcsh.config.skel	2009-06-24 02:38:25 UTC (rev 43446)
@@ -1,65 +0,0 @@
-##
-## TCSH Configuration
-##
-## The setting in this file influence the behaviour and configuration
-## of the base tcsh scripts.
-##
-## 2003-01-14  --  Alain Penders (alain at gentoo.org)
-##   Initial version
-##
-
-#
-# Will pressing CTRL-D exit the shell?
-#
-# Value: set to enable CTRLD, unset to disable.  (Default: enabled)
-#
-setenv TCSH_SHELL_CTRLD 1
-
-#
-# Will the history be saved for the next session when the shell is closed?
-#
-# Value: set to enable saving the history, unset to disable.  (Default: enabled)
-#
-setenv TCSH_SHELL_SAVEHISTORY 1
-
-#
-# Auto-logout after a certain number of minutes?
-#
-# Value: unset to disable, set to the number of minutes to enable.  (Default: disabled)
-#
-#setenv TCSH_SHELL_AUTOLOGOUT 15
-
-#
-# Default rm, mv, and cp to safe versions (ask before overwriting or deleting a file)?
-#
-# Value: set to enable, unset to disable.  (Default: set to protect new users)
-#
-setenv TCSH_SHELL_SAFETY 1
-
-#
-# Add MSDOS/CPM command aliases (del, cls, md, rd, dir)?
-#
-# Value: set to enable, unset to disable.  (Default: disabled)
-#
-#setenv TCSH_SHELL_DOS 1
-
-#
-# Add CD shortcut aliases?
-#
-# These include:
-#   .    -> pwd
-#   ..   -> cd ..
-#   ../  -> cd ../
-#   -    -> cd -
-#   /    -> cd /
-#
-# Value: set to enable, unset to disable.  (Default: disabled)
-#
-#setenv TCSH_SHELL_CDALIAS 1
-
-#
-# Enable intelligent command line completion (by pressing TAB)?
-#
-# Value: set to enable, unset to disable.  (Default: enabled)
-#
-setenv TCSH_SHELL_COMPLETION 1


