* ./debian/control: added the FLAC decoder to the Debian package (sid-only,

    because the API changed too much since the version in woody).

diff --git a/debian/control b/debian/control
index 582cae11ac799fe76631f41eddd2fb80bf8a90b9..f03a2424f9c9c9272a899ebe84e90cdd750c33ee 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, 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
+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, libflac-dev (>=1.1.0)
 Standards-Version: 3.5.6
 
 Package: vlc

diff --git a/debian/rules b/debian/rules
index 7ef091e5bf2a2a665a1dc9f55a584e65bd8027a8..0d2d20fde382dfda9a190db1bcdf84343a11ff88 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -43,6 +43,7 @@ CONFIG_FLAGS += \
        --enable-vorbis \
        --enable-wxwindows \
        --enable-slp \
+       --enable-flac \
        $(NULL)
 
 # These ones are currently shipped with VLC

diff --git a/debian/woody-buildpackage b/debian/woody-buildpackage
index 2e1f6f9484dfc4d9a2b23078d735acf6cdaaa7b5..f17c1beef5576cfe2a0faa77e6e4f0274d36b84a 100755 (executable)
--- a/debian/woody-buildpackage
+++ b/debian/woody-buildpackage
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $Id: woody-buildpackage,v 1.7 2003/02/17 07:22:05 sam Exp $
+# $Id: woody-buildpackage,v 1.8 2003/03/11 18:57:30 sam Exp $
 # Build VLC for a Woody Debian system
 
 if test ! -d debian
@@ -16,8 +16,10 @@ sed -e 's/^vlc (\([^)]*\)-\([^-)]*\))/vlc (\1-0woody.\2)/' \
 # control: replace liba52-*-dev with a52dec-dev (>=0.7.3)
 #                  libdv*-dev with libdv-dev
 #                  kdelibs4-dev with kdelibs-dev
+#                  libqt3-dev with libqt-dev
 #                  libarts1-dev with libarts-dev
 #          remove libwxgtk2.4-dev
+#                 libflac-dev
 sed -e 's/liba52-[^-]*-dev/a52dec-dev (>=0.7.3)/' \
     -e 's/libdv[0-9]*-dev/libdv-dev/' \
     -e 's/kdelibs[0-9]*-dev/kdelibs-dev/' \
@@ -25,6 +27,7 @@ sed -e 's/liba52-[^-]*-dev/a52dec-dev (>=0.7.3)/' \
     -e 's/libarts[0-9]*-dev/libarts-dev/' \
     -e 's/, libwx[^,]*//' \
     -e '/Package: wxvlc/,/^ *$/d' \
+    -e 's/, libflac-dev[^,]*//' \
     < debian/control > debian/control.woody
 
 # rules: remove wxwindows stuff
@@ -32,6 +35,7 @@ sed -e 's/liba52-[^-]*-dev/a52dec-dev (>=0.7.3)/' \
 sed -e '/# Package: wxvlc/,/^ *$/d' \
     -e 's,^ARCH_EXCLUDE =,& -Nwxvlc,' \
     -e 's,--enable-wxwindows,--disable-wxwindows,' \
+    -e 's,--enable-flac,--disable-flac,' \
     -e 's, debian/changelog , debian/changelog.woody ,' \
     -e 's,dh_gencontrol[^#]*,& -- -ldebian/changelog.woody,' \
     < debian/rules > debian/rules.woody