Changeset 9bcf04ca297e25fa0e15344cb15e3d44f706af8a

Timestamp:

11/01/03 11:07:09 (5 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1067681229 +0000

git-parent:

[c43fd0523b9c234cc39c5fef62e78fe151adb0aa]

git-author:

Sam Hocevar <sam@videolan.org> 1067681229 +0000

Message:

• 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.

Files:

• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• debian/rules (modified) (2 diffs)
• toolbox (modified) (11 diffs)

debian/changelog

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  * New CVS snapshot.

debian/control

@@ -3 +3 @@
-Priority: optional
-Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
-dvb-dev, libdv2-dev, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>= 1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-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)
+, dvb-dev
-Standards-Version: 3.6.1.0
-

debian/rules

@@ -1 +1 @@
-#!/usr/bin/make -f
-# debian/rules for the VideoLAN Client - uses debhelper.
-7 2003/10/31 23:57:28
+8 2003/11/01 10:07:09
-# based on Joey Hess's one.
-
@@ -16 +16 @@
-    --enable-gtk \
-    --disable-familiar \
-en
+dis
-    --enable-ggi \
-    --enable-sdl \

toolbox

@@ -2 +2 @@
-
-##  toolbox for the VLC media player
-6 2003/10/24 14:50:07
+7 2003/11/01 10:07:08
-##
-##  Authors: Samuel Hocevar <sam@zoy.org>
@@ -137 +137 @@
-if test "${action}" = "vc"
-then
-...
+
-
-  if test -z "${srcdir}"; then
@@ -165 +165 @@
-  for target in evc/config.h msvc/config.h
-  do
-echo "${target}
+printf ".
-    rm -f ${target}
-    sed -e "s/@CODENAME@/${LIBVLC_CODENAME}/" \
@@ -175 +175 @@
-  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}
@@ -298 +298 @@
-        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}
@@ -329 +329 @@
-  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}
@@ -351 +351 @@
-  done
-
-
+ 
-  exit 0
-fi
@@ -598 +598 @@
-  #                  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
@@ -604 +605 @@
-  #                 libmatroska-dev
-  #                 libspeex-dev
+  #                 dvb-dev (in build-conflicts)
-  #          change Source: vlc with Source: vlc-woody
-  #                 Section: gnome with Section: graphics
@@ -618 +620 @@
-      -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' \
@@ -625 +628 @@
-      -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/' \