* ./debian/*: additional Debian butchery; merged vlc-plugin-aa and

    vlc-plugin-lirc into vlc, and removed vlc-mad, vlc-arts, vlc-lirc and
    vlc-aa legacy packages because they were not in woody.
  * ./debian/control: tuned the control file to provide smooth upgrades from
    woody, from sarge, and from the local VideoLAN repository.

diff --git a/debian/control b/debian/control
index 868dd3edc5de728d8f7505330e5114d57fd1e253..5effa928a9954b157310900a55ffb59473765303 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,6 +11,8 @@ Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: vlc-gui
 Suggests: gnome-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)
+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)
 Description: a complete multimedia player
  This is the VideoLAN project's VLC media player. It plays MPEG, MPEG2,
  MPEG4, DivX, mp3, Ogg/Vorbis files, DVDs, VCDs, and multimedia streams
@@ -155,12 +157,6 @@ Depends: qvlc
 Description: legacy package that you should remove
  This package is now called qvlc.
 
-Package: vlc-mad
-Architecture: any
-Depends: vlc
-Description: legacy package that you should remove
- This package is now included in vlc.
-
 Package: vlc-plugin-arts
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
@@ -171,44 +167,6 @@ Description: aRts audio output plugin for VLC
  player. To activate it, use the `--aout arts' flag or select the `arts'
  audio output plugin from the preferences menu.
 
-Package: vlc-arts
-Architecture: any
-Depends: vlc-plugin-arts
-Description: legacy package that you should remove
- This package is now called vlc-plugin-arts.
-
-Package: vlc-plugin-lirc
-Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Conflicts: vlc-lirc (<< 0.5.0)
-Replaces: vlc-lirc (<< 0.5.0)
-Description: lirc (infrared remote control) interface plugin for VLC
- This plugin is an infrared lirc interface for the VLC media player. To
- activate it, use the `--extraintf lirc' flag or select the `lirc' extra
- interface plugin from the preferences menu.
-
-Package: vlc-lirc
-Architecture: any
-Depends: vlc-plugin-lirc
-Description: legacy package that you should remove
- This package is now called vlc-plugin-lirc.
-
-Package: vlc-plugin-aa
-Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
-Conflicts: vlc-aa (<< 0.5.0)
-Replaces: vlc-aa (<< 0.5.0)
-Description: ASCII art video output plugin for VLC
- This is an ASCII art video output plugin for the VLC media player. To
- activate it, use the `--vout aa' flag or select the `aa' video output
- plugin from the preferences menu.
-
-Package: vlc-aa
-Architecture: any
-Depends: vlc-plugin-aa
-Description: legacy package that you should remove
- This package is now called vlc-plugin-aa.
-
 Package: mozilla-plugin-vlc
 Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}

diff --git a/debian/rules b/debian/rules
index 3ec78b2aeefbdfbe8241193f454325980fed3458..1e2ee9380d88123d9126ef519d13442847480d82 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -246,37 +246,11 @@ endif
        mkdir -p debian/vlc-qt/usr/share/doc/
        ln -s vlc debian/vlc-qt/usr/share/doc/vlc-qt
 
-       # Package: vlc-mad
-       mkdir -p debian/vlc-mad/usr/share/doc/
-       ln -s vlc debian/vlc-mad/usr/share/doc/vlc-mad
-
        # 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: vlc-arts
-       mkdir -p debian/vlc-arts/usr/share/doc/
-       ln -s vlc debian/vlc-arts/usr/share/doc/vlc-arts
-
-       # Package: vlc-plugin-lirc
-       ln -s vlc debian/vlc-plugin-lirc/usr/share/doc/vlc-plugin-lirc
-       mv debian/vlc/usr/lib/vlc/control/liblirc_plugin.so \
-               debian/vlc-plugin-lirc/usr/lib/vlc/control/
-
-       # Package: vlc-lirc
-       mkdir -p debian/vlc-lirc/usr/share/doc/
-       ln -s vlc debian/vlc-lirc/usr/share/doc/vlc-lirc
-
-       # Package: vlc-plugin-aa
-       ln -s vlc debian/vlc-plugin-aa/usr/share/doc/vlc-plugin-aa
-       mv debian/vlc/usr/lib/vlc/video_output/libaa_plugin.so \
-               debian/vlc-plugin-aa/usr/lib/vlc/video_output/
-
-       # Package: vlc-aa
-       mkdir -p debian/vlc-aa/usr/share/doc/
-       ln -s vlc debian/vlc-aa/usr/share/doc/vlc-aa
-
        # 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

diff --git a/debian/vlc-plugin-aa.dirs b/debian/vlc-plugin-aa.dirs
deleted file mode 100644 (file)
index 118ba52..0000000
--- a/debian/vlc-plugin-aa.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/vlc/video_output
-usr/share/doc

diff --git a/debian/vlc-plugin-lirc.dirs b/debian/vlc-plugin-lirc.dirs
deleted file mode 100644 (file)
index f036717..0000000
--- a/debian/vlc-plugin-lirc.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/vlc/control
-usr/share/doc