[Debian-med-packaging] [SCM] mrtrix branch, master, updated. upstream/0.2.8-14-g5df6a15

[Michael Hanke]

The following commit has been merged in the master branch:
commit c8143ccfac52662016c69aef3205f1c67d741edf
Author: Michael Hanke <michael.hanke at gmail.com>
Date:   Fri Feb 10 08:51:29 2012 +0100

    Update packaging for 0.2.10 and Matlab/Octave

diff --git a/debian/changelog b/debian/changelog
index 26f749d..20556eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mrtrix (0.2.10-1) unstable; urgency=low
+
+  * New upstream release. Among other changes:
+    - new binary for selecting tracks according to inclusion/exclusion ROIs
+    - fix bug in transform re-jigging code to handle 45° oblique orientations
+  * Install Matlab/Octave components.
+
+ -- Michael Hanke <mih at debian.org>  Fri, 10 Feb 2012 08:37:17 +0100
+
 mrtrix (0.2.9-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 569e2eb..5717240 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,9 @@ Source: mrtrix
 Priority: extra
 Maintainer: NeuroDebian Team <team at neuro.debian.net>
 Uploaders: Michael Hanke <mih at debian.org>, Yaroslav Halchenko <debian at onerussian.com>
-Build-Depends: debhelper (>= 7.0.50~), libgsl0-dev, python, pkg-config, libgtkmm-2.4-dev, libgtkglext1-dev, imagemagick
+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
 Standards-Version: 3.9.2
 Section: science
 Homepage: http://www.brain.org.au/software/mrtrix
@@ -14,7 +16,7 @@ Package: mrtrix
 Section: science
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: mrtrix-doc
+Suggests: mrtrix-doc, octave, matlab-support
 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 --git a/debian/mrtrix.install b/debian/mrtrix.install
index 7e048c7..58c1572 100644
--- a/debian/mrtrix.install
+++ b/debian/mrtrix.install
@@ -2,3 +2,4 @@ bin/* usr/lib/mrtrix/bin
 lib/*.so usr/lib/mrtrix/lib
 mrtrix.xpm usr/share/pixmaps
 debian/*.desktop usr/share/applications
+matlab usr/share/mrtrix
diff --git a/debian/mrtrix.links b/debian/mrtrix.links.in
similarity index 100%
rename from debian/mrtrix.links
rename to debian/mrtrix.links.in
diff --git a/debian/rules b/debian/rules
index 5218be0..3236d7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,29 +1,37 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+# get octave paths (have to build-depend on octave-headers)
+include /usr/share/octave/debian/defs.make
+# same for Matlab
+include /usr/share/matlab/debian/defs.make
+
 # one ring to rule them all ...
 %:
 	dh $@
 
-
 override_dh_auto_build:
 	./build -verbose -debug -system=linux
 	# build icon
 	convert icons/mrtrix.xpm -resize 32x32 mrtrix.xpm
 
+override_dh_auto_install:
+	dh_auto_install
+	cp debian/mrtrix.links.in debian/mrtrix.links
+	echo "/usr/share/mrtrix/matlab $(MATLAB_MDIR)/mrtrix" >> debian/mrtrix.links
+	echo "/usr/share/mrtrix/matlab $(MDIR)/mrtrix" >> debian/mrtrix.links
 
 # we want immediately useable docs and example data, they are in a dedicated
 # package already
 override_dh_compress:
 	dh_compress -X.html
 
-
 override_dh_clean:
 	./build -system=linux clean
 	find . -name '*.pyc' -delete
 	-rm mrtrix.xpm
 	dh_clean
-
+	@rm -f debian/mrtrix.links
 
 override_dh_shlibdeps:
 	dh_shlibdeps -l $(CURDIR)/lib

-- 
Debian packaging of MRtrix