* ALL: bumped version number to 0.6.0 (finally :), updated po, ChangeLog, removed
the Wdisabled-optimization flag from the build (too verbose with gcc-3.3).

INSTALL.win32

-$Id: INSTALL.win32,v 1.15 2003/05/22 12:00:56 gbazin Exp $
+$Id: INSTALL.win32,v 1.16 2003/06/22 16:00:56 gbazin Exp $
 
 INSTALL file for the Windows9x/Me/NT4/2k/XP version of the VLC media player
 
@@ -91,7 +91,7 @@ http://www.videolan.org/pub/testing/contrib/
 I 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-20030420-win32-bin.tar.bz2
+http://www.videolan.org/pub/testing/win32/contrib-20030622-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)
 

configure.ac

 dnl Autoconf settings for vlc
 
-AC_INIT(vlc,0.6.0-test3)
+AC_INIT(vlc,0.6.0)
 
 CONFIGURE_LINE="$0 $*"
 CODENAME="Trevelyan"
@@ -12,7 +12,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.0-test3)
+AM_INIT_AUTOMAKE(vlc,0.6.0)
 AM_CONFIG_HEADER(config.h)
 
 dnl
@@ -589,10 +589,11 @@ AC_CACHE_CHECK([if \$CC accepts -Wsign-compare],
     [CFLAGS="-Wsign-compare ${CFLAGS_save}"
      AC_TRY_COMPILE([],,ac_cv_c_Wsign_compare=yes, ac_cv_c_Wsign_compare=no)])
 
-AC_CACHE_CHECK([if \$CC accepts -Wdisabled-optimization],
-    [ac_cv_c_Wdisabled_optimization],
-    [CFLAGS="-Wdisabled-optimization ${CFLAGS_save}"
-     AC_TRY_COMPILE([],,ac_cv_c_Wdisabled_optimization=yes, ac_cv_c_Wdisabled_optimization=no)])
+dnl Disabled as it is way too verbose on gcc-3.3
+dnl AC_CACHE_CHECK([if \$CC accepts -Wdisabled-optimization],
+dnl     [ac_cv_c_Wdisabled_optimization],
+dnl     [CFLAGS="-Wdisabled-optimization ${CFLAGS_save}"
+dnl      AC_TRY_COMPILE([],,ac_cv_c_Wdisabled_optimization=yes, ac_cv_c_Wdisabled_optimization=no)])
 
 AC_CACHE_CHECK([if \$CC accepts -Winline],
     [ac_cv_c_Winline],

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

 /* Localized versions of Info.plist keys */
 
 CFBundleName = "VLC";
-CFBundleShortVersionString = "0.6.0-test3";
-CFBundleGetInfoString = "VLC media player 0.6.0-test3, Copyright (c) 1996-2003 VideoLAN.";
+CFBundleShortVersionString = "0.6.0";
+CFBundleGetInfoString = "VLC media player 0.6.0, 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.0-test3, Copyright (c) 1996-2003 VideoLAN.</string>
+	<string>VLC media player 0.6.0, 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.0-test3</string>
+	<string>0.6.0</string>
 	<key>CFBundleSignature</key>
 	<string>VLC#</string>
 	<key>CFBundleURLTypes</key>
@@ -474,7 +474,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>0.6.0-test3</string>
+	<string>0.6.0</string>
 	<key>NSAppleScriptEnabled</key>
 	<string>YES</string>
 	<key>NSMainNibFile</key>

po/POTFILES.in

@@ -325,6 +325,7 @@ modules/demux/avi/libavi.h
 modules/demux/demuxdump.c
 modules/demux/flac.c
 modules/demux/m3u.c
+modules/demux/mkv.cpp
 modules/demux/mp4/libmp4.c
 modules/demux/mp4/libmp4.h
 modules/demux/mp4/mp4.c
@@ -501,22 +502,6 @@ modules/gui/skins/controls/slider.cpp
 modules/gui/skins/controls/slider.h
 modules/gui/skins/controls/text.cpp
 modules/gui/skins/controls/text.h
-modules/gui/skins/gtk2/gtk2_api.cpp
-modules/gui/skins/gtk2/gtk2_bitmap.cpp
-modules/gui/skins/gtk2/gtk2_bitmap.h
-modules/gui/skins/gtk2/gtk2_dragdrop.cpp
-modules/gui/skins/gtk2/gtk2_dragdrop.h
-modules/gui/skins/gtk2/gtk2_event.cpp
-modules/gui/skins/gtk2/gtk2_event.h
-modules/gui/skins/gtk2/gtk2_font.cpp
-modules/gui/skins/gtk2/gtk2_font.h
-modules/gui/skins/gtk2/gtk2_graphics.cpp
-modules/gui/skins/gtk2/gtk2_graphics.h
-modules/gui/skins/gtk2/gtk2_run.cpp
-modules/gui/skins/gtk2/gtk2_theme.cpp
-modules/gui/skins/gtk2/gtk2_theme.h
-modules/gui/skins/gtk2/gtk2_window.cpp
-modules/gui/skins/gtk2/gtk2_window.h
 modules/gui/skins/os_api.h
 modules/gui/skins/os_bitmap.h
 modules/gui/skins/os_event.h