r105 - videolan/vlc/debian

[xtophe-guest at alioth.debian.org]

Author: xtophe-guest
Date: 2006-09-25 21:05:01 +0000 (Mon, 25 Sep 2006)
New Revision: 105

Modified:
   videolan/vlc/debian/changelog
   videolan/vlc/debian/control
Log:
Backport [98]-[100]


Modified: videolan/vlc/debian/changelog
===================================================================
--- videolan/vlc/debian/changelog	2006-09-25 19:47:51 UTC (rev 104)
+++ videolan/vlc/debian/changelog	2006-09-25 21:05:01 UTC (rev 105)
@@ -25,13 +25,29 @@
     + Build-depends on libshout3-dev
 
   * debian/patches
-    + Look at the debian default place for TLS certificates (Closes: #365239)
     + notify.patch: adapt the path for debian system
 
-  * debian/wxvlc.desktop is now supplied by upstream
-
  -- Christophe Mutricy <xtophe at videolan.org>  Wed, 14 Jun 2006 23:16:42 +0100
 
+vlc (0.8.6-svn20060925.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
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org>  Mon, 25 Sep 2006 14:00:46 +0200
+
+>>>>>>> .merge-right.r100
 vlc (0.8.6-svn20060918.debian-1) unstable; urgency=low
 
   * New upstream SVN snapshot, with a slightly saner version number.

Modified: videolan/vlc/debian/control
===================================================================
--- videolan/vlc/debian/control	2006-09-25 19:47:51 UTC (rev 104)
+++ videolan/vlc/debian/control	2006-09-25 21:05:01 UTC (rev 105)
@@ -2,8 +2,10 @@
 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 (>= 5.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, libnotify-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev, libshout3-dev, libqt4-dev, qt4-dev-tools
 Standards-Version: 3.7.2
+XS-X-Vcs-Svn: svn://svn.videolan.org/pkg-multimedia/unstable/vlc/
 
 Package: vlc
 Section: graphics