r89 - in videolan/vlc/debian: . patches
xtophe-guest at alioth.debian.org
xtophe-guest at alioth.debian.org
Wed Mar 14 14:20:22 CET 2007
Author: xtophe-guest
Date: 2006-09-18 19:23:32 +0000 (Mon, 18 Sep 2006)
New Revision: 89
Added:
videolan/vlc/debian/libvlc0-dev.install
videolan/vlc/debian/libvlc0.install
videolan/vlc/debian/mozilla-plugin-vlc.install
videolan/vlc/debian/patches/020_dejavu_font.diff
videolan/vlc/debian/vlc-nox.dirs
videolan/vlc/debian/vlc-nox.install
videolan/vlc/debian/vlc-plugin-arts.install
videolan/vlc/debian/vlc-plugin-esd.install
videolan/vlc/debian/vlc-plugin-ggi.install
videolan/vlc/debian/vlc-plugin-glide.install
videolan/vlc/debian/vlc-plugin-sdl.install
videolan/vlc/debian/vlc-plugin-svgalib.install
videolan/vlc/debian/vlc.install
Removed:
videolan/vlc/debian/patches/020_freetype_font.diff
Modified:
videolan/vlc/debian/README.Debian
videolan/vlc/debian/changelog
videolan/vlc/debian/control
videolan/vlc/debian/copyright
videolan/vlc/debian/patches/series
videolan/vlc/debian/rules
videolan/vlc/debian/vlc.menu
Log:
Synchronise with sam's packaging
Modified: videolan/vlc/debian/README.Debian
===================================================================
--- videolan/vlc/debian/README.Debian 2006-09-18 19:22:24 UTC (rev 88)
+++ videolan/vlc/debian/README.Debian 2006-09-18 19:23:32 UTC (rev 89)
@@ -1,4 +1,4 @@
-$Id: README.Debian 8532 2004-08-27 12:10:17Z sam $
+$Id$
Notes for anyone wanting to build Debian packages of VLC.
@@ -7,11 +7,11 @@
- To build for a Debian woody system, first build a tarball using
"make dist-woody".
- - Usually VLC will come with a copy of ffmpeg, faad2 and x264 in the
+ - Usually VLC will come with a copy of faad2 and x264 in the
extras/ directory, because they are not yet available in Debian.
- If there is no CVS directory in the root, debian/rules will assume a
- full build is requested and will clean ffmpeg, faad2 and x264.
+ full build is requested and will clean faad2 and x264.
- VLC does not link with libdvdcss by default, thus it will not depend
on the libdvdcss packages. However it will use libdvdread that can
Property changes on: videolan/vlc/debian/README.Debian
___________________________________________________________________
Name: svn:keywords
+ Id
Modified: videolan/vlc/debian/changelog
===================================================================
--- videolan/vlc/debian/changelog 2006-09-18 19:22:24 UTC (rev 88)
+++ videolan/vlc/debian/changelog 2006-09-18 19:23:32 UTC (rev 89)
@@ -1,4 +1,4 @@
-vlc (0.8.6-svn1) experimental; urgency=low
+vlc (0.9.0-svn1) experimental; urgency=low
* Add a vlc-dbg package with debugging symbols for vlc.
+ debian/control:
@@ -11,7 +11,7 @@
-- Mohammed Adnène Trojette <adn+deb at diwi.org> Fri, 16 Jun 2006 22:44:24 +0200
-vlc (0.8.6-svn) experimental; urgency=low
+vlc (0.9.0-svn) experimental; urgency=low
* debian/control
+ Build-depends on libshout3-dev
@@ -21,10 +21,91 @@
+ 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-svn20060918.debian-1) unstable; urgency=low
+
+ * New upstream SVN snapshot, with a slightly saner version number.
+ * debian/rules:
+ + Call dh_install with -si so that it does not try to install files that
+ are not for us (Closes: #387873).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 18 Sep 2006 12:38:26 +0200
+
+vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-5) unstable; urgency=low
+
+ * debian/control:
+ + Added proper conflicts/replaces to the libvlc0 package because it
+ overwrites files from old vlc packages (Closes: #387844).
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 17 Sep 2006 01:38:24 +0200
+
+vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-4) unstable; urgency=low
+
+ * debian/control:
+ + Add libsdl-image1.2-dev to the build-dependencies.
+ + Shorten short descriptions and add “without X support” to the vlc-nox
+ short description.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sat, 16 Sep 2006 20:08:53 +0200
+
+vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-3) unstable; urgency=low
+
+ * debian/control:
+ + Distribute libvlc0 in a separate package.
+ + Created vlc-nox package that contains VLC and all its non-X related
+ plugins.
+ * debian/rules:
+ + Use dh_install.
+ + Bail out with an error if a plugin from vlc-nox got linked to libX11.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Thu, 14 Sep 2006 18:39:59 +0200
+
+vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-2) unstable; urgency=low
+
+ * debian/patches/000_dup_builtins.diff:
+ + Fix a powerpc FTBFS due to duplicate libraries in link lines.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 11 Sep 2006 18:32:04 +0200
+
+vlc (0.8.6-svn20060911.0.8.5-1-svn.debian-1) unstable; urgency=low
+
+ * New upstream SVN snapshot, fixes an amd64 FTBFS.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Mon, 11 Sep 2006 13:56:19 +0200
+
+vlc (0.8.6-svn20060910.0.8.5-1-svn.debian-1) unstable; urgency=low
+
+ * New upstream SVN snapshot, from the forthcoming 0.8.5-1 branch.
+ * This branch's playlist window does not crash like the 0.8.6 does
+ (Closes: #375213, #385036, #384869).
+
+ * Upstream fixed implicit pointer functions (Closes: #385192).
+ * Upstream's x264 build system now uses config.guess instead of uname to
+ detect system and CPU types (Closes: #385535).
+ * Upstream removed debug messages from the ts plugin (Closes: #385008,
+ Closes: #385323).
+ * Aspect ration in mkv files was fixed (Closes: #385876).
+
+ * debian/control:
+ + Build-depend on libcaca-dev (>= 0.99.beta4-1) so that we no longer pull
+ useless build dependencies (Closes: #385536).
+ + Have VLC depend on ttf-dejavu again. It's used for subtitles and the
+ default skin.
+ * debian/copyright:
+ + Full copyright holders and license audit (Closes: #324978).
+ * debian/rules:
+ + No longer install old copyright files (Closes: #385200).
+ + Re-activated the speex module (Closes: #386204).
+ + Don't install TTF fonts, use the ones from ttf-dejavu instead.
+
+ * debian/patches/020_freetype_font.diff:
+ + Renamed this patch into 020_dejavu_font.diff and made it use dejavu
+ fonts.
+
+ -- Sam Hocevar (Debian packages) <sam+deb at zoy.org> Sun, 10 Sep 2006 19:02:17 +0200
+
vlc (0.8.6-svn20060823.debian-3) unstable; urgency=low
* debian/control:
Modified: videolan/vlc/debian/control
===================================================================
--- videolan/vlc/debian/control 2006-09-18 19:22:24 UTC (rev 88)
+++ videolan/vlc/debian/control 2006-09-18 19:23:32 UTC (rev 89)
@@ -2,19 +2,19 @@
Section: graphics
Priority: optional
Maintainer: Sam Hocevar (Debian packages) <sam+deb at zoy.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), 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), libshout3-dev, libqt4-dev, qt4-dev-tools
+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, libxosd-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev, libshou+t3-dev, libqt4-dev, qt4-dev-tools
Standards-Version: 3.7.2
Package: vlc
Section: graphics
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: ttf-freefont, videolan-doc
+Depends: vlc-nox (= ${Source-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)
Provides: mp3-decoder
-Description: multimedia player for all audio and video formats
+Description: multimedia player and streamer
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.
@@ -43,10 +43,51 @@
.
This package contains the debugging symbols for vlc.
+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)
+Provides: mp3-decoder
+Description: multimedia player and streamer (without X support)
+ 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.
+ .
+ VLC can also be used as a streaming server that duplicates the stream it
+ reads and multicasts them through the network to other clients, or serves
+ them through HTTP.
+ .
+ VLC has support for on-the-fly transcoding of audio and video formats, either
+ for broadcasting purposes or for movie format transformations. Support for
+ most output methods is provided by this package, but features can be added
+ by installing additional audio plugins (vlc-plugin-esd, vlc-plugin-sdl,
+ vlc-plugin-arts) or video plugins (vlc-plugin-sdl, vlc-plugin-ggi,
+ vlc-plugin-glide, vlc-plugin-svgalib). There is also a web browser plugin
+ in the mozilla-plugin-vlc package.
+ .
+ This package contains a version of VLC that does not require X and that is
+ thus suitable for headless servers.
+
+Package: libvlc0
+Section: libs
+Architecture: any
+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
+ This package contains the shared library required by applications using VLC
+ features.
+ .
+ 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: libvlc0-dev
Section: libdevel
Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: libvlc0 (= ${Source-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.
@@ -57,7 +98,7 @@
Package: vlc-plugin-esd
Architecture: any
-Depends: ${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
@@ -81,7 +122,7 @@
Package: vlc-plugin-sdl
Architecture: any
-Depends: ${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
@@ -96,7 +137,7 @@
Package: vlc-plugin-ggi
Architecture: any
-Depends: ${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
@@ -110,7 +151,7 @@
Package: vlc-plugin-glide
Architecture: i386
-Depends: ${shlibs:Depends}, libglide2
+Depends: vlc-nox, ${shlibs:Depends}, libglide2
Conflicts: vlc-glide (<< 0.5.0)
Replaces: vlc-glide (<< 0.5.0)
Description: Glide video output plugin for VLC
@@ -124,7 +165,7 @@
Package: vlc-plugin-arts
Architecture: any
-Depends: ${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
@@ -138,7 +179,7 @@
Package: mozilla-plugin-vlc
Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: vlc-nox (= ${Source-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
@@ -152,7 +193,7 @@
Package: vlc-plugin-svgalib
Architecture: i386
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: vlc-nox (= ${Source-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
Modified: videolan/vlc/debian/copyright
===================================================================
--- videolan/vlc/debian/copyright 2006-09-18 19:22:24 UTC (rev 88)
+++ videolan/vlc/debian/copyright 2006-09-18 19:23:32 UTC (rev 89)
@@ -4,176 +4,563 @@
It was taken from http://download.videolan.org/pub/vlc/, and the source
tarball also contains the faad2 and x264 trees.
-Upstream authors: The VideoLAN Team <videolan at videolan.org>
+1. Copyright holders list
+=========================
-faad2 authors: M. Bakker (mbakker(at)nero.com)
- Alexander Kurpiers (a.kurpiers(at)nt.tu-darmstadt.de)
- Volker Fischer (v.fischer(at)nt.tu-darmstadt.de)
+With the exception of other files mentioned in this document, all code and
+artwork belongs to members of the VideoLAN team <videolan at videolan.org>. See
+each file for precise details about its respective authors.
+ Copyright (c) 1996-2006 Laurent Aimar <fenrir at via.ecp.fr>
+ Marc Ariberti <marcari at via.ecp.fr>
+ Stephan Assmus <stippi at yellowbites.com>
+ Olivier Aubert <oaubert at lisi dot univ-lyon1 dot fr>
+ Sigmund Augdal Helberg <dnumgis at videolan.org>
+ Pierre Baillet <oct at zoy.org>
+ Gildas Bazin <gbazin at videolan.org>
+ Rocky Bernstein <rocky at panix.com>
+ Johan Bilien <jobi at via.ecp.fr>
+ Stéphane Borel <stef at via.ecp.fr>
+ Arnaud de Bossoreille de Ribou <bozo at via.ecp.fr>
+ Filippo Carone <filippo[dontspam]@carone.org>
+ Tony Castley <tony at castley.net>
+ Antoine Cellerier <dionoea at videolan.org>
+ Renaud Dartus <reno at via.ecp.fr>
+ Cyril Deguet <asmax at via.ecp.fr>
+ Rémi Denis-Courmont <rem#videolan.org>
+ Colin Delacroix <colin at zoy.org>
+ Boris Dorès <babal(at)via.ecp.fr>
+ Jean-Marc Dressler <polux at via.ecp.fr>
+ Henri Fallon <henri at via.ecp.fr>
+ Andrew Flintham <amf at cus.org.uk>
+ Damien Fouilleul <Damien.Fouilleul at laposte.net>
+ Alexis Guillard <alexis.guillard at bt.com>
+ Gerald Hansink <gerald.hansink at ordina.nl>
+ Shane Harper <shanegh at optusnet.com.au>
+ Derk-Jan Hartman <hartman at videolan.org>
+ Gaël Hendryckx <jimmy at via.ecp.fr>
+ Sam Hocevar <sam at zoy.org>
+ Eugenio Jarosiewicz <ej0 at cise.ufl.edu>
+ Jon Lech Johansen <jon-vl at nanocrew.net>
+ Michel Kaempf <maxx at via.ecp.fr>
+ Felix Kühne <fkuehne at users.sourceforge.net>
+ Simon Latapie <garf at via.ecp.fr>
+ Pascal Levesque <pascal.levesque at mindready.com>
+ Christophe Massiot <massiot at via.ecp.fr>
+ Loïc Minier <lool at via.ecp.fr>
+ Florian G. Pflug <fgp at phlo.org>
+ Heiko Panther <heiko.panther at web.de>
+ Eric Petit <titer at videolan.org>
+ Benjamin Pracht <bigben at videolan.org>
+ Emmanuel Puig <karibu at videolan.org>
+ Frédéric RUGET <frederic.ruget at free.fr>
+ Jean-Paul Saman <jp_dot_saman#videolan_dot_nl>
+ Arnaud Schauly <gitan at via.ecp.fr>
+ Vincent Seguin <seguin at via.ecp.fr>
+ Richard Shepherd <richard at rshepherd.demon.co.uk>
+ Clément Stenac <zorglub at videolan.org>
+ Peter Surda <shurdeek at panorama.sth.ac.at>
+ Olivier Teulière <ipkiss at via.ecp.fr>
+ Licensed under the GNU General Public License, version 2 or later.
-x264 authors: Laurent Aimar <fenrir at via.ecp.fr>
- Eric Petit <titer at videolan.org>
- Min Chen <chenm001 at 163.com>
- Justin Clay (justin_clay(at)hotmail.com)
- Måns Rullgård (mru(at)mru.ath.cx)
+extras/faad2/common/faad/getopt.c:
+ Copyright (C) 1987, 88, 89, 90, 91, 92, 1993 Free Software Foundation, Inc.
+ Licensed under the GNU General Public License, version 2 or later.
-Most of the VideoLAN code is Copyright 1996-2006 The VideoLAN Team
+extras/faad2/common/mp4ff/drms.c:
+ Copyright (C) 2004 Jon Lech Johansen <jon-vl at nanocrew.net>
+ Sam Hocevar <sam at zoy.org>
+ Licensed under the GNU General Public License, version 2 or later.
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+extras/faad2/plugins/mpeg4ip:
+ Copyright (C) 2003 Bill May wmay at cisco.com
+ Licensed under the GNU General Public License, version 2 or later.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
+extras/faad2/plugins/xmms:
+ Copyright (c) 2002-2004 Frederic Fondriest <frederic.fondriest at laposte.net>
+ Licensed under the GNU General Public license, version 2, as can be seen
+ in http://fondriest.frederic.free.fr/fichiers/xmms-mp4_20050213.tar.bz2,
+ found on the author’s website. This code is not used in the build process
+ hence does not cancel the “version 2 or later” clause for binaries.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+Other files in extras/faad2:
+ Copyright (C) 2003-2005 M. Bakker, Ahead Software AG <mbakker(at)nero.com>
+ Alexander Kurpiers (a.kurpiers(at)nt.tu-darmstadt.de)
+ Volker Fischer (v.fischer(at)nt.tu-darmstadt.de)
+ Gian-Carlo Pascutto (gpascutto(at)nero.com)
+ Licensed under the GNU General Public License, version 2 or later.
-Additional copyrights:
+extras/x264/extras/getopt.c:
+ Copyright (c) 2000 The NetBSD Foundation, Inc.
+ This code is derived from software contributed to The NetBSD Foundation
+ by Dieter Baron and Thomas Klausner.
+ Licensed under the NetBSD license (see below).
-* Some parts of the network layer (src/network, include/vlc_acl.h) are
- Copyright (C) 2002-2004 Rémi Denis-Courmont,
- Copyright (C) 2005 Rémi Denis-Courmont,
- Copyright (C) 2005-2006 Rémi Denis-Courmont and
- Copyright (C) 2006 Rémi Denis-Courmont
+Other files in extras/x264:
+ Copyright (c) 2003-2006 Laurent Aimar <fenrir at via.ecp.fr>
+ Alex Izvorski (aizvorski(at)gmail.com)
+ Alex Wright (alexw0885(at)hotmail.com)
+ Andrew Dunstan
+ bobololo
+ Christian Heine (sennindemokrit(at)gmx.net)
+ Eric Petit <titer at videolan.org>
+ Francesco Corriga
+ Justin Clay (justin_clay(at)hotmail.com)
+ Loren Merritt (lorenm(at)u.washington.edu)
+ Måns Rullgård (mru(at)mru.ath.cx)
+ Michael Niedermayer (michaelni(at)gmx.at)
+ Mike Matsnev (mike(at)po.cs.msu.su)
+ Min Chen <chenm001 at 163.com>
+ Phil Jensen (philj(at)csufresno.edu)
+ Radek Czyz (radoslaw(at)syskin.cjb.net)
+ Riccardo Stievano (walkunafraid(at)tin.it)
+ Tuukka Toivonen (tuukkat(at)ee.oulu.fi)
+ Vincent Torri (Vincent.Torri(at)iecn.u-nancy.fr)
+ Licensed under the GNU General Public License, version 2 or later.
-* The OSD menu (src/osd, modules/video_filter/osdemenu.c) are
- Copyright (C) 2005 M2X
+mozilla/support/npunix.c:
+mozilla/support/npwin.cpp:
+ Copyright (c) 1998 Netscape Communications Corporation
+ dp Suresh <dp at netscape.com>
+ Stephen Mak <smak at sun.com>
+ Advertised as being under the Mozilla Public License, but effectively
+ under the MPL/GPL/LGPL triple license since the Mozilla relicensing,
+ hence used under the GNU General Public License, version 2 or later.
-* Some parts of the unicode handling routines (src/misc/unicode.c) are
- Copyright (C) 1998-2002, Larry Wall
+src/extras/getopt.c:
+src/extras/getopt.h:
+src/extras/getopt1.c:
+ Copyright (c) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97
+ Free Software Foundation, Inc.
+ Licensed under the GNU General Public License, version 2 or later.
-* Some parts of the charset handling routines (src/misc/charset.c) are
- Copyright (C) 2001-2003 The Mape Project
+src/misc/unicode.c:
+ Copyright (c) 2005-2006 Rémi Denis-Courmont <rem # videolan.org>
+ 1998-2002 Larry Wall
+ Licensed under the GNU General Public License, version 2 or later.
-* The XSPF playlist handling code (modules/demux/playlist/xspf and
- modules/misc/playlist/xspf) is
- Copyright (C) 2006 Daniel Stränger <vlc at schmaller dot de>
+src/misc/charset.c:
+ Copyright (c) 2003-2006 Derk-Jan Hartman <thedj at users.sf.net>
+ Christophe Massiot <massiot at via.ecp.fr>
+ Rémi Denis-Courmont <rem#videolan.org>
+ 2001-2003 The Mape Project
+ Karel Zak <zakkr at zf.jcu.cz>
+ Licensed under the GNU General Public License, version 2 or later.
-* Some parts of the TY demux (modules/demux/ty.c) are Copyright (C) 2005
- by Neal Symms (tivo at freakinzoo.com) - February 2005
+Files in loader/:
+ Copyright (C) the Wine project
+ 1993 Robert J. Amstadt
+ 1993, 1994 Martin Ayotte
+ 1994 Eric Youndale & Erik Bos
+ 1995 Thomas Sandford
+ 1995, 1996 Martin von Löwis
+ 1996-1998 Marcus Meissner
+ 1998 Patrick Stridvall
+ 1999 Éric Pouech
+ 1995-1999 Alexandre Julliard
+ 2000 Eugene Kuznetsov (divx at euro.ru)
+ 2005 Rémi Denis-Courmont <rem#videolan.org>
+ Originally distributed under LPGL 2.1 (or later) by the Wine project.
+ Licensed under the GNU General Public License, version 2 or later.
-* The VLC tables for transrating are Copyright (C) 1996, MPEG Software
- Simulation Group. All Rights Reserved.
+Files in intl/:
+ Copyright (C) 1984, 1989, 1990, 1995-2002 Free Software Foundation, Inc.
+ Licensed under the GNU General Public License, version 2 or later.
-* Some parts of the transrating module (modules/stream_out/transrate)
- are Copyright (C) 2003 Antoine Missout, Copyright (C) 2000-2003 Michel
- Lespinasse <walken at zoy.org>, Copyright (C) 1999-2000 Aaron Holtzman
- <aholtzma at ess.engr.uvic.ca>
+include/mmx.h:
+ Copyright (C) 1997-1999 H. Dietz and R. Fisher
+ Licensed under the GNU General Public License, version 2 or later.
-* The Unzip library used in skins2 (modules/gui/skins2/unzip) is
- Copyright (C) 1998-2005 Gilles Vollant and Copyright (c) 1990-2000
- Info-ZIP. All rights reserved.
+Files in modules/gui/skins2/unzip:
+ Copyright (C) 1998-2005 Gilles Vollant
+ Copyright (c) 1990-2000 Info-ZIP. All rights reserved.
+ Licensed under the Info-ZIP license (see below).
-* The GnuTLS module (module/misc/gnutls.c) is Copyright (C) 2004-2006
- Rémi Denis-Courmont
+modules/access/dvb/en50221.c:
+ Copyright (c) 2004-2005 Christophe Massiot <massiot at via.ecp.fr>
+ 2000 Klaus Schmidinger
+ Licensed under the GNU General Public License, version 2 or later.
-* The Xtag XML parser (modules/misc/xml/xtag*) is Copyright (C)
- 2003-2004 Commonwealth Scientific and Industrial Research
+modules/stream_out/transrate/putvlc.h:
+ Copyright (C) 1996, MPEG Software Simulation Group. All Rights Reserved.
+ This file has a purely functional purpose and does henceforth not qualify
+ for copyright.
-* The Real RTSP access plugin (modules/access/rtsp) is Copyright (C)
- 2002-2003 the xine project and Copyright (C) 2002-2004 the xine project
+Other files in modules/stream_out/transrate/:
+ Copyright (C) 2003 Antoine Missout <antoine.missout at metakine.com>
+ Laurent Aimar <fenrir at via.ecp.fr>
+ Christophe Massiot <massiot at via.ecp.fr>
+ 2000-2003 Michel Lespinasse <walken at zoy.org>
+ 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
+ Licensed under the GNU General Public License, version 2 or later.
-* The mono converter (modules/audio_filter/converter/mono.c) is
- Copyright (C) 2006 M2X
+Files in modules/codec/cmml/:
+modules/misc/xml/xtag.c:
+ Copyright (C) 2003-2004 Commonwealth Scientific and Industrial Research
+ Organisation (CSIRO) Australia
+ 2003-2004 Conrad Parker <Conrad.Parker at csiro.au>
+ 2003-2004 Andre Pang <Andre.Pang at csiro.au>
+ 2004 Gildas Bazin <gbazin at videolan.org>
+ Licensed under the GNU General Public License, version 2 or later.
-* The DV access module (modules/access/dv.c) is Copyright (C) 2005 M2X
- and Copyright by Arne Schirmacher <dvgrab at schirmacher.de>
+modules/codec/dvbsub.c:
+ Copyright (c) 2003 Damien LUCAS <damien.lucas at anevia.com>
+ 2003 ANEVIA
+ 2003-2005 Gildas Bazin <gbazin at videolan.org>
+ 2003-2005 Laurent Aimar <fenrir at via.ecp.fr>
+ 2003-2005 Jean-Paul Saman <jpsaman #_at_# m2x dot nl>
+ Licensed under the GNU General Public License, version 2 or later.
-* The VCDx input module (modules/access/vcdx/) is Copyright (C) 2003,
- 2004 Rocky Bernstein <rocky at panix.com>
+Files in modules/video_filter/swscale/:
+ Copyright (C) 1999 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
+ 1999 Franck Sicard <Franck.Sicard at solsoft.fr>
+ 2000 Håkan Hjort <d95hjort at dtek.chalmers.se>
+ 2000 Silicon Integrated System Corp.
+ 2001 Nick Kurshev
+ 2001-2003 Michael Niedermayer <michaelni at gmx.at>
+ 2003-2004 Gildas Bazin <gbazin at videolan.org>
+ 2004 Marc Hoffman <marc.hoffman at analog.com>
+ 2004 Romain Dolbeau <romain at dolbeau.org>
+ Licensed under the GNU General Public License, version 2 or later.
-* Some parts of the V4L input module
- (modules/access/v4l/videodev_mjpeg.h) are Copyright (C) lavrec (see
- http://mjpeg.sourceforge.net)
+modules/misc/playlist/xspf.[ch]:
+modules/demux/playlist/xspf.[ch]:
+ Copyright (c) 2006 Daniel Stränger <vlc at schmaller dot de>
+ 2006 Yoann Peronneau <yoann at videolan.org>
+ Licensed under the GNU General Public License, version 2 or later.
-* Some parts of the FFMPEG encoder is Copyright (C) FFMPEG Project
- Developers
+modules/demux/ty.c:
+ 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.
-* Some parts of the FTP input module (modules/access/ftp.c) are
- Copyright © 2006 Rémi Denis-Courmont
+Files in modules/access/rtsp/:
+ Copyright (c) 2005 Gildas Bazin <gbazin at videolan.org>
+ 2002-2004 the xine project
+ Licensed under the GNU General Public License, version 2 or later.
-* Some parts of the DVB input module (modules/access/dvb/en50221.c) are
- Copyright (C) 2000 Klaus Schmidinger
+modules/access/v4l.c:
+ Copyright (c) 2002-2004 Laurent Aimar <fenrir at via.ecp.fr>
+ 2002-2004 Paul Forgey <paulf at aphrodite dot com>
+ 2002-2004 Gildas Bazin <gbazin at videolan.org>
+ 2002-2004 Benjamin Pracht <bigben at videolan dot org>
+ Licensed under the GNU General Public License, version 2 or later.
-* The XA and VOC demuxers are Copyright (C) 2005 Rémi Denis-Courmont
+modules/access/videodev_mjpeg.h:
+ Copyright (c) 2006 lavrec <http://mjpeg.sourceforge.net>
+ 2006 Rainer Johanni <rainer at johanni.de>
+ Licensed under the GNU General Public License, version 2 or later.
-* The RTCP handling routines (modules/mux/rtp/rtcp,
- modules/mux/rtp/rtp.h) are Copyright (C) 2005 M2X
+Files in src/osd/:
+modules/mux/rtp/rtcp.[ch]:
+modules/mux/rtp/rtp.h:
+ Copyright (c) 2005 M2X
+ 2005 Jean-Paul Saman <jpsaman #_at_# videolan dot org>
+ 2005 Sigmund Augdal Helberg <dnumgis at videolan.org>
+ Licensed under the GNU General Public License, version 2 or later.
-* Some parts of the TS muxer (modules/mux/mpeg/csa*) are Copyright (C)
- 2004-2005 Laurent Aimar and Copyright (C) 2004 Laurent Aimar
+modules/access/dv.c:
+ Copyright (c) 2005 M2X
+ 2005 Jean-Paul Saman <jpsaman #_at_# videolan dot org>
+ Copyright Arne Schirmacher <dvgrab at schirmacher.de>
+ Dan Dennedy <dan at dennedy.org> and others
+ Licensed under the GNU General Public License, version 2 or later.
-* The Swscale module is Copyright (C) 1999, Aaron Holtzman
- <aholtzma at ess.engr.uvic.ca>, Copyright (C) 2001-2003 Michael
- Niedermayer <michaelni at gmx.at>, Copyright (C) 2004 Romain
- Dolbeau <romain at dolbeau.org>, Copyright (C) 2000, Håkan Hjort
- <d95hjort at dtek.chalmers.se> and opyright (C) 2000, Silicon Integrated
- System Corp.
+share/skins2/fonts/FreeSans.ttf:
+share/skins2/fonts/FreeSansBold.ttf:
+ Copyright (C) 2002 Free Software Foundation.
+ Primoz Peterlin <primoz.peterlin at biofiz.mf.uni-lj.si>
+ Licensed under the GNU General Public License, version 2 or later.
-* The CMML decoder (modules/codec/cmml) is Copyright (C) 2003-2004
- Commonwealth Scientific and Industrial Research
+Other files in share/skins2/:
+ Copyright (c) 2006 aLtgLasS <http://www.d-gfx.net.tc/>
+ 1994-1996 Jos Buivenga <http://www.josbuivenga.demon.nl/>
+ Licensed under the Creative Commons Attribution 2.5 Scotland license
-* The DVB subtitles decoder (modules/codec/dvbsub.c) is Copyright (C)
- 2003 ANEVIA
+2. License list
+===============
-* Some MMX routines (include/mmx.h) are Copyright (C) 1997-1999 H. Dietz
- and R. Fisher
+The blurb for the GNU General Publice License, version 2 or later:
-* The binary loader is Copyright 1994 Eric Youndale & Erik Bos,
- Copyright 1995-1996 Martin von Löwis, Copyright 1996-98 Marcus
- Meissner, Copyright 1995 Thomas Sandford, Copyright 1993 Robert J.
- Amstadt, Copyright 1995 Alexandre Julliard, Copyright 2000 Eugene
- Kuznetsov (divx at euro.ru), Copyright (C) 1998 Patrick Stridvall,
- Copyright (C) 1999 Eric Pouech, Copyright (C) 1993-1994 Martin Ayotte.
+ | This program is free software; you can redistribute it and/or modify
+ | it under the terms of the GNU General Public License as published by
+ | the Free Software Foundation; either version 2, or (at your option)
+ | any later version.
+ |
+ | This program is distributed in the hope that it will be useful,
+ | but WITHOUT ANY WARRANTY; without even the implied warranty of
+ | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ | General Public License for more details.
+ |
+ | You should have received a copy of the GNU General Public License
+ | along with this program; if not, write to the Free Software
+ | Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-* The atof and url testsuites (src/test/i18n_atof.c and src/test/url.c)
- are Copyright (C) 2006 Rémi Denis-Courmont
+On Debian GNU/Linux systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
-* Faad2 (extras/faad2) is Copyright (C) 2003-2005 M. Bakker, Ahead
- Software AG, http://www.nero.com
+The NetBSD license:
-* The custom line edit widget in modules/gui/qt4/util/customwidgets is
- Copyright (C) 2004 Daniel Molkentin <molkentin at kde.org>
+ | Redistribution and use in source and binary forms, with or without
+ | modification, are permitted provided that the following conditions
+ | are met:
+ | 1. Redistributions of source code must retain the above copyright
+ | notice, this list of conditions and the following disclaimer.
+ | 2. Redistributions in binary form must reproduce the above copyright
+ | notice, this list of conditions and the following disclaimer in the
+ | documentation and/or other materials provided with the distribution.
+ | 3. All advertising materials mentioning features or use of this software
+ | must display the following acknowledgement:
+ | This product includes software developed by the NetBSD
+ | Foundation, Inc. and its contributors.
+ | 4. Neither the name of The NetBSD Foundation nor the names of its
+ | contributors may be used to endorse or promote products derived
+ | from this software without specific prior written permission.
+ |
+ | THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ | ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ | TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ | PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ | BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ | CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ | SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ | INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ | CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ | ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ | POSSIBILITY OF SUCH DAMAGE.
-* The AppleRemote code in modules/gui/macosx is Copyright (c) 2006
- martinkahr.com. All rights reserved.and released under
- a MIT-style license.
+The Info-ZIP license:
-* The MPEG4IP plugin for Faad2 (extras/faad2/plugins/mpeg4ip) is
- Copyright (C) 2003 Bill May wmay at cisco.com
+ | For the purposes of this copyright and license, "Info-ZIP" is defined as
+ | the following set of individuals:
+ |
+ | Mark Adler, John Bush, Karl Davis, Harald Denker, Jean-Michel Dubois,
+ | Jean-loup Gailly, Hunter Goatley, Ed Gordon, Ian Gorman, Chris Herborth,
+ | Dirk Haase, Greg Hartwig, Robert Heath, Jonathan Hudson, Paul Kienitz,
+ | David Kirschbaum, Johnny Lee, Onno van der Linden, Igor Mandrichenko,
+ | Steve P. Miller, Sergio Monesi, Keith Owens, George Petrov, Greg Roelofs,
+ | Kai Uwe Rommel, Steve Salisbury, Dave Smith, Steven M. Schweda,
+ | Christian Spieler, Cosmin Truta, Antoine Verheijen, Paul von Behren,
+ | Rich Wales, Mike White
+ |
+ | This software is provided "as is," without warranty of any kind, express
+ | or implied. In no event shall Info-ZIP or its contributors be held liable
+ | for any direct, indirect, incidental, special or consequential damages
+ | arising out of the use of or inability to use this software.
+ |
+ | Permission is granted to anyone to use this software for any purpose,
+ | including commercial applications, and to alter it and redistribute it
+ | freely, subject to the following restrictions:
+ |
+ | 1. Redistributions of source code must retain the above copyright notice,
+ | definition, disclaimer, and this list of conditions.
+ |
+ | 2. Redistributions in binary form (compiled executables) must reproduce
+ | the above copyright notice, definition, disclaimer, and this list of
+ | conditions in documentation and/or other materials provided with the
+ | distribution. The sole exception to this condition is redistribution
+ | of a standard UnZipSFX binary (including SFXWiz) as part of a
+ | self-extracting archive; that is permitted without inclusion of this
+ | license, as long as the normal SFX banner has not been removed from
+ | the binary or disabled.
+ |
+ | 3. Altered versions--including, but not limited to, ports to new operating
+ | systems, existing ports with new graphical interfaces, and dynamic,
+ | shared, or static library versions--must be plainly marked as such
+ | and must not be misrepresented as being the original source. Such
+ | altered versions also must not be misrepresented as being Info-ZIP
+ | releases--including, but not limited to, labeling of the altered
+ | versions with the names "Info-ZIP" (or any variation thereof, including,
+ | but not limited to, different capitalizations), "Pocket UnZip," "WiZ"
+ | or "MacZip" without the explicit permission of Info-ZIP. Such altered
+ | versions are further prohibited from misrepresentative use of the
+ | Zip-Bugs or Info-ZIP e-mail addresses or of the Info-ZIP URL(s).
+ |
+ | 4. Info-ZIP retains the right to use the names "Info-ZIP," "Zip," "UnZip,"
+ | "UnZipSFX," "WiZ," "Pocket UnZip," "Pocket Zip," and "MacZip" for its
+ | own source and binary releases.
-* The XMMS plugin for Faad2 (extras/faad2/plugins/xmms) is copyrighted
- by Frederic Fondriest (2002-2004).
+The Creative Commons Attribution 2.5 Scotland license:
-* X264 (extras/x264) is Copyright (C) 2003 Laurent Aimar, Copyright (C)
- 2005 Loren Merritt, Copyright (C) 2003 x264 project, Copyright (c) 2002
- Michael Niedermayer <michaelni at gmx.at>, Copyright (c) 2000 The NetBSD
- Foundation, Inc., Copyright 2005 Laurent Aimar, Justin Clay, Min Chen,
- Eric Petit, Måns Rullgård, Loren Merritt
+ | This Creative Commons Scotland public licence enables You to Use the
+ | Work worldwide provided that You keep to the terms of this Licence.
+ |
+ | 'The Licensor' (the Person offering the Work under the terms and
+ | conditions of this Licence)
+ |
+ | and
+ |
+ | 'You' (the Person acquiring rights under this Licence)
+ |
+ | agree as follows:
+ |
+ | 1. Definitions of Capitalised Words
+ | 1. "Collective Work" means a work made up of the Work in its entirety
+ | in unmodified form, along with other work, assembled into a
+ | collective whole.
+ | 2. "Derivative Work" means a work that Uses the Work (or any
+ | substantial part of the Work) in any material form whatsoever
+ | (such as a translation, dramatisation, or abridgment), other than
+ | (i) as a whole and in unmodified form or (ii) by modifying it as
+ | may be technically necessary to Use it in a different mode or
+ | format; but a Collective Work is not a Derivative Work for the
+ | purpose of this Licence.
+ | 3. "Derogatory Treatment" means derogatory treatment as defined by
+ | section 80 of the Copyright Design and Patents Act 1988, except as
+ | allowed by that Act: and it has that meaning wherever that
+ | treatment may take place and whoever may carry it out.
+ | 4. "Licence Elements" means the following licence attributes
+ | indicated in the title of this Licence: Attribution.
+ | 5. "Original Author" means the Person who created the Work.
+ | 6. "Person" means a natural person or a body of persons corporate or
+ | incorporate.
+ | 7. "Use", as a verb, means doing any act which is restricted by
+ | copyright, whether in the original medium or any other; and
+ | includes modifying the Work as may be technically necessary to Use
+ | it in a different mode or format.
+ | 8. "Work" means the work protected by copyright which is offered
+ | under the terms of this Licence, and includes the Work as
+ | incorporated in any Collective Work.
+ | 9. Words in the singular include the plural and vice versa.
+ |
+ | 2. The Rights Granted
+ |
+ | 2.1 The Licensor grants to You a worldwide, royalty-free,
+ | non-exclusive, licence to Use the Work for the duration of its
+ | copyright.
+ |
+ | So you may, for example:
+ | 1. copy the Work, or create Derivative Works or incorporate it into a
+ | Collective Work;
+ | 2. copy Derivative Works, or the Work as incorporated in any
+ | Collective Work; and
+ | 3. publish, perform or communicate the Work and/or Derivative Works
+ | and/or the Work as incorporated in any Collective Work to anyone;
+ |
+ | in any medium whether now known or created in the future.
+ |
+ | 2.2 However, this Licence does not allow you to:
+ | 1. impose any terms or any technological measures on the Work, or a
+ | Derivative Work, that alter or restrict the terms of this Licence
+ | or any rights granted under it or have the effect or intent of
+ | restricting the ability of any person to exercise those rights;
+ | 2. sublicense the Work; or
+ | 3. subject the Work to Derogatory Treatment.
+ |
+ | 2.3 You must, if you publish or distribute the Work or any Derivative
+ | Work to anyone else in any way, give reasonable credit to the Original
+ | Author as follows:
+ | 1. by giving the name of the Original Author if that has been
+ | supplied; or a pseudonym if that has been supplied instead; and/or
+ | the name of any other person if that has been supplied for
+ | attribution in place of the Original Author;
+ | 2. by giving the title of the Work if that has been supplied;
+ | 3. by giving the Uniform Resource Identifier of the Work if that has
+ | been supplied, but you need not do so if this does not refer to
+ | its copyright terms or to its licensing information;
+ | 4. in the case of a Derivative Work, by identifying how the Work has
+ | been used (for example, "French translation of the Work by X", or
+ | "Screenplay based on original work by X"); and
+ | 5. in the case of a Derivative Work or a Collective Work, placing
+ | that credit in the same place, and at least as prominently, as any
+ | comparable authorship credit.
+ |
+ | But, if what you are publishing or distributing is a Derivative
+ | Work or a Collective Work, you must remove any of these credits
+ | if you are asked to do so by the Licensor and if it is
+ | practicable to do so.
+ |
+ | These are important conditions of this licence and if you fail to do
+ | so you will be in material breach of its terms.
+ |
+ | 2.4 The Original Author asserts the right to be identified as the
+ | original author of the Work; but only as and when required by clause
+ | 2.3 above.
+ |
+ | 2.5 You must also, if you publish or distribute the Work or any
+ | Derivative Work to anyone else in any way:
+ | 1. include a copy of this Licence (or its Uniform Resource
+ | Identifier) with it; and
+ | 2. keep intact any copyright notices for the Work and notices that
+ | refer to this Licence.
+ |
+ | These are important conditions of this licence and if you fail to do
+ | so you will be in material breach of its terms.
+ |
+ | 2.6 Each time You publish the Work or any Derivative Work to anyone
+ | else in any way, the Licensor offers to the recipient a licence to the
+ | Work on the same terms and conditions as this Licence.
+ |
+ | 2.7 And:
+ | 1. the right to release the Work under different terms, or to stop
+ | distributing the Work, is reserved; and
+ | 2. all other rights not expressly granted by the Licensor are
+ | reserved.
+ |
+ | 2.8 This Licence does not affect any rights that You or anyone else
+ | may independently have under any applicable law (including fair
+ | dealing, fair use, or any other legally recognised limitation or
+ | exception to copyright infringement) to make any Use of this Work.
+ |
+ | 3. Warranties and Disclaimer
+ |
+ | 3.1 The Work is licensed by the Licensor "as is" and without any
+ | warranty of any kind, either express or implied, whether of title, of
+ | accuracy, of fitness for purpose, or otherwise.
+ |
+ | 4. Limit of Liability
+ |
+ | 4.1 Subject to any liability which may not be excluded or limited by
+ | law, the Licensor shall not be liable for, and expressly excludes, all
+ | liability for loss or damage however and whenever caused to anyone by
+ | any Use under this Licence, whether by You or by anyone else, and
+ | whether caused by any fault on the part of the Licensor or not. If
+ | liability may not be excluded by law, it is limited to actual and
+ | direct financial loss to the extent it is caused by proved negligence
+ | on the part of the Licensor.
+ |
+ | 5. Termination
+ |
+ | 5.1 Any breach by You of the terms of this licence (for example, by
+ | distributing the work licensed without attributing authorship as
+ | appropriate) entitles the Licensor to terminate this Licence with
+ | immediate effect and without notice to you. Persons who have received
+ | the Work, Derivative Works, or Collective Works from You under this
+ | Licence, however, will not have their licences terminated provided
+ | their use is in full compliance with this Licence or a licence granted
+ | under clause 2.6 of this Licence.
+ |
+ | 5.2 If You are not in breach of the terms of this licence, the
+ | Licensor may not terminate your rights under it.
+ |
+ | 5.3 Unless terminated under clause 5.1, this Licence is granted to you
+ | for the duration of copyright in the Work.
+ |
+ | 6. General
+ |
+ | 6.1 If any provision of this Licence is held to be invalid or
+ | unenforceable, that shall not affect the validity or enforceability of
+ | the remainder of the terms of this Licence.
+ |
+ | 6.2 This Licence is the entire agreement between the parties with
+ | respect to the Work licensed here. It replaces any earlier
+ | understandings, agreements or representations with respect to the Work
+ | not specified here.
+ |
+ | 6.3 If You are in breach of the terms of this Licence (for example, by
+ | distributing the work licensed without attributing authorship as
+ | appropriate) you will not be entitled to rely on the terms of this
+ | Licence or to complain of any breach by the Licensor.
+ |
+ | 6.4 Neither You, nor anyone else, may enforce any provision of this
+ | Licence by specific implement or interdict.
+ |
+ | 6.5 This Licence is governed by the law of Scotland and the parties
+ | accept the exclusive jurisdiction of the Courts of Scotland to decide
+ | any action or claim directed against the Licensor.
+ |
+ | 6.6 If there is any dispute as to the meaning or effect of any
+ | provision of this Licence, it must so far as possible be read and
+ | given effect in a way that is compatible with the provisions of the
+ | Creative Commons generic licence, version 2.5, which has the same
+ | Licence Elements.
-* The default skin (share/skins2/default) is Copyright (C) 2006 aLtgLass
- and the font is Copyright (C) 1994-1996 Jos Buivenga.
- The skin is released under Creative Commons Deeds Attribution-ShareAlike
- 2.5 UK:Scotland
- You are free:
- * to copy, distribute, display, and perform the work
- * to make derivative works
- * to make commercial use of the work
- Under the following conditions:
- * Attribution. You must attribute the work in the manner specified by
- the author or licensor.
- * Share Alike. If you alter, transform, or build upon this work, you may
- distribute the resulting work only under a license identical to this one.
- * For any reuse or distribution, you must make clear to others the license
- terms of this work.
- * Any of these conditions can be waived if you get permission from the
- copyright holder.
-
-
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
Copied: videolan/vlc/debian/libvlc0-dev.install (from rev 87, unstable/vlc/debian/libvlc0-dev.install)
Copied: videolan/vlc/debian/libvlc0.install (from rev 87, unstable/vlc/debian/libvlc0.install)
Copied: videolan/vlc/debian/mozilla-plugin-vlc.install (from rev 87, unstable/vlc/debian/mozilla-plugin-vlc.install)
Copied: videolan/vlc/debian/patches/020_dejavu_font.diff (from rev 87, unstable/vlc/debian/patches/020_dejavu_font.diff)
Deleted: videolan/vlc/debian/patches/020_freetype_font.diff
===================================================================
--- videolan/vlc/debian/patches/020_freetype_font.diff 2006-09-18 19:22:24 UTC (rev 88)
+++ videolan/vlc/debian/patches/020_freetype_font.diff 2006-09-18 19:23:32 UTC (rev 89)
@@ -1,13 +0,0 @@
-Index: vlc-0.8.5-test3.debian/modules/misc/freetype.c
-===================================================================
---- vlc-0.8.5-test3.debian.orig/modules/misc/freetype.c 2006-04-24 18:20:14.000000000 +0200
-+++ vlc-0.8.5-test3.debian/modules/misc/freetype.c 2006-04-24 18:20:21.000000000 +0200
-@@ -55,7 +55,7 @@
- #elif defined( WIN32 )
- #define DEFAULT_FONT "" /* Default font found at run-time */
- #else
--#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
-+#define DEFAULT_FONT ""
- #endif
-
- #if defined(HAVE_FRIBIDI)
Modified: videolan/vlc/debian/patches/series
===================================================================
--- videolan/vlc/debian/patches/series 2006-09-18 19:22:24 UTC (rev 88)
+++ videolan/vlc/debian/patches/series 2006-09-18 19:23:32 UTC (rev 89)
@@ -1,6 +1,6 @@
000_ltmain.diff
010_no-wx-updates.diff
010_osdmenu-paths.diff
-020_freetype_font.diff
+020_dejavu_font.diff
020_certificates_paths.diff
020_notify.diff
Modified: videolan/vlc/debian/rules
===================================================================
--- videolan/vlc/debian/rules 2006-09-18 19:22:24 UTC (rev 88)
+++ videolan/vlc/debian/rules 2006-09-18 19:23:32 UTC (rev 89)
@@ -1,6 +1,6 @@
#!/usr/bin/make -f
# debian/rules for the VLC media player - uses debhelper.
-# $Id: rules 15296 2006-04-21 21:33:39Z xtophe $
+# $Id$
# based on Joey Hess's one.
# Uncomment this to turn on verbose mode.
@@ -53,7 +53,7 @@
--enable-mkv \
--enable-v4l \
--enable-pvr \
- --disable-speex \
+ --enable-speex \
--enable-caca \
--enable-live555 \
--enable-libmpeg2 \
@@ -144,6 +144,7 @@
cd extras/faad2/libfaad && $(MAKE) clean && $(MAKE) AM_CFLAGS=-fPIC
$(MAKE)
+
# Minor test, to see which plugins were built and whether they load
# properly.
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -180,76 +181,62 @@
dh_clean -k
dh_installdirs
- DESTDIR=`pwd`/debian/vlc/ $(MAKE) install prefix=/usr
+ $(MAKE) install DESTDIR=`pwd`/debian/tmp/
# Clean up libtool crap
- find debian/vlc -name '*.la' -exec rm '{}' ';'
+ find debian/tmp -name '*.la' -exec rm '{}' ';'
- # Package: vlc
- mv debian/vlc/$(VIDDIR)/vlc48x48.png debian/vlc/$(PIXDIR)/vlc.png
- mv debian/vlc/$(VIDDIR)/vlc32x32.xpm debian/vlc/$(VIDDIR)/vlc.xpm
+ # Remove useless stuff
+ rm -Rf debian/tmp/$(VIDDIR)/skins
+ rm -f debian/tmp/usr/share/vlc/skins2/fonts/FreeSans.ttf
+ rm -f debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
+ ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSans.ttf
+ ln -s /usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf debian/tmp/usr/share/vlc/skins2/fonts/FreeSansBold.ttf
- #cp doc/fortunes.txt debian/vlc/usr/share/games/fortunes/vlc
- #strfile doc/fortunes.txt debian/vlc/usr/share/games/fortunes/vlc.dat
+ # Move stuff around
+ mkdir -p debian/tmp/$(PIXDIR)
+ -mv debian/tmp/$(VIDDIR)/vlc48x48.png debian/tmp/$(PIXDIR)/vlc.png
+ -mv debian/tmp/$(VIDDIR)/vlc32x32.xpm debian/tmp/$(VIDDIR)/vlc.xpm
- rm -Rf debian/vlc/$(VIDDIR)/skins
- ln -s vlc.1.gz debian/vlc/usr/share/man/man1/svlc.1.gz
+ # Install stuff
+ dh_install -si --fail-missing --sourcedir=debian/tmp
- # Package: libvlc0-dev
- mv debian/vlc/usr/bin/vlc-config debian/libvlc0-dev/usr/bin/
- #mv debian/vlc/usr/lib/libvlc.so debian/libvlc0-dev/usr/lib/
- #mv debian/vlc/usr/lib/vlc/*.a debian/libvlc0-dev/usr/lib/
- mv debian/vlc/usr/include/vlc/*.h debian/libvlc0-dev/usr/include/vlc/
- rm -Rf debian/vlc/usr/include
- ln -s vlc debian/libvlc0-dev/usr/share/doc/libvlc0-dev
+ # Check that we did not install a plugin linked with libX11 in vlc-nox
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+ BORKED=no; \
+ for file in $$(find debian/vlc-nox/usr/lib/vlc -name '*.so'); do \
+ if ldd $$file | grep -q libX11; then \
+ BORKED=yes; \
+ echo $$file depends on libX11; \
+ fi; \
+ done; \
+ if test "$$BORKED" = yes; then exit 1; fi
+endif
- # Package: vlc-plugin-esd
- ln -s vlc debian/vlc-plugin-esd/usr/share/doc/vlc-plugin-esd
- mv debian/vlc/usr/lib/vlc/audio_output/libesd_plugin.so* \
- debian/vlc-plugin-esd/usr/lib/vlc/audio_output/
+ # manpage symlinks
+ ln -s vlc.1.gz debian/vlc/usr/share/man/man1/svlc.1.gz
+ ln -s vlc.1.gz debian/vlc/usr/share/man/man1/wxvlc.1.gz
- # Package: vlc-plugin-sdl
+ # /usr/share/doc symlinks
+ ln -s vlc debian/vlc-nox/usr/share/doc/vlc-nox
+ ln -s libvlc0 debian/libvlc0-dev/usr/share/doc/libvlc0-dev
+ ln -s vlc debian/vlc-plugin-esd/usr/share/doc/vlc-plugin-esd
ln -s vlc debian/vlc-plugin-sdl/usr/share/doc/vlc-plugin-sdl
- mv debian/vlc/usr/lib/vlc/audio_output/libaout_sdl_plugin.so* \
- debian/vlc-plugin-sdl/usr/lib/vlc/audio_output/
- mv debian/vlc/usr/lib/vlc/video_output/libvout_sdl_plugin.so* \
- debian/vlc-plugin-sdl/usr/lib/vlc/video_output/
-
- # Package: vlc-plugin-ggi
ln -s vlc debian/vlc-plugin-ggi/usr/share/doc/vlc-plugin-ggi
- mv debian/vlc/usr/lib/vlc/video_output/libggi_plugin.so* \
- debian/vlc-plugin-ggi/usr/lib/vlc/video_output/
-
- # Package: vlc-plugin-glide
+ ln -s vlc debian/vlc-plugin-arts/usr/share/doc/vlc-plugin-arts
+ ln -s vlc debian/mozilla-plugin-vlc/usr/share/doc/mozilla-plugin-vlc
ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
ln -s vlc debian/vlc-plugin-glide/usr/share/doc/vlc-plugin-glide
- mv debian/vlc/usr/lib/vlc/video_output/libglide_plugin.so* \
- debian/vlc-plugin-glide/usr/lib/vlc/video_output/
+ ln -s vlc debian/vlc-plugin-svgalib/usr/share/doc/vlc-plugin-svgalib
endif
- # Package: vlc-plugin-arts
- ln -s vlc debian/vlc-plugin-arts/usr/share/doc/vlc-plugin-arts
- mv debian/vlc/usr/lib/vlc/audio_output/libarts_plugin.so* \
- debian/vlc-plugin-arts/usr/lib/vlc/audio_output/
-
- # Package: mozilla-plugin-vlc
- ln -s vlc debian/mozilla-plugin-vlc/usr/share/doc/mozilla-plugin-vlc
- mv debian/vlc/usr/lib/mozilla debian/mozilla-plugin-vlc/usr/lib
# links for firefox
mkdir -p debian/mozilla-plugin-vlc/usr/lib/mozilla-firefox/plugins/
ln -s ../../mozilla/plugins/libvlcplugin.so debian/mozilla-plugin-vlc/usr/lib/mozilla-firefox/plugins/
mkdir -p debian/mozilla-plugin-vlc/usr/lib/mozilla-firefox/components/
ln -s ../../mozilla/components/vlcintf.xpt debian/mozilla-plugin-vlc/usr/lib/mozilla-firefox/components/
- # Package: vlc-plugin-svgalib
-ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
- ln -s vlc debian/vlc-plugin-svgalib/usr/share/doc/vlc-plugin-svgalib
- mv debian/vlc/usr/lib/vlc/video_output/libsvgalib_plugin.so* \
- debian/vlc-plugin-svgalib/usr/lib/vlc/video_output
-endif
-
cp debian/vlc/$(VIDDIR)/vlc.xpm debian/vlc/$(VIDDIR)/wxvlc.xpm
- ln -s vlc.1.gz debian/vlc/usr/share/man/man1/wxvlc.1.gz
# Clean up
rm -f debian/vlc/$(VIDDIR)/*.png
@@ -271,23 +258,23 @@
dh_testdir
dh_testroot
# dh_installdebconf
- dh_installdocs -p vlc
- dh_buildinfo -p vlc
+ dh_installdocs -p vlc-nox
+ dh_installdocs -p libvlc0
+ dh_buildinfo -p vlc-nox
# dh_installexamples
dh_installmenu -s
dh_installmime -s
- dh_installman doc/vlc.1 -p vlc
+ dh_installman doc/vlc.1 -p vlc-nox
dh_installman doc/vlc-config.1 -p libvlc0-dev
- dh_installchangelogs ChangeLog -p vlc
- for x in doc/ChangeLog-* ; do cp "doc/ChangeLog-$${x#*-}" "debian/vlc/usr/share/doc/vlc/changelog$${x#*-}" ; done
+ dh_installchangelogs ChangeLog -p vlc-nox
+ dh_installchangelogs ChangeLog -p libvlc0
dh_link -s
dh_strip -s --dbg-package=vlc-dbg
dh_compress -s
dh_fixperms -s
- dh_makeshlibs -pvlc -V 'vlc (>= 0.8.6-svn20060823.debian-1)'
+ dh_makeshlibs -plibvlc0 -V # -V is nasty, but I mean it
dh_installdeb -s
-# dh_perl
- dh_shlibdeps -s -ldebian/vlc/usr/lib
+ dh_shlibdeps -s -ldebian/libvlc0/usr/lib
dh_gencontrol -s
dh_md5sums -s
dh_builddeb -s
Property changes on: videolan/vlc/debian/rules
___________________________________________________________________
Name: svn:keywords
+ Id
Copied: videolan/vlc/debian/vlc-nox.dirs (from rev 87, unstable/vlc/debian/vlc-nox.dirs)
Copied: videolan/vlc/debian/vlc-nox.install (from rev 87, unstable/vlc/debian/vlc-nox.install)
Copied: videolan/vlc/debian/vlc-plugin-arts.install (from rev 87, unstable/vlc/debian/vlc-plugin-arts.install)
Copied: videolan/vlc/debian/vlc-plugin-esd.install (from rev 87, unstable/vlc/debian/vlc-plugin-esd.install)
Copied: videolan/vlc/debian/vlc-plugin-ggi.install (from rev 87, unstable/vlc/debian/vlc-plugin-ggi.install)
Copied: videolan/vlc/debian/vlc-plugin-glide.install (from rev 87, unstable/vlc/debian/vlc-plugin-glide.install)
Copied: videolan/vlc/debian/vlc-plugin-sdl.install (from rev 87, unstable/vlc/debian/vlc-plugin-sdl.install)
Copied: videolan/vlc/debian/vlc-plugin-svgalib.install (from rev 87, unstable/vlc/debian/vlc-plugin-svgalib.install)
Copied: videolan/vlc/debian/vlc.install (from rev 87, unstable/vlc/debian/vlc.install)
Modified: videolan/vlc/debian/vlc.menu
===================================================================
--- videolan/vlc/debian/vlc.menu 2006-09-18 19:22:24 UTC (rev 88)
+++ videolan/vlc/debian/vlc.menu 2006-09-18 19:23:32 UTC (rev 89)
@@ -1,3 +1,3 @@
-?package(vlc):command="/usr/bin/vlc" hotkey="V" needs="X11" \
+?package(vlc):command="/usr/bin/wxvlc" hotkey="V" needs="X11" \
section="Apps/Viewers" title="VLC media player" \
icon="/usr/share/vlc/vlc.xpm" hints="Video"
More information about the Pkg-multimedia-commits
mailing list