# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1366606277 14400
# Node ID 3392e7d0cbf232a10db83a03335919e509dcbe02
# Parent  fda4940ba71bd1f3e17ca543eb992182f23cadcd# Parent  137b8fb799a9667671924e6f63bc8a25979c307d
merge away extra head

diff -r fda4940ba71b -r 3392e7d0cbf2 src/octave.mk
--- a/src/octave.mk	Mon Apr 22 00:48:36 2013 -0400
+++ b/src/octave.mk	Mon Apr 22 00:51:17 2013 -0400
@@ -7,7 +7,7 @@
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
 $(PKG)_URL      := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE)
-$(PKG)_DEPS     := arpack blas curl fontconfig fftw fltk gcc glpk gnuplot graphicsmagick hdf5 lapack llvm pcre pstoedit qhull qrupdate qscintilla qt readline suitesparse texinfo zlib
+$(PKG)_DEPS     := arpack blas curl fftw fltk fontconfig gcc glpk gnuplot graphicsmagick hdf5 lapack llvm pcre pstoedit qhull qrupdate qscintilla qt readline suitesparse texinfo zlib
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package octave.' >&2;
diff -r fda4940ba71b -r 3392e7d0cbf2 src/stable-octave.mk
--- a/src/stable-octave.mk	Mon Apr 22 00:48:36 2013 -0400
+++ b/src/stable-octave.mk	Mon Apr 22 00:51:17 2013 -0400
@@ -6,8 +6,8 @@
 $(PKG)_CHECKSUM := 4563c3fdb15ac76419f78b8ad8a9b1ba3484a7aa
 $(PKG)_SUBDIR   := octave-$($(PKG)_VERSION)
 $(PKG)_FILE     := octave-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL      := ftp://alpha.gnu.org/gnu/octave/$($(PKG)_FILE)
-$(PKG)_DEPS     := arpack blas curl fftw fltk fontconfig gcc glpk gnuplot graphicsmagick hdf5 lapack pcre qhull qrupdate readline suitesparse zlib
+$(PKG)_URL      := ftp://ftp.gnu.org/gnu/octave/$($(PKG)_FILE)
+$(PKG)_DEPS     := arpack blas curl fftw fltk fontconfig gcc glpk gnuplot graphicsmagick hdf5 lapack pcre pstoedit qhull qrupdate readline suitesparse texinfo zlib
 
 define $(PKG)_UPDATE
     echo 'Warning: Updates are temporarily disabled for package octave.' >&2;