* fixed headers for FreeBSD compilation.

  * fixed debian/rules for non-x86 packages (Closes: Debian bug #88583).

diff --git a/debian/changelog b/debian/changelog
index 4c27a87d7e88070658abe41ee776b38940c72c60..b45def20ef12e83e8c08c2e25cad9aae013d76cf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vlc (0.2.63-2) unstable; urgency=low
+
+  * Glide shouldn't cause any non-x86 problems anymore (Closes: #88583).
+
+ -- Samuel Hocevar <sam@zoy.org>  Mon,  5 Mar 2001 12:50:28 +0100
+
 vlc (0.2.63-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/rules b/debian/rules
index eae15348f4ccbe0f8645bee7d09dcf85dbfb2530..4e5670295b5ec10aef1b4a2a74ad9103e0230742 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -95,9 +95,15 @@ binary-arch: build install
        dh_installdeb
 #      dh_perl
        dh_shlibdeps -Nvlc-glide
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
+       if [ $(DEB_BUILD_ARCH) = i386 ]; then \
+               dh_gencontrol ;\
+               dh_md5sums ;\
+               dh_builddeb ;\
+       else \
+               dh_gencontrol -Nvlc-glide ;\
+               dh_md5sums -Nvlc-glide ;\
+               dh_builddeb -Nvlc-glide ;\
+       fi
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install

diff --git a/plugins/dvd/dvd_ioctl.c b/plugins/dvd/dvd_ioctl.c
index eeb91354784813d7f04f0654221f0f0703be68d5..bcf0d7a70461689f1f52499717d4c1d4f3d80a2f 100644 (file)
--- a/plugins/dvd/dvd_ioctl.c
+++ b/plugins/dvd/dvd_ioctl.c
@@ -2,7 +2,7 @@
  * dvd_ioctl.c: DVD ioctl replacement function
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: dvd_ioctl.c,v 1.2 2001/02/26 12:16:28 sam Exp $
+ * $Id: dvd_ioctl.c,v 1.3 2001/03/05 11:53:44 sam Exp $
  *
  * Authors: Markus Kuespert <ltlBeBoy@beosmail.com>
  *          Samuel Hocevar <sam@zoy.org>
@@ -27,6 +27,7 @@
  *****************************************************************************/
 #include "defs.h"
 
+#include <sys/types.h>
 #include <netinet/in.h>
 #ifdef HAVE_SYS_IOCTL_H
 #   include <sys/ioctl.h>

diff --git a/plugins/mpeg/input_ts.c b/plugins/mpeg/input_ts.c
index e6eda47b73bf18c9e1eb7744535215e5c3fec7e5..c8557cac0fbbfa8b237d795a7db06b01c8e6e935 100644 (file)
--- a/plugins/mpeg/input_ts.c
+++ b/plugins/mpeg/input_ts.c
@@ -2,7 +2,7 @@
  * input_ts.c: TS demux and netlist management
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: input_ts.c,v 1.6 2001/02/21 04:38:59 henri Exp $
+ * $Id: input_ts.c,v 1.7 2001/03/05 11:53:44 sam Exp $
  *
  * Authors: 
  *
@@ -32,9 +32,9 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <sys/uio.h>
 
 #include <sys/types.h>
+#include <sys/uio.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>