[SCM] VLC media player packaging branch, experimental, updated. debian/0.9.9a-1-36-g4dae45f

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e020e9ab4ee5a461b299ae431e18af33027f4e2e
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Wed May 13 12:02:48 2009 +0200

    Remove vlc-plugin-esd and vlc-plugin-arts as they have been removed by upstream

diff --git a/debian/control b/debian/control
index bdbfad5..5fd956b 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,6 @@ Build-Depends: debhelper (>= 7),
                iceape-dev (>=  1.1.9-4),
                liba52-0.7.4-dev,
                libaa1-dev,
-               libarts1-dev (>= 1.4.2),
                libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libass-dev (>= 0.9.5-2),
                libaudiofile-dev,
@@ -29,7 +28,6 @@ Build-Depends: debhelper (>= 7),
                libdvbpsi4-dev,
                libdvdnav-dev,
                libdvdread-dev (>= 0.9.5),
-               libesd0-dev,
                libfaad-dev,
                libflac-dev (>= 1.1.2-3),
                libfreetype6-dev,
@@ -112,10 +110,9 @@ Description: multimedia player and streamer
  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-svgalib). There is also a web browser plugin in the 
- mozilla-plugin-vlc package.
+ by installing additional audio plugins (vlc-plugin-pulse, vlc-plugin-sdl)
+ or video plugins (vlc-plugin-sdl, vlc-plugin-ggi, vlc-plugin-svgalib). There
+ is also a web browser plugin in the mozilla-plugin-vlc package.
 
 Package: vlc-dbg
 Section: debug
@@ -151,10 +148,10 @@ Description: multimedia player and streamer (without X support)
  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, vlc-plugin-jack) or video plugins (vlc-plugin-sdl, 
- vlc-plugin-ggi, vlc-plugin-svgalib). There is also a web browser plugin in 
- the mozilla-plugin-vlc package.
+ by installing additional audio plugins (vlc-plugin-pulse, vlc-plugin-sdl,
+ vlc-plugin-jack) or video plugins (vlc-plugin-sdl, vlc-plugin-ggi,
+ 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.
@@ -215,18 +212,6 @@ Description: development files for libvlc
  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
  streams from various network sources.
 
-Package: vlc-plugin-esd
-Architecture: any
-Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
-Description: Esound audio output plugin for VLC
- This plugin adds support for the Enlightened Sound Daemon to the VLC
- media player. To activate it, use the `--aout esd' flag or select the
- `esd' 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.
-
 Package: vlc-plugin-sdl
 Architecture: any
 Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
@@ -252,18 +237,6 @@ Description: GGI video output plugin for VLC
  DivX, MOV, WMV, QuickTime, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia
  streams from various network sources.
 
-Package: vlc-plugin-arts
-Architecture: any
-Depends: vlc-nox, ${shlibs:Depends}, ${misc:Depends}
-Description: aRts audio output plugin for VLC
- This plugin adds support for the aRts Sound System to the VLC media
- player. To activate it, use the `--aout arts' flag or select the `arts'
- 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.
-
 Package: mozilla-plugin-vlc
 Architecture: any
 Depends: vlc-nox (= ${binary:Version}), vlc, ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index cb16716..e176791 100755
--- a/debian/rules
+++ b/debian/rules
@@ -45,9 +45,7 @@ confflags += \
 	--disable-fb \
 	--enable-ggi \
 	--enable-sdl \
-	--enable-esd \
 	--enable-mad \
-	--enable-arts \
 	--enable-jack \
 	--enable-pulse \
 	--enable-lirc \
diff --git a/debian/vlc-plugin-arts.install b/debian/vlc-plugin-arts.install
deleted file mode 100644
index 201e6fa..0000000
--- a/debian/vlc-plugin-arts.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/vlc/audio_output/libarts_plugin.so
diff --git a/debian/vlc-plugin-arts.links b/debian/vlc-plugin-arts.links
deleted file mode 100644
index 5332016..0000000
--- a/debian/vlc-plugin-arts.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-arts
-/usr/share/bug/vlc-nox /usr/share/bug/vlc-plugin-arts
diff --git a/debian/vlc-plugin-esd.install b/debian/vlc-plugin-esd.install
deleted file mode 100644
index 520946a..0000000
--- a/debian/vlc-plugin-esd.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/vlc/audio_output/libesd_plugin.so
diff --git a/debian/vlc-plugin-esd.links b/debian/vlc-plugin-esd.links
deleted file mode 100644
index 1c2ea68..0000000
--- a/debian/vlc-plugin-esd.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/share/doc/vlc-nox /usr/share/doc/vlc-plugin-esd
-/usr/share/bug/vlc-nox /usr/share/bug/vlc-plugin-esd

-- 
VLC media player packaging