r898 - in /videolan/vlc/debian/patches: 100_no_wx_updates.diff 101_certificates_paths.diff 102_dejavu_font.diff 104_notify.diff 200_osdmenu_paths.diff
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Thu Oct 18 21:40:10 UTC 2007
Author: xtophe-guest
Date: Thu Oct 18 21:40:09 2007
New Revision: 898
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=898
Log:
refresh all the patches
Modified:
videolan/vlc/debian/patches/100_no_wx_updates.diff
videolan/vlc/debian/patches/101_certificates_paths.diff
videolan/vlc/debian/patches/102_dejavu_font.diff
videolan/vlc/debian/patches/104_notify.diff
videolan/vlc/debian/patches/200_osdmenu_paths.diff
Modified: videolan/vlc/debian/patches/100_no_wx_updates.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/patches/100_no_wx_updates.diff?rev=898&op=diff
==============================================================================
--- videolan/vlc/debian/patches/100_no_wx_updates.diff (original)
+++ videolan/vlc/debian/patches/100_no_wx_updates.diff Thu Oct 18 21:40:09 2007
@@ -1,10 +1,10 @@
-Index: vlc-0.8.6-svn20061012.debian/modules/gui/wxwidgets/interface.cpp
+Index: vlc-debian/modules/gui/wxwidgets/interface.cpp
===================================================================
---- vlc-0.8.6-svn20061012.debian.orig/modules/gui/wxwidgets/interface.cpp 2006-09-18 12:28:21.000000000 +0200
-+++ vlc-0.8.6-svn20061012.debian/modules/gui/wxwidgets/interface.cpp 2007-01-08 02:25:50.000000000 +0100
-@@ -606,8 +606,8 @@
- /* Create the "Help" menu */
- wxMenu *help_menu = new wxMenu;
+--- vlc-debian.orig/modules/gui/wxwidgets/interface.cpp 2007-10-18 22:11:19.000000000 +0100
++++ vlc-debian/modules/gui/wxwidgets/interface.cpp 2007-10-18 22:12:40.000000000 +0100
+@@ -617,8 +617,8 @@
+ help_menu->Append( OnWebHelp_Event, wxU(_("Online Help")) );
+ help_menu->AppendSeparator();
help_menu->Append( About_Event, wxU(_("About...")) );
- help_menu->AppendSeparator();
- help_menu->Append( UpdateVLC_Event, wxU(_("Check for Updates...")) );
Modified: videolan/vlc/debian/patches/101_certificates_paths.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/patches/101_certificates_paths.diff?rev=898&op=diff
==============================================================================
--- videolan/vlc/debian/patches/101_certificates_paths.diff (original)
+++ videolan/vlc/debian/patches/101_certificates_paths.diff Thu Oct 18 21:40:09 2007
@@ -1,10 +1,10 @@
-Index: vlc-trunk/modules/misc/gnutls.c
+Index: vlc-debian/modules/misc/gnutls.c
===================================================================
---- vlc-trunk/modules/misc/gnutls.c (revision 18345)
-+++ vlc-trunk/modules/misc/gnutls.c (working copy)
-@@ -728,6 +728,10 @@
+--- vlc-debian.orig/modules/misc/gnutls.c 2007-10-18 22:11:19.000000000 +0100
++++ vlc-debian/modules/misc/gnutls.c 2007-10-18 22:12:40.000000000 +0100
+@@ -729,6 +729,10 @@
sprintf (path, "%s/ca-certificates.crt", datadir);
- gnutls_Addx509File ((vlc_object_t *)p_session,
+ gnutls_Addx509File (VLC_OBJECT (p_session),
p_sys->x509_cred, path, VLC_FALSE);
+ gnutls_Addx509File( (vlc_object_t *)p_session,
+ p_sys->x509_cred,
Modified: videolan/vlc/debian/patches/102_dejavu_font.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/patches/102_dejavu_font.diff?rev=898&op=diff
==============================================================================
--- videolan/vlc/debian/patches/102_dejavu_font.diff (original)
+++ videolan/vlc/debian/patches/102_dejavu_font.diff Thu Oct 18 21:40:09 2007
@@ -1,8 +1,8 @@
-Index: vlc-0.8.5-test3.debian/modules/misc/freetype.c
+Index: vlc-debian/modules/misc/freetype.c
===================================================================
---- vlc-0.8.5-test3.debian.orig/modules/misc/freetype.c 2006-04-24 18:20:14.000000000 +0200
-+++ vlc-0.8.5-test3.debian/modules/misc/freetype.c 2006-04-24 18:20:21.000000000 +0200
-@@ -55,7 +55,7 @@
+--- vlc-debian.orig/modules/misc/freetype.c 2007-10-18 22:11:18.000000000 +0100
++++ vlc-debian/modules/misc/freetype.c 2007-10-18 22:12:40.000000000 +0100
+@@ -61,7 +61,7 @@
#define DEFAULT_FONT "" /* Default font found at run-time */
#define FC_DEFAULT_FONT "Arial"
#else
Modified: videolan/vlc/debian/patches/104_notify.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/patches/104_notify.diff?rev=898&op=diff
==============================================================================
--- videolan/vlc/debian/patches/104_notify.diff (original)
+++ videolan/vlc/debian/patches/104_notify.diff Thu Oct 18 21:40:09 2007
@@ -1,14 +1,13 @@
-Index: vlc-0.8.6a.debian/modules/misc/notify/notify.c
+Index: vlc-debian/modules/misc/notify/notify.c
===================================================================
---- vlc-0.8.6a.debian.orig/modules/misc/notify/notify.c 2007-01-03 19:27:57.000000000 +0100
-+++ vlc-0.8.6a.debian/modules/misc/notify/notify.c 2007-01-11 18:30:48.000000000 +0100
-@@ -205,7 +205,7 @@
+--- vlc-debian.orig/modules/misc/notify/notify.c 2007-10-18 22:11:18.000000000 +0100
++++ vlc-debian/modules/misc/notify/notify.c 2007-10-18 22:12:40.000000000 +0100
+@@ -214,7 +214,7 @@
free( psz_arturl );
}
else /* else we show state-of-the art logo */
- pix = gdk_pixbuf_new_from_file( DATA_PATH "/vlc48x48.png", &p_error );
+ pix = gdk_pixbuf_new_from_file( "/usr/share/pixmaps/vlc.png", &p_error );
- /* we need to replace '&' with '&' because '&' is a keyword of
+ /* we need to replace '&' with '&' because '&' is a keyword of
* notification-daemon parser */
-
Modified: videolan/vlc/debian/patches/200_osdmenu_paths.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/patches/200_osdmenu_paths.diff?rev=898&op=diff
==============================================================================
--- videolan/vlc/debian/patches/200_osdmenu_paths.diff (original)
+++ videolan/vlc/debian/patches/200_osdmenu_paths.diff Thu Oct 18 21:40:09 2007
@@ -1,28 +1,28 @@
-Index: vlc-0.8.5-test3.debian/share/osdmenu/default.cfg
+Index: vlc-debian/share/osdmenu/default.cfg
===================================================================
---- vlc-0.8.5-test3.debian.orig/share/osdmenu/default.cfg 2006-04-19 09:25:02.000000000 +0200
-+++ vlc-0.8.5-test3.debian/share/osdmenu/default.cfg 2006-04-24 16:21:46.000000000 +0200
+--- vlc-debian.orig/share/osdmenu/default.cfg 2007-10-18 22:11:17.000000000 +0100
++++ vlc-debian/share/osdmenu/default.cfg 2007-10-18 22:12:41.000000000 +0100
@@ -1,4 +1,4 @@
-dir share/osdmenu/default
+dir /usr/share/vlc/osdmenu/default
action key-play-pause (0,0)
unselect unselected.png
select selection/play_pause.png
-Index: vlc-0.8.5-test3.debian/share/osdmenu/dvd.cfg
+Index: vlc-debian/share/osdmenu/dvd.cfg
===================================================================
---- vlc-0.8.5-test3.debian.orig/share/osdmenu/dvd.cfg 2006-04-19 09:25:02.000000000 +0200
-+++ vlc-0.8.5-test3.debian/share/osdmenu/dvd.cfg 2006-04-24 16:21:46.000000000 +0200
+--- vlc-debian.orig/share/osdmenu/dvd.cfg 2007-10-18 22:11:17.000000000 +0100
++++ vlc-debian/share/osdmenu/dvd.cfg 2007-10-18 22:12:41.000000000 +0100
@@ -1,4 +1,4 @@
-dir share/osdmenu/dvd
+dir /usr/share/vlc/osdmenu/dvd
action key-play (0,0)
unselect unselect/barroff.png
select selection/play.png
-Index: vlc-0.8.5-test3.debian/modules/video_filter/osdmenu.c
+Index: vlc-debian/modules/video_filter/osdmenu.c
===================================================================
---- vlc-0.8.5-test3.debian.orig/modules/video_filter/osdmenu.c 2006-04-19 09:25:11.000000000 +0200
-+++ vlc-0.8.5-test3.debian/modules/video_filter/osdmenu.c 2006-04-24 16:21:46.000000000 +0200
-@@ -92,7 +92,7 @@
+--- vlc-debian.orig/modules/video_filter/osdmenu.c 2007-10-18 22:11:17.000000000 +0100
++++ vlc-debian/modules/video_filter/osdmenu.c 2007-10-18 22:12:41.000000000 +0100
+@@ -96,7 +96,7 @@
#if defined( WIN32 ) || defined( UNDER_CE )
#define OSD_DEFAULT_CFG "osdmenu/default.cfg"
#else
More information about the pkg-multimedia-commits
mailing list