* Another official Debian upload (workaround for an ICE in gcc-3.3 on PPC).

diff --git a/debian/changelog b/debian/changelog
index 56d656dfe8a48ef996779c677e4d3905a507eac3..a4417a6f4cb49f200fee17c1ba2d00617f9d4b94 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vlc (0.7.0-3) unstable; urgency=medium
+
+  * ppc/mpegvideo_altivec.c:
+    + Build this file with GCC 3.2 to work around an ICE.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Wed, 21 Jan 2004 15:36:30 +0100
+
 vlc (0.7.0-2) unstable; urgency=low
 
   * debian/rules:

diff --git a/debian/control b/debian/control
index f194ddc6a21059d706098a4892d714af5996b492..8027784139bc7ae61fa1ea21468775f1b79de541 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: vlc
 Section: graphics
 Priority: optional
 Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
-Build-Depends: debhelper (>= 4.0), gettext, xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>= 1.2.2-3.1), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi2-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, dvb-dev (>= 1.0.1-6), 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), libdvdplay0-dev (>= 1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>= 1.1.0), libimlib2-dev, libmatroska-dev (>= 0.6.2), libfreetype6-dev, libspeex-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.8)
+Build-Depends: debhelper (>= 4.0), gettext, xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>= 1.2.2-3.1), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi2-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, dvb-dev (>= 1.0.1-6), 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), libdvdplay0-dev (>= 1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>= 1.1.0), libimlib2-dev, libmatroska-dev (>= 0.6.2), libfreetype6-dev, libspeex-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.8), gcc-3.2 [powerpc]
 Build-Conflicts: libmpeg2-dev, libmpeg2-0-dev, libmpeg2-1-dev, libmpeg2-2-dev, libmpeg2-3-dev
 Standards-Version: 3.6.1.0
 

diff --git a/toolbox b/toolbox
index fc9fc34d1a583a76a50764e58183bb200d2eb9ef..bc363dade82871d1e01b6d4cc6d8579b1d361bf8 100755 (executable)
--- a/toolbox
+++ b/toolbox
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 ##  toolbox for the VLC media player
-##  $Id: toolbox,v 1.54 2004/01/04 18:18:45 sam Exp $
+##  $Id: toolbox,v 1.55 2004/01/21 14:44:56 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -633,6 +633,7 @@ then
   #                 libglib2.0-0 (workaround for mozilla-dev's bad deps)
   #                 libmatroska-dev
   #                 libspeex-dev
+  #                 gcc-3.2 (workaround for an ICE in gcc-3.3)
   #          change Section: gnome with Section: graphics
   #                 Section: kde with Section: kde
   #                 Section: libdevel with Section: devel
@@ -654,6 +655,7 @@ then
       -e 's/, libglib2.0-0[^,]*//' \
       -e 's/, libmatroska-dev[^,]*//' \
       -e 's/, libspeex-dev[^,]*//' \
+      -e 's/, gcc-3.2[^,]*//' \
       -e 's/Section: gnome/Section: graphics/' \
       -e 's/Section: kde/Section: graphics/' \
       -e 's/Section: libdevel/Section: devel/' \