r99 - tarballs unstable/vlc/debian unstable/vlc/debian/patches

[Samuel Hocevar]

Author: sho
Date: 2006-09-22 16:07:22 +0000 (Fri, 22 Sep 2006)
New Revision: 99

Added:
   tarballs/vlc_0.8.6-svn20060922.debian.orig.tar.gz
   unstable/vlc/debian/patches/020_certificates_paths.diff
Modified:
   unstable/vlc/debian/changelog
   unstable/vlc/debian/control
   unstable/vlc/debian/patches/series
Log:
vlc (0.8.6-svn20060922.debian-1) unstable; urgency=low

  [ Sam Hocevar ]
  * New upstrean SVN snapshot.
  * This release fixes issues with the French Freebox device (Closes: #388332).

  * debian/control:
    + Added Cl?\195?\169ment Stenac to the uploaders.

  * 020_certificates_paths.diff:
    + New patch from upstream that looks for SSL certificates in
      /etc/ssl/certs/ca-certificates.crt (Closes: #365239).

  [ Cl?\195?\169ment Stenac ]
  * Add VCS information to control

 -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri, 22 Sep 2006 17:55:36 +0200


Added: tarballs/vlc_0.8.6-svn20060922.debian.orig.tar.gz
===================================================================
(Binary files differ)


Property changes on: tarballs/vlc_0.8.6-svn20060922.debian.orig.tar.gz
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: unstable/vlc/debian/changelog
===================================================================
--- unstable/vlc/debian/changelog	2006-09-22 13:02:22 UTC (rev 98)
+++ unstable/vlc/debian/changelog	2006-09-22 16:07:22 UTC (rev 99)
@@ -1,9 +1,20 @@
-vlc (0.8.6-svn20060918.debian-2) UNRELEASED; urgency=low
+vlc (0.8.6-svn20060922.debian-1) unstable; urgency=low
 
+  [ Sam Hocevar ]
+  * New upstrean SVN snapshot.
+  * This release fixes issues with the French Freebox device (Closes: #388332).
+
+  * debian/control:
+    + Added Clément Stenac to the uploaders.
+
+  * 020_certificates_paths.diff:
+    + New patch from upstream that looks for SSL certificates in
+      /etc/ssl/certs/ca-certificates.crt (Closes: #365239).
+
   [ Clément Stenac ]
   * Add VCS information to control
 
- -- Clément Stenac <zorglub at debian.org>  Fri, 22 Sep 2006 14:59:10 +0200
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Fri, 22 Sep 2006 17:55:36 +0200
 
 vlc (0.8.6-svn20060918.debian-1) unstable; urgency=low
 

Modified: unstable/vlc/debian/control
===================================================================
--- unstable/vlc/debian/control	2006-09-22 13:02:22 UTC (rev 98)
+++ unstable/vlc/debian/control	2006-09-22 16:07:22 UTC (rev 99)
@@ -2,6 +2,7 @@
 Section: graphics
 Priority: optional
 Maintainer: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
+Uploaders: Clément Stenac <zorglub at debian.org>
 Build-Depends: debhelper (>= 4.0), dh-buildinfo, quilt, nasm, yasm [amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7), xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a), libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060823-1), libavformat-dev (>= 0.cvs20060823-1), libcaca-dev (>= 0.99.beta4-1), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread-dev (>= 0.9.5), libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3), libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2006.03.17), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060823-1), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, zlib1g-dev, libavc1394-dev, libraw1394-dev, libdc1394-13-dev, libxosd-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev
 Standards-Version: 3.7.2
 XS-X-Vcs-Svn: svn://svn.videolan.org/pkg-multimedia/unstable/vlc/

Added: unstable/vlc/debian/patches/020_certificates_paths.diff
===================================================================
--- unstable/vlc/debian/patches/020_certificates_paths.diff	2006-09-22 13:02:22 UTC (rev 98)
+++ unstable/vlc/debian/patches/020_certificates_paths.diff	2006-09-22 16:07:22 UTC (rev 99)
@@ -0,0 +1,15 @@
+Index: vlc-trunk/modules/misc/gnutls.c
+===================================================================
+--- vlc-trunk/modules/misc/gnutls.c	(revision 15766)
++++ vlc-trunk/modules/misc/gnutls.c	(working copy)
+@@ -614,6 +614,10 @@
+                                 p_sys->x509_cred, psz_path, VLC_FALSE );
+             free( psz_path );
+         }
++        gnutls_Addx509File( (vlc_object_t *)p_session,
++                            p_sys->x509_cred,
++                            "/etc/ssl/certs/ca-certificates.crt",VLC_FALSE );
++        
+         p_session->pf_handshake2 = gnutls_HandshakeAndValidate;
+     }
+     else

Modified: unstable/vlc/debian/patches/series
===================================================================
--- unstable/vlc/debian/patches/series	2006-09-22 13:02:22 UTC (rev 98)
+++ unstable/vlc/debian/patches/series	2006-09-22 16:07:22 UTC (rev 99)
@@ -4,3 +4,4 @@
 #020_xulrunner.diff
 020_dejavu_font.diff
 #020_notify.diff
+020_certificates_paths.diff