* ./modules/visualization/xosd/xosd.c: Woody compilation fixed.

  * ./debian/woody-buildpackage: sed syntax fixed.

diff --git a/debian/woody-buildpackage b/debian/woody-buildpackage
index 37b017052f27e487f359ee00b9263ca90e13ad1f..f15ae995228951cb66eb3d8b74413d9daaad99c8 100755 (executable)
--- a/debian/woody-buildpackage
+++ b/debian/woody-buildpackage
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $Id: woody-buildpackage,v 1.2 2003/02/02 18:57:01 sam Exp $
+# $Id: woody-buildpackage,v 1.3 2003/02/03 01:32:37 sam Exp $
 # Build VLC for a Woody Debian system
 
 if test ! -d debian
@@ -25,8 +25,8 @@ sed -e 's/liba52-[^-]*-dev/a52dec-dev (>=0.7.3)/' \
 # remove wxwindows stuff, change changelog path
 sed -e '/# Package: wxvlc/,/^ *$/d' \
     -e '/--enable-wxwindows/d' \
-    -e ', debian/changelog , debian/changelog.woody ,' \
-    -e '/dh_gencontrol[^#]*/& -- -ldebian/changelog.woody/' \
+    -e 's, debian/changelog , debian/changelog.woody ,' \
+    -e 's,dh_gencontrol[^#]*,& -- -ldebian/changelog.woody,' \
     < debian/rules > debian/rules.woody
 chmod a+x debian/rules.woody
 

diff --git a/modules/visualization/xosd/xosd.c b/modules/visualization/xosd/xosd.c
index dbfac883145b2f0ef996c98068219fe772c68196..23297ed94a5173e27c07bcc6271e1ec53f8b8d51 100644 (file)
--- a/modules/visualization/xosd/xosd.c
+++ b/modules/visualization/xosd/xosd.c
@@ -2,7 +2,7 @@
  * xosd.c : X On Screen Display interface
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: xosd.c,v 1.6 2003/01/28 16:52:36 sam Exp $
+ * $Id: xosd.c,v 1.7 2003/02/03 01:32:37 sam Exp $
  *
  * Authors: Loïc Minier <lool@videolan.org>
  *
@@ -108,7 +108,7 @@ static int Open( vlc_object_t *p_this )
 
     /* Initialize library */
     p_intf->p_sys->p_osd =
-#ifdef HAVE_XOSD_VERSION_0
+#if defined(HAVE_XOSD_VERSION_0) || defined(HAVE_XOSD_VERSION_1)
         xosd_init( config_GetPsz( p_intf, "xosd-font" ),
                    "LawnGreen", 3, XOSD_top, 0, 1 );
 #else