In the patch attached to the original bug report, I suggested to use the octave-config script instead of including the file /usr/share/octave/debian/defs.make. Actually, this file is present in the liboctave-dev package and does exactly what my proposed code does.
Please, forget that part of the patch and keep including the defs.make file. Best, Rafael * Rafael Laboissiere <raf...@laboissiere.net> [2012-04-01 13:53]: > Package: mrtrix > Version: 0.2.10-1 > Severity: important > Tags: patch > > The current version of mrtrix in sid build-depends on octave3.2-headers. > This later package will be removed from unstable once the transition to > the new version of octave (currently 3.6.1) will be completed (see the > wiki page of the DOG [1]). > > The mtrtix package needs octave3.2-headers only for including the > makefile fragment defs.make. This file has been dropped in the > Debian packaging of Octave 3.6.1. Just using the octave-config script > is the recommended way of going now. For that it is necessary to > build-depend on liboctave-dev. > > I am attaching below a patch for fixing the issue in this bug report. The > patch was obtained through debdiff. I added the corresponding entries to > debian/changelog. Note also that I added "Suggests: octave" to the > binary mrtrix package, a change that you may reconsider. > > Rafael > > [1] http://wiki.debian.org/Teams/DebianOctaveGroup > > > -- System Information: > Debian Release: wheezy/sid > APT prefers testing > APT policy: (700, 'testing'), (650, 'unstable') > Architecture: i386 (i686) > > Kernel: Linux 3.2.0-2-686-pae (SMP w/2 CPU cores) > Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.utf8 (charmap=UTF-8) > Shell: /bin/sh linked to /bin/dash > > Rafael > diff -Nru mrtrix-0.2.10/debian/changelog mrtrix-0.2.10/debian/changelog > --- mrtrix-0.2.10/debian/changelog 2012-02-10 07:44:20.000000000 +0000 > +++ mrtrix-0.2.10/debian/changelog 2012-04-01 11:35:02.000000000 +0000 > @@ -1,3 +1,12 @@ > +mrtrix (0.2.10-2) UNRELEASED; urgency=low > + > + * debian/control: > + + Build-depend on liboctave-dev > + + Package mrtrix now suggests octave > + * debian/rules: Use octave-config directly for obtaining Octave path > + > + -- Rafael Laboissiere <raf...@laboissiere.net> Sun, 01 Apr 2012 13:12:39 > +0200 > + > mrtrix (0.2.10-1) unstable; urgency=low > > * New upstream release. > diff -Nru mrtrix-0.2.10/debian/control mrtrix-0.2.10/debian/control > --- mrtrix-0.2.10/debian/control 2012-02-10 07:43:58.000000000 +0000 > +++ mrtrix-0.2.10/debian/control 2012-04-01 11:11:56.000000000 +0000 > @@ -4,7 +4,7 @@ > Uploaders: Michael Hanke <m...@debian.org>, Yaroslav Halchenko > <deb...@onerussian.com> > Build-Depends: debhelper (>= 7.0.50~), libgsl0-dev, python, pkg-config, > libgtkmm-2.4-dev, libgtkglext1-dev, imagemagick, matlab-support-dev, > - octave3.2-headers | octave-headers > + liboctave-dev > Standards-Version: 3.9.2 > Section: science > Homepage: http://www.brain.org.au/software/mrtrix > @@ -16,7 +16,7 @@ > Section: science > Architecture: any > Depends: ${shlibs:Depends}, ${misc:Depends} > -Suggests: mrtrix-doc > +Suggests: mrtrix-doc, octave > Description: diffusion-weighted MRI white matter tractography > Set of tools to perform diffusion-weighted MRI white matter tractography of > the > brain in the presence of crossing fibres, using Constrained Spherical > diff -Nru mrtrix-0.2.10/debian/rules mrtrix-0.2.10/debian/rules > --- mrtrix-0.2.10/debian/rules 2012-02-10 07:42:29.000000000 +0000 > +++ mrtrix-0.2.10/debian/rules 2012-04-01 11:27:52.000000000 +0000 > @@ -1,8 +1,8 @@ > #!/usr/bin/make -f > # -*- makefile -*- > > -# get octave paths (have to build-depend on octave-headers) > -include /usr/share/octave/debian/defs.make > +# get Octave path for *.m files > +MDIR = $(shell octave-config --print LOCALFCNFILEDIR) > # same for Matlab > include /usr/share/matlab/debian/defs.make > Rafael -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
