From 5a7141344c60c99d819baa771552cc8061d3295a Mon Sep 17 00:00:00 2001
From: Morgan Collett <morgan.collett@gmail.com>
Date: Thu, 21 Aug 2008 10:30:28 +0000
Subject: #7852: Fix crash on launch by using numpy

---
diff --git a/Speak.activity/MANIFEST b/Speak.activity/MANIFEST
index 4fdf708..e9e53b0 100644
--- a/Speak.activity/MANIFEST
+++ b/Speak.activity/MANIFEST
@@ -4,6 +4,12 @@ activity.py
 audio.py
 COPYING
 eye.py
+fft_mouth.py
+glasses.py
 mouth.py
+NEWS
 setup.py
-voice.py
\ No newline at end of file
+voice.py
+waveform_mouth.py
+po/activity.pot
+po/voice.pot
diff --git a/Speak.activity/NEWS b/Speak.activity/NEWS
new file mode 100644
index 0000000..f07baa1
--- /dev/null
+++ b/Speak.activity/NEWS
@@ -0,0 +1 @@
+* #7852: Fix crash on launch by using numpy (morgs)
diff --git a/Speak.activity/fft_mouth.py b/Speak.activity/fft_mouth.py
index 230b673..08564d8 100644
--- a/Speak.activity/fft_mouth.py
+++ b/Speak.activity/fft_mouth.py
@@ -25,8 +25,13 @@
 
 from mouth import *
 
-from Numeric import ceil
-from FFT import *
+# Newer OLPC builds (and Fedora) have numpy instead of numeric:
+try:
+    from numpy.oldnumeric import ceil
+    from numpy.fft import *
+except:
+    from Numeric import ceil
+    from FFT import *
 
 class FFTMouth(Mouth):
     def __init__(self, audioSource):
--
cgit v0.9.1