* debian/rules:

    + Disabled the deprecated satellite plugin; the dvb plugin is now
      the recommended one (Closes: #216367).
    + Don't install fortunes in /usr/share/games, they are too private for
      common mortals (Closes: #212856). They are still available in the
      /usr/share/doc/vlc directory though.
  * debian/control:
    + Depend on ttf-freefont for subtitles.

diff --git a/debian/changelog b/debian/changelog
index 148833761519b0a166bb70e0475d256db4c12953..ae1d78b7b787d1c50d18ff00c44ba6356b34973b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+vlc (0.6.3+cvs-20031024-1) unstable; urgency=low
+
+  * New CVS snapshot.
+  * debian/rules:
+    + Disabled the deprecated satellite plugin; the dvb plugin is now
+      the recommended one (Closes: #216367).
+    + Don't install fortunes in /usr/share/games, they are too private for
+      common mortals (Closes: #212856). They are still available in the
+      /usr/share/doc/vlc directory though.
+  * debian/control:
+    + Depend on ttf-freefont for subtitles.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Fri, 24 Oct 2003 13:23:27 +0200
+
 vlc (0.6.2-3) unstable; urgency=low
 
   * debian/control:

diff --git a/debian/control b/debian/control
index 4dc7bb8c14eede0a1c81d00db111ee0fdaa5cf80..ffd5c526bfae26954b8f771f32b289351fe18f60 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,15 @@ Source: vlc
 Section: graphics
 Priority: optional
 Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
-Build-Depends: debhelper (>=3.4.4), 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-mt-dev, libqt3-compat-headers, libasound2-dev (>=0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi2-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, dvb-dev, libdv2-dev, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>=1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev, libdvdplay0-dev (>=1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>=1.1.0), libimlib2-dev, libmatroska-dev (>= 0.5.0-3), libfreetype6-dev
+Build-Depends: debhelper (>=3.4.4), gettext, xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>=0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi2-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, dvb-dev, libdv2-dev, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>=1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev, libdvdplay0-dev (>=1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>=1.1.0), libimlib2-dev, libmatroska-dev (>= 0.5.0-3), libfreetype6-dev
 Build-Conflicts: libmpeg2-dev, libmpeg2-0-dev, libmpeg2-1-dev, libmpeg2-2-dev, libmpeg2-3-dev
 Standards-Version: 3.6.1.0
 
 Package: vlc
 Section: graphics
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: gnome-vlc | wxvlc, ttf-freefont | ttf-thryomanes
-Suggests: fortune-mod
+Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-freefont
+Recommends: gnome-vlc | wxvlc, ttf-thryomanes
 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)
 Provides: mp3-decoder

diff --git a/debian/rules b/debian/rules
index 4121831c222fe581059be70ea2517b10b68f820b..1439680b074e700b80ace42416eea8a4b79b64ca 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 # debian/rules for the VideoLAN Client - uses debhelper.
-# $Id: rules,v 1.104 2003/09/02 13:44:23 sam Exp $
+# $Id: rules,v 1.105 2003/10/24 11:31:51 sam Exp $
 # based on Joey Hess's one.
 
 # Uncomment this to turn on verbose mode.
@@ -33,7 +33,7 @@ CONFIG_FLAGS += \
        --enable-mp4 \
        --enable-dvb \
        --enable-dv \
-       --enable-satellite \
+       --disable-satellite \
        --enable-ogg \
        --enable-vorbis \
        --enable-wxwindows \
@@ -200,8 +200,8 @@ 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
+       #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/