Date: Friday, January 31, 2014 @ 14:36:05 Author: ronald Revision: 204926
fix merge error Modified: octave/repos/extra-x86_64/PKGBUILD ----------+ PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-01-31 13:29:43 UTC (rev 204925) +++ PKGBUILD 2014-01-31 13:36:05 UTC (rev 204926) @@ -5,16 +5,16 @@ pkgname=octave pkgver=3.8.0 -pkgrel=1 +pkgrel=2 pkgdesc="A high-level language, primarily intended for numerical computations." arch=('i686' 'x86_64') url="http://www.octave.org" license=('GPL') depends=('fftw' 'curl' 'graphicsmagick' 'glpk' 'hdf5' 'qhull' 'fltk' 'arpack' 'glu') -makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot') +makedepends=('gcc-fortran' 'texlive-core' 'suitesparse' 'texinfo' 'gnuplot' 'qscintilla') optdepends=('texinfo: for help-support in octave' 'gnuplot: alternative plotting' - 'qt4: experimental gui') + 'qscintilla: experimental gui') source=(ftp://ftp.gnu.org/gnu/octave/octave-$pkgver.tar.bz2{,.sig}) options=('!emptydirs') install=octave.install