* Removed more unused code.

  * Updated config.guess and config.sub from GNU's latest versions (bozo,
    you may want to update them in vls as well).
  * Added vlc.pot skeleton for translators.

AUTHORS

@@ -100,7 +100,7 @@ E: arnaud@carrosse.frmug.org
 D: autoconf patches
 
 N: Thomas Graf
-E: reeler@reeler.org
+E: tgraf@europe.com
 D: gettext support, german translation
 
 N: Jean-Philippe Grimaldi

Makefile

@@ -232,7 +232,7 @@ vlc-clean:
 	rm -Rf vlc.app
 
 distclean: clean
-	-cd po && $(MAKE) distclean
+	-cd po && $(MAKE) maintainer-clean
 	rm -f **/*.o **/*~ *.log
 	rm -f Makefile.opts
 	rm -f include/defs.h include/config.h include/modules_builtin.h

TODO

@@ -664,7 +664,7 @@ Urgency: Wishlist
 Description: Rename channel names
  Channels should start from 1 (not 0) like on a VCR or TV,
  and Channel 0 should be renamed to "Playlist" or similar.
-Status: Todo
+Status: Done
 
 Task: 0x0d
 Difficulty: Medium
@@ -762,7 +762,7 @@ Description: Get rid of vlc.channels
  The file vlc.channels should be removed and information
  found in it put either into ~/.vlcrc or in another rc
  file. Note that this file can be modified by the vlc.
-Status: Todo
+Status: Done 9 Dec 2001 (sam)
 
 Task: 0x03
 Difficulty: Hard

configure.in

@@ -34,12 +34,13 @@ AC_PROG_CPP
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 
 dnl Gettext stuff
+ALL_LINGUAS="de fr"
 PACKAGE="vlc"
 VERSION="$VLC_VERSION"
+
 AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AM_GNU_GETTEXT
-ALL_LINGUAS="de"
 
 dnl AM_PROG_LIBTOOL
 AC_PROG_INSTALL

include/interface.h

@@ -4,7 +4,7 @@
  * interface, such as message output.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: interface.h,v 1.23 2001/12/09 17:01:35 sam Exp $
+ * $Id: interface.h,v 1.24 2001/12/10 12:40:24 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -61,12 +61,6 @@ typedef struct intf_thread_s
     /* Interface callback */
     void             ( *pf_manage ) ( struct intf_thread_s * );
 
-    /* XXX: Channels array - new API */
-  //p_intf_channel_t *  p_channel[INTF_MAX_CHANNELS];/* channel descriptions */
-
-    /* Channels array - NULL if not used */
-    p_intf_channel_t    p_channel;                /* description of channels */
-
     /* Input thread - NULL if not active */
     p_input_thread_t    p_input;
 

po/.cvsignore

@@ -2,3 +2,4 @@ Makefile
 Makefile.in
 POTFILES
 *.mo
+*.gmo

po/ChangeLog

+2001-12-10  gettextize  <bug-gnu-utils@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.10.40.
+

po/Makefile.in.in

@@ -2,19 +2,22 @@
 # Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <drepper@gnu.ai.mit.edu>
 #
 # This file file be copied and used freely without restrictions.  It can
-# be used in projects which are not available under the GNU Public License
+# be used in projects which are not available under the GNU General Public License
 # but which still want to provide support for the GNU gettext functionality.
 # Please note that the actual code is *not* freely available.
 
 PACKAGE = @PACKAGE@
 VERSION = @VERSION@
 
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
 SHELL = /bin/sh
 @SET_MAKE@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
-top_builddir = ..
 VPATH = @srcdir@
 
 prefix = @prefix@
@@ -22,7 +25,6 @@ exec_prefix = @exec_prefix@
 datadir = @datadir@
 localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/po
-subdir = po
 
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@@ -151,7 +153,7 @@ maintainer-clean: distclean
 	@echo "it deletes files that may require special tools to rebuild."
 	rm -f $(GMOFILES)
 
-distdir = ../$(PACKAGE)-$(VERSION)/$(subdir)
+distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 dist distdir:
 	$(MAKE) update-po
 	@$(MAKE) dist2
@@ -159,7 +161,8 @@ dist distdir:
 dist2: $(DISTFILES)
 	dists="$(DISTFILES)"; \
 	for file in $$dists; do \
-	  cp -p $(srcdir)/$$file $(distdir); \
+	  if test -f $$file; then dir=.; else dir=$(srcdir); fi; \
+	  cp -p $$dir/$$file $(distdir); \
 	done
 
 update-po: Makefile
@@ -183,21 +186,8 @@ update-po: Makefile
 update-gmo: Makefile $(GMOFILES)
 	@:
 
-POTFILES: POTFILES.in
-	( if test 'x$(srcdir)' != 'x.'; then \
-	    posrcprefix='$(top_srcdir)/'; \
-	  else \
-	    posrcprefix="../"; \
-	  fi; \
-	  rm -f $@-t $@ \
-	    && (sed -e '/^#/d' -e '/^[ 	]*$$/d' \
-		    -e "s@.*@	$$posrcprefix& \\\\@" < $(srcdir)/$@.in \
-		| sed -e '$$s/\\$$//') > $@-t \
-	    && chmod a-w $@-t \
-	    && mv $@-t $@ )
-
-Makefile: Makefile.in.in ../config.status POTFILES
-	cd .. \
+Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \
 	       $(SHELL) ./config.status