* configure.ac: bumped version number to 0.6.1.
    Enabled matroska support by default.
* extras/MacOSX/*: bumped version number to 0.6.1.
* INSTALL.win32: instructions update.
* share/Makefile.am: included the html files for the http interface.
* po/*: ran ./toolbox --update-po.

INSTALL.win32

-$Id: INSTALL.win32,v 1.18 2003/07/25 13:24:29 gbazin Exp $
+$Id: INSTALL.win32,v 1.19 2003/07/29 17:42:58 gbazin Exp $
 
 INSTALL file for the Windows9x/Me/NT4/2k/XP version of the VLC media player
 
@@ -86,10 +86,10 @@ http://www.videolan.org/pub/testing/contrib/
 We also provide a package with all the libraries already compiled so it is
 actually really easy to compile a full-featured version of vlc (these compiled
 libraries will only work with mingw or cygwin):
-http://www.videolan.org/pub/testing/win32/contrib-20030725-win32-bin.tar.bz2
+http://www.videolan.org/pub/testing/win32/contrib-20030729-win32-bin.tar.bz2
 All you need to do is extract it in your root directory (the include files
 and libraries will be put in /usr/win32). You can do this with the following
-command: "tar xjvf contrib-20030725-win32-bin.tar.bz2 -C /"
+command: "tar xjvf contrib-20030729-win32-bin.tar.bz2 -C /"
 
 A complete list of the libraries on which we depend can be found here:
 http://developers.videolan.org/vlc/
@@ -149,6 +149,7 @@ lines:
   LDFLAGS=-L/usr/win32/lib \
   ./configure \
       --disable-sdl --disable-gtk \
+      --disable-mkv \
       --enable-nls \
       --enable-ffmpeg --with-ffmpeg-mp3lame \
       --enable-faad \

configure.ac

 dnl Autoconf settings for vlc
-dnl $Id: configure.ac,v 1.45 2003/07/28 21:41:20 massiot Exp $
+dnl $Id: configure.ac,v 1.46 2003/07/29 17:42:58 gbazin Exp $
 
-AC_INIT(vlc,0.6.1-test1)
+AC_INIT(vlc,0.6.1)
 
 CONFIGURE_LINE="$0 $*"
 CODENAME="Trevelyan"
@@ -13,7 +13,7 @@ AC_CANONICAL_SYSTEM
 
 dnl XXX: we don't put any flags here, because automake 1.5 doesn't support
 dnl them. And we need the comma otherwize automake will choke on it.
-AM_INIT_AUTOMAKE(vlc,0.6.1-test1)
+AM_INIT_AUTOMAKE(vlc,0.6.1)
 AM_CONFIG_HEADER(config.h)
 
 dnl
@@ -1403,8 +1403,8 @@ dnl
 dnl  matroska demux plugin
 dnl
 AC_ARG_ENABLE(mkv,
-  [  --enable-mkv            Matroska demux support (default disabled)])
-if test "${enable_mkv}" = "yes"
+  [  --enable-mkv            Matroska demux support (default enabled)])
+if test "${enable_mkv}" != "no"
 then
 AC_LANG_PUSH(C++)
   dnl matroska headers include ebml headers directly... pouah that stinks

extras/MacOSX/Resources/English.lproj/InfoPlist.strings

 /* Localized versions of Info.plist keys */
 
 CFBundleName = "VLC";
-CFBundleShortVersionString = "0.6.1-test1";
-CFBundleGetInfoString = "VLC media player 0.6.1-test1, Copyright (c) 1996-2003 VideoLAN.";
+CFBundleShortVersionString = "0.6.1";
+CFBundleGetInfoString = "VLC media player 0.6.1, Copyright (c) 1996-2003 VideoLAN.";
 NSHumanReadableCopyright = "Copyright (c) 1996-2003 VideoLAN.";

extras/MacOSX/vlc.pbproj/project.pbxproj

@@ -415,7 +415,7 @@
 	<key>CFBundleExecutable</key>
 	<string>VLC</string>
 	<key>CFBundleGetInfoString</key>
-	<string>VLC media player 0.6.1-test1, Copyright (c) 1996-2003 VideoLAN.</string>
+	<string>VLC media player 0.6.1, Copyright (c) 1996-2003 VideoLAN.</string>
 	<key>CFBundleIconFile</key>
 	<string>vlc.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -427,7 +427,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.6.1-test1</string>
+	<string>0.6.1</string>
 	<key>CFBundleSignature</key>
 	<string>VLC#</string>
 	<key>CFBundleURLTypes</key>
@@ -474,7 +474,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>0.6.1-test1</string>
+	<string>0.6.1</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSMainNibFile</key>

po/POTFILES.in

@@ -21,30 +21,30 @@ include/modules.h
 include/modules_inner.h
 include/mtime.h
 include/network.h
-include/os_specific.h
 include/osd.h
+include/os_specific.h
 include/stream_control.h
 include/stream_output.h
 include/variables.h
 include/video_output.h
 include/vlc/aout.h
-include/vlc/decoder.h
-include/vlc/input.h
-include/vlc/intf.h
-include/vlc/sout.h
-include/vlc/vlc.h
-include/vlc/vout.h
 include/vlc_common.h
 include/vlc_config.h
 include/vlc_cpu.h
+include/vlc/decoder.h
 include/vlc_error.h
+include/vlc/input.h
 include/vlc_interface.h
+include/vlc/intf.h
 include/vlc_messages.h
 include/vlc_objects.h
 include/vlc_playlist.h
-include/vlc_threads.h
+include/vlc/sout.h
 include/vlc_threads_funcs.h
+include/vlc_threads.h
 include/vlc_video.h
+include/vlc/vlc.h
+include/vlc/vout.h
 include/vout_synchro.h
 include/win32_specific.h
 src/audio_output/common.c
@@ -56,9 +56,9 @@ src/audio_output/mixer.c
 src/audio_output/output.c
 src/extras/dirent.c
 src/extras/dirent.h
+src/extras/getopt1.c
 src/extras/getopt.c
 src/extras/getopt.h
-src/extras/getopt1.c
 src/extras/libc.c
 src/input/input.c
 src/input/input_clock.c
@@ -104,18 +104,12 @@ modules/access/directory.c
 modules/access/dvd/access.c
 modules/access/dvd/demux.c
 modules/access/dvd/dvd.c
-modules/access/dvd/dvd.h
 modules/access/dvd/dvdcss.h
+modules/access/dvd/dvd.h
 modules/access/dvd/es.c
 modules/access/dvd/es.h
 modules/access/dvd/ifo.c
 modules/access/dvd/ifo.h
-modules/access/dvd/seek.c
-modules/access/dvd/seek.h
-modules/access/dvd/summary.c
-modules/access/dvd/summary.h
-modules/access/dvd/udf.c
-modules/access/dvd/udf.h
 modules/access/dvdplay/access.c
 modules/access/dvdplay/access.h
 modules/access/dvdplay/demux.c
@@ -131,6 +125,12 @@ modules/access/dvdplay/tools.h
 modules/access/dvdread/dvdread.c
 modules/access/dvdread/input.c
 modules/access/dvdread/input.h
+modules/access/dvd/seek.c
+modules/access/dvd/seek.h
+modules/access/dvd/summary.c
+modules/access/dvd/summary.h
+modules/access/dvd/udf.c
+modules/access/dvd/udf.h
 modules/access/file.c
 modules/access/ftp.c
 modules/access/http.c
@@ -144,6 +144,10 @@ modules/access/mms/mmsh.c
 modules/access/mms/mmsh.h
 modules/access/mms/mmstu.c
 modules/access/mms/mmstu.h
+modules/access_output/dummy.c
+modules/access_output/file.c
+modules/access_output/http.c
+modules/access_output/udp.c
 modules/access/pvr/pvr.c
 modules/access/pvr/videodev2.h
 modules/access/satellite/access.c
@@ -158,10 +162,6 @@ modules/access/vcd/cdrom.c
 modules/access/vcd/cdrom.h
 modules/access/vcd/cdrom_internals.h
 modules/access/vcd/vcd.c
-modules/access_output/dummy.c
-modules/access_output/file.c
-modules/access_output/http.c
-modules/access_output/udp.c
 modules/audio_filter/channel_mixer/headphone.c
 modules/audio_filter/channel_mixer/trivial.c
 modules/audio_filter/converter/a52tofloat32.c
@@ -204,26 +204,26 @@ modules/codec/a52old/adec.h
 modules/codec/a52old/bit_allocate.c
 modules/codec/a52old/decoder.c
 modules/codec/a52old/decoder.h
-modules/codec/a52old/downmix.h
-modules/codec/a52old/downmix/downmix.c
 modules/codec/a52old/downmix/downmix_3dn.c
+modules/codec/a52old/downmix/downmix.c
 modules/codec/a52old/downmix/downmix_c.c
 modules/codec/a52old/downmix/downmix_common.h
 modules/codec/a52old/downmix/downmix_sse.c
+modules/codec/a52old/downmix.h
 modules/codec/a52old/exponent.c
 modules/codec/a52old/exponent.h
 modules/codec/a52old/imdct.c
 modules/codec/a52old/imdct.h
-modules/codec/a52old/imdct/imdct.c
 modules/codec/a52old/imdct/imdct_3dn.c
+modules/codec/a52old/imdct/imdct.c
 modules/codec/a52old/imdct/imdct_c.c
 modules/codec/a52old/imdct/imdct_common.c
 modules/codec/a52old/imdct/imdct_common.h
 modules/codec/a52old/imdct/imdct_sse.c
 modules/codec/a52old/imdct/retables.h
-modules/codec/a52old/imdct/srfft.h
 modules/codec/a52old/imdct/srfft_3dn.c
 modules/codec/a52old/imdct/srfft_c.c
+modules/codec/a52old/imdct/srfft.h
 modules/codec/a52old/imdct/srfft_sse.c
 modules/codec/a52old/internal.h
 modules/codec/a52old/mantissa.c
@@ -244,9 +244,9 @@ modules/codec/ffmpeg/chroma.c
 modules/codec/ffmpeg/ffmpeg.c
 modules/codec/ffmpeg/ffmpeg.h
 modules/codec/ffmpeg/postprocessing/postprocessing.c
-modules/codec/ffmpeg/postprocessing/postprocessing.h
 modules/codec/ffmpeg/postprocessing/postprocessing_c.c
 modules/codec/ffmpeg/postprocessing/postprocessing_common.h
+modules/codec/ffmpeg/postprocessing/postprocessing.h
 modules/codec/ffmpeg/postprocessing/postprocessing_mmx.c
 modules/codec/ffmpeg/postprocessing/postprocessing_mmxext.c
 modules/codec/ffmpeg/video.c
@@ -273,17 +273,17 @@ modules/codec/mpeg_video/decoder.h
 modules/codec/mpeg_video/headers.c
 modules/codec/mpeg_video/idct/block_c.h
 modules/codec/mpeg_video/idct/block_mmx.h
-modules/codec/mpeg_video/idct/idct.c
-modules/codec/mpeg_video/idct/idct.h
-modules/codec/mpeg_video/idct/idct_decl.h
-modules/codec/mpeg_video/idct/idct_sparse.h
 modules/codec/mpeg_video/idct/idctaltivec.c
+modules/codec/mpeg_video/idct/idct.c
 modules/codec/mpeg_video/idct/idctclassic.c
+modules/codec/mpeg_video/idct/idct_decl.h
+modules/codec/mpeg_video/idct/idct.h
 modules/codec/mpeg_video/idct/idctmmx.c
 modules/codec/mpeg_video/idct/idctmmxext.c
-modules/codec/mpeg_video/motion/motion.c
+modules/codec/mpeg_video/idct/idct_sparse.h
 modules/codec/mpeg_video/motion/motion3dnow.c
 modules/codec/mpeg_video/motion/motionaltivec.c
+modules/codec/mpeg_video/motion/motion.c
 modules/codec/mpeg_video/motion/motionmmx.c
 modules/codec/mpeg_video/motion/motionmmxext.c
 modules/codec/mpeg_video/parser.c
@@ -386,6 +386,20 @@ modules/gui/familiar/playlist.c
 modules/gui/familiar/playlist.h
 modules/gui/familiar/support.c
 modules/gui/familiar/support.h
+modules/gui/gtk2/gnome2.c
+modules/gui/gtk2/gnome2_callbacks.c
+modules/gui/gtk2/gnome2_callbacks.h
+modules/gui/gtk2/gnome2_interface.c
+modules/gui/gtk2/gnome2_interface.h
+modules/gui/gtk2/gnome2_support.c
+modules/gui/gtk2/gnome2_support.h
+modules/gui/gtk2/gtk2.c
+modules/gui/gtk2/gtk2_callbacks.c
+modules/gui/gtk2/gtk2_callbacks.h
+modules/gui/gtk2/gtk2_interface.c
+modules/gui/gtk2/gtk2_interface.h
+modules/gui/gtk2/gtk2_support.c
+modules/gui/gtk2/gtk2_support.h
 modules/gui/gtk/common.h
 modules/gui/gtk/control.c
 modules/gui/gtk/control.h
@@ -416,22 +430,6 @@ modules/gui/gtk/playlist.h
 modules/gui/gtk/preferences.c
 modules/gui/gtk/preferences.h
 modules/gui/gtk/sout.c
-modules/gui/gtk2/gnome2.c
-modules/gui/gtk2/gnome2_callbacks.c
-modules/gui/gtk2/gnome2_callbacks.h
-modules/gui/gtk2/gnome2_interface.c
-modules/gui/gtk2/gnome2_interface.h
-modules/gui/gtk2/gnome2_support.c
-modules/gui/gtk2/gnome2_support.h
-modules/gui/gtk2/gtk2.c
-modules/gui/gtk2/gtk2_callbacks.c
-modules/gui/gtk2/gtk2_callbacks.h
-modules/gui/gtk2/gtk2_interface.c
-modules/gui/gtk2/gtk2_interface.h
-modules/gui/gtk2/gtk2_support.c
-modules/gui/gtk2/gtk2_support.h
-modules/gui/kde/QConfigItem.cpp
-modules/gui/kde/QConfigItem.h
 modules/gui/kde/common.h
 modules/gui/kde/disc.cpp
 modules/gui/kde/disc.h
@@ -452,6 +450,8 @@ modules/gui/kde/pluginsbox.cpp
 modules/gui/kde/pluginsbox.h
 modules/gui/kde/preferences.cpp
 modules/gui/kde/preferences.h
+modules/gui/kde/QConfigItem.cpp
+modules/gui/kde/QConfigItem.h
 modules/gui/kde/slider.cpp
 modules/gui/kde/slider.h
 modules/gui/macosx/about.h
@@ -585,6 +585,7 @@ modules/gui/skins/x11/x11_timer.cpp
 modules/gui/skins/x11/x11_timer.h
 modules/gui/skins/x11/x11_window.cpp
 modules/gui/skins/x11/x11_window.h
+modules/gui/wxwindows/control.cpp
 modules/gui/wxwindows/dialogs.cpp
 modules/gui/wxwindows/fileinfo.cpp
 modules/gui/wxwindows/interface.cpp
@@ -611,8 +612,8 @@ modules/misc/gtk_main.c
 modules/misc/httpd.c
 modules/misc/logger/logger.c
 modules/misc/memcpy/fastmemcpy.h
-modules/misc/memcpy/memcpy.c
 modules/misc/memcpy/memcpyaltivec.c
+modules/misc/memcpy/memcpy.c
 modules/misc/network/ipv4.c
 modules/misc/network/ipv6.c
 modules/misc/qte_main.cpp
@@ -644,11 +645,11 @@ modules/stream_out/duplicate.c
 modules/stream_out/es.c
 modules/stream_out/standard.c
 modules/stream_out/transcode.c
-modules/video_chroma/i420_rgb.c
-modules/video_chroma/i420_rgb.h
 modules/video_chroma/i420_rgb16.c
 modules/video_chroma/i420_rgb8.c
+modules/video_chroma/i420_rgb.c
 modules/video_chroma/i420_rgb_c.h
+modules/video_chroma/i420_rgb.h
 modules/video_chroma/i420_rgb_mmx.h
 modules/video_chroma/i420_ymga.c
 modules/video_chroma/i420_yuy2.c

share/Makefile.am

@@ -13,7 +13,9 @@ dist_pkgdata_DATA = \
 	$(NULL)
 
 nobase_dist_pkgdata_DATA = \
-	$(DIST_skins)
+	$(DIST_skins) \
+	$(DIST_http) \
+	$(NULL)
 
 DIST_fonts = \
 	$(NULL)
@@ -122,5 +124,13 @@ DIST_skins = \
 	skins/default/pause4.bmp \
 	skins/default/playlist3.bmp \
 	skins/default/prev3.bmp \
-	skins/default/stop1.bmp
+	skins/default/stop1.bmp \
+	$(NULL)
 
+DIST_http = \
+	http/index.html \
+	http/info.html \
+	http/admin/index.html \
+	http/admin/browse.html \
+	http/admin/.access \
+	$(NULL)