X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=toolbox;h=3942dd7bbda75263321d9174f9647a66d073ca5d;hb=eeb51429199c125ab84cada93d0a0b4d4c2e194c;hp=bc363dade82871d1e01b6d4cc6d8579b1d361bf8;hpb=83c6d1f77c2dd0b9dd283c0027208f82b9d2c36c;p=vlc

diff --git a/toolbox b/toolbox
index bc363dade8..3942dd7bbd 100755
--- a/toolbox
+++ b/toolbox
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  toolbox for the VLC media player
-##  $Id: toolbox,v 1.55 2004/01/21 14:44:56 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
 
 ##
@@ -384,7 +372,7 @@ then
   echo "" >> po/POTFILES.in
   echo "# modules" >> po/POTFILES.in
   find modules -name '*.[chm]' -o -name '*.[ch]pp' \
-    | grep -v '\(gui/win32/\|\.moc\.\|gui/gtk2/\)' \
+    | grep -v '\(gui/wxwindows/wizard\|\.moc\.\|gui/gtk2/\)' \
     | sort >> po/POTFILES.in
   # clean old potfiles
   cd po
@@ -590,7 +578,7 @@ then
   test -f vlc.spec.mdk -a -f debian/rules || exit 1
   # let's rock!
   find . -type f '(' -name '*.[oa]' -o -name '*.so' -o -name '*.sl' -o -name '*.dylib' -o -name '*.dll' -o -name .dirstamp -o -name Makefile.in -o -name 'stamp-h*' -o -name '*~' -o -name '*.bak' -o -name '*.moc.cpp' ')' -exec rm -f '{}' ';'
-  (cd autotools && find . -name '[a-z]*' -exec rm -f '{}' ';')
+  (cd autotools && find . -name '[a-z]*' -maxdepth 1 -exec rm -f '{}' ';')
   (cd debian && find . -type d -name '[a-z]*' -maxdepth 1 -exec rm -Rf '{}' ';')
   find msvc -type f -name '*.dsp' -exec rm -f '{}' ';'
   find evc -type f -name '*.vcp' -exec rm -f '{}' ';'
@@ -628,11 +616,8 @@ then
   #                  ttf-freefont with ttf-thryomanes
   #                  dvb-dev (>= 1.0.1-6) with dvb-dev
   #          remove libwxgtk2.4-dev
-  #                 libflac-dev
   #                 libidl0 (workaround for mozilla-dev's bad deps)
   #                 libglib2.0-0 (workaround for mozilla-dev's bad deps)
-  #                 libmatroska-dev
-  #                 libspeex-dev
   #                 gcc-3.2 (workaround for an ICE in gcc-3.3)
   #          change Section: gnome with Section: graphics
   #                 Section: kde with Section: kde
@@ -650,11 +635,8 @@ then
       -e 's/, dvb-dev[^,]*/, dvb-dev/' \
       -e 's/, libwx[^,]*//' \
       -e '/Package: wxvlc/,/^ *$/d' \
-      -e 's/, libflac-dev[^,]*//' \
       -e 's/, libidl0[^,]*//' \
       -e 's/, libglib2.0-0[^,]*//' \
-      -e 's/, libmatroska-dev[^,]*//' \
-      -e 's/, libspeex-dev[^,]*//' \
       -e 's/, gcc-3.2[^,]*//' \
       -e 's/Section: gnome/Section: graphics/' \
       -e 's/Section: kde/Section: graphics/' \
@@ -663,14 +645,9 @@ then
   mv "$1/debian/control.woody" "$1/debian/control"
 
   # rules: remove wxwindows and skins stuff
-  #        remove flac support
-  #        remove matroska support
   sed -e '/# Package: wxvlc/,/^ *$/d' \
       -e 's,--enable-wxwindows,--disable-wxwindows,' \
       -e 's,--enable-skins,--disable-skins,' \
-      -e 's,--enable-flac,--disable-flac,' \
-      -e 's,--enable-mkv,--disable-mkv,' \
-      -e 's,--enable-speex,--disable-speex,' \
       < "$1/debian/rules" > "$1/debian/rules.woody"
   mv "$1/debian/rules.woody" "$1/debian/rules"
   chmod 0755 "$1/debian/rules"