[Debian-med-packaging] [mrtrix] 03/09: Refresh patches.

[Michael Hanke]

This is an automated email from the git hooks/post-receive script.

mih pushed a commit to branch master
in repository mrtrix.

commit a7ad3bc7d2d2bbd52d51e7007e71f2bc5fef5b1d
Author: Michael Hanke <michael.hanke at gmail.com>
Date:   Fri Sep 27 18:36:36 2013 +0200

    Refresh patches.
---
 debian/patches/debian_build_cfg          |   20 +++++++++++++++++++-
 debian/patches/glib-single-include.patch |   15 +--------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/debian/patches/debian_build_cfg b/debian/patches/debian_build_cfg
index 6c4b3fd..9c23e93 100644
--- a/debian/patches/debian_build_cfg
+++ b/debian/patches/debian_build_cfg
@@ -15,7 +15,7 @@ Author: Michael Hanke <michael.hanke at gmail.com>
 -cpp_flags = [ '-Wall', '-march=native', '-fPIC', '-fno-strict-aliasing', '-DGL_GLEXT_PROTOTYPES', '-DUSE_TR1' ]
 +cpp_flags = [ '-Wall', '-fPIC', '-fno-strict-aliasing', '-DGL_GLEXT_PROTOTYPES', '-DUSE_TR1' ]
  
- ld = [ 'g++', '$flags$', '$path$', '$obj$', '$mrtrix$', '$gsl$', '$gtk$', '-o', '$bin$' ]
+ ld = [ 'g++', '$flags$', '$path$', '$obj$', '$mrtrix$', '$gsl$', '$gtk$', '$lz$', '-o', '$bin$' ]
  ld_flags = []
 @@ -16,7 +16,7 @@
  ld_lib_flags = []
@@ -26,3 +26,21 @@ Author: Michael Hanke <michael.hanke at gmail.com>
  ld_lib_flags_debug = ld_lib_flags + [ '-g' ]
  
  cpp_flags_profile = [ '-pg' ] + cpp_flags_debug
+--- a/build
++++ b/build
+@@ -177,12 +177,12 @@
+   if verbose:
+     print svn_revision
+   svn_revision = '#define SVN_REVISION ' + svn_revision + '\n'
++  if svn_revision != open(svn_revision_file).read():
++    with open(svn_revision_file, 'wb') as fd:
++      fd.write (svn_revision)
+ except:
+   pass
+ 
+-if svn_revision != open(svn_revision_file).read():
+-  with open(svn_revision_file, 'wb') as fd:
+-    fd.write (svn_revision)
+ 
+ 
+ 
diff --git a/debian/patches/glib-single-include.patch b/debian/patches/glib-single-include.patch
index cabe25e..cd02aae 100644
--- a/debian/patches/glib-single-include.patch
+++ b/debian/patches/glib-single-include.patch
@@ -1,23 +1,10 @@
 --- a/lib/file/dicom/select_cmdline.cpp
 +++ b/lib/file/dicom/select_cmdline.cpp
-@@ -24,7 +24,7 @@
+@@ -24,6 +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>
- 

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/mrtrix.git