* toolbox:

    + Removed --changelog from the help message.
    + Output a warning asking to use "svn log" when --changelog is called.
  * Regenerated SVN changelogs.

toolbox

 #! /bin/sh
 
 ##  toolbox for the VLC media player
-##  $Id: toolbox,v 1.56 2004/02/10 14:33:17 sam Exp $
+##  $Id$
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -28,7 +28,6 @@ recognized flags are:
   --update-glade          generate and fix Glade code
   --update-glade2         generate and fix Glade 2 code
   --update-flexml         generate and fix flexml and flex code
-  --changelog             update the CVS changelog
   --distclean             "make distclean" on steroids
   --make-woody <dir>      change distdir <dir> to a woody distdir
 EOF
@@ -114,21 +113,10 @@ fi
 ##
 if test "${action}" = "changelog"
 then
-  set -e
-  set -x
-  cvs2cl --help >/dev/null 2>&1 || exit 1
-  rm -f ChangeLog ChangeLog.tmp
-  cvs2cl --utc --hide-filenames --no-wrap -w --stdout -g -z9 | \
-    sed -e 's/^[^0-9]/ /' -e 's/^  *$//' -e 's/^ \* 	/ /g' | \
-    grep -v '^ \*$' | uniq > ChangeLog.tmp         # ^-- tab
-  YEAR=`sed -e 's/\(....\)-..-.*/\1/;q' ChangeLog.tmp`
-  LASTYEAR="$((${YEAR} - 1))"
-  sed -ne "/^${YEAR}-..-../,/^${LASTYEAR}-..-../{/^${LASTYEAR}-..-../d;p}" \
-    < ChangeLog.tmp > ChangeLog
-  rm -f ChangeLog.tmp
+  YEAR="`date +%Y`"
+  echo "toolbox --changelog no longer required. use this instead:"
+  echo " svn log -v -r '{$YEAR-01-01}:{$YEAR-12-31}' > ChangeLog"
   exit 0
-  # To generate changelog for the year 2001:
-  # sed -ne '/^2001/,/^2000/{/^2000/d;p}'
 fi
 
 ##