r1540 - in /lenny/vlc/debian: ./ bug/ patches/
xtophe-guest at users.alioth.debian.org
xtophe-guest at users.alioth.debian.org
Wed Nov 5 23:25:49 UTC 2008
Author: xtophe-guest
Date: Wed Nov 5 23:25:49 2008
New Revision: 1540
URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1540
Log:
Sync with testing-security
Sorry maybe not the best way to retain whole history. Time to switch to git ?
Added:
lenny/vlc/debian/bug/
lenny/vlc/debian/bug/control
lenny/vlc/debian/bug/presubj
lenny/vlc/debian/patches/010_iceape.diff
lenny/vlc/debian/patches/401-CVE-2008-2430.diff
lenny/vlc/debian/patches/405-CVE-2008-3732.diff
lenny/vlc/debian/patches/406-live555-crash.diff
lenny/vlc/debian/patches/407-mms-overflow.diff
lenny/vlc/debian/patches/408-CVE-2008-4686.diff
lenny/vlc/debian/vlc-plugin-jack.install
lenny/vlc/debian/vlc-plugin-jack.links
lenny/vlc/debian/watch
Modified:
lenny/vlc/debian/changelog
lenny/vlc/debian/compat
lenny/vlc/debian/control
lenny/vlc/debian/copyright
lenny/vlc/debian/libvlc0-dev.links
lenny/vlc/debian/mozilla-plugin-vlc.links
lenny/vlc/debian/patches/001_am_maintainer_mode.diff
lenny/vlc/debian/patches/050_bootstrap.diff
lenny/vlc/debian/patches/101_certificates_paths.diff
lenny/vlc/debian/patches/300_manpage_syntax.diff
lenny/vlc/debian/patches/series
lenny/vlc/debian/rules
lenny/vlc/debian/vlc-nox.install
lenny/vlc/debian/vlc-plugin-arts.links
lenny/vlc/debian/vlc-plugin-esd.links
lenny/vlc/debian/vlc-plugin-ggi.links
lenny/vlc/debian/vlc-plugin-glide.links
lenny/vlc/debian/vlc-plugin-sdl.links
lenny/vlc/debian/vlc-plugin-svgalib.links
lenny/vlc/debian/vlc.links
lenny/vlc/debian/vlc.menu
Added: lenny/vlc/debian/bug/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/bug/control?rev=1540&op=file
==============================================================================
--- lenny/vlc/debian/bug/control (added)
+++ lenny/vlc/debian/bug/control Wed Nov 5 23:25:49 2008
@@ -1,0 +1,1 @@
+report-width: vlc vlc-nox libvlc0
Added: lenny/vlc/debian/bug/presubj
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/bug/presubj?rev=1540&op=file
==============================================================================
--- lenny/vlc/debian/bug/presubj (added)
+++ lenny/vlc/debian/bug/presubj Wed Nov 5 23:25:49 2008
@@ -1,0 +1,3 @@
+Make sure you have reset your plugins cache before reporting a bug.
+Use "rm ~/.cache/vlc/plugins-*.dat" to remove your plugins cache.
+
Modified: lenny/vlc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/changelog?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/changelog (original)
+++ lenny/vlc/debian/changelog Wed Nov 5 23:25:49 2008
@@ -1,15 +1,280 @@
-vlc (0.8.6.a.debian-6lenny1) testing-security; urgency=high
-
- * 110_formatstring.diff:
- + Fix format string vulnerabilities (VideoLAN-SA-0702) (Closes: #429726).
- * 111_memleak.diff:
- + Fix memory leaks that can lead to denials of service.
- * 113_overflows.diff:
- + Fix integer and buffer overflows.
- * 112_missingchecks.diff 114_uninitialised.diff:
- + Fix missing checks that can lead to denials of service.
-
- -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 21 Jun 2007 15:31:14 +0000
+vlc (0.8.6.h-4+lenny1) testing-security; urgency=high
+
+ * Non-maintainer upload by the Security Team.
+ * Fix integer overflows that could possibly lead to arbitrary
+ code execution (CVE-2008-4686.diff; Closes: #503118).
+
+ -- Nico Golde <nion at debian.org> Mon, 03 Nov 2008 14:41:58 +0100
+
+vlc (0.8.6.h-4) unstable; urgency=high
+
+ * Security: Fix integer overflow in mms module
+ (Closes: #496265)(407-mms-overflow.diff taken from upstream)
+
+ -- Christophe Mutricy <xtophe at videolan.org> Mon, 25 Aug 2008 01:07:27 +0100
+
+vlc (0.8.6.h-3) unstable; urgency=low
+
+ * Minor cleanups.
+ * Use DEB_HOST_ARCH instead of DEB_BUILD_ARCH in rules.
+ * Use objdump -x instead of ldd to check for links on libX11 as ldd might
+ resolve libvlc to the system's version if the system has libvlc installed;
+ closes: #495730.
+
+ -- Loic Minier <lool at dooz.org> Fri, 22 Aug 2008 19:46:35 +0200
+
+vlc (0.8.6.h-2) unstable; urgency=high
+
+ * Fix integer overflow in TTA (CVE-2008-3732) (405-CVE-2008-3732.diff)
+ * Fix crashes in Live555 (406-live555-crash.diff)
+ * Switch to libdc1394-22-dev (Closes: #484695)
+
+ -- Christophe Mutricy <xtophe at videolan.org> Thu, 21 Aug 2008 20:19:39 +0100
+
+vlc (0.8.6.h-1) unstable; urgency=high
+
+ [ Christophe Mutricy ]
+ * Acknowledge NMU by Nico Golde. Thanks.
+ * Acknowledge NMU by Mike Hommey. Thanks.
+ * New security upstrem release
+ - Fix buffer overflow (CVE-2008-1881)
+ - Fix out of bound array access (CVE-2008-1769)
+ - Fix various integer overflow in MP4 demuxer, Cinepak, RTSP
+ (CVE-2008-1489, CVE-2008-1768)
+ - Remove 105_min_mkv.patch, 400-CVE-2008-1489.diff and
+ 401-CVE-2008-0073.diff, 402-CVE-2008-1881, 403-CVE-2008-1768.diff
+ and 404-CVE-2008-1881 integrated upstream
+ * Remove old transitional packages: vlc-plugin-alsa and wxvlc
+ (Closes: #477543, #477545)
+ * Add some magic for reportbug to ask people to remove their plugin cache
+ and get the info for vlc-nox and libvlc0 also.
+
+ [ Reinhard Tartler ]
+ * added a watch file
+ * new upstream release, refreshing patches
+
+ [ Christophe Mutricy ]
+ * Fix buffer overflow in Wav demux.(CVE-2008-2430)(Closes: #489004)
+ (Patch taken from upstream: 401-CVE-2008-2430.diff)
+
+ -- Christophe Mutricy <xtophe at videolan.org> Sat, 05 Jul 2008 23:45:15 +0100
+
+vlc (0.8.6.e-2.3) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/control: Build depend on iceape-dev >= 1.1.9-4 instead of
+ libxul-dev (Closes: #480812).
+ * debian/patches/010_iceape.diff: configure.ac changes to allow to build
+ against iceape.
+ * debian/patches/050_bootstrap.diff: Corresponding configure changes.
+ * debian/patches/series: Added 010_iceape.diff.
+
+ -- Mike Hommey <glandium at debian.org> Fri, 23 May 2008 21:11:07 +0200
+
+vlc (0.8.6.e-2.1) unstable; urgency=high
+
+ * Non-maintainer upload by the Security Team.
+ * This update addresses the following security issues:
+ - CVE-2008-1769: out-of-bounds array access and memory corruption
+ via a crafted cinepak file (Closes: #478140).
+ - CVE-2008-1768: multiple integer overflow triggering buffer overflows
+ in the mp4 and real demuxer and the cinepak codec (Closes: #478140).
+ - CVE-2008-1881: stack-based buffer overflow in subtitle parsing leading
+ to arbitrary code execution via crafted subtitle file (Closes: #477805).
+
+ -- Nico Golde <nion at debian.org> Sun, 27 Apr 2008 16:17:49 +0200
+
+vlc (0.8.6.e-2) unstable; urgency=high
+
+ [ Christophe Mutricy ]
+ * Acknowledge NMU by Nico Golde. Thanks
+ * New patch taken from upstream to fix an arbitrary code execution.
+ CVE-2008-0073 (Closes: #473057)
+ * New patch to fix FTBS in MKV module
+
+ [ Loic Minier ]
+ * Mention CVE id in 0.8.6.e-1.1.
+
+ -- Christophe Mutricy <xtophe at videolan.org> Sat, 29 Mar 2008 15:04:28 +0000
+
+vlc (0.8.6.e-1.1) unstable; urgency=high
+
+ * Non-maintainer upload by the Security Team.
+ * Fix Integer overflow in MP4_ReadBox_rdrf function
+ that triggers a heap-based buffer overflow via a
+ large atom length value (Closes: #472635); CVE-2008-1489.
+
+ -- Nico Golde <nion at debian.org> Wed, 26 Mar 2008 13:21:44 +0100
+
+vlc (0.8.6.e-1) unstable; urgency=high
+
+ [ Christophe Mutricy ]
+ * New security upstream release
+ - CORE-2008-0130, VideoLAN-SA-0802, CVE-2008-0986: Arbitrary memory
+ overwrite in the MP4 demuxer (Closes: #467652)
+ - Others security fixes already included in the Debian package
+ - Xshm detection fix (Closes: #404361)
+ - Alsa 5.1 fixes
+ - DTS to S/PDIF fixes
+ * patches/
+ - delete the uneeded sec-* patches
+ - delete 100_no_wx_update.diff as the update "feature" has been removed
+ upstream
+
+ [ Loic Minier ]
+ * Urgency high for security bugfix.
+
+ -- Christophe Mutricy <xtophe at videolan.org> Mon, 25 Feb 2008 23:35:24 +0000
+
+vlc (0.8.6.c-6) unstable; urgency=high
+
+ [ Nico Golde ]
+ * This update addresses the following security issues (Closes: #461544).
+ - CVE-2008-0295: Heap-based buffer overflow in real_sdpplin.c
+ which could lead to user-assisted arbitrary code execution
+ via crafted SDP data.
+ - CVE-2008-0296: Heap-based buffer overflow in libaccess_realrtsp plugin
+ which might lead to arbitrary code execution via a crafted RTSP server.
+
+ [ Loic Minier ]
+ * Merge above changes by Nico Golde.
+
+ -- Loic Minier <lool at dooz.org> Mon, 21 Jan 2008 16:16:51 +0100
+
+vlc (0.8.6.c-5) unstable; urgency=low
+
+ [ Christophe Mutricy ]
+ * New vlc-plugin-jack pkg with jack audio_output module
+ (closes: #402252, #444992)
+ * Make all the symlink for /usr/share/${pkg} point to /usr/share/doc/vlc-nox
+ as the plugins depends on vlc-nox and not vlc
+ * debian/control: dpkg-shlibdeps gives the correct depends for
+ vlc-plugin-glide. So drop the hardcoded depends on libglide2
+ * debian/rules: dpkg-shlibdeps now behaves better with libraries without
+ versionned symbol file.
+
+ [ Sam Hocevar ]
+ * debian/control:
+ + Dropped the libcdio-dev versioned build-dep to ease backports.
+
+ [ Loic Minier ]
+ * Ack NMU by Nico Golde; thanks!
+ * Wrap more deps.
+ * Also build vlc-plugin-svgalib package on amd64 as well; build-dep on
+ libsvga1-dev on amd64 too; --enable-svgalib on amd64.
+ * Drop debian/*.dirs.
+ * Only pass --host to configure if DEB_BUILD_GNU_TYPE and DEB_HOST_GNU_TYPE
+ differ.
+ * Pass --quiltrc /dev/null to quilt and use $(QUILT) to invoke quilt.
+ * Bump up Debhelper compatibility level to 6; drop dpkg-dev build-dep.
+ * Add /svn to Vcs-Svn.
+ * Don't run ./vlc as a test if nocheck is given.
+ * Cleanup rules.
+ * Drop vlc-plugin-alsa and wxvlc /u/s/d symlinks as these are dummy packages
+ anyway.
+ * Update menu file.
+
+ -- Loic Minier <lool at dooz.org> Fri, 11 Jan 2008 17:32:36 +0100
+
+vlc (0.8.6.c-4.1) unstable; urgency=high
+
+ * Non-maintainer upload by security team.
+ * This update addresses the following security issues
+ (CVE ids pending; Closes: #458318):
+ - Fix format string issue in internal webserver that could lead to
+ to arbitrary code execution (sec-httpd_formatstring.diff).
+ - Disable m3u EXTVLCOPT parsing if no command line option is specified
+ (--m3u-extvlcopt) to prevent browser plugins to control stream output
+ and thus overwriting arbitrary files of the user running vlc
+ (sec-vlcopt_support.diff).
+ - Fix stack-based buffer overflow in subtitle parsing
+ (sec-subtitle_buffer_overflow.diff).
+ - Fix NULL pointer dereference in the rtsp/rtp module by checking return
+ of the httpd_MsgGet function (sec-rtsp_remote_dos.diff).
+
+ -- Nico Golde <nion at debian.org> Fri, 11 Jan 2008 15:05:10 +0100
+
+vlc (0.8.6.c-4) unstable; urgency=high
+
+ [ Loic Minier ]
+ * Wrap build-deps and deps.
+ * Only suggest videolan-doc; closes: #451914.
+
+ [ Christophe Mutricy ]
+ * Use Vcs- instead of Xs-Vcs-
+ * Add Homepage field to control
+ * Use --ignore-missing-info with dpkg-shlibdeps as glide doesn't provide a
+ versionned .shlibs
+
+ [ Sam Hocevar ]
+ * debian/control:
+ + Build-depend on a newer libcdio-dev to transition to the newer binary
+ packages (Closes: #456390, #456403, #453823).
+ + Depend on ttf-dejavu-core instead of ttf-dejavu (Closes: #445580).
+ + Set policy to 3.7.3.
+ * debian/rules:
+ + Don’t ignore make distclean errors.
+ + Call dh_desktop to register desktop files.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sat, 15 Dec 2007 12:33:48 +0000
+
+vlc (0.8.6.c-3) unstable; urgency=high
+
+ * debian/control:
+ + Removed now useless linux-libc-dev build-dependency (Closes: #430710),
+ thanks to Steve Langasek.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 05 Jul 2007 10:13:42 +0200
+
+vlc (0.8.6.c-2) unstable; urgency=high
+
+ [ Loic Minier ]
+ * Merge the never uploaded 0.8.6.a.debian-7 changelog entry into 0.8.6.c-1.
+
+ [ Christophe Mutricy ]
+ * Build-depends on linux-libc-dev rather than linux-kernel-headers
+ (Closes: #430710 )
+
+ [ Sam Hocevar ]
+ * debian/control:
+ + Build-depend on newer libavcodec libraries.
+ + Build-depend on newer libflac-dev.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Wed, 04 Jul 2007 22:31:32 +0200
+
+vlc (0.8.6.c-1) unstable; urgency=high
+
+ [ Loic Minier ]
+ * New patch, 107_gcc-4.3, fixes missing include causing a build failure with
+ GCC 4.3; thanks Martin Michlmayr; closes: #417750.
+
+ [ Christophe Mutricy ]
+ * No longer build the x264 module as libx264 has been removed from Sid
+ (Closes: #424649, #427283).
+ * New patch, 108_flac-1.1.3 taken from upstream to fix building with
+ libflac8 (Closes: #426673).
+ * Rebuild against new libavcodec and libavformat (Closes: #427573).
+
+ [ Fathi Boudra, Christophe Mutricy ]
+ * New upstream release (Closes: #424915):
+ + multiple format string vulnerabilities (VideoLAN-SA-0207).
+ (Closes: #429726)
+ + media player unspecified Denial Of Service vulnerability (CVE-2007-0256).
+ (Closes: #407290)
+ + missing includes to fix FTBFS with GCC 4.3.0. (Closes: #417750)
+ + fullscreen opens a normal window instead of going fullscreen on amd64.
+ (Closes: #405035)
+ + fix building with libflac8. (Closes: #426673)
+ + The following patches are no longer necessary:
+ 105_audio_format_crash.diff
+ 106_xshm_check.diff
+ 107_gcc-4.3.diff
+ 108_flac-1.1.3.diff
+
+ [ Sam Hocevar ]
+ * Install libtelx_plugin.so in vlc-nox package.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Tue, 26 Jun 2007 01:41:02 +0200
vlc (0.8.6.a.debian-6) unstable; urgency=low
Modified: lenny/vlc/debian/compat
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/compat?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/compat (original)
+++ lenny/vlc/debian/compat Wed Nov 5 23:25:49 2008
@@ -1,1 +1,1 @@
-5
+6
Modified: lenny/vlc/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/control?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/control (original)
+++ lenny/vlc/debian/control Wed Nov 5 23:25:49 2008
@@ -2,20 +2,122 @@
Section: graphics
Priority: optional
Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>, Clément Stenac <zorglub at debian.org>
-Build-Depends: dpkg-dev (>= 1.13.19), debhelper (>= 5.0), dh-buildinfo, quilt, nasm, yasm [amd64 kfreebsd-amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], 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) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], 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 [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libxosd-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev, libnotify-dev, libgtk2.0-dev, python-dev, libx264-dev, libfaad-dev
-Standards-Version: 3.7.2
-XS-Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/vlc
-XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/
+Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
+ Clément Stenac <zorglub at debian.org>,
+ Loic Minier <lool at dooz.org>,
+ Christophe Mutricy <xtophe at videolan.org>
+Build-Depends: debhelper (>= 6),
+ dh-buildinfo,
+ quilt,
+ nasm,
+ yasm [amd64 kfreebsd-amd64],
+ gettext,
+ iceape-dev (>= 1.1.9-4),
+ libgl1-mesa-dev,
+ liba52-0.7.4-dev,
+ libaa1-dev,
+ libarts1-dev (>= 1.4.2),
+ libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libaudiofile-dev,
+ libavahi-client-dev,
+ libavcodec-dev (>= 0.cvs20070307-3),
+ libavformat-dev (>= 0.cvs20070307-3),
+ libcaca-dev (>= 0.99.beta4),
+ libcdio-dev,
+ libdvbpsi4-dev,
+ libdvdnav-dev,
+ libdvdread-dev (>= 0.9.5),
+ libdts-dev,
+ libesd0-dev,
+ libflac-dev (>= 1.1.4-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) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ 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.cvs20070307-3),
+ libpng12-dev,
+ libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3),
+ libsmbclient-dev,
+ libsvga1-dev [amd64 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 [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
+ libxosd-dev,
+ libtwolame-dev (>= 0.3.8),
+ libspeex-dev,
+ libsdl-image1.2-dev,
+ libnotify-dev,
+ libgtk2.0-dev,
+ python-dev,
+ libfaad-dev,
+ libjack-dev
+Standards-Version: 3.7.3
+Homepage: http://www.videolan.org/vlc
+Vcs-Svn: svn://svn.debian.org/svn/pkg-multimedia/unstable/vlc
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/vlc/
Package: vlc
Section: graphics
Architecture: any
-Depends: vlc-nox (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu
-Recommends: videolan-doc
-Suggests: mozilla-plugin-vlc
-Replaces: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0), wxvlc (<< 0.8.5-test3.debian-4), vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
-Conflicts: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0), wxvlc (<< 0.8.5-test3.debian-4), vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
+Depends: vlc-nox (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends},
+ ttf-dejavu-core
+Suggests: mozilla-plugin-vlc,
+ videolan-doc
+Replaces: vlc-plugin-dvb (<< 0.5.2-2),
+ vlc-plugin-xosd (<< 0.5.2-2),
+ vlc-plugin-dv (<< 0.5.2-2),
+ vlc-plugin-mad (<< 0.5.2-2),
+ vlc-mad (<< 0.5.0),
+ vlc-plugin-a52 (<< 0.5.2-2),
+ vlc-plugin-ogg (<< 0.5.2-2),
+ vlc-plugin-lirc (<< 0.5.2-2),
+ vlc-lirc (<< 0.5.0),
+ vlc-plugin-aa (<< 0.5.2-2),
+ vlc-aa (<< 0.5.0),
+ wxvlc (<< 0.8.5-test3.debian-4),
+ vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
+Conflicts: vlc-plugin-dvb (<< 0.5.2-2),
+ vlc-plugin-xosd (<< 0.5.2-2),
+ vlc-plugin-dv (<< 0.5.2-2),
+ vlc-plugin-mad (<< 0.5.2-2),
+ vlc-mad (<< 0.5.0),
+ vlc-plugin-a52 (<< 0.5.2-2),
+ vlc-plugin-ogg (<< 0.5.2-2),
+ vlc-plugin-lirc (<< 0.5.2-2),
+ vlc-lirc (<< 0.5.0),
+ vlc-plugin-aa (<< 0.5.2-2),
+ vlc-aa (<< 0.5.0),
+ wxvlc (<< 0.8.5-test3.debian-4),
+ vlc-plugin-alsa (<< 0.8.5-test3.debian-4)
Provides: mp3-decoder
Description: multimedia player and streamer
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
@@ -37,9 +139,36 @@
Package: vlc-nox
Section: net
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0), wxvlc (<< 0.8.5-test3.debian-4), vlc-plugin-alsa (<< 0.8.5-test3.debian-4), vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
-Conflicts: vlc-plugin-dvb (<< 0.5.2-2), vlc-plugin-xosd (<< 0.5.2-2), vlc-plugin-dv (<< 0.5.2-2), vlc-plugin-mad (<< 0.5.2-2), vlc-mad (<< 0.5.0), vlc-plugin-a52 (<< 0.5.2-2), vlc-plugin-ogg (<< 0.5.2-2), vlc-plugin-lirc (<< 0.5.2-2), vlc-lirc (<< 0.5.0), vlc-plugin-aa (<< 0.5.2-2), vlc-aa (<< 0.5.0), wxvlc (<< 0.8.5-test3.debian-4), vlc-plugin-alsa (<< 0.8.5-test3.debian-4), vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: vlc-plugin-dvb (<< 0.5.2-2),
+ vlc-plugin-xosd (<< 0.5.2-2),
+ vlc-plugin-dv (<< 0.5.2-2),
+ vlc-plugin-mad (<< 0.5.2-2),
+ vlc-mad (<< 0.5.0),
+ vlc-plugin-a52 (<< 0.5.2-2),
+ vlc-plugin-ogg (<< 0.5.2-2),
+ vlc-plugin-lirc (<< 0.5.2-2),
+ vlc-lirc (<< 0.5.0),
+ vlc-plugin-aa (<< 0.5.2-2),
+ vlc-aa (<< 0.5.0),
+ wxvlc (<< 0.8.5-test3.debian-4),
+ vlc-plugin-alsa (<< 0.8.5-test3.debian-4),
+ vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
+Conflicts: vlc-plugin-dvb (<< 0.5.2-2),
+ vlc-plugin-xosd (<< 0.5.2-2),
+ vlc-plugin-dv (<< 0.5.2-2),
+ vlc-plugin-mad (<< 0.5.2-2),
+ vlc-mad (<< 0.5.0),
+ vlc-plugin-a52 (<< 0.5.2-2),
+ vlc-plugin-ogg (<< 0.5.2-2),
+ vlc-plugin-lirc (<< 0.5.2-2),
+ vlc-lirc (<< 0.5.0),
+ vlc-plugin-aa (<< 0.5.2-2),
+ vlc-aa (<< 0.5.0),
+ wxvlc (<< 0.8.5-test3.debian-4),
+ vlc-plugin-alsa (<< 0.8.5-test3.debian-4),
+ vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
Provides: mp3-decoder
Description: multimedia player and streamer (without X support)
VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
@@ -64,7 +193,8 @@
Package: libvlc0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends},
+ ${misc:Depends}
Replaces: vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
Conflicts: vlc (<< 0.8.6-svn20060911.0.8.5-1-svn.debian-3)
Description: multimedia player and streamer library
@@ -78,7 +208,9 @@
Package: libvlc0-dev
Section: libdevel
Architecture: any
-Depends: libvlc0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libvlc0 (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
Description: development files for VLC
This package contains headers and a static library required to build plugins
for VLC, or standalone applications that use VLC features.
@@ -89,7 +221,9 @@
Package: vlc-plugin-esd
Architecture: any
-Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
+Depends: vlc-nox,
+ ${shlibs:Depends},
+ ${misc:Depends}
Conflicts: vlc-esd (<< 0.5.0)
Replaces: vlc-esd (<< 0.5.0)
Description: Esound audio output plugin for VLC
@@ -101,19 +235,11 @@
DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
streams from various network sources.
-Package: vlc-plugin-alsa
-Architecture: all
-Depends: vlc
-Description: dummy transitional package
- This dummy package is now part of VLC.
- .
- VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
- DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
- streams from various network sources.
-
Package: vlc-plugin-sdl
Architecture: any
-Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
+Depends: vlc-nox,
+ ${shlibs:Depends},
+ ${misc:Depends}
Conflicts: vlc-sdl (<< 0.5.0)
Replaces: vlc-sdl (<< 0.5.0)
Description: SDL video and audio output plugin for VLC
@@ -128,7 +254,9 @@
Package: vlc-plugin-ggi
Architecture: any
-Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
+Depends: vlc-nox,
+ ${shlibs:Depends},
+ ${misc:Depends}
Conflicts: vlc-ggi (<< 0.5.0)
Replaces: vlc-ggi (<< 0.5.0)
Description: GGI video output plugin for VLC
@@ -142,7 +270,8 @@
Package: vlc-plugin-glide
Architecture: i386
-Depends: vlc-nox, ${shlibs:Depends}, libglide2
+Depends: vlc-nox,
+ ${shlibs:Depends}
Conflicts: vlc-glide (<< 0.5.0)
Replaces: vlc-glide (<< 0.5.0)
Description: Glide video output plugin for VLC
@@ -156,7 +285,9 @@
Package: vlc-plugin-arts
Architecture: any
-Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
+Depends: vlc-nox,
+ ${shlibs:Depends},
+ ${misc:Depends}
Conflicts: vlc-arts (<< 0.5.0)
Replaces: vlc-arts (<< 0.5.0)
Description: aRts audio output plugin for VLC
@@ -170,7 +301,10 @@
Package: mozilla-plugin-vlc
Architecture: any
-Depends: vlc-nox (= ${binary:Version}), vlc, ${shlibs:Depends}, ${misc:Depends}
+Depends: vlc-nox (= ${binary:Version}),
+ vlc,
+ ${shlibs:Depends},
+ ${misc:Depends}
Description: multimedia plugin for web browsers based on VLC
This plugin adds support for MPEG, MPEG2, DVD, DivX, Ogg/Vorbis and many
more formats to your Gecko-based web browser (Firefox, Galeon, etc.). The
@@ -183,8 +317,10 @@
streams from various network sources.
Package: vlc-plugin-svgalib
-Architecture: i386
-Depends: vlc-nox (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Architecture: amd64 i386
+Depends: vlc-nox (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
Description: SVGAlib video output plugin for VLC
This plugin adds support for SVGAlib to the VLC media player. To
activate it, use the `--vout svgalib' flag or select the `svgalib' video
@@ -195,13 +331,17 @@
DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
streams from various network sources.
-Package: wxvlc
-Architecture: all
-Depends: vlc
-Description: dummy transitional package
- This dummy package is now part of VLC.
- .
- VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
- DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
- streams from various network sources.
-
+Package: vlc-plugin-jack
+Architecture: any
+Depends: vlc-nox (= ${binary:Version}),
+ ${shlibs:Depends},
+ ${misc:Depends}
+Description: Jack audio plugins for VLC
+ These plugins add support for JACK to the VLC media player. To
+ activate the audio output module, use the `--aout jack' flag or
+ select the `jack' audio output plugin from the preferences menu.
+ .
+ VLC is the VideoLAN project's media player. It plays MPEG, MPEG2, MPEG4,
+ DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
+ streams from various network sources.
+
Modified: lenny/vlc/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/copyright?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/copyright (original)
+++ lenny/vlc/debian/copyright Wed Nov 5 23:25:49 2008
@@ -202,7 +202,7 @@
Licensed under the GNU General Public License, version 2 or later.
modules/demux/ty.c:
- Copyright (C) 2005 Neal Symms <tivo at freakinzoo.com>
+ Copyright (C) 2005 Neal Symms <tivo at freakinzoo.com>
2005 Christopher Wingert for tivo-mplayer
Licensed under the GNU General Public License, version 2 or later.
Modified: lenny/vlc/debian/libvlc0-dev.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/libvlc0-dev.links?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/libvlc0-dev.links (original)
+++ lenny/vlc/debian/libvlc0-dev.links Wed Nov 5 23:25:49 2008
@@ -1,1 +1,2 @@
/usr/share/doc/libvlc0 /usr/share/doc/libvlc0-dev
+/usr/share/bug/vlc-nox /usr/share/bug/libvlc0-dev
Modified: lenny/vlc/debian/mozilla-plugin-vlc.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/mozilla-plugin-vlc.links?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/mozilla-plugin-vlc.links (original)
+++ lenny/vlc/debian/mozilla-plugin-vlc.links Wed Nov 5 23:25:49 2008
@@ -1,2 +1,3 @@
/usr/share/doc/vlc /usr/share/doc/mozilla-plugin-vlc
/usr/lib/mozilla/plugins/libvlcplugin.so /usr/lib/mozilla-firefox/plugins/libvlcplugin.so
+/usr/share/bug/vlc-nox /usr/share/bug/mozilla-plugin-vlc
Modified: lenny/vlc/debian/patches/001_am_maintainer_mode.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/patches/001_am_maintainer_mode.diff?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/patches/001_am_maintainer_mode.diff (original)
+++ lenny/vlc/debian/patches/001_am_maintainer_mode.diff Wed Nov 5 23:25:49 2008
@@ -1,8 +1,6 @@
-Index: vlc-0.8.6.a.debian/configure.ac
-===================================================================
---- vlc-0.8.6.a.debian.orig/configure.ac 2007-03-17 00:09:31.000000000 +0100
-+++ vlc-0.8.6.a.debian/configure.ac 2007-03-17 00:09:45.000000000 +0100
-@@ -23,9 +23,6 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -24,9 +24,6 @@ dnl you can specify "--disable-maintaine
dnl automake behavior, you've likely never heard of maintainer mode, so we
dnl can't expect you to enable it manually.
Added: lenny/vlc/debian/patches/010_iceape.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/patches/010_iceape.diff?rev=1540&op=file
==============================================================================
--- lenny/vlc/debian/patches/010_iceape.diff (added)
+++ lenny/vlc/debian/patches/010_iceape.diff Wed Nov 5 23:25:49 2008
@@ -1,0 +1,41 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -5150,9 +5150,9 @@ then
+ if test "${with_mozilla_sdk_path}" = "" -o "${with_mozilla_sdk_path}" = "no"
+ then
+ dnl New firefox-1.5 SDK api
+- PKG_CHECK_MODULES([FIREFOX], [firefox-plugin],
++ PKG_CHECK_MODULES([ICEAPE], [iceape-plugin],
+ [
+- PKG_CHECK_MODULES([FIREFOX_XPCOM], [firefox-xpcom],
++ PKG_CHECK_MODULES([ICEAPE_XPCOM], [iceape-xpcom],
+ [],
+ [
+ PKG_CHECK_MODULES([MOZILLA_NSPR], [mozilla-nspr],
+@@ -5167,7 +5167,7 @@ then
+ ]
+ )
+ ])
+- CPPFLAGS="${CPPFLAGS_save} ${FIREFOX_CFLAGS} ${FIREFOX_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}"
++ CPPFLAGS="${CPPFLAGS_save} ${ICEAPE_CFLAGS} ${ICEAPE_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}"
+ MOZILLA_REQUIRED_HEADERS=1
+ AC_CHECK_HEADERS(mozilla-config.h,,MOZILLA_REQUIRED_HEADERS=0)
+ AC_CHECK_HEADERS(npapi.h,,MOZILLA_REQUIRED_HEADERS=0)
+@@ -5181,7 +5181,7 @@ then
+ fi
+ MOZILLA_REQUIRED_HEADERS=
+ mozilla=:
+- firefox_include=`pkg-config --variable=includedir firefox-plugin`
++ firefox_include=`pkg-config --variable=includedir iceape-plugin`
+ if test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config32.h"; then
+ MOZILLA_CONFIG_H="${firefox_include}/mozilla-config32.h"
+ elif test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config64.h"; then
+@@ -5193,7 +5193,7 @@ then
+ VLC_ADD_LDFLAGS([mozilla], [${X_LIBS} ${X_PRE_LIBS} -lX11 -lXt])
+ fi
+ VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS}])
+- VLC_ADD_LDFLAGS([mozilla],[${FIREFOX_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS} ${MOZILLA_LDFLAGS}])
++ VLC_ADD_LDFLAGS([mozilla],[${ICEAPE_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS} ${MOZILLA_LDFLAGS}])
+ VLC_ADD_PLUGINS([mozilla])
+ MOZILLA_CONFIG=
+ CPPFLAGS="${CPPFLAGS_save}"
Modified: lenny/vlc/debian/patches/050_bootstrap.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/patches/050_bootstrap.diff?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/patches/050_bootstrap.diff (original)
+++ lenny/vlc/debian/patches/050_bootstrap.diff Wed Nov 5 23:25:49 2008
@@ -1,8 +1,61 @@
-Index: vlc-0.8.6.a.debian/configure
-===================================================================
---- vlc-0.8.6.a.debian.orig/configure 2007-03-17 00:16:23.000000000 +0100
-+++ vlc-0.8.6.a.debian/configure 2007-03-17 00:17:21.000000000 +0100
-@@ -2952,10 +2952,6 @@
+--- a/configure
++++ b/configure
+@@ -988,13 +988,13 @@ HAS_WIDL_COMPILER_TRUE
+ HAS_WIDL_COMPILER_FALSE
+ BUILD_ACTIVEX_TRUE
+ BUILD_ACTIVEX_FALSE
+-FIREFOX_CFLAGS
+-FIREFOX_LIBS
++ICEAPE_CFLAGS
++ICEAPE_LIBS
+ MOZILLA_CONFIG
+ SEAMONKEY_CONFIG
+ XULRUNNER_CONFIG
+-FIREFOX_XPCOM_CFLAGS
+-FIREFOX_XPCOM_LIBS
++ICEAPE_XPCOM_CFLAGS
++ICEAPE_XPCOM_LIBS
+ MOZILLA_NSPR_CFLAGS
+ MOZILLA_NSPR_LIBS
+ NSPR_CFLAGS
+@@ -1091,10 +1091,10 @@ GNUTLS_CFLAGS
+ GNUTLS_LIBS
+ MIDL
+ WIDL
+-FIREFOX_CFLAGS
+-FIREFOX_LIBS
+-FIREFOX_XPCOM_CFLAGS
+-FIREFOX_XPCOM_LIBS
++ICEAPE_CFLAGS
++ICEAPE_LIBS
++ICEAPE_XPCOM_CFLAGS
++ICEAPE_XPCOM_LIBS
+ MOZILLA_NSPR_CFLAGS
+ MOZILLA_NSPR_LIBS
+ NSPR_CFLAGS
+@@ -1973,14 +1973,13 @@ Some influential environment variables:
+ GNUTLS_LIBS linker flags for GNUTLS, overriding pkg-config
+ MIDL Microsoft IDL compiler (Win32 platform only)
+ WIDL Wine IDL compiler (requires Wine SDK)
+- FIREFOX_CFLAGS
+- C compiler flags for FIREFOX, overriding pkg-config
+- FIREFOX_LIBS
+- linker flags for FIREFOX, overriding pkg-config
+- FIREFOX_XPCOM_CFLAGS
+- C compiler flags for FIREFOX_XPCOM, overriding pkg-config
+- FIREFOX_XPCOM_LIBS
+- linker flags for FIREFOX_XPCOM, overriding pkg-config
++ ICEAPE_CFLAGS
++ C compiler flags for ICEAPE, overriding pkg-config
++ ICEAPE_LIBS linker flags for ICEAPE, overriding pkg-config
++ ICEAPE_XPCOM_CFLAGS
++ C compiler flags for ICEAPE_XPCOM, overriding pkg-config
++ ICEAPE_XPCOM_LIBS
++ linker flags for ICEAPE_XPCOM, overriding pkg-config
+ MOZILLA_NSPR_CFLAGS
+ C compiler flags for MOZILLA_NSPR, overriding pkg-config
+ MOZILLA_NSPR_LIBS
+@@ -3023,11 +3022,6 @@ ac_config_headers="$ac_config_headers co
@@ -10,6 +63,404 @@
- enable_maintainer_mode="yes"
-fi
-
-
+-
{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
+ # Check whether --enable-maintainer-mode was given.
+@@ -6577,7 +6571,7 @@ ia64-*-hpux*)
+ ;;
+ *-*-irix6*)
+ # Find out which ABI we are using.
+- echo '#line 6580 "configure"' > conftest.$ac_ext
++ echo '#line 6574 "configure"' > conftest.$ac_ext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+@@ -9216,11 +9210,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9219: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9213: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9223: \$? = $ac_status" >&5
++ echo "$as_me:9217: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -9506,11 +9500,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9509: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9503: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:9513: \$? = $ac_status" >&5
++ echo "$as_me:9507: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -9610,11 +9604,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:9613: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:9607: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:9617: \$? = $ac_status" >&5
++ echo "$as_me:9611: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -11987,7 +11981,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 11990 "configure"
++#line 11984 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -12087,7 +12081,7 @@ else
+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+ lt_status=$lt_dlunknown
+ cat > conftest.$ac_ext <<EOF
+-#line 12090 "configure"
++#line 12084 "configure"
+ #include "confdefs.h"
+
+ #if HAVE_DLFCN_H
+@@ -14488,11 +14482,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14491: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14485: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:14495: \$? = $ac_status" >&5
++ echo "$as_me:14489: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -14592,11 +14586,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:14595: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:14589: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:14599: \$? = $ac_status" >&5
++ echo "$as_me:14593: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -16190,11 +16184,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16193: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16187: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:16197: \$? = $ac_status" >&5
++ echo "$as_me:16191: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -16294,11 +16288,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:16297: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:16291: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:16301: \$? = $ac_status" >&5
++ echo "$as_me:16295: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -18514,11 +18508,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18517: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18511: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18521: \$? = $ac_status" >&5
++ echo "$as_me:18515: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -18804,11 +18798,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18807: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18801: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>conftest.err)
+ ac_status=$?
+ cat conftest.err >&5
+- echo "$as_me:18811: \$? = $ac_status" >&5
++ echo "$as_me:18805: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s "$ac_outfile"; then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings other than the usual output.
+@@ -18908,11 +18902,11 @@ else
+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
+ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
+ -e 's:$: $lt_compiler_flag:'`
+- (eval echo "\"\$as_me:18911: $lt_compile\"" >&5)
++ (eval echo "\"\$as_me:18905: $lt_compile\"" >&5)
+ (eval "$lt_compile" 2>out/conftest.err)
+ ac_status=$?
+ cat out/conftest.err >&5
+- echo "$as_me:18915: \$? = $ac_status" >&5
++ echo "$as_me:18909: \$? = $ac_status" >&5
+ if (exit $ac_status) && test -s out/conftest2.$ac_objext
+ then
+ # The compiler can only warn and ignore the option if not recognized
+@@ -62427,20 +62421,20 @@ then
+ then
+
+ pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for FIREFOX" >&5
+-echo $ECHO_N "checking for FIREFOX... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for ICEAPE" >&5
++echo $ECHO_N "checking for ICEAPE... $ECHO_C" >&6; }
+
+ if test -n "$PKG_CONFIG"; then
+- if test -n "$FIREFOX_CFLAGS"; then
+- pkg_cv_FIREFOX_CFLAGS="$FIREFOX_CFLAGS"
++ if test -n "$ICEAPE_CFLAGS"; then
++ pkg_cv_ICEAPE_CFLAGS="$ICEAPE_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin\"") >&5
+- ($PKG_CONFIG --exists --print-errors "firefox-plugin") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"iceape-plugin\"") >&5
++ ($PKG_CONFIG --exists --print-errors "iceape-plugin") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_FIREFOX_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin" 2>/dev/null`
++ pkg_cv_ICEAPE_CFLAGS=`$PKG_CONFIG --cflags "iceape-plugin" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -62449,16 +62443,16 @@ else
+ pkg_failed=untried
+ fi
+ if test -n "$PKG_CONFIG"; then
+- if test -n "$FIREFOX_LIBS"; then
+- pkg_cv_FIREFOX_LIBS="$FIREFOX_LIBS"
++ if test -n "$ICEAPE_LIBS"; then
++ pkg_cv_ICEAPE_LIBS="$ICEAPE_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-plugin\"") >&5
+- ($PKG_CONFIG --exists --print-errors "firefox-plugin") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"iceape-plugin\"") >&5
++ ($PKG_CONFIG --exists --print-errors "iceape-plugin") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_FIREFOX_LIBS=`$PKG_CONFIG --libs "firefox-plugin" 2>/dev/null`
++ pkg_cv_ICEAPE_LIBS=`$PKG_CONFIG --libs "iceape-plugin" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -62477,12 +62471,12 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- FIREFOX_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-plugin"`
++ ICEAPE_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "iceape-plugin"`
+ else
+- FIREFOX_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-plugin"`
++ ICEAPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "iceape-plugin"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+- echo "$FIREFOX_PKG_ERRORS" >&5
++ echo "$ICEAPE_PKG_ERRORS" >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+@@ -62774,27 +62768,27 @@ echo "$as_me: error: Please install the
+
+
+ else
+- FIREFOX_CFLAGS=$pkg_cv_FIREFOX_CFLAGS
+- FIREFOX_LIBS=$pkg_cv_FIREFOX_LIBS
++ ICEAPE_CFLAGS=$pkg_cv_ICEAPE_CFLAGS
++ ICEAPE_LIBS=$pkg_cv_ICEAPE_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+
+
+ pkg_failed=no
+-{ echo "$as_me:$LINENO: checking for FIREFOX_XPCOM" >&5
+-echo $ECHO_N "checking for FIREFOX_XPCOM... $ECHO_C" >&6; }
++{ echo "$as_me:$LINENO: checking for ICEAPE_XPCOM" >&5
++echo $ECHO_N "checking for ICEAPE_XPCOM... $ECHO_C" >&6; }
+
+ if test -n "$PKG_CONFIG"; then
+- if test -n "$FIREFOX_XPCOM_CFLAGS"; then
+- pkg_cv_FIREFOX_XPCOM_CFLAGS="$FIREFOX_XPCOM_CFLAGS"
++ if test -n "$ICEAPE_XPCOM_CFLAGS"; then
++ pkg_cv_ICEAPE_XPCOM_CFLAGS="$ICEAPE_XPCOM_CFLAGS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-xpcom\"") >&5
+- ($PKG_CONFIG --exists --print-errors "firefox-xpcom") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"iceape-xpcom\"") >&5
++ ($PKG_CONFIG --exists --print-errors "iceape-xpcom") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_FIREFOX_XPCOM_CFLAGS=`$PKG_CONFIG --cflags "firefox-xpcom" 2>/dev/null`
++ pkg_cv_ICEAPE_XPCOM_CFLAGS=`$PKG_CONFIG --cflags "iceape-xpcom" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -62803,16 +62797,16 @@ else
+ pkg_failed=untried
+ fi
+ if test -n "$PKG_CONFIG"; then
+- if test -n "$FIREFOX_XPCOM_LIBS"; then
+- pkg_cv_FIREFOX_XPCOM_LIBS="$FIREFOX_XPCOM_LIBS"
++ if test -n "$ICEAPE_XPCOM_LIBS"; then
++ pkg_cv_ICEAPE_XPCOM_LIBS="$ICEAPE_XPCOM_LIBS"
+ else
+ if test -n "$PKG_CONFIG" && \
+- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"firefox-xpcom\"") >&5
+- ($PKG_CONFIG --exists --print-errors "firefox-xpcom") 2>&5
++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"iceape-xpcom\"") >&5
++ ($PKG_CONFIG --exists --print-errors "iceape-xpcom") 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+- pkg_cv_FIREFOX_XPCOM_LIBS=`$PKG_CONFIG --libs "firefox-xpcom" 2>/dev/null`
++ pkg_cv_ICEAPE_XPCOM_LIBS=`$PKG_CONFIG --libs "iceape-xpcom" 2>/dev/null`
+ else
+ pkg_failed=yes
+ fi
+@@ -62831,12 +62825,12 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- FIREFOX_XPCOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "firefox-xpcom"`
++ ICEAPE_XPCOM_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "iceape-xpcom"`
+ else
+- FIREFOX_XPCOM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "firefox-xpcom"`
++ ICEAPE_XPCOM_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "iceape-xpcom"`
+ fi
+ # Put the nasty error message in config.log where it belongs
+- echo "$FIREFOX_XPCOM_PKG_ERRORS" >&5
++ echo "$ICEAPE_XPCOM_PKG_ERRORS" >&5
+
+ { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+@@ -63320,13 +63314,13 @@ echo "${ECHO_T}yes" >&6; }
+ fi
+
+ else
+- FIREFOX_XPCOM_CFLAGS=$pkg_cv_FIREFOX_XPCOM_CFLAGS
+- FIREFOX_XPCOM_LIBS=$pkg_cv_FIREFOX_XPCOM_LIBS
++ ICEAPE_XPCOM_CFLAGS=$pkg_cv_ICEAPE_XPCOM_CFLAGS
++ ICEAPE_XPCOM_LIBS=$pkg_cv_ICEAPE_XPCOM_LIBS
+ { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ :
+ fi
+- CPPFLAGS="${CPPFLAGS_save} ${FIREFOX_CFLAGS} ${FIREFOX_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}"
++ CPPFLAGS="${CPPFLAGS_save} ${ICEAPE_CFLAGS} ${ICEAPE_XPCOM_CFLAGS} ${MOZILLA_NSPR_CFLAGS} ${NSPR_CFLAGS} ${MOZILLA_CPPFLAGS}"
+ MOZILLA_REQUIRED_HEADERS=1
+
+ for ac_header in mozilla-config.h
+@@ -63682,7 +63676,7 @@ echo "$as_me: error: Please install the
+ fi
+ MOZILLA_REQUIRED_HEADERS=
+ mozilla=:
+- firefox_include=`pkg-config --variable=includedir firefox-plugin`
++ firefox_include=`pkg-config --variable=includedir iceape-plugin`
+ if test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config32.h"; then
+ MOZILLA_CONFIG_H="${firefox_include}/mozilla-config32.h"
+ elif test -f "${firefox_include}/mozilla-config.h" -a -f "${firefox_include}/mozilla-config64.h"; then
+@@ -63706,7 +63700,7 @@ echo "$as_me: error: Please install the
+
+
+ for element in mozilla; do
+- eval "LDFLAGS_${element}="'"'"${FIREFOX_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS} ${MOZILLA_LDFLAGS} "'$'"{LDFLAGS_${element}} "'"'
++ eval "LDFLAGS_${element}="'"'"${ICEAPE_LIBS} ${MOZILLA_NSPR_LIBS} ${NSPR_LIBS} ${MOZILLA_LDFLAGS} "'$'"{LDFLAGS_${element}} "'"'
+ am_modules_with_ldflags="${am_modules_with_ldflags} ${element}"
+ done
+
+@@ -64829,7 +64823,7 @@ else
+ JAVA_TEST=Test.java
+ CLASS_TEST=Test.class
+ cat << \EOF > $JAVA_TEST
+-/* #line 64832 "configure" */
++/* #line 64826 "configure" */
+ public class Test {
+ }
+ EOF
+@@ -65005,7 +64999,7 @@ EOF
+ if uudecode$EXEEXT Test.uue; then
+ ac_cv_prog_uudecode_base64=yes
+ else
+- echo "configure: 65008: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
++ echo "configure: 65002: uudecode had trouble decoding base 64 file 'Test.uue'" >&5
+ echo "configure: failed file was:" >&5
+ cat Test.uue >&5
+ ac_cv_prog_uudecode_base64=no
+@@ -65127,7 +65121,7 @@ else
+ JAVA_TEST=Test.java
+ CLASS_TEST=Test.class
+ cat << \EOF > $JAVA_TEST
+-/* #line 65130 "configure" */
++/* #line 65124 "configure" */
+ public class Test {
+ }
+ EOF
+@@ -65164,7 +65158,7 @@ JAVA_TEST=Test.java
+ CLASS_TEST=Test.class
+ TEST=Test
+ cat << \EOF > $JAVA_TEST
+-/* [#]line 65167 "configure" */
++/* [#]line 65161 "configure" */
+ public class Test {
+ public static void main (String args[]) {
+ System.exit (0);
+@@ -67203,13 +67197,13 @@ HAS_WIDL_COMPILER_TRUE!$HAS_WIDL_COMPILE
+ HAS_WIDL_COMPILER_FALSE!$HAS_WIDL_COMPILER_FALSE$ac_delim
+ BUILD_ACTIVEX_TRUE!$BUILD_ACTIVEX_TRUE$ac_delim
+ BUILD_ACTIVEX_FALSE!$BUILD_ACTIVEX_FALSE$ac_delim
+-FIREFOX_CFLAGS!$FIREFOX_CFLAGS$ac_delim
+-FIREFOX_LIBS!$FIREFOX_LIBS$ac_delim
++ICEAPE_CFLAGS!$ICEAPE_CFLAGS$ac_delim
++ICEAPE_LIBS!$ICEAPE_LIBS$ac_delim
+ MOZILLA_CONFIG!$MOZILLA_CONFIG$ac_delim
+ SEAMONKEY_CONFIG!$SEAMONKEY_CONFIG$ac_delim
+ XULRUNNER_CONFIG!$XULRUNNER_CONFIG$ac_delim
+-FIREFOX_XPCOM_CFLAGS!$FIREFOX_XPCOM_CFLAGS$ac_delim
+-FIREFOX_XPCOM_LIBS!$FIREFOX_XPCOM_LIBS$ac_delim
++ICEAPE_XPCOM_CFLAGS!$ICEAPE_XPCOM_CFLAGS$ac_delim
++ICEAPE_XPCOM_LIBS!$ICEAPE_XPCOM_LIBS$ac_delim
+ MOZILLA_NSPR_CFLAGS!$MOZILLA_NSPR_CFLAGS$ac_delim
+ MOZILLA_NSPR_LIBS!$MOZILLA_NSPR_LIBS$ac_delim
+ NSPR_CFLAGS!$NSPR_CFLAGS$ac_delim
Modified: lenny/vlc/debian/patches/101_certificates_paths.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/patches/101_certificates_paths.diff?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/patches/101_certificates_paths.diff (original)
+++ lenny/vlc/debian/patches/101_certificates_paths.diff Wed Nov 5 23:25:49 2008
@@ -1,8 +1,6 @@
-Index: vlc-0.8.6-svn20061012.debian/modules/misc/gnutls.c
-===================================================================
---- vlc-0.8.6-svn20061012.debian.orig/modules/misc/gnutls.c 2006-09-22 17:14:31.000000000 +0200
-+++ vlc-0.8.6-svn20061012.debian/modules/misc/gnutls.c 2007-01-08 02:28:18.000000000 +0100
-@@ -681,6 +681,10 @@
+--- a/modules/misc/gnutls.c
++++ b/modules/misc/gnutls.c
+@@ -714,6 +714,10 @@ gnutls_ClientCreate( tls_t *p_tls )
p_sys->x509_cred, psz_path, VLC_FALSE );
free( psz_path );
}
Modified: lenny/vlc/debian/patches/300_manpage_syntax.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/patches/300_manpage_syntax.diff?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/patches/300_manpage_syntax.diff (original)
+++ lenny/vlc/debian/patches/300_manpage_syntax.diff Wed Nov 5 23:25:49 2008
@@ -2,25 +2,16 @@
===================================================================
--- 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
-@@ -45,7 +45,7 @@
- .B *.mpg, *.vob, *.avi, *.mp3, *.ogg
- Various multimedia file formats
- .TP
--.B dvd://[<device>][@<raw device>][@[<title>][,[<chapter>][,<angle>]]]
-+.B dvd://[<device>][@<raw device>][@[<title>][:[<chapter>][:<angle>]]]
- DVD device (for instance dvd:///dev/dvd). The raw device is optional and
- must have been prepared beforehand.
- .TP
-@@ -69,7 +69,11 @@
+@@ -70,6 +70,11 @@
(close VLC).
.SH SEE ALSO
--.BR vls (1)
+The
+.B videolan-doc
+package contains comprehensive documents on how to use
+.B VLC
+both as a media player and as a streaming server.
- .PP
Online documentation: http://www.videolan.org/doc/
.PP
+ .SH AUTHOR
+
Added: lenny/vlc/debian/patches/401-CVE-2008-2430.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/patches/401-CVE-2008-2430.diff?rev=1540&op=file
==============================================================================
--- lenny/vlc/debian/patches/401-CVE-2008-2430.diff (added)
+++ lenny/vlc/debian/patches/401-CVE-2008-2430.diff Wed Nov 5 23:25:49 2008
@@ -1,0 +1,56 @@
+commit 3de60bf5b886ad81d7c05d68dff7a1ba461c0ac1
+Author: Rémi Denis-Courmont <rdenis at simphalempin.com>
+Date: Sat Jun 28 14:00:57 2008 +0300
+
+ wav: fix integer overflow (CVE-2008-2430)
+
+ When i_size is sufficiently large, we would overflow malloc(), and then
+ overwrite the heap with stream_Read().
+
+ Bug reported by: Alin Rad Pop, Secunia Research.
+
+ (cherry-picked from commit 95e2f0ff579a5b987cbde9454aa1fc86080528e2)
+
+diff --git a/modules/demux/wav.c b/modules/demux/wav.c
+index 0c271d3..045344a 100644
+--- a/modules/demux/wav.c
++++ b/modules/demux/wav.c
+@@ -106,7 +106,8 @@ static int Open( vlc_object_t * p_this )
+ demux_sys_t *p_sys;
+
+ uint8_t *p_peek;
+- unsigned int i_size, i_extended;
++ uint32_t i_size;
++ unsigned int i_extended;
+ char *psz_name;
+
+ WAVEFORMATEXTENSIBLE *p_wf_ext = NULL;
+@@ -139,7 +140,8 @@ static int Open( vlc_object_t * p_this )
+ msg_Err( p_demux, "cannot find 'fmt ' chunk" );
+ goto error;
+ }
+- if( i_size < sizeof( WAVEFORMATEX ) - 2 ) /* XXX -2 isn't a typo */
++ i_size += 2;
++ if( i_size < sizeof( WAVEFORMATEX ) )
+ {
+ msg_Err( p_demux, "invalid 'fmt ' chunk" );
+ goto error;
+@@ -147,14 +149,15 @@ static int Open( vlc_object_t * p_this )
+ stream_Read( p_demux->s, NULL, 8 ); /* Cannot fail */
+
+ /* load waveformatex */
+- p_wf_ext = malloc( __EVEN( i_size ) + 2 );
++ p_wf_ext = malloc( i_size );
+ if( p_wf_ext == NULL )
+ goto error;
+
+ p_wf = (WAVEFORMATEX *)p_wf_ext;
+ p_wf->cbSize = 0;
+- if( stream_Read( p_demux->s,
+- p_wf, __EVEN( i_size ) ) < (int)__EVEN( i_size ) )
++ i_size -= 2;
++ if( stream_Read( p_demux->s, p_wf, i_size ) != (int)i_size
++ || ( ( i_size & 1 ) && stream_Read( p_demux->s, NULL, 1 ) != 1 ) )
+ {
+ msg_Err( p_demux, "cannot load 'fmt ' chunk" );
+ goto error;
Added: lenny/vlc/debian/patches/405-CVE-2008-3732.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/patches/405-CVE-2008-3732.diff?rev=1540&op=file
==============================================================================
--- lenny/vlc/debian/patches/405-CVE-2008-3732.diff (added)
+++ lenny/vlc/debian/patches/405-CVE-2008-3732.diff Wed Nov 5 23:25:49 2008
@@ -1,0 +1,141 @@
+diff --git a/modules/demux/tta.c b/modules/demux/tta.c
+index e400908..eede5bb 100644
+--- a/modules/demux/tta.c
++++ b/modules/demux/tta.c
+@@ -60,10 +60,10 @@ struct demux_sys_t
+ es_out_id_t *p_es;
+
+ /* */
+- int i_totalframes;
+- int i_currentframe;
++ uint32_t i_totalframes;
++ uint32_t i_currentframe;
+ uint32_t *pi_seektable;
+- int i_datalength;
++ uint32_t i_datalength;
+ int i_framelength;
+
+ /* */
+@@ -81,10 +81,11 @@ static int Open( vlc_object_t * p_this )
+ es_format_t fmt;
+ uint8_t *p_peek;
+ uint8_t p_header[22];
+- uint8_t *p_seektable;
+- int i_seektable_size = 0, i;
++ uint8_t *p_fullheader;
++ int i_seektable_size = 0;
+ //char psz_info[4096];
+ //module_t *p_id3;
++ uint32_t i;
+
+ if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 )
+ return VLC_EGENERIC;
+@@ -94,7 +95,7 @@ static int Open( vlc_object_t * p_this )
+ if( !p_demux->b_force ) return VLC_EGENERIC;
+
+ /* User forced */
+- msg_Err( p_demux, "this doesn't look like a flac stream, "
++ msg_Err( p_demux, "this doesn't look like a true-audio stream, "
+ "continuing anyway" );
+ }
+
+@@ -106,11 +107,22 @@ static int Open( vlc_object_t * p_this )
+ p_demux->pf_control = Control;
+ p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+
++ if( !p_sys )
++ return VLC_ENOMEM;
++
++ p_sys->pi_seektable = NULL;
++
+ /* Read the metadata */
+ es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'T', 'T', 'A', '1' ) );
+ fmt.audio.i_channels = GetWLE( &p_header[6] );
+ fmt.audio.i_bitspersample = GetWLE( &p_header[8] );
+ fmt.audio.i_rate = GetDWLE( &p_header[10] );
++ if( fmt.audio.i_rate == 0 || /* Avoid divide by 0 */
++ fmt.audio.i_rate > ( 1 << 20 ) /* Avoid i_framelength overflow */ )
++ {
++ msg_Warn( p_demux, "Wrong sample rate" );
++ goto error;
++ }
+
+ p_sys->i_datalength = GetDWLE( &p_header[14] );
+ p_sys->i_framelength = TTA_FRAMETIME * fmt.audio.i_rate;
+@@ -118,25 +130,36 @@ static int Open( vlc_object_t * p_this )
+ p_sys->i_totalframes = p_sys->i_datalength / p_sys->i_framelength +
+ ((p_sys->i_datalength % p_sys->i_framelength) ? 1 : 0);
+ p_sys->i_currentframe = 0;
++ if( p_sys->i_totalframes > (1 << 29))
++ goto error;
+
+ i_seektable_size = sizeof(uint32_t)*p_sys->i_totalframes;
+- p_seektable = (uint8_t *)malloc( i_seektable_size );
+- stream_Read( p_demux->s, p_seektable, i_seektable_size );
+- p_sys->pi_seektable = (uint32_t *)malloc(i_seektable_size);
+
++ /* Store the header and Seektable for avcodec */
++ fmt.i_extra = 22 + i_seektable_size + 4;
++ fmt.p_extra = p_fullheader = malloc( fmt.i_extra );
++ if( !p_fullheader )
++ goto error;
++
++ memcpy( p_fullheader, p_header, 22 );
++ p_fullheader += 22;
++ if( stream_Read( p_demux->s, p_fullheader, i_seektable_size )
++ != i_seektable_size )
++ goto error;
++
++ p_sys->pi_seektable = calloc( p_sys->i_totalframes, sizeof(uint32_t) );
++ if( !p_sys->pi_seektable )
++ goto error;
+ for( i = 0; i < p_sys->i_totalframes; i++ )
+- p_sys->pi_seektable[i] = GetDWLE( &p_seektable[i*4] );
+-
+- stream_Read( p_demux->s, NULL, 4 ); /* CRC */
++ {
++ p_sys->pi_seektable[i] = GetDWLE( p_fullheader );
++ p_fullheader += 4;
++ }
+
+- /* Store the header and Seektable for avcodec */
+- fmt.i_extra = 22 + (p_sys->i_totalframes * 4) + 4;
+- fmt.p_extra = malloc( fmt.i_extra );
+- memcpy( fmt.p_extra, p_header, 22 );
+- memcpy( fmt.p_extra+22, p_seektable, fmt.i_extra -22 );
++ stream_Read( p_demux->s, p_fullheader, 4 ); /* CRC */
++ p_fullheader += 4;
+
+ p_sys->p_es = es_out_Add( p_demux->out, &fmt );
+- free( p_seektable );
+ p_sys->i_start = stream_Tell( p_demux->s );
+
+ #if 0
+@@ -152,6 +175,10 @@ static int Open( vlc_object_t * p_this )
+ p_sys->p_meta = vlc_meta_New();
+ #endif
+ return VLC_SUCCESS;
++error:
++ es_format_Clean( &fmt );
++ Close( p_this );
++ return VLC_EGENERIC;
+ }
+
+ /*****************************************************************************
+@@ -162,6 +189,7 @@ static void Close( vlc_object_t * p_this )
+ demux_t *p_demux = (demux_t*)p_this;
+ demux_sys_t *p_sys = p_demux->p_sys;
+
++ free( p_sys->pi_seektable );
+ free( p_sys );
+ }
+
+@@ -221,7 +249,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
+ if( i64 > 0 )
+ {
+ int64_t tmp = 0;
+- int i;
++ uint32_t i;
+ for( i=0; i < p_sys->i_totalframes && tmp+p_sys->pi_seektable[i] < i64; i++)
+ {
+ tmp += p_sys->pi_seektable[i];
Added: lenny/vlc/debian/patches/406-live555-crash.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/patches/406-live555-crash.diff?rev=1540&op=file
==============================================================================
--- lenny/vlc/debian/patches/406-live555-crash.diff (added)
+++ lenny/vlc/debian/patches/406-live555-crash.diff Wed Nov 5 23:25:49 2008
@@ -1,0 +1,28 @@
+diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
+index 3c75243..90040d3 100644
+--- a/modules/demux/live555.cpp
++++ b/modules/demux/live555.cpp
+@@ -829,7 +829,8 @@ describe:
+ else
+ {
+ const char *psz_tmp = strstr( psz_error, "RTSP" );
+- sscanf( psz_tmp, "RTSP/%*s%3u", &i_code );
++ if( psz_tmp )
++ sscanf( psz_tmp, "RTSP/%*u.%*u %3u", &i_code );
+ }
+ msg_Dbg( p_demux, "DESCRIBE failed with %d: [%s]", i_code, psz_error );
+
+@@ -869,13 +870,6 @@ describe:
+ p_sys->rtsp = NULL;
+ goto createnew;
+ }
+- else
+- {
+- msg_Dbg( p_demux, "connection timeout, retrying" );
+- if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp );
+- p_sys->rtsp = NULL;
+- goto createnew;
+- }
+ i_ret = VLC_EGENERIC;
+ }
+
Added: lenny/vlc/debian/patches/407-mms-overflow.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/patches/407-mms-overflow.diff?rev=1540&op=file
==============================================================================
--- lenny/vlc/debian/patches/407-mms-overflow.diff (added)
+++ lenny/vlc/debian/patches/407-mms-overflow.diff Wed Nov 5 23:25:49 2008
@@ -1,0 +1,117 @@
+commit 2947f778df4f440ceeb6f5dc1bdb0e9f5cd31e74
+Author: Rémi Denis-Courmont <rdenis at simphalempin.com>
+Date: Sun Aug 24 13:18:01 2008 +0300
+
+ MMS integers handling fixes, including buffer overflow
+
+ Pointed-out-by: Pınar Yanardağ
+ (cherry picked from commit afe3464a1c7c6f9d7640a3f5db17010c34212440)
+
+ Conflicts:
+
+ modules/access/mms/mmstu.c
+
+diff --git a/modules/access/mms/mmstu.c b/modules/access/mms/mmstu.c
+index 61f9e38..df5ec78 100644
+--- a/modules/access/mms/mmstu.c
++++ b/modules/access/mms/mmstu.c
+@@ -28,6 +28,7 @@
+ #include <stdlib.h>
+ #include <vlc/vlc.h>
+ #include <string.h>
++#include <inttypes.h>
+ #include <vlc/input.h>
+ #include <errno.h>
+
+@@ -695,7 +696,7 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto )
+ GetDWLE( p_sys->p_cmd + MMS_CMD_HEADERSIZE + 60 );
+
+ msg_Dbg( p_access,
+- "answer 0x06 flags:0x%8.8x media_length:%us packet_length:%lu packet_count:%u max_bit_rate:%d header_size:%d",
++ "answer 0x06 flags:0x%8.8"PRIx32" media_length:%"PRIu32"s packet_length:%zu packet_count:%"PRIu32" max_bit_rate:%d header_size:%zu",
+ p_sys->i_flags_broadcast,
+ p_sys->i_media_length,
+ p_sys->i_packet_length,
+@@ -749,12 +750,12 @@ static int MMSOpen( access_t *p_access, vlc_url_t *p_url, int i_proto )
+ if( p_sys->i_header >= p_sys->i_header_size )
+ {
+ msg_Dbg( p_access,
+- "header complete(%d)",
++ "header complete(%zu)",
+ p_sys->i_header );
+ break;
+ }
+ msg_Dbg( p_access,
+- "header incomplete (%d/%d), reading more",
++ "header incomplete (%zu/%zu), reading more",
+ p_sys->i_header,
+ p_sys->i_header_size );
+ }
+@@ -1128,7 +1129,7 @@ static int NetFillBuffer( access_t *p_access )
+
+ static int mms_ParseCommand( access_t *p_access,
+ uint8_t *p_data,
+- int i_data,
++ size_t i_data,
+ int *pi_used )
+ {
+ #define GET32( i_pos ) \
+@@ -1137,7 +1138,7 @@ static int mms_ParseCommand( access_t *p_access,
+ ( p_sys->p_cmd[i_pos + 3] << 24 ) )
+
+ access_sys_t *p_sys = p_access->p_sys;
+- int i_length;
++ uint32_t i_length;
+ uint32_t i_id;
+
+ if( p_sys->p_cmd )
+@@ -1159,10 +1160,10 @@ static int mms_ParseCommand( access_t *p_access,
+ i_id = GetDWLE( p_data + 4 );
+ i_length = GetDWLE( p_data + 8 ) + 16;
+
+- if( i_id != 0xb00bface )
++ if( i_id != 0xb00bface || i_length < 16 )
+ {
+ msg_Err( p_access,
+- "incorrect command header (0x%x)", i_id );
++ "incorrect command header (0x%"PRIx32")", i_id );
+ p_sys->i_command = 0;
+ return -1;
+ }
+@@ -1170,8 +1171,8 @@ static int mms_ParseCommand( access_t *p_access,
+ if( i_length > p_sys->i_cmd )
+ {
+ msg_Warn( p_access,
+- "truncated command (missing %d bytes)",
+- i_length - i_data );
++ "truncated command (missing %zu bytes)",
++ (size_t)i_length - i_data );
+ p_sys->i_command = 0;
+ return -1;
+ }
+diff --git a/modules/access/mms/mmstu.h b/modules/access/mms/mmstu.h
+index b265127..8d41fe7 100644
+--- a/modules/access/mms/mmstu.h
++++ b/modules/access/mms/mmstu.h
+@@ -62,10 +62,10 @@ struct access_sys_t
+ int i_packet_seq_num;
+
+ uint8_t *p_cmd; /* latest command read */
+- int i_cmd; /* allocated at the begining */
++ size_t i_cmd; /* allocated at the begining */
+
+ uint8_t *p_header; /* allocated by mms_ReadPacket */
+- int i_header;
++ size_t i_header;
+
+ uint8_t *p_media; /* allocated by mms_ReadPacket */
+ size_t i_media;
+@@ -86,7 +86,7 @@ struct access_sys_t
+ size_t i_packet_length;
+ uint32_t i_packet_count;
+ int i_max_bit_rate;
+- int i_header_size;
++ size_t i_header_size;
+
+ /* */
+ vlc_bool_t b_seekable;
Added: lenny/vlc/debian/patches/408-CVE-2008-4686.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/patches/408-CVE-2008-4686.diff?rev=1540&op=file
==============================================================================
--- lenny/vlc/debian/patches/408-CVE-2008-4686.diff (added)
+++ lenny/vlc/debian/patches/408-CVE-2008-4686.diff Wed Nov 5 23:25:49 2008
@@ -1,0 +1,46 @@
+diff -Nurad vlc-0.8.6.h.orig/modules/demux/ty.c vlc-0.8.6.h/modules/demux/ty.c
+--- vlc-0.8.6.h.orig/modules/demux/ty.c 2008-11-01 14:10:36.000000000 +0100
++++ vlc-0.8.6.h/modules/demux/ty.c 2008-11-01 14:19:52.000000000 +0100
+@@ -129,8 +129,8 @@
+ mtime_t lastVideoPTS;
+
+ ty_rec_hdr_t *rec_hdrs; /* record headers array */
+- int i_cur_rec; /* current record in this chunk */
+- int i_num_recs; /* number of recs in this chunk */
++ unsigned i_cur_rec; /* current record in this chunk */
++ unsigned i_num_recs; /* number of recs in this chunk */
+ int i_seq_rec; /* record number where seq start is */
+ vlc_bool_t eof;
+ vlc_bool_t b_first_chunk;
+@@ -763,7 +763,7 @@
+ {
+ demux_sys_t *p_sys = p_demux->p_sys;
+ int64_t seek_pos = p_sys->i_stream_size * seek_pct;
+- int i;
++ unsigned i;
+ long l_skip_amt;
+
+ /* if we're not seekable, there's nothing to do */
+@@ -856,7 +856,8 @@
+ /* =========================================================================== */
+ static int get_chunk_header(demux_t *p_demux)
+ {
+- int i_readSize, i_num_recs, i;
++ uint32_t i, i_readSize;
++ unsigned i_num_recs;
+ uint8_t packet_header[4];
+ uint8_t record_header[16];
+ ty_rec_hdr_t *p_rec_hdr;
+@@ -914,7 +915,11 @@
+ /* parse headers into array */
+ if (p_sys->rec_hdrs)
+ free(p_sys->rec_hdrs);
+- p_sys->rec_hdrs = malloc(i_num_recs * sizeof(ty_rec_hdr_t));
++ p_sys->rec_hdrs = calloc(i_num_recs, sizeof(ty_rec_hdr_t));
++ if(!p_sys->rec_hdrs){
++ i_num_recs = 0;
++ return;
++ }
+ for (i = 0; i < i_num_recs; i++)
+ {
+ i_readSize = stream_Read( p_demux->s, record_header, 16 );
Modified: lenny/vlc/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/patches/series?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/patches/series (original)
+++ lenny/vlc/debian/patches/series Wed Nov 5 23:25:49 2008
@@ -1,16 +1,14 @@
001_am_maintainer_mode.diff
+010_iceape.diff
050_bootstrap.diff
-100_no_wx_updates.diff
101_certificates_paths.diff
102_dejavu_font.diff
103_kfreebsd.diff
104_notify.diff
-105_audio_format_crash.diff
-106_xshm_check.diff
-110_formatstring.diff
-111_memleak.diff
-112_missingchecks.diff
-113_overflows.diff
-114_uninitialised.diff
200_osdmenu_paths.diff
300_manpage_syntax.diff
+401-CVE-2008-2430.diff
+405-CVE-2008-3732.diff
+406-live555-crash.diff
+407-mms-overflow.diff
+408-CVE-2008-4686.diff
Modified: lenny/vlc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/rules?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/rules (original)
+++ lenny/vlc/debian/rules Wed Nov 5 23:25:49 2008
@@ -1,22 +1,20 @@
#!/usr/bin/make -f
-# debian/rules for the VLC media player - uses debhelper.
-# $Id$
-# based on Joey Hess's one.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
+
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
-confflags = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
-
-#
-# Compilation options
-#
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+confflags := --build=$(DEB_BUILD_GNU_TYPE)
+else
+confflags := --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE)
+endif
+
+# how to call quilt
+QUILT := QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
+
+# configure flags
confflags += --enable-release --prefix=/usr
confflags += \
--enable-libtool \
@@ -30,6 +28,7 @@
--disable-qt \
--enable-mad \
--enable-arts \
+ --enable-jack \
--enable-lirc \
--enable-a52 \
--enable-aa \
@@ -75,17 +74,21 @@
--enable-notify \
--enable-faad \
--enable-mediacontrol-bindings \
- --enable-x264 \
+ --disable-x264 \
$(NULL)
-# These ones are only for Linux
+# Linux specific flags
ifeq ($(DEB_HOST_ARCH_OS),linux)
confflags += --enable-alsa --enable-dv --enable-v4l --enable-pvr
endif
-# Glide and svgalib are only for x86 on Linux
-ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),i386)
+# Glide is only for x86 on Linux
+ifeq ($(DEB_HOST_ARCH),i386)
confflags += --enable-glide
+endif
+
+# svgalib is only for x86 and x86-64 on Linux
+ifneq ($(filter $(DEB_HOST_ARCH), amd64 i386),)
confflags += --enable-svgalib
endif
@@ -93,34 +96,36 @@
confflags += --enable-dvd --without-dvdcss
# A few shortcuts
-VIDDIR = usr/share/vlc
-PIXDIR = usr/share/pixmaps
+VIDDIR := usr/share/vlc
+PIXDIR := usr/share/pixmaps
build: build-stamp
build-stamp:
dh_testdir
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+ $(QUILT) push -a || test $$? = 2
./configure --enable-static --mandir=$${prefix}/share/man $(confflags)
$(MAKE) src/libvlc.la
cp src/.libs/libvlc.a src/libvlc.a
./configure --mandir=$${prefix}/share/man $(confflags)
$(MAKE)
+ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
# Check which plugins were built and whether they load properly.
./vlc --reset-plugins-cache -l -I rc vlc:quit
endif
- touch build-stamp
+endif
+ touch $@
clean:
dh_testdir
dh_testroot
sed -e '/lib\(alsa\|dvb\|v4l\|pvr\)_/d' debian/vlc-nox.install \
- > debian/vlc-nox.install.kfreebsd-i386
+ >debian/vlc-nox.install.kfreebsd-i386
cp debian/vlc-nox.install.kfreebsd-i386 \
debian/vlc-nox.install.kfreebsd-amd64
rm -f build-stamp
# Clean VLC
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
rm -f src/libvlc.a
# Clean zsh completion stuff
rm -f extras/zsh
@@ -130,7 +135,7 @@
# Remove spurious autotools stuff
rm -f config.log confdefs.h
# Unpatch package
- QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
+ $(QUILT) pop -a -R || test $$? = 2
dh_clean
install: build
@@ -138,7 +143,7 @@
dh_testroot
dh_clean -k
dh_installdirs
- $(MAKE) install DESTDIR=`pwd`/debian/tmp/
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/
cp src/libvlc.a debian/tmp/usr/lib
# Clean up libtool crap
find debian/tmp -name '*.la' -exec rm '{}' ';'
@@ -154,13 +159,16 @@
-mv debian/tmp/$(VIDDIR)/vlc32x32.xpm debian/tmp/$(VIDDIR)/vlc.xpm
# Install stuff
dh_install -si --fail-missing --sourcedir=debian/tmp
+ # install BTS stuff
+ mkdir -p debian/vlc-nox/usr/share/bug/vlc-nox
+ cp debian/bug/* debian/vlc-nox/usr/share/bug/vlc-nox
# Clean up
rm -f debian/vlc/$(VIDDIR)/*.png
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
# Check that we did not install a plugin linked with libX11 in vlc-nox
BORKED=no; \
for file in $$(find debian/vlc-nox/usr/lib/vlc -name '*.so'); do \
- if ldd $$file | grep -q libX11; then \
+ if objdump -x $$file | egrep -q '^ +NEEDED +libX11\.so'; then \
BORKED=yes; \
echo $$file depends on libX11; \
fi; \
@@ -194,6 +202,7 @@
dh_installman doc/vlc-config.1 -p libvlc0-dev
dh_installchangelogs ChangeLog -p vlc-nox
dh_installchangelogs ChangeLog -p libvlc0
+ dh_desktop
dh_strip -s
dh_compress -s
dh_fixperms -s
@@ -205,5 +214,4 @@
dh_builddeb -s
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
-
+.PHONY: build clean install binary-indep binary-arch binary
Modified: lenny/vlc/debian/vlc-nox.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/vlc-nox.install?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/vlc-nox.install (original)
+++ lenny/vlc/debian/vlc-nox.install Wed Nov 5 23:25:49 2008
@@ -39,10 +39,11 @@
usr/lib/vlc/codec/libtwolame_plugin.so
usr/lib/vlc/codec/libpng_plugin.so
usr/lib/vlc/codec/libsvcdsub_plugin.so
+usr/lib/vlc/codec/libtelx_plugin.so
usr/lib/vlc/codec/libcvdsub_plugin.so
usr/lib/vlc/codec/libfake_plugin.so
usr/lib/vlc/codec/libfaad_plugin.so
-usr/lib/vlc/codec/libx264_plugin.so
+usr/lib/vlc/codec/libtelx_plugin.so
usr/lib/vlc/control
usr/lib/vlc/demux
usr/lib/vlc/gui/libncurses_plugin.so
Modified: lenny/vlc/debian/vlc-plugin-arts.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/vlc-plugin-arts.links?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/vlc-plugin-arts.links (original)
+++ lenny/vlc/debian/vlc-plugin-arts.links Wed Nov 5 23:25:49 2008
@@ -1,1 +1,2 @@
-/usr/share/doc/vlc /usr/share/doc/vlc-plugin-arts
+/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-arts
+/usr/share/bug/vlc-nox /usr/share/bug/vlc-plugin-arts
Modified: lenny/vlc/debian/vlc-plugin-esd.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/vlc-plugin-esd.links?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/vlc-plugin-esd.links (original)
+++ lenny/vlc/debian/vlc-plugin-esd.links Wed Nov 5 23:25:49 2008
@@ -1,1 +1,2 @@
-/usr/share/doc/vlc /usr/share/doc/vlc-plugin-esd
+usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-esd
+usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-esd
Modified: lenny/vlc/debian/vlc-plugin-ggi.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/vlc-plugin-ggi.links?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/vlc-plugin-ggi.links (original)
+++ lenny/vlc/debian/vlc-plugin-ggi.links Wed Nov 5 23:25:49 2008
@@ -1,1 +1,2 @@
-/usr/share/doc/vlc /usr/share/doc/vlc-plugin-ggi
+usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-ggi
+usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-ggi
Modified: lenny/vlc/debian/vlc-plugin-glide.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/vlc-plugin-glide.links?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/vlc-plugin-glide.links (original)
+++ lenny/vlc/debian/vlc-plugin-glide.links Wed Nov 5 23:25:49 2008
@@ -1,1 +1,2 @@
-/usr/share/doc/vlc /usr/share/doc/vlc-plugin-glide
+usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-glide
+usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-glide
Added: lenny/vlc/debian/vlc-plugin-jack.install
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/vlc-plugin-jack.install?rev=1540&op=file
==============================================================================
--- lenny/vlc/debian/vlc-plugin-jack.install (added)
+++ lenny/vlc/debian/vlc-plugin-jack.install Wed Nov 5 23:25:49 2008
@@ -1,0 +1,1 @@
+usr/lib/vlc/audio_output/libjack_plugin.so
Added: lenny/vlc/debian/vlc-plugin-jack.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/vlc-plugin-jack.links?rev=1540&op=file
==============================================================================
--- lenny/vlc/debian/vlc-plugin-jack.links (added)
+++ lenny/vlc/debian/vlc-plugin-jack.links Wed Nov 5 23:25:49 2008
@@ -1,0 +1,2 @@
+usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-jack
+usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-jack
Modified: lenny/vlc/debian/vlc-plugin-sdl.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/vlc-plugin-sdl.links?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/vlc-plugin-sdl.links (original)
+++ lenny/vlc/debian/vlc-plugin-sdl.links Wed Nov 5 23:25:49 2008
@@ -1,1 +1,2 @@
-/usr/share/doc/vlc /usr/share/doc/vlc-plugin-sdl
+usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-sdl
+usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-sdl
Modified: lenny/vlc/debian/vlc-plugin-svgalib.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/vlc-plugin-svgalib.links?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/vlc-plugin-svgalib.links (original)
+++ lenny/vlc/debian/vlc-plugin-svgalib.links Wed Nov 5 23:25:49 2008
@@ -1,1 +1,2 @@
-/usr/share/doc/vlc /usr/share/doc/vlc-plugin-svgalib
+usr/share/doc/vlc-nox usr/share/doc/vlc-plugin-svgalib
+usr/share/bug/vlc-nox usr/share/bug/vlc-plugin-svgalib
Modified: lenny/vlc/debian/vlc.links
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/vlc.links?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/vlc.links (original)
+++ lenny/vlc/debian/vlc.links Wed Nov 5 23:25:49 2008
@@ -1,3 +1,5 @@
+/usr/share/doc/vlc-nox /usr/share/doc/vlc
/usr/share/vlc/vlc.xpm /usr/share/vlc/wxvlc.xpm
/usr/share/man/man1/vlc.1.gz /usr/share/man/man1/svlc.1.gz
/usr/share/man/man1/vlc.1.gz /usr/share/man/man1/wxvlc.1.gz
+/usr/share/bug/vlc-nox /usr/share/bug/vlc
Modified: lenny/vlc/debian/vlc.menu
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/vlc.menu?rev=1540&op=diff
==============================================================================
--- lenny/vlc/debian/vlc.menu (original)
+++ lenny/vlc/debian/vlc.menu Wed Nov 5 23:25:49 2008
@@ -1,3 +1,3 @@
?package(vlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
- section="Apps/Viewers" title="VLC media player" \
+ section="Applications/Viewers" title="VLC media player" \
icon="/usr/share/vlc/vlc.xpm" hints="Video"
Added: lenny/vlc/debian/watch
URL: http://svn.debian.org/wsvn/pkg-multimedia/lenny/vlc/debian/watch?rev=1540&op=file
==============================================================================
--- lenny/vlc/debian/watch (added)
+++ lenny/vlc/debian/watch Wed Nov 5 23:25:49 2008
@@ -1,0 +1,4 @@
+version=3
+
+opts="dversionmangle=s/(\d\.\d\.\d).([a-z])/$1$2/" \
+ http://download.videolan.org/pub/videolan/vlc/([\d\.]+[a-z])\/vlc-([\d\.]+[a-z])\.tar\.gz
More information about the pkg-multimedia-commits
mailing list