r1219 - in /videolan/vlc/debian/patches: 101_certificates_paths.diff 102_dejavu_font.diff 104_notify.diff 200_osdmenu_paths.diff

[xtophe-guest at users.alioth.debian.org]

Author: xtophe-guest
Date: Sun Jun  1 17:16:54 2008
New Revision: 1219

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1219
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

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=1219&op=diff
==============================================================================
--- videolan/vlc/debian/patches/101_certificates_paths.diff (original)
+++ videolan/vlc/debian/patches/101_certificates_paths.diff Sun Jun  1 17:16:54 2008
@@ -1,9 +1,9 @@
 Index: vlc-debian/modules/misc/gnutls.c
 ===================================================================
---- 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", confdir);
+--- vlc-debian.orig/modules/misc/gnutls.c	2008-06-01 00:46:01.000000000 +0200
++++ vlc-debian/modules/misc/gnutls.c	2008-06-01 11:38:57.000000000 +0200
+@@ -688,6 +688,10 @@
+         sprintf (path, "%s/ssl/certs/ca-certificates.crt", confdir);
          gnutls_Addx509File (VLC_OBJECT (p_session),
                              p_sys->x509_cred, path, false);
 +    gnutls_Addx509File( VLC_OBJECT(p_session),

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=1219&op=diff
==============================================================================
--- videolan/vlc/debian/patches/102_dejavu_font.diff (original)
+++ videolan/vlc/debian/patches/102_dejavu_font.diff Sun Jun  1 17:16:54 2008
@@ -1,8 +1,8 @@
 Index: vlc-debian/modules/misc/freetype.c
 ===================================================================
---- 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 @@
+--- vlc-debian.orig/modules/misc/freetype.c	2008-06-01 00:46:01.000000000 +0200
++++ vlc-debian/modules/misc/freetype.c	2008-06-01 11:38:57.000000000 +0200
+@@ -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=1219&op=diff
==============================================================================
--- videolan/vlc/debian/patches/104_notify.diff (original)
+++ videolan/vlc/debian/patches/104_notify.diff Sun Jun  1 17:16:54 2008
@@ -1,8 +1,8 @@
 Index: vlc-debian/modules/misc/notify/notify.c
 ===================================================================
---- 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 @@
+--- vlc-debian.orig/modules/misc/notify/notify.c	2008-06-01 00:46:01.000000000 +0200
++++ vlc-debian/modules/misc/notify/notify.c	2008-06-01 11:38:57.000000000 +0200
+@@ -220,13 +220,7 @@
          free( psz_arturl );
      }
      else /* else we show state-of-the art logo */

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=1219&op=diff
==============================================================================
--- videolan/vlc/debian/patches/200_osdmenu_paths.diff (original)
+++ videolan/vlc/debian/patches/200_osdmenu_paths.diff Sun Jun  1 17:16:54 2008
@@ -1,7 +1,7 @@
 Index: vlc-debian/share/osdmenu/default.cfg
 ===================================================================
---- 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
+--- vlc-debian.orig/share/osdmenu/default.cfg	2008-06-01 00:46:01.000000000 +0200
++++ vlc-debian/share/osdmenu/default.cfg	2008-06-01 11:38:57.000000000 +0200
 @@ -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	2008-01-20 00:15:11.000000000 +0000
-+++ vlc-debian/share/osdmenu/dvd.cfg	2008-01-20 00:16:31.000000000 +0000
+--- vlc-debian.orig/share/osdmenu/dvd.cfg	2008-06-01 00:46:01.000000000 +0200
++++ vlc-debian/share/osdmenu/dvd.cfg	2008-06-01 11:38:57.000000000 +0200
 @@ -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	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 @@
+--- vlc-debian.orig/modules/video_filter/osdmenu.c	2008-06-01 00:46:01.000000000 +0200
++++ vlc-debian/modules/video_filter/osdmenu.c	2008-06-01 11:38:57.000000000 +0200
+@@ -105,7 +105,7 @@
  #if defined( WIN32 ) || defined( UNDER_CE )
  #define OSD_DEFAULT_CFG "osdmenu/default.cfg"
  #else