| @@ -1,7 +1,6 @@
-diff -Nur vlc-1.1.8-orig/configure vlc-1.1.8/configure
---- vlc-1.1.8-orig/configure 2011-03-26 08:21:26.626945001 +0100
-+++ vlc-1.1.8/configure 2011-03-26 08:25:49.246945000 +0100
-@@ -48139,12 +48139,12 @@
+--- configure.orig 2011-04-12 01:54:08.000000000 +0200
++++ configure 2011-05-22 21:56:09.000000000 +0200
+@@ -48989,12 +48989,12 @@
cat >>confdefs.h <<_ACEOF
@@ -16,10 +15,22 @@
_ACEOF
-diff -Nur vlc-1.1.8-orig/configure.ac vlc-1.1.8/configure.ac
---- vlc-1.1.8-orig/configure.ac 2011-03-26 08:21:26.676945001 +0100
-+++ vlc-1.1.8/configure.ac 2011-03-26 08:26:22.758945000 +0100
-@@ -4738,8 +4738,8 @@
+--- src/libvlc.c.orig 2011-01-27 16:50:31.000000000 +0100
++++ src/libvlc.c 2011-05-22 21:56:17.000000000 +0200
+@@ -1922,9 +1922,7 @@
+
+ utf8_fprintf( stdout, _("VLC version %s (%s)\n"), VLC_Version(),
+ psz_vlc_changeset );
+- utf8_fprintf( stdout, _("Compiled by %s on %s (%s)\n"),
+- VLC_CompileBy(), VLC_CompileHost(), __DATE__" "__TIME__ );
+- utf8_fprintf( stdout, _("Compiler: %s\n"), VLC_Compiler() );
++ utf8_fprintf( stdout, "Compiled by the Packman team -- http://packman.links2linux.org\n" );
+ utf8_fprintf( stdout, "%s", LICENSE_MSG );
+
+ #ifdef WIN32 /* Pause the console because it's destroyed when we exit */
+--- configure.ac.orig 2011-04-11 17:00:32.000000000 +0200
++++ configure.ac 2011-05-22 21:56:09.000000000 +0200
+@@ -4744,8 +4744,8 @@
AC_SUBST(VERSION_REVISION)
AC_SUBST(VERSION_EXTRA)
AC_SUBST(COPYRIGHT_YEARS)
@@ -30,3 +41,16 @@
AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler])
dnl Win32 need s a numerical version_extra.
case $( echo ${VERSION_EXTRA}|wc -m ) in
+--- modules/gui/qt4/dialogs/help.cpp.orig 2010-04-13 02:22:27.000000000 +0200
++++ modules/gui/qt4/dialogs/help.cpp 2011-05-22 21:56:17.000000000 +0200
+@@ -117,9 +117,7 @@
+ "VLC uses its internal codecs and works on essentially every "
+ "popular platform.\n\n" )
+ + qtr( "This version of VLC was compiled by:\n " )
+- + qfu( VLC_CompileBy() )+ " on " + qfu( VLC_CompileHost() ) +
+- + " ("__DATE__" "__TIME__").\n"
+- + qtr( "Compiler: " ) + qfu( VLC_Compiler() ) + ".\n"
++ + "the Packman team -- http://packman.links2linux.org\n"
+ + qtr( "You are using the Qt4 Interface.\n\n" )
+ + qtr( "Copyright (C) " ) + COPYRIGHT_YEARS
+ + qtr( " by the VideoLAN Team.\n" )
|
| @@ -1,12 +1,12 @@
-diff -urB vlc-1.1.0-rc4/modules/misc/freetype.c new/modules/misc/freetype.c
---- vlc-1.1.0-rc4/modules/misc/freetype.c 2010-06-16 01:58:09.000000000 +0200
-+++ new/modules/misc/freetype.c 2010-06-16 14:13:35.153090911 +0200
-@@ -67,7 +67,7 @@
- #define DEFAULT_FONT "/usr/share/fonts/nokia/nosnb.ttf"
- #define FC_DEFAULT_FONT "Nokia Sans Bold"
+diff -Nur vlc-1.1.10-orig/modules/misc/freetype.c vlc-1.1.10/modules/misc/freetype.c
+--- vlc-1.1.10-orig/modules/misc/freetype.c 2011-06-07 11:36:07.726672002 +0200
++++ vlc-1.1.10/modules/misc/freetype.c 2011-06-07 11:37:52.884672000 +0200
+@@ -55,7 +55,7 @@
+ # define DEFAULT_FONT_FILE "/usr/share/fonts/nokia/nosnb.ttf"
+ # define DEFAULT_FAMILY "Nokia Sans Bold"
#else
--#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
-+#define DEFAULT_FONT "/usr/share/fonts/truetype/FreeSerifBold.ttf"
- #define FC_DEFAULT_FONT "Serif Bold"
+-# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
++# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/FreeSerifBold.ttf"
+ # define DEFAULT_FAMILY "Serif Bold"
#endif
|
