* bootstrap:

+ Minor indentation fix.
  * toolbox:
    + Exclude vlc_symbols.h and modules_{plugins,builtins}.h from POTFILES.in.
  * po/*:
    + Re-ran toolbox --update po.

bootstrap

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  bootstrap file for the VLC media player
-##  $Id: bootstrap,v 1.68 2003/07/08 13:40:57 sam Exp $
+##  $Id: bootstrap,v 1.69 2003/07/16 15:52:04 sam Exp $
 ##
 ##  Authors: Sam Hocevar <sam@zoy.org>
 
@@ -318,14 +318,14 @@ if automake-1.7 --version >/dev/null 2>&1; then
   amvers="-1.7"
   # If we also have 1.6, use it instead because it is faster
   if automake-1.6 --version >/dev/null 2>&1; then
-    if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1
+    if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" ">" "1.6.1" > /dev/null 2>&1; then
-    then amvers="-1.6"
+      amvers="-1.6"
     fi
   fi
 elif automake-1.6 --version >/dev/null 2>&1; then
   amvers="-1.6"
-  if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" "<=" "1.6.1" > /dev/null 2>&1
+  if expr "`automake-1.6 --version | sed -e '1s/[^0-9]*//' -e q`" "<=" "1.6.1" > /dev/null 2>&1; then
-  then AUTOMAKESUCKS=yes
+    AUTOMAKESUCKS=yes
   fi
 elif automake-1.5 --version >/dev/null 2>&1; then
   INSTALLSUCKS=yes

po/POTFILES.in

@@ -590,7 +590,9 @@ modules/misc/dummy/dummy.c
 modules/misc/dummy/dummy.h
 modules/misc/dummy/input.c
 modules/misc/dummy/interface.c
+modules/misc/dummy/renderer.c
 modules/misc/dummy/vout.c
+modules/misc/freetype.c
 modules/misc/gtk_main.c
 modules/misc/httpd.c
 modules/misc/logger/logger.c
@@ -648,7 +650,6 @@ modules/video_filter/filter_common.h
 modules/video_filter/invert.c
 modules/video_filter/logo.c
 modules/video_filter/motionblur.c
-modules/video_filter/osd_text.c
 modules/video_filter/transform.c
 modules/video_filter/wall.c
 modules/video_output/aa.c

toolbox

@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  toolbox for the VLC media player
-##  $Id: toolbox,v 1.41 2003/07/14 20:36:55 sigmunau Exp $
+##  $Id: toolbox,v 1.42 2003/07/16 15:52:04 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -369,11 +369,13 @@ then
   echo "# automatically created by toolbox --update-po" > po/POTFILES.in
   echo "" >> po/POTFILES.in
   echo "# main sources" >> po/POTFILES.in
-  find include src -name '*.[chm]' -o -name '*.[ch]pp' | sort >> po/POTFILES.in
+  find include src -name '*.[chm]' -o -name '*.[ch]pp' \
+    | grep -v '\(vlc_symbols\|misc/modules_\)' \
+    | sort >> po/POTFILES.in
   echo "" >> po/POTFILES.in
   echo "# modules" >> po/POTFILES.in
   find modules -name '*.[chm]' -o -name '*.[ch]pp' \
-    | grep -v '\(gui/win32/\|\.moc\.\)' \
+    | grep -v '\(gui/win32/\)' \
     | sort >> po/POTFILES.in
   # clean old potfiles
   cd po
@@ -569,6 +571,9 @@ then
   # FIXME: a lot of Makefiles are still there
 fi
 
+##
+##  Build a woody-friendly package
+##
 if test "${action}" = "woody"
 then
   set -ex