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

[Michael Hanke]

The following commit has been merged in the master branch:
commit e710cc93d2e4e7112e8fe1195ba49982106c287f
Author: Michael Hanke <michael.hanke at gmail.com>
Date:   Tue May 15 11:38:55 2012 +0200

    Add patch for glib 2.32 transition. Closes #665582

diff --git a/debian/changelog b/debian/changelog
index 5d117fa..01d7db9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ mrtrix (0.2.10-2) unstable; urgency=low
 
   [ Michael Hanke ]
   * Bumped Standards-version to 3.9.3 -- no changes necessary.
+  * Add patch for glib 2.32 transition (Closes: #665582)
 
- -- Michael Hanke <mih at debian.org>  Tue, 15 May 2012 11:29:51 +0200
+ -- Michael Hanke <mih at debian.org>  Tue, 15 May 2012 11:39:26 +0200
 
 mrtrix (0.2.10-1) unstable; urgency=low
 
diff --git a/debian/patches/glib-single-include.patch b/debian/patches/glib-single-include.patch
new file mode 100644
index 0000000..cabe25e
--- /dev/null
+++ b/debian/patches/glib-single-include.patch
@@ -0,0 +1,23 @@
+--- a/lib/file/dicom/select_cmdline.cpp
++++ b/lib/file/dicom/select_cmdline.cpp
+@@ -24,7 +24,7 @@
+ 
+ */
+ 
+-#include <glib/gstrfuncs.h>
++#include <glib.h>
+ #include "file/dicom/image.h"
+ #include "file/dicom/series.h"
+ #include "file/dicom/study.h"
+--- a/lib/mrtrix.h
++++ b/lib/mrtrix.h
+@@ -62,8 +62,7 @@
+ #include <cstdlib>
+ #include <cmath>
+ 
+-#include <glib/gtypes.h>
+-#include <glib/gutils.h>
++#include <glib.h>
+ #include <glibmm/timer.h>
+ #include <glibmm/miscutils.h>
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 5452931..9a77d86 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debian_build_cfg
+glib-single-include.patch

-- 
Debian packaging of MRtrix