--- aubio-0.3.2.orig/debian/libaubio-dev.docs +++ aubio-0.3.2/debian/libaubio-dev.docs @@ -0,0 +1,2 @@ +THANKS +TODO --- aubio-0.3.2.orig/debian/rules +++ aubio-0.3.2/debian/rules @@ -0,0 +1,43 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +ifeq (linux-gnu,$(DEB_HOST_GNU_SYSTEM)) + DEB_CONFIGURE_ALSA := --enable-alsa +else + DEB_CONFIGURE_ALSA := --disable-alsa +endif + +%: + dh --with quilt,python-support $@ + +override_dh_auto_configure: + dh_auto_configure -- \ + ${DEB_CONFIGURE_ALSA} \ + --enable-jack \ + --enable-fftw3 \ + --disable-lash + +binary: binary-arch binary-indep + dh binary + +binary-indep: + $(MAKE) doc-user + dh binary-indep + +override_dh_auto_install: + dh_auto_install + sed -i -e "s/\(dependency_libs=\).*/\1/" debian/tmp/usr/lib/*.la + +override_dh_auto_clean: + dh_testdir + dh_testroot + [ ! -f doc/Makefile ] || $(MAKE) -C doc clean + [ ! -f Makefile ] || $(MAKE) distclean + dh_quilt_unpatch + dh_clean + +override_dh_compress: + dh_compress -X.js --- aubio-0.3.2.orig/debian/watch +++ aubio-0.3.2/debian/watch @@ -0,0 +1,2 @@ +version=2 +http://aubio.piem.org/pub/ aubio-([0-9.]*)\.tar\.gz --- aubio-0.3.2.orig/debian/libaubio2.install +++ aubio-0.3.2/debian/libaubio2.install @@ -0,0 +1 @@ +usr/lib/libaubio*.so.* --- aubio-0.3.2.orig/debian/python-aubio.install +++ aubio-0.3.2/debian/python-aubio.install @@ -0,0 +1,3 @@ +usr/lib/python*/site-packages/aubio/_aubiowrapper.so +usr/lib/python*/site-packages/aubio/*.py +usr/lib/python*/site-packages/aubio/*/*.py --- aubio-0.3.2.orig/debian/compat +++ aubio-0.3.2/debian/compat @@ -0,0 +1 @@ +7 --- aubio-0.3.2.orig/debian/pd-aubio.install +++ aubio-0.3.2/debian/pd-aubio.install @@ -0,0 +1,2 @@ +usr/lib/pd/extra/* +usr/lib/pd/doc/* --- aubio-0.3.2.orig/debian/libaubio2.dirs +++ aubio-0.3.2/debian/libaubio2.dirs @@ -0,0 +1 @@ +usr/lib --- aubio-0.3.2.orig/debian/control +++ aubio-0.3.2/debian/control @@ -0,0 +1,92 @@ +Source: aubio +Section: sound +Priority: optional +Maintainer: Paul Brossier +Build-Depends: debhelper (>= 7.0.50~), + quilt, + docbook-to-man, + libtool, + libjack-dev, + libsndfile1-dev, + libsamplerate-dev, + libasound2-dev, + fftw3-dev, + python-all-dev (>= 2.3.5-11), + python-support (>= 0.90), + swig, + puredata-dev +Build-Depends-Indep: doxygen, graphviz, gsfonts +XS-Python-Version: current +Standards-Version: 3.8.3 + +Package: libaubio-dev +Section: libdevel +Architecture: any +Depends: libaubio2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Description: a library for audio segmentation + aubio gathers a set of functions for audio signal segmentation and labelling. + The library contains a phase vocoder, onset and pitch detection functions, a + beat tracking algorithm and other sound processing utilities. + . + This package contains the development files for libaubio. + +Package: libaubio2 +Section: libs +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: libaubio1 +Description: a library for audio segmentation + aubio gathers a set of functions for audio signal segmentation and labelling. + The library contains a phase vocoder, onset and pitch detection functions, a + beat tracking algorithm and other sound processing utilities. + . + This package provides the shared library libaubio. + +Package: aubio-tools +Section: sound +Architecture: any +Depends: python-aubio (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Description: a library for audio segmentation -- utilities + aubio gathers a set of functions for audio signal segmentation and labelling. + The library contains a phase vocoder, onset and pitch detection functions, a + beat tracking algorithm and other sound processing utilities. + . + This package provides command line tools to run the different algorithms. + +Package: libaubio-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Description: a library for audio segmentation -- documentation + aubio gathers a set of functions for audio signal segmentation and labelling. + The library contains a phase vocoder, onset and pitch detection functions, a + beat tracking algorithm and other sound processing utilities. + . + This package provides the documentation for the C interface. + +Package: python-aubio +Section: python +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Suggests: python-numpy, python-gnuplot +Provides: ${python:Provides} +Replaces: python2.3-aubio +Conflicts: python2.3-aubio +XB-Python-Version: ${python:Versions} +Description: python interface for aubio, a library for audio segmentation + aubio gathers a set of functions for audio signal segmentation and labelling. + The library contains a phase vocoder, onset and pitch detection functions, a + beat tracking algorithm and other sound processing utilities. + . + This package provides the Python interface for the current Python version. + +Package: pd-aubio +Section: sound +Architecture: any +Depends: pd, ${shlibs:Depends}, ${misc:Depends} +Description: aubio external for PureData + aubio gathers a set of functions for audio signal segmentation and labelling. + The library contains a phase vocoder, onset and pitch detection functions, a + beat tracking algorithm and other sound processing utilities. + . + This package provides PureData objects to use the aubio features. --- aubio-0.3.2.orig/debian/copyright +++ aubio-0.3.2/debian/copyright @@ -0,0 +1,118 @@ +This package was debianized by Paul Brossier on +Tue, 27 Apr 2004 15:01:59 +0100. + +It was downloaded from http://aubio.piem.org/ + +Upstream Author: Paul Brossier + +Copyright: + + Copyright (C) 2003-2005 Paul Brossier + +License: + + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation; either version 2, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for + more details. + + You should have received a copy of the GNU Library General Public License + along with this library; if not, write to the Free Software Foundation, Inc., + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General Public License may be +found in /usr/share/common-licenses/GPL. + +-- + +Copyright for files src/pitchschmitt.c and src/pitchfcomb.c: + + This file were originally taken from TuneIt - a simple command line + instrument tuner for Linux, available at http://delysid.org/tuneit.html . + + Copyright (C) 2004, 2005 Mario Lang + +License: + + This library is free software; you can redistribute it and/or modify it under + the terms of the GNU Library General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your option) any + later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for + more details. + + You should have received a copy of the GNU Library General Public License + along with this library; if not, write to the Free Software Foundation, Inc., + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General Public License may be +found in /usr/share/common-licenses/GPL. + +-- + +Copyright for files ext/**.c: + + This files were originally taken from FluidSynth - a software synthesizer, + available at http://www.nongnu.org/fluid + + Copyright (C) 2003 Peter Hanappe and others. + +License: + + This library is free software; you can redistribute it and/or modify it under + the terms of the GNU Library General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your option) any + later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for + more details. + + You should have received a copy of the GNU Library General Public License + along with this library; if not, write to the Free Software Foundation, Inc., + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General Public License may be +found in /usr/share/common-licenses/GPL. + +-- + +Copyright for files ext/midi/list.[ch]: + + Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald + + This files, also found in Fluidsynth, were modified by the authors of GLIB - + a Library of useful routines for C programming, and are available at + ftp://ftp.gtk.org/pub/gtk/ . + +License: + + This library is free software; you can redistribute it and/or modify it under + the terms of the GNU Library General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at your option) any + later version. + + This library is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more + details. + + You should have received a copy of the GNU Library General Public License + along with this library; if not, write to the Free Software Foundation, Inc., + 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General Public License may be +found in /usr/share/common-licenses/GPL. + +-- + +The Debian packaging is (C) 2006, Paul Brossier and is +licensed under the GPL, see above. --- aubio-0.3.2.orig/debian/changelog +++ aubio-0.3.2/debian/changelog @@ -0,0 +1,139 @@ +aubio (0.3.2-4.2) unstable; urgency=low + + * Non-maintainer upload. + * Replace puredata with puredata-dev in the Build-Depends field to fix + FTBFS (Closes: #625676). + + -- Alessio Treglia Thu, 05 May 2011 10:09:35 +0200 + +aubio (0.3.2-4.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix FTBFS with binutils-gold (Closes: #553930). + * Conditionally enable ALSA depending on whether building on Linux; + patch from Steven McDonald (Closes: #619802). + * Explicitly set packaging format by putting '1.0' into the + debian/source/format file. + + -- Alessio Treglia Fri, 29 Apr 2011 15:32:33 +0200 + +aubio (0.3.2-4) unstable; urgency=low + + * Fix building of architecture dependent packages + * Do not compress search.js in libaubio-doc + + -- Paul Brossier Mon, 28 Sep 2009 13:34:53 +0200 + +aubio (0.3.2-3) unstable; urgency=low + + * debian/patches/01_numarray_gnuplot.diff: pull patch from bzr rev 690 + (closes: #478438, #512622) + * debian/control: + - split Build-Depends on multiple lines + - change B-D from puredata to pd (closes: #491965) + - fix typo python Python + - switch to python-numpy (see: #478438) + - move libaubio-dev to libdevel + - bump Standards-Version to 3.8.3 + - use ${binary:Version}, not ${Source-Version} + - add ${shlibs:Depends}, ${misc:Depends} to libaubio-dev + - add Build-Depends on quilt + - switch to python-support + * debian/rules: + - use tiny model + - disable lash + - tighten debhelper Build-Depends to (>= 7.0.50~) + - move config.{sub,guess} updating to + debian/patches/10_uptodate_configure.diff + * debian/libaubio-dev.install: temporarly hack .la files until the + libtool dependency traverser is being fixed (closes: #465057) + * debian/aubio-tools.manpages: install all manpages + * debian/libaubio-doc.doc-base: correct section Programming + * debian/compat: bump to 7 + * debian/rules: move dh_installdeb before dh_makeshlibs + + -- Paul Brossier Mon, 28 Sep 2009 03:15:52 +0200 + +aubio (0.3.2-2) unstable; urgency=low + + * Update debian/copyright + * Upload to unstable (closes: #383550) + + -- Paul Brossier Thu, 2 Nov 2006 19:36:41 +0100 + +aubio (0.3.2-1) unstable; urgency=low + + * New upstream release + + -- Paul Brossier Tue, 31 Oct 2006 19:38:54 +0100 + +aubio (0.3.1-1) unstable; urgency=low + + * New upstream release + * Removed python2.3-aubio, moved to python-central + + -- Paul Brossier Tue, 27 Jun 2006 17:46:42 +0200 + +aubio (0.3.0-1) unstable; urgency=low + + * New upstream release + * Add package for PureData plugins + + -- Paul Brossier Fri, 19 May 2006 16:07:21 +0200 + +aubio (0.2.0-1) unstable; urgency=low + + * New upstream release + * Added -fPIC to swig python module python/aubio/Makefile.am + * Added manpages for aubiocut, aubiopitch and aubiotrack + * Splitted python-aubio and libaubio-doc packages + + -- Paul Brossier Tue, 27 Sep 2005 16:49:09 +0100 + +aubio (0.1.9beta5-1) unstable; urgency=low + + * New upstream release + + -- Paul Brossier Sun, 15 May 2005 16:20:03 +0100 + +aubio (0.1.8-1) unstable; urgency=low + + * New upstream release + * Added docbook-to-man and puredata Build-Depends + + -- Paul Brossier Sun, 12 Dec 2004 00:01:32 +0000 + +aubio (0.1.6-1) unstable; urgency=low + + * New release + * Added swig and python-dev Build-Depends + + -- Paul Brossier Sun, 26 Sep 2004 13:48:41 +0100 + +aubio (0.1.5-1) unstable; urgency=low + + * New upstream release + + -- Paul Brossier Mon, 23 Aug 2004 21:36:58 +0200 + +aubio (0.1.4-1) unstable; urgency=low + + * New upstream release + * Simplifies install scripts + + -- Paul Brossier Wed, 23 Jun 2004 18:24:55 +0100 + +aubio (0.1.3alpha-2) unstable; urgency=low + + * Manually added missing headers in libaubio-dev + * Added manpages for autio tools. + * Fixed dependancies. + + -- Paul Brossier Wed, 5 May 2004 12:18:39 +0100 + +aubio (0.1.3alpha-1) unstable; urgency=low + + * Initial Release. + + -- Paul Brossier Tue, 27 Apr 2004 15:01:59 +0100 + --- aubio-0.3.2.orig/debian/libaubio-doc.doc-base +++ aubio-0.3.2/debian/libaubio-doc.doc-base @@ -0,0 +1,10 @@ +Document: libaubio +Title: Aubio Manual +Author: Paul Brossier +Abstract: This is a programming manual for the libaubio library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libaubio-doc/html/index.html +Files: /usr/share/doc/libaubio-doc/html/*.html + --- aubio-0.3.2.orig/debian/aubio-tools.dirs +++ aubio-0.3.2/debian/aubio-tools.dirs @@ -0,0 +1,2 @@ +usr/bin +usr/share --- aubio-0.3.2.orig/debian/aubio-tools.install +++ aubio-0.3.2/debian/aubio-tools.install @@ -0,0 +1,2 @@ +usr/bin/* +usr/share/sounds/* --- aubio-0.3.2.orig/debian/pycompat +++ aubio-0.3.2/debian/pycompat @@ -0,0 +1 @@ +2 --- aubio-0.3.2.orig/debian/README.source +++ aubio-0.3.2/debian/README.source @@ -0,0 +1,5 @@ +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +Read more about this on /usr/share/doc/quilt/README.source. --- aubio-0.3.2.orig/debian/libaubio-dev.install +++ aubio-0.3.2/debian/libaubio-dev.install @@ -0,0 +1,5 @@ +usr/include/* +usr/lib/lib*.a +usr/lib/lib*.so +usr/lib/pkgconfig/* +usr/lib/*.la --- aubio-0.3.2.orig/debian/aubio-tools.manpages +++ aubio-0.3.2/debian/aubio-tools.manpages @@ -0,0 +1 @@ +doc/*.1 --- aubio-0.3.2.orig/debian/libaubio-dev.dirs +++ aubio-0.3.2/debian/libaubio-dev.dirs @@ -0,0 +1,2 @@ +usr/lib +usr/include --- aubio-0.3.2.orig/debian/libaubio-doc.docs +++ aubio-0.3.2/debian/libaubio-doc.docs @@ -0,0 +1,3 @@ +doc/user/html +THANKS +TODO --- aubio-0.3.2.orig/debian/source/format +++ aubio-0.3.2/debian/source/format @@ -0,0 +1 @@ +1.0 --- aubio-0.3.2.orig/debian/patches/series +++ aubio-0.3.2/debian/patches/series @@ -0,0 +1,3 @@ +01_numarray_gnuplot.diff +10_uptodate_configure.diff +02_binutils_gold.patch --- aubio-0.3.2.orig/debian/patches/10_uptodate_configure.diff +++ aubio-0.3.2/debian/patches/10_uptodate_configure.diff @@ -0,0 +1,22 @@ +--- aubio/config.sub 2009-01-29 08:30:53.000000000 +0100 ++++ aubio/config.sub 2009-03-17 13:40:53.000000000 +0100 +@@ -1,4 +1,8 @@ + #! /bin/sh ++if [ -x /usr/share/misc/config.sub ]; then ++ exec /usr/share/misc/config.sub "$@" ++fi ++ + # Configuration validation subroutine script. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 +--- aubio/config.guess 2009-01-29 08:30:53.000000000 +0100 ++++ aubio/config.guess 2009-03-17 13:39:55.000000000 +0100 +@@ -1,4 +1,8 @@ + #! /bin/sh ++if [ -x /usr/share/misc/config.guess ]; then ++ exec /usr/share/misc/config.guess "$@" ++fi ++ + # Attempt to guess a canonical system name. + # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, + # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 --- aubio-0.3.2.orig/debian/patches/02_binutils_gold.patch +++ aubio-0.3.2/debian/patches/02_binutils_gold.patch @@ -0,0 +1,31 @@ +Description: Fix build failure with ld --no-add-needed. +Origin: Ubuntu +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=553930 +Forwarded: no +--- + examples/Makefile.am | 2 +- + examples/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- aubio-0.3.2.orig/examples/Makefile.am ++++ aubio-0.3.2/examples/Makefile.am +@@ -4,7 +4,7 @@ endif + + # global flags + AM_CFLAGS = -DAUBIO_PREFIX=\"$(prefix)\" -I$(top_srcdir)/src -I$(top_srcdir)/ext @AUBIO_CFLAGS@ @LASH_CFLAGS@ @FFTWLIB_CFLAGS@ +-AM_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/ext -laubioext -laubio @LASH_LIBS@ ++AM_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/ext -laubioext -laubio @LASH_LIBS@ -lm + + # add your programs to this list + bin_PROGRAMS = \ +--- aubio-0.3.2.orig/examples/Makefile.in ++++ aubio-0.3.2/examples/Makefile.in +@@ -239,7 +239,7 @@ target_alias = @target_alias@ + + # global flags + AM_CFLAGS = -DAUBIO_PREFIX=\"$(prefix)\" -I$(top_srcdir)/src -I$(top_srcdir)/ext @AUBIO_CFLAGS@ @LASH_CFLAGS@ @FFTWLIB_CFLAGS@ +-AM_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/ext -laubioext -laubio @LASH_LIBS@ ++AM_LDFLAGS = -L$(top_builddir)/src -L$(top_builddir)/ext -laubioext -laubio @LASH_LIBS@ -lm + EXTRA_DIST = utils.h + + # optionally add sources file for these programs --- aubio-0.3.2.orig/debian/patches/01_numarray_gnuplot.diff +++ aubio-0.3.2/debian/patches/01_numarray_gnuplot.diff @@ -0,0 +1,330 @@ +--- aubio-0.3.2.orig/python/aubio/aubioclass.py 2006-07-27 01:27:22.000000000 +0200 ++++ aubio-0.3.2/python/aubio/aubioclass.py 2009-09-27 21:53:46.000000000 +0200 +@@ -42,8 +42,10 @@ + self.file = new_aubio_sndfile_wo(model.file,filename) + else: + self.file = new_aubio_sndfile_ro(filename) ++ if self.file == None: ++ raise(ValueError, "failed opening file %s" % filename) + def __del__(self): +- del_aubio_sndfile(self.file) ++ if self.file != None: del_aubio_sndfile(self.file) + def info(self): + aubio_sndfile_info(self.file) + def samplerate(self): +@@ -126,7 +128,7 @@ + channels=1,samplerate=44100.,omode=aubio_pitchm_freq,yinthresh=0.1): + self.pitchp = new_aubio_pitchdetection(bufsize,hopsize,channels, + samplerate,mode,omode) +- aubio_pitchdetection_set_yinthresh(self.pitchp,yinthresh) ++ aubio_pitchdetection_set_yinthresh(self.pitchp,yinthresh) + #self.filt = filter(srate,"adsgn") + def __del__(self): + del_aubio_pitchdetection(self.pitchp) +--- aubio-0.3.2.orig/python/aubio/bench/onset.py 2006-07-27 01:27:19.000000000 +0200 ++++ aubio-0.3.2/python/aubio/bench/onset.py 2009-09-27 21:53:46.000000000 +0200 +@@ -111,7 +111,7 @@ + for i in self.vlist: + gd.append(i['GD']) + fp.append(i['FP']) +- d.append(Gnuplot.Data(fp, gd, with='linespoints', ++ d.append(Gnuplot.Data(fp, gd, with_='linespoints', + title="%s %s" % (plottitle,i['mode']) )) + + def plotplotroc(self,d,outplot=0,extension='ps'): +@@ -147,7 +147,7 @@ + for i in self.vlist: + x.append(i['prec']) + y.append(i['recl']) +- d.append(Gnuplot.Data(x, y, with='linespoints', ++ d.append(Gnuplot.Data(x, y, with_='linespoints', + title="%s %s" % (plottitle,i['mode']) )) + + def plotplotpr(self,d,outplot=0,extension='ps'): +@@ -172,7 +172,7 @@ + for i in self.vlist: + x.append(i['thres']) + y.append(i['dist']) +- d.append(Gnuplot.Data(x, y, with='linespoints', ++ d.append(Gnuplot.Data(x, y, with_='linespoints', + title="%s %s" % (plottitle,i['mode']) )) + + def plotplotfmeas(self,d,outplot="",extension='ps', title="F-measure"): +@@ -205,7 +205,7 @@ + for i in self.vlist: + x.append(i[var]) + y.append(i['dist']) +- d.append(Gnuplot.Data(x, y, with='linespoints', ++ d.append(Gnuplot.Data(x, y, with_='linespoints', + title="%s %s" % (plottitle,i['mode']) )) + + def plotplotfmeasvar(self,d,var,outplot="",extension='ps', title="F-measure"): +@@ -244,7 +244,7 @@ + total = v['Torig'] + for i in range(len(per)): per[i] /= total/100. + +- d.append(Gnuplot.Data(val, per, with='fsteps', ++ d.append(Gnuplot.Data(val, per, with_='fsteps', + title="%s %s" % (plottitle,v['mode']) )) + #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (mean,smean)) + #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (amean,samean)) +@@ -275,7 +275,7 @@ + total = v['Torig'] + for i in range(len(per)): per[i] /= total/100. + +- d.append(Gnuplot.Data(val, per, with='fsteps', ++ d.append(Gnuplot.Data(val, per, with_='fsteps', + title="%s %s" % (plottitle,v['mode']) )) + #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (mean,smean)) + #d.append('mean=%f,sigma=%f,eps(x) title \"\"'% (amean,samean)) +--- aubio-0.3.2.orig/python/aubio/gnuplot.py 2006-08-24 04:13:22.000000000 +0200 ++++ aubio-0.3.2/python/aubio/gnuplot.py 2009-09-27 21:53:46.000000000 +0200 +@@ -23,7 +23,7 @@ + + def audio_to_array(filename): + import aubio.aubioclass +- import numarray ++ from numpy import arange + hopsize = 2048 + filei = aubio.aubioclass.sndfile(filename) + framestep = 1/(filei.samplerate()+0.) +@@ -39,7 +39,7 @@ + while (curpos < readsize): + data.append(myvec.get(curpos,i)) + curpos+=1 +- time = numarray.arange(len(data))*framestep ++ time = arange(len(data))*framestep + return time,data + + def plot_audio(filenames, g, options): +@@ -143,29 +143,29 @@ + + def downsample_audio(time,data,maxpoints=10000): + """ resample audio data to last only maxpoints """ +- import numarray ++ from numpy import array, resize + length = len(time) + downsample = length/maxpoints + if downsample == 0: downsample = 1 +- x = numarray.array(time).resize(length)[0:-1:downsample] +- y = numarray.array(data).resize(length)[0:-1:downsample] ++ x = resize(array(time),length)[0:-1:downsample] ++ y = resize(array(data),length)[0:-1:downsample] + return x,y + + def make_audio_plot(time,data,maxpoints=10000): + """ create gnuplot plot from an audio file """ + import Gnuplot, Gnuplot.funcutils + x,y = downsample_audio(time,data,maxpoints=maxpoints) +- return Gnuplot.Data(x,y,with='lines') ++ return Gnuplot.Data(x,y,with_='lines') + + def make_audio_envelope(time,data,maxpoints=10000): + """ create gnuplot plot from an audio file """ +- import numarray ++ from numpy import array + import Gnuplot, Gnuplot.funcutils + bufsize = 500 +- x = [i.mean() for i in numarray.array(time).resize(len(time)/bufsize,bufsize)] +- y = [i.mean() for i in numarray.array(data).resize(len(time)/bufsize,bufsize)] ++ x = [i.mean() for i in resize(array(time), (len(time)/bufsize,bufsize))] ++ y = [i.mean() for i in resize(array(data), (len(time)/bufsize,bufsize))] + x,y = downsample_audio(x,y,maxpoints=maxpoints) +- return Gnuplot.Data(x,y,with='lines') ++ return Gnuplot.Data(x,y,with_='lines') + + def gnuplot_addargs(parser): + """ add common gnuplot argument to OptParser object """ +--- aubio-0.3.2.orig/python/aubio/onsetcompare.py 2006-07-27 01:27:40.000000000 +0200 ++++ aubio-0.3.2/python/aubio/onsetcompare.py 2009-09-27 21:53:46.000000000 +0200 +@@ -106,7 +106,7 @@ + return orig, missed, merged, expc, bad, doubled, l, labs + + def notes_roc (la, lb, eps): +- from numarray import transpose, add, resize ++ from numpy import transpose, add, resize + """ creates a matrix of size len(la)*len(lb) then look for hit and miss + in it within eps tolerance windows """ + gdn,fpw,fpg,fpa,fdo,fdp = 0,0,0,0,0,0 +--- aubio-0.3.2.orig/python/aubio/task/beat.py 2006-09-25 21:26:08.000000000 +0200 ++++ aubio-0.3.2/python/aubio/task/beat.py 2009-09-27 21:53:46.000000000 +0200 +@@ -247,7 +247,7 @@ + + def plot(self,oplots,results): + import Gnuplot +- oplots.append(Gnuplot.Data(results,with='linespoints',title="auto")) ++ oplots.append(Gnuplot.Data(results,with_='linespoints',title="auto")) + + def plotplot(self,wplot,oplots,outplot=None,extension=None,xsize=1.,ysize=1.,spectro=False): + import Gnuplot +@@ -258,5 +258,5 @@ + #f = make_audio_plot(time,data) + + g = gnuplot_create(outplot=outplot, extension=extension) +- oplots = [Gnuplot.Data(self.gettruth(),with='linespoints',title="orig")] + oplots ++ oplots = [Gnuplot.Data(self.gettruth(),with_='linespoints',title="orig")] + oplots + g.plot(*oplots) +--- aubio-0.3.2.orig/python/aubio/task/notes.py 2006-07-27 01:27:19.000000000 +0200 ++++ aubio-0.3.2/python/aubio/task/notes.py 2009-09-27 21:53:46.000000000 +0200 +@@ -92,18 +92,17 @@ + return now, onset, freq, ifreq + + def plot(self,now,onset,freq,ifreq,oplots): +- import numarray + import Gnuplot + +- oplots.append(Gnuplot.Data(now,freq,with='lines', ++ oplots.append(Gnuplot.Data(now,freq,with_='lines', + title=self.params.pitchmode)) +- oplots.append(Gnuplot.Data(now,ifreq,with='lines', ++ oplots.append(Gnuplot.Data(now,ifreq,with_='lines', + title=self.params.pitchmode)) + + temponsets = [] + for i in onset: + temponsets.append(i*1000) +- oplots.append(Gnuplot.Data(now,temponsets,with='impulses', ++ oplots.append(Gnuplot.Data(now,temponsets,with_='impulses', + title=self.params.pitchmode)) + + def plotplot(self,wplot,oplots,outplot=None,multiplot = 0): +@@ -117,10 +116,10 @@ + # check if ground truth exists + #timet,pitcht = self.gettruth() + #if timet and pitcht: +- # oplots = [Gnuplot.Data(timet,pitcht,with='lines', ++ # oplots = [Gnuplot.Data(timet,pitcht,with_='lines', + # title='ground truth')] + oplots + +- t = Gnuplot.Data(0,0,with='impulses') ++ t = Gnuplot.Data(0,0,with_='impulses') + + g = gnuplot_init(outplot) + g('set title \'%s\'' % (re.sub('.*/','',self.input))) +--- aubio-0.3.2.orig/python/aubio/task/onset.py 2006-08-11 14:27:47.000000000 +0200 ++++ aubio-0.3.2/python/aubio/task/onset.py 2009-09-27 21:53:46.000000000 +0200 +@@ -92,7 +92,7 @@ + import Gnuplot, Gnuplot.funcutils + import aubio.txtfile + import os.path +- import numarray ++ from numpy import arange, array, ones + from aubio.onsetcompare import onset_roc + + x1,y1,y1p = [],[],[] +@@ -102,8 +102,8 @@ + self.lenofunc = len(ofunc) + self.maxofunc = max(ofunc) + # onset detection function +- downtime = numarray.arange(len(ofunc))*self.params.step +- oplot.append(Gnuplot.Data(downtime,ofunc,with='lines',title=self.params.onsetmode)) ++ downtime = arange(len(ofunc))*self.params.step ++ oplot.append(Gnuplot.Data(downtime,ofunc,with_='lines',title=self.params.onsetmode)) + + # detected onsets + if not nplot: +@@ -111,11 +111,11 @@ + x1.append(i[0]*self.params.step) + y1.append(self.maxofunc) + y1p.append(-self.maxofunc) +- #x1 = numarray.array(onsets)*self.params.step +- #y1 = self.maxofunc*numarray.ones(len(onsets)) ++ #x1 = array(onsets)*self.params.step ++ #y1 = self.maxofunc*ones(len(onsets)) + if x1: +- oplot.append(Gnuplot.Data(x1,y1,with='impulses')) +- wplot.append(Gnuplot.Data(x1,y1p,with='impulses')) ++ oplot.append(Gnuplot.Data(x1,y1,with_='impulses')) ++ wplot.append(Gnuplot.Data(x1,y1p,with_='impulses')) + + oplots.append((oplot,self.params.onsetmode,self.maxofunc)) + +@@ -126,9 +126,9 @@ + self.title = "" #"(no ground truth)" + else: + t_onsets = aubio.txtfile.read_datafile(datafile) +- x2 = numarray.array(t_onsets).resize(len(t_onsets)) +- y2 = self.maxofunc*numarray.ones(len(t_onsets)) +- wplot.append(Gnuplot.Data(x2,y2,with='impulses')) ++ x2 = array(t_onsets).resize(len(t_onsets)) ++ y2 = self.maxofunc*ones(len(t_onsets)) ++ wplot.append(Gnuplot.Data(x2,y2,with_='impulses')) + + tol = 0.050 + +--- aubio-0.3.2.orig/python/aubio/task/pitch.py 2006-07-27 01:27:19.000000000 +0200 ++++ aubio-0.3.2/python/aubio/task/pitch.py 2009-09-27 21:53:46.000000000 +0200 +@@ -156,7 +156,7 @@ + + time = [ (i+self.params.pitchdelay)*self.params.step for i in range(len(pitch)) ] + pitch = [aubio_freqtomidi(i) for i in pitch] +- oplots.append(Gnuplot.Data(time,pitch,with='lines', ++ oplots.append(Gnuplot.Data(time,pitch,with_='lines', + title=self.params.pitchmode)) + titles.append(self.params.pitchmode) + +@@ -170,7 +170,7 @@ + if truth: + timet,pitcht = self.gettruth() + if timet and pitcht: +- oplots = [Gnuplot.Data(timet,pitcht,with='lines', ++ oplots = [Gnuplot.Data(timet,pitcht,with_='lines', + title='ground truth')] + oplots + + g = gnuplot_create(outplot=outplot, extension=extension) +--- aubio-0.3.2.orig/python/aubiofilter-notes 2006-01-18 06:37:48.000000000 +0100 ++++ aubio-0.3.2/python/aubiofilter-notes 2009-09-27 21:53:45.000000000 +0200 +@@ -78,7 +78,7 @@ + + from aubio import notefilter,txtfile,gnuplot + """ load midi and raw data """ +- from numarray import array ++ from numpy import array + notelist = array(txtfile.read_datafile(input)) + """ filter it out """ + notelist_filtered = notefilter.segraw_onsets4(notelist,winlength,eps) +--- aubio-0.3.2.orig/python/aubionotes 2006-01-18 06:37:48.000000000 +0100 ++++ aubio-0.3.2/python/aubionotes 2009-09-27 21:53:45.000000000 +0200 +@@ -4,7 +4,6 @@ + + import aubio.aubioclass + import aubio.median +- #from numarray import around + from math import floor + hopsize = 512 + bufsize = 4096 +--- aubio-0.3.2.orig/python/aubioplot-notes 2006-01-18 06:37:48.000000000 +0100 ++++ aubio-0.3.2/python/aubioplot-notes 2009-09-27 21:53:45.000000000 +0200 +@@ -18,7 +18,7 @@ + def main (sysargs) : + from aubio.txtfile import read_datafile + from aubio.gnuplot import plotnote,plotnote_do +- from numarray import array ++ from numpy import array + filein,fileout = parse_args(sysargs) + #print 'checking', fileerr, 'against', fileorg + """ load midi and raw data """ +--- aubio-0.3.2.orig/python/aubioweb.py 2006-02-16 12:59:18.000000000 +0100 ++++ aubio-0.3.2/python/aubioweb.py 2009-09-27 21:53:45.000000000 +0200 +@@ -11,7 +11,7 @@ + sndfile-programs (sndfile-info) + vorbis-tools (oggenc) + python-gnuplot +-python-numarray ++python-numpy + + Try the command line tools in aubio/python to test your installation. + +--- aubio-0.3.2.orig/python/aubio/plot/keyboard.py 2009-09-13 23:58:08.000000000 +0200 ++++ aubio-0.3.2/python/aubio/plot/keyboard.py 2009-09-27 22:36:48.000000000 +0200 +@@ -30,8 +30,8 @@ + yb = [y0+(y1-y0)*2/3. for i in range(len(xb))] + ybdelta = [(y1-y0)*1/3. for i in range(len(xb))] + +- whites = Gnuplot.Data(xw,yw,xwdelta,ywdelta,with = 'boxxyerrorbars') +- blacks = Gnuplot.Data(xb,yb,xbdelta,ybdelta,with = 'boxxyerrorbars fill solid') ++ whites = Gnuplot.Data(xw,yw,xwdelta,ywdelta,with_ = 'boxxyerrorbars') ++ blacks = Gnuplot.Data(xb,yb,xbdelta,ybdelta,with_ = 'boxxyerrorbars fill solid') + + return blacks,whites +