Diff for /src/sys/conf/newvers.sh between versions 1.3 and 1.4

version 1.3, 2003/10/24 17:19:14 version 1.4, 2003/11/19 00:51:29
Line 35 Line 35
 # $FreeBSD: src/sys/conf/newvers.sh,v 1.44.2.30 2003/04/04 07:02:46 murray Exp $  # $FreeBSD: src/sys/conf/newvers.sh,v 1.44.2.30 2003/04/04 07:02:46 murray Exp $
 # $DragonFly$  # $DragonFly$
   
TYPE="FreeBSD"TYPE="DragonFly"
REVISION="4.8"REVISION="1.0"
BRANCH="STABLE"BRANCH="CURRENT"
 RELEASE="${REVISION}-${BRANCH}"  RELEASE="${REVISION}-${BRANCH}"
 VERSION="${TYPE} ${RELEASE}"  VERSION="${TYPE} ${RELEASE}"
   
 if [ "X${PARAMFILE}" != "X" ]; then  if [ "X${PARAMFILE}" != "X" ]; then
        RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \        RELDATE=$(awk '/__DragonFly_version.*propagated to newvers/ {print $3}' \
                 ${PARAMFILE})                  ${PARAMFILE})
 else  else
        RELDATE=$(awk '/__FreeBSD_version.*propagated to newvers/ {print $3}' \        RELDATE=$(awk '/__DragonFly_version.*propagated to newvers/ {print $3}' \
                 $(dirname $0)/../sys/param.h)                  $(dirname $0)/../sys/param.h)
 fi  fi
   
Line 58  do Line 58  do
         if [ -r "$bsd_copyright" ]; then          if [ -r "$bsd_copyright" ]; then
                 COPYRIGHT=`sed \                  COPYRIGHT=`sed \
                     -e "s/\[year\]/$year/" \                      -e "s/\[year\]/$year/" \
                    -e 's/\[your name here\]\.* /FreeBSD Inc./' \                    -e 's/\[your name here\]\.* /DragonFly Inc./' \
                    -e 's/\[your name\]\.*/FreeBSD Inc./' \                    -e 's/\[your name\]\.*/DragonFly Inc./' \
                     -e '/\[id for your version control system, if any\]/d' \                      -e '/\[id for your version control system, if any\]/d' \
                     $bsd_copyright`                       $bsd_copyright` 
                 break                  break
Line 70  done Line 70  done
 if [ X"$COPYRIGHT" = X ]; then  if [ X"$COPYRIGHT" = X ]; then
         COPYRIGHT="/*          COPYRIGHT="/*
  * Copyright (c) $year   * Copyright (c) $year
 *      FreeBSD Inc. All rights reserved. *      DragonFly Inc. All rights reserved.
  *   *
  */"   */"
 fi  fi

Removed from v.1.3  
changed lines
  Added in v.1.4