* debian/control:

    + Build-depend on a newer wxwindows version to avoid incompatibilities.
    + Build-depend on linux-kernel-headers and build-conflict on dvb-dev
      because these packages cannot be installed together.
  * debian/rules:
    + Temporarily disabled the framebuffer video output plugin because of
       current code errors in linux-kernel-headers.

diff --git a/debian/changelog b/debian/changelog
index 917135eeed691d8142e29d7bf8277740d23112fe..4b442a8ffb8d803ae59c1dd743b6b434fc30ebe4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,16 @@
-vlc (0.6.2+cvs20031031-1) unstable; urgency=low
+vlc (0.6.2+cvs20031030-2) unstable; urgency=low
+
+  * debian/control:
+    + Build-depend on a newer wxwindows version to avoid incompatibilities.
+    + Build-depend on linux-kernel-headers and build-conflict on dvb-dev
+      because these packages cannot be installed together.
+  * debian/rules:
+    + Temporarily disabled the framebuffer video output plugin because of
+      current code errors in linux-kernel-headers.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Sat,  1 Nov 2003 11:01:40 +0100
+
+vlc (0.6.2+cvs20031030-1) unstable; urgency=low
 
   * New CVS snapshot.
   * debian/rules:

diff --git a/debian/control b/debian/control
index 1faf82b27c4965a5a5882339405fb1e873f83640..6f7686fbb325e9624dd886c0cc44d4ec85ac72c0 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: vlc
 Section: graphics
 Priority: optional
 Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
-Build-Depends: debhelper (>= 4.0), 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, libspeex-dev
-Build-Conflicts: libmpeg2-dev, libmpeg2-0-dev, libmpeg2-1-dev, libmpeg2-2-dev, libmpeg2-3-dev
+Build-Depends: debhelper (>= 4.0), 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, linux-kernel-headers (>= 2.5.999-test7-bk-5), libdv2-dev, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>= 1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev (>= 2.4.2.4), 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, libspeex-dev
+Build-Conflicts: libmpeg2-dev, libmpeg2-0-dev, libmpeg2-1-dev, libmpeg2-2-dev, libmpeg2-3-dev, dvb-dev
 Standards-Version: 3.6.1.0
 
 Package: vlc

diff --git a/debian/rules b/debian/rules
index e694fef6a23483b97136d8f5b81d732ab9625b37..a10502ed30da14db2c2b802b6c9d682dead53e79 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.107 2003/10/31 23:57:28 sam Exp $
+# $Id: rules,v 1.108 2003/11/01 10:07:09 sam Exp $
 # based on Joey Hess's one.
 
 # Uncomment this to turn on verbose mode.
@@ -15,7 +15,7 @@ CONFIG_FLAGS += \
        --enable-gnome \
        --enable-gtk \
        --disable-familiar \
-       --enable-fb \
+       --disable-fb \
        --enable-ggi \
        --enable-sdl \
        --enable-esd \

diff --git a/toolbox b/toolbox
index a941e06c17d6fcf1230ee96fb4db75463c892715..632e727f54dc1a43097c5efd92ca4076e36432eb 100755 (executable)
--- a/toolbox
+++ b/toolbox
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  toolbox for the VLC media player
-##  $Id: toolbox,v 1.46 2003/10/24 14:50:07 sam Exp $
+##  $Id: toolbox,v 1.47 2003/11/01 10:07:08 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -136,7 +136,7 @@ fi
 ##
 if test "${action}" = "vc"
 then
-  echo "generating Visual Studio files..."
+  echo "generating Visual Studio files"
 
   if test -z "${srcdir}"; then
     srcdir="`sed -ne 's/^srcdir *= *//p' < Makefile`"
@@ -163,7 +163,7 @@ then
   # config files
   for target in evc/config.h msvc/config.h
   do
-    echo "${target}"
+    printf "."
     rm -f ${target}
     sed -e "s/@CODENAME@/${LIBVLC_CODENAME}/" \
         -e "s/@VERSION@/${LIBVLC_VERSION}/" \
@@ -173,7 +173,7 @@ then
   # libvlc files
   for target in evc/libvlc.vcp msvc/libvlc.dsp
   do
-    echo "${target}"
+    printf "."
     #  Top of the project file
     perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
     #  The source files
@@ -296,7 +296,7 @@ EOF
         test "${msdir}" = "evc" && suf="vcp" || suf="dsp"
         source="${msdir}/plugins.${suf}.in"
         target="${msdir}/plugin_${mod}.${suf}"
-        echo "${target}"
+        printf "."
         perl -pe 'if(/§SOURCES§/){last;} s/§PLUGIN§/'${mod}'/g' < ${source} > ${target}
         for cfile in ${cfiles}
         do
@@ -327,7 +327,7 @@ EOF
   # vlc files
   for target in evc/vlc.vcp msvc/vlc.dsp
   do
-    echo "${target}"
+    printf "."
     #  Top of the project file
     perl -pe 'if(/§SOURCES§/){last;}' < ${target}.in > ${target}
     #  The source files
@@ -349,7 +349,7 @@ EOF
     perl -e 'while(<>){if(/§SOURCES§/){last;}}while(<>){print $_}' < ${target}.in >> ${target}
   done
 
-  echo "done."
+  echo " done."
   exit 0
 fi
 
@@ -596,12 +596,14 @@ then
   #                  libdvdplay0-dev (>=1.0.1-2) with libdvdplay0-dev
   #                  libxosd-dev (>=2.2.4-1.3) with libxosd-dev
   #                  ttf-freefonts with ttf-thryomanes
+  #                  linux-kernel-headers (>= 2.5.999-test7-bk-5) with dvb-dev
   #          remove libwxgtk2.4-dev
   #                 libflac-dev
   #                 libidl0 (workaround for mozilla-dev's bad deps)
   #                 libglib2.0-0 (workaround for mozilla-dev's bad deps)
   #                 libmatroska-dev
   #                 libspeex-dev
+  #                 dvb-dev (in build-conflicts)
   #          change Source: vlc with Source: vlc-woody
   #                 Section: gnome with Section: graphics
   #                 Section: kde with Section: kde
@@ -616,6 +618,7 @@ then
       -e 's/, libdvdplay0-dev[^,]*/, libdvdplay0-dev/' \
       -e 's/, libxosd-dev[^,]*/, libxosd-dev/' \
       -e 's/, ttf-freefonts[^,]*/, ttf-thryomanes/' \
+      -e 's/, linux-kernel-headers[^,]*/, dvb-dev/' \
       -e 's/, libwx[^,]*//' \
       -e '/Package: wxvlc/,/^ *$/d' \
       -e 's/, libflac-dev[^,]*//' \
@@ -623,6 +626,7 @@ then
       -e 's/, libglib2.0-0[^,]*//' \
       -e 's/, libmatroska-dev[^,]*//' \
       -e 's/, libspeex-dev[^,]*//' \
+      -e 's/\(Build-Conflicts: .*\), dvb-dev/\1/' \
       -e 's/Source: vlc/Source: vlc-woody/' \
       -e 's/Section: gnome/Section: graphics/' \
       -e 's/Section: kde/Section: graphics/' \