* ./debian/control: fixed Debian build-depends.

  * ./include/config.h: changed RELEASE to HAVE_RELEASE because RELEASE
    is already defined in <scsi/scsi.h> under Linux.

diff --git a/Makefile.opts.in b/Makefile.opts.in
index 788e435d1035356b6332fba6031afcf1d54331c8..72afe40af2653fad93ce0b1bd985151fa9af436a 100644 (file)
--- a/Makefile.opts.in
+++ b/Makefile.opts.in
@@ -223,7 +223,7 @@ CFLAGS += -D_REENTRANT
 CFLAGS += -D_GNU_SOURCE
 
 ifeq ($(RELEASE),1)
-CFLAGS += -DRELEASE
+CFLAGS += -DHAVE_RELEASE
 endif
 
 # flags needed for clean beos compilation

diff --git a/debian/control b/debian/control
index c1955f0043d7c75a499e3714988199f3d13e9fed..af69048f0f4d94ac2ace51e04eaede9ec292afeb 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,15 @@ Section: graphics
 Priority: optional
 Maintainer: Samuel Hocevar <sam@zoy.org>
 Build-Depends: debhelper (>=2.2.0),
-               xlibs-dev, xlibs-pic
+               xlibs-dev, xlibs-pic,
                libgnome-dev,
                libggi2-dev,
                libglide2-dev [i386],
                libesd0-dev,
                libsdl1.2-dev (>=1.2.2-3.1),
                libqt-dev,
-               libasound2-dev [alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc] (>=0.9.0beta7)
+               libasound2-dev [alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc] (>=0.9.0beta7),
+               libarts-dev
 Standards-Version: 3.5.6
 
 Package: vlc

diff --git a/include/config.h b/include/config.h
index 3d1fdbc630df8df5a3728b3cdbf612bca46fbebd..6190004f1ddfed4dbe3f0f2fc3787ffcfb2edcad 100644 (file)
--- a/include/config.h
+++ b/include/config.h
@@ -416,7 +416,7 @@
 
 /* Optimization level, from 0 to 2 - 1 is generally a good compromise. Remember
  * that raising this level dramatically lengthens the compilation time. */
-#ifdef RELEASE
+#ifdef HAVE_RELEASE
 #   define VPAR_OPTIM_LEVEL             2
 #else
 #   define VPAR_OPTIM_LEVEL             1