* ./debian/changelog: updated for 0.5.1.

  * ./debian/control: vlc-glide is now Architecture: i386 only.
  * ./debian/control: vlc-plugin-mad Provides: mp3-decoder.
  * ./debian/rules: the deprecated vlc-* packages have a proper link to
    /usr/share/doc/vlc/.

diff --git a/debian/changelog b/debian/changelog
index 89e662765dfeef7d7f74e6deaeac433d4d4ca8f3..39745d9dc5a1b49905b65df31ffb889cce813e22 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+vlc (0.5.1-1) unstable; urgency=low
+
+  * New upstream release.
+  * The vlc-glide package is now Architecture: i386 only.
+  * The vlc-plugin-mad package Provides: mp3-decoder.
+  * The deprecated vlc-* packages have a proper link to /usr/share/doc/vlc/.
+
+ -- Samuel Hocevar <sam@zoy.org>  Sat, 15 Feb 2003 03:43:33 +0100
+
 vlc (0.5.0-1) unstable; urgency=low
 
   * New upstream release (Closes: #157166).

diff --git a/debian/control b/debian/control
index de3ab7f3bb8439017f85d9d57a0399313383040e..582cae11ac799fe76631f41eddd2fb80bf8a90b9 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: vlc
 Section: graphics
 Priority: optional
 Maintainer: Samuel Hocevar <sam@zoy.org>
-Build-Depends: debhelper (>=2.2.0), gettext, xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt3-dev, libasound2-dev (>=0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi1-dev, mozilla-dev, kdelibs4-dev, dvb-dev, libdv2-dev, libxosd-dev, svgalibg1-dev (>=1.4.0), libogg-dev, libvorbis-dev, libwxgtk2.4-dev, libdvdplay0-dev, libdvdread2-dev, libslp-dev
+Build-Depends: debhelper (>=2.2.0), gettext, fortune-mod, xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt3-dev, libasound2-dev (>=0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi1-dev, mozilla-dev, kdelibs4-dev, dvb-dev, libdv2-dev, libxosd-dev, svgalibg1-dev (>=1.4.0), libogg-dev, libvorbis-dev, libwxgtk2.4-dev, libdvdplay0-dev, libdvdread2-dev, libslp-dev
 Standards-Version: 3.5.6
 
 Package: vlc
@@ -135,7 +135,7 @@ Description: Glide video output plugin for VLC
  plugin from the preferences menu.
 
 Package: vlc-glide
-Architecture: any
+Architecture: i386
 Depends: vlc-plugin-glide
 Description: legacy package that you should remove
  This package is now called vlc-plugin-glide.
@@ -161,6 +161,7 @@ Architecture: any
 Depends: vlc (= ${Source-Version}), ${shlibs:Depends}
 Conflicts: vlc-mad (<< 0.5.0)
 Replaces: vlc-mad (<< 0.5.0)
+Provides: mp3-decoder
 Description: MPEG audio codec plugin for VLC
  This plugin adds support for libmad, the MPEG audio decoder library,
  to the VLC media player. It is based on libmad, a 100% fixed-point based

diff --git a/debian/rules b/debian/rules
index f5e3ff0288eb5b3162ffdce3137dc186131b2724..fbd5c58dc521b2548f4f031e478d98bff0fe5cd1 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -71,8 +71,7 @@ build-stamp:
        dh_testdir
 
        # Touch stuff
-       touch configure.ac.in \
-       && touch configure.ac \
+       touch configure.ac \
        && touch aclocal.m4 \
        && touch configure \
        && touch config.h.in \
@@ -138,6 +137,9 @@ install: build
        cp debian/gvlc.desktop debian/gvlc/$(GNOMEDIR)
        cp debian/gnome-vlc.desktop debian/gnome-vlc/$(GNOMEDIR)
 
+       cp doc/fortunes.txt debian/vlc/usr/share/games/fortunes/vlc
+       strfile doc/fortunes.txt debian/vlc/usr/share/games/fortunes/vlc.dat
+
        # Package: libvlc0-dev
        mv debian/vlc/usr/bin/vlc-config debian/libvlc0-dev/usr/bin/
        mv debian/vlc/usr/lib/*.a debian/libvlc0-dev/usr/lib/
@@ -157,6 +159,9 @@ install: build
        mv debian/vlc/$(VIDDIR)/gnome-vlc32x32.xpm debian/gnome-vlc/$(VIDDIR)/gnome-vlc.xpm
        mv debian/vlc/$(VIDDIR)/gnome-vlc48x48.png debian/gnome-vlc/$(PIXDIR)/gnome-vlc.png
 
+       mkdir -p debian/vlc-gnome/usr/share/doc/
+       ln -s vlc debian/vlc-gnome/usr/share/doc/vlc-gnome
+
        # Package: gvlc
        mv debian/vlc/usr/bin/gvlc debian/gvlc/usr/bin/
        ln -s vlc debian/gvlc/usr/share/doc/gvlc
@@ -170,16 +175,25 @@ install: build
        mv debian/vlc/$(VIDDIR)/gvlc32x32.xpm debian/gvlc/$(VIDDIR)/gvlc.xpm
        mv debian/vlc/$(VIDDIR)/gvlc48x48.png debian/gvlc/$(PIXDIR)/gvlc.png
 
+       mkdir -p debian/vlc-gtk/usr/share/doc/
+       ln -s vlc debian/vlc-gtk/usr/share/doc/vlc-gtk
+
        # 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/
 
+       mkdir -p debian/vlc-esd/usr/share/doc/
+       ln -s vlc debian/vlc-esd/usr/share/doc/vlc-esd
+
        # Package: vlc-plugin-alsa
        ln -s vlc debian/vlc-plugin-alsa/usr/share/doc/vlc-plugin-alsa
        mv debian/vlc/usr/lib/vlc/audio_output/libalsa_plugin.so \
                debian/vlc-plugin-alsa/usr/lib/vlc/audio_output/
 
+       mkdir -p debian/vlc-alsa/usr/share/doc/
+       ln -s vlc debian/vlc-alsa/usr/share/doc/vlc-alsa
+
        # Package: vlc-plugin-sdl
        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 \
@@ -187,16 +201,25 @@ install: build
        mv debian/vlc/usr/lib/vlc/video_output/libvout_sdl_plugin.so \
                debian/vlc-plugin-sdl/usr/lib/vlc/video_output/
 
+       mkdir -p debian/vlc-sdl/usr/share/doc/
+       ln -s vlc debian/vlc-sdl/usr/share/doc/vlc-sdl
+
        # 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/
 
+       mkdir -p debian/vlc-ggi/usr/share/doc/
+       ln -s vlc debian/vlc-ggi/usr/share/doc/vlc-ggi
+
        # Package: vlc-plugin-glide
 ifeq ($(DEB_BUILD_ARCH),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/
+
+       mkdir -p debian/vlc-glide/usr/share/doc/
+       ln -s vlc debian/vlc-glide/usr/share/doc/vlc-glide
 endif
 
        # Package: qvlc
@@ -208,26 +231,41 @@ endif
        mv debian/vlc/$(VIDDIR)/qvlc32x32.xpm debian/qvlc/$(VIDDIR)/qvlc.xpm
        mv debian/vlc/$(VIDDIR)/qvlc48x48.png debian/qvlc/$(PIXDIR)/qvlc.png
 
+       mkdir -p debian/vlc-qt/usr/share/doc/
+       ln -s vlc debian/vlc-qt/usr/share/doc/vlc-qt
+
        # Package: vlc-plugin-mad
        ln -s vlc debian/vlc-plugin-mad/usr/share/doc/vlc-plugin-mad
        mv debian/vlc/usr/lib/vlc/audio_filter/libmpgatofixed32_plugin.so \
                debian/vlc-plugin-mad/usr/lib/vlc/audio_filter/
 
+       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/
 
+       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/
 
+       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/
 
+       mkdir -p debian/vlc-aa/usr/share/doc/
+       ln -s vlc debian/vlc-aa/usr/share/doc/vlc-aa
+
        # Package: vlc-plugin-xosd
        ln -s vlc debian/vlc-plugin-xosd/usr/share/doc/vlc-plugin-xosd
        mv debian/vlc/usr/lib/vlc/visualization/libxosd_plugin.so \

diff --git a/debian/vlc.dirs b/debian/vlc.dirs
index c9f5c0751b72173b26e4c0031371b37cefd69b23..46d13ac3d77b3ea221c6bdd60999e0b897e99abf 100644 (file)
--- a/debian/vlc.dirs
+++ b/debian/vlc.dirs
@@ -13,6 +13,7 @@ usr/lib/vlc/video_filter
 usr/lib/vlc/video_output
 usr/lib/vlc/visualization
 usr/share/doc/vlc
+usr/share/games/fortunes
 usr/share/gnome/apps/Multimedia
 usr/share/pixmaps
 usr/share/vlc

diff --git a/doc/fortunes.txt b/doc/fortunes.txt
index 89e48867294ba382c6a8b8d4be1305176245270a..dc85db33e54b7938610d5d13adeee7e6682a0831 100644 (file)
--- a/doc/fortunes.txt
+++ b/doc/fortunes.txt
@@ -229,11 +229,6 @@ the Boston strangler is to the woman home alone.
 
   -- #videolan
 %
-<Meuuh> mais non henri, si on t'appréciait à la qualité de ton code, y'aurait
-        longtemps qu'on t'aurait fait bouffer de la strychnine
-
-  -- #videolan
-%
 <ArkanumJ> BTW, the CVS version runs well on MacOS X, but the sound is a bit
            broken. 
 <Dnumgis> ArkanumJ: sound is a bit broken everywhere I think
@@ -314,13 +309,6 @@ the Boston strangler is to the woman home alone.
 
   -- #videolan
 %
-<henrisson> hal_3k: don't worry, I'll soon be replaced by a lib
-<hal_3k> henri: you'll be replaced by a lib? does the lib know how to
-         program? ;)
-<Meuuh> do you think henri knows ? :p
-
-  -- #videolan
-%
 <Meuuh> you want to be in a porn movie with me ?
 <ali> are we well paid for doing that ?
 <Meuuh> ali : no but they say you take a lot of pleasure in that job