tags 400720 + patch
thanks
Since there seem to be noone interested in working on creating a minimal
patch to fix the problem (since the full upstream changes probably won't
be allowed into Etch), here's a patch that takes the easy route and
removes the mozilla-plugin-vlc package from the vlc source.
Patch attached.
--
Regards,
Andreas Henriksson
diff -uriNp vlc-0.8.6-svn20061012.debian/debian/control vlc-0.8.6-svn20061012.debian-nomozvlc/debian/control
--- vlc-0.8.6-svn20061012.debian/debian/control 2006-12-23 20:30:39.000000000 +0100
+++ vlc-0.8.6-svn20061012.debian-nomozvlc/debian/control 2006-12-23 20:38:04.000000000 +0100
@@ -3,7 +3,7 @@ Section: graphics
Priority: optional
Maintainer: Sam Hocevar (Debian packages) <[EMAIL PROTECTED]>
Uploaders: Clément Stenac <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 4.0), dh-buildinfo, quilt, nasm, yasm [amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7), xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a), libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060823-1), libavformat-dev (>= 0.cvs20060823-1), libcaca-dev (>= 0.99.beta4-1), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread-dev (>= 0.9.5), libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3), libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2006.03.17), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060823-1), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, zlib1g-dev, libavc1394-dev, libraw1394-dev, libdc1394-13-dev, libxosd-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev, libnotify-dev, libgtk2.0-dev
+Build-Depends: debhelper (>= 4.0), dh-buildinfo, quilt, nasm, yasm [amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7), 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, libnotify-dev, libgtk2.0-dev
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.videolan.org/pkg-multimedia/unstable/vlc/
@@ -12,7 +12,6 @@ Section: graphics
Architecture: any
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
@@ -30,8 +29,7 @@ Description: multimedia player and strea
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.
+ vlc-plugin-glide, vlc-plugin-svgalib).
Package: vlc-nox
Section: net
@@ -54,8 +52,7 @@ Description: multimedia player and strea
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.
+ vlc-plugin-glide, vlc-plugin-svgalib).
.
This package contains a version of VLC that does not require X and that is
thus suitable for headless servers.
@@ -167,20 +164,6 @@ Description: aRts audio output plugin fo
DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
streams from various network sources.
-Package: mozilla-plugin-vlc
-Architecture: any
-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
- decoding process is done by VLC and the output window is embedded in a
- webpage or directly in the browser window. There is also support for
- fullscreen display and javascript control.
- .
- 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-svgalib
Architecture: i386
Depends: vlc-nox (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
diff -uriNp vlc-0.8.6-svn20061012.debian/debian/mozilla-plugin-vlc.dirs vlc-0.8.6-svn20061012.debian-nomozvlc/debian/mozilla-plugin-vlc.dirs
--- vlc-0.8.6-svn20061012.debian/debian/mozilla-plugin-vlc.dirs 2006-12-23 20:30:39.000000000 +0100
+++ vlc-0.8.6-svn20061012.debian-nomozvlc/debian/mozilla-plugin-vlc.dirs 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-usr/lib
-usr/share/doc
diff -uriNp vlc-0.8.6-svn20061012.debian/debian/mozilla-plugin-vlc.install vlc-0.8.6-svn20061012.debian-nomozvlc/debian/mozilla-plugin-vlc.install
--- vlc-0.8.6-svn20061012.debian/debian/mozilla-plugin-vlc.install 2006-12-23 20:30:39.000000000 +0100
+++ vlc-0.8.6-svn20061012.debian-nomozvlc/debian/mozilla-plugin-vlc.install 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-usr/lib/mozilla
diff -uriNp vlc-0.8.6-svn20061012.debian/debian/rules vlc-0.8.6-svn20061012.debian-nomozvlc/debian/rules
--- vlc-0.8.6-svn20061012.debian/debian/rules 2006-12-23 20:30:39.000000000 +0100
+++ vlc-0.8.6-svn20061012.debian-nomozvlc/debian/rules 2006-12-23 20:35:06.000000000 +0100
@@ -33,7 +33,6 @@ vlc_confflags += \
--enable-a52 \
--enable-aa \
--enable-dvbpsi \
- --enable-mozilla \
--disable-kde \
--enable-mp4 \
--enable-dvb \
@@ -171,7 +170,6 @@ clean:
rm -f extras/zsh
# Removed ugly cruft
rm -f src/misc/modules_builtin.h
- rm -f mozilla/vlcintf.xpt mozilla/vlcintf.h
# Remove spurious autotools stuff
rm -f config.log confdefs.h
# Unpatch package
@@ -227,18 +225,11 @@ endif
ln -s vlc debian/vlc-plugin-sdl/usr/share/doc/vlc-plugin-sdl
ln -s vlc debian/vlc-plugin-ggi/usr/share/doc/vlc-plugin-ggi
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
ln -s vlc debian/vlc-plugin-svgalib/usr/share/doc/vlc-plugin-svgalib
endif
- # 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/
-
cp debian/vlc/$(VIDDIR)/vlc.xpm debian/vlc/$(VIDDIR)/wxvlc.xpm
# Clean up
