r1054 - in /videolan/vlc/debian/patches: 101_certificates_paths.diff 102_dejavu_font.diff 104_notify.diff 200_osdmenu_paths.diff 300_manpage_syntax.diff
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Mon Feb 11 22:50:46 UTC 2008
Author: xtophe-guest
Date: Mon Feb 11 22:50:46 2008
New Revision: 1054
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1054
Log:
Refresh patches
Modified:
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
videolan/vlc/debian/patches/300_manpage_syntax.diff
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=1054&op=diff
==============================================================================
--- videolan/vlc/debian/patches/101_certificates_paths.diff (original)
+++ videolan/vlc/debian/patches/101_certificates_paths.diff Mon Feb 11 22:50:46 2008
@@ -1,8 +1,8 @@
Index: vlc-debian/modules/misc/gnutls.c
===================================================================
---- 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 @@
+--- vlc-debian.orig/modules/misc/gnutls.c 2008-01-20 00:15:12.000000000 +0000
++++ vlc-debian/modules/misc/gnutls.c 2008-02-11 20:52:08.000000000 +0000
+@@ -729,6 +724,10 @@
sprintf (path, "%s/ca-certificates.crt", datadir);
gnutls_Addx509File (VLC_OBJECT (p_session),
p_sys->x509_cred, path, VLC_FALSE);
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=1054&op=diff
==============================================================================
--- videolan/vlc/debian/patches/102_dejavu_font.diff (original)
+++ videolan/vlc/debian/patches/102_dejavu_font.diff Mon Feb 11 22:50:46 2008
@@ -1,8 +1,8 @@
Index: vlc-debian/modules/misc/freetype.c
===================================================================
---- 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 @@
+--- vlc-debian.orig/modules/misc/freetype.c 2008-01-20 00:15:12.000000000 +0000
++++ vlc-debian/modules/misc/freetype.c 2008-02-11 20:52:08.000000000 +0000
+@@ -61,7 +60,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=1054&op=diff
==============================================================================
--- videolan/vlc/debian/patches/104_notify.diff (original)
+++ videolan/vlc/debian/patches/104_notify.diff Mon Feb 11 22:50:46 2008
@@ -1,12 +1,18 @@
Index: vlc-debian/modules/misc/notify/notify.c
===================================================================
---- 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 @@
+--- vlc-debian.orig/modules/misc/notify/notify.c 2008-01-20 00:15:12.000000000 +0000
++++ vlc-debian/modules/misc/notify/notify.c 2008-02-11 20:52:08.000000000 +0000
+@@ -214,13 +219,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 );
+- {
+- const char *data_path = config_GetDataDir ();
+- char buf[strlen (data_path) + sizeof ("/vlc48x48.png")];
+-
+- snprintf (buf, sizeof (buf), "%s/vlc48x48.png", data_path);
+- pix = gdk_pixbuf_new_from_file( buf, &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
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=1054&op=diff
==============================================================================
--- videolan/vlc/debian/patches/200_osdmenu_paths.diff (original)
+++ videolan/vlc/debian/patches/200_osdmenu_paths.diff Mon Feb 11 22:50:46 2008
@@ -1,7 +1,7 @@
Index: vlc-debian/share/osdmenu/default.cfg
===================================================================
---- 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
+--- vlc-debian.orig/share/osdmenu/default.cfg 2008-01-20 00:15:11.000000000 +0000
++++ vlc-debian/share/osdmenu/default.cfg 2008-01-20 00:16:31.000000000 +0000
@@ -1,4 +1,4 @@
-dir share/osdmenu/default
+dir /usr/share/vlc/osdmenu/default
@@ -10,8 +10,8 @@
select selection/play_pause.png
Index: vlc-debian/share/osdmenu/dvd.cfg
===================================================================
---- 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
+--- vlc-debian.orig/share/osdmenu/dvd.cfg 2008-01-20 00:15:11.000000000 +0000
++++ vlc-debian/share/osdmenu/dvd.cfg 2008-01-20 00:16:31.000000000 +0000
@@ -1,4 +1,4 @@
-dir share/osdmenu/dvd
+dir /usr/share/vlc/osdmenu/dvd
@@ -20,9 +20,9 @@
select selection/play.png
Index: vlc-debian/modules/video_filter/osdmenu.c
===================================================================
---- 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 @@
+--- vlc-debian.orig/modules/video_filter/osdmenu.c 2008-01-20 00:15:12.000000000 +0000
++++ vlc-debian/modules/video_filter/osdmenu.c 2008-02-11 20:52:14.000000000 +0000
+@@ -100,7 +104,7 @@
#if defined( WIN32 ) || defined( UNDER_CE )
#define OSD_DEFAULT_CFG "osdmenu/default.cfg"
#else
Modified: videolan/vlc/debian/patches/300_manpage_syntax.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/videolan/vlc/debian/patches/300_manpage_syntax.diff?rev=1054&op=diff
==============================================================================
--- videolan/vlc/debian/patches/300_manpage_syntax.diff (original)
+++ videolan/vlc/debian/patches/300_manpage_syntax.diff Mon Feb 11 22:50:46 2008
@@ -1,7 +1,7 @@
-Index: vlc-0.8.6.a.debian/doc/vlc.1
+Index: vlc-debian/doc/vlc.1
===================================================================
---- vlc-0.8.6.a.debian.orig/doc/vlc.1 2007-03-17 20:16:25.000000000 +0100
-+++ vlc-0.8.6.a.debian/doc/vlc.1 2007-03-17 20:18:24.000000000 +0100
+--- vlc-debian.orig/doc/vlc.1 2008-01-20 00:13:51.000000000 +0000
++++ vlc-debian/doc/vlc.1 2008-01-20 00:16:31.000000000 +0000
@@ -70,6 +70,11 @@
(close VLC).
@@ -14,4 +14,3 @@
Online documentation: http://www.videolan.org/doc/
.PP
.SH AUTHOR
-
More information about the pkg-multimedia-commits
mailing list