[med-svn] [SCM] mricron branch, master, updated. upstream/0.20101102.1_dfsg.1-50-g772ab6d

[Michael Hanke]

The following commit has been merged in the master branch:
commit 1756027cb831f650f6431ccf265304be6a06b892
Author: Michael Hanke <michael.hanke at gmail.com>
Date:   Thu Apr 14 13:27:26 2011 -0400

    New package version. FSL autodetection.

diff --git a/debian/changelog b/debian/changelog
index c956042..f60b9c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mricron (0.20110413.1~dfsg.1-1) unstable; urgency=low
+
+  * New upstream version. FSL BET related patches are no obsolete
+    and have been removed. Mricron now performs autodetection of FSL.
+    Additionally it supports a system-wide configuration file at
+    /etc/mricron/mricron.ini
+
+ -- Michael Hanke <mih at debian.org>  Thu, 14 Apr 2011 13:18:37 -0400
+
 mricron (0.20101102.1~dfsg.1-2) unstable; urgency=low
 
   * Change maintainer email.
diff --git a/debian/patches/debian_fslbet b/debian/patches/debian_fslbet
deleted file mode 100644
index 3527fee..0000000
--- a/debian/patches/debian_fslbet
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Make mricron works with Debian's FSL
-Forwarded: not-needed
-Author: Michael Hanke <michael.hanke at gmail.com>
---- a/bet.pas
-+++ b/bet.pas
-@@ -63,8 +63,11 @@
-    AStringList := TStringList.Create;
-    AProcess.CommandLine := lCmd;
-    {$IFDEF UNIX}
--      AProcess.Environment.Add(gBGImg.FSLDIR);
--   AProcess.Environment.Add(gBGImg.FSLOUTPUTTYPE);
-+      // On Debian FSLDIR is set outside mricron
-+      //AProcess.Environment.Add(gBGImg.FSLDIR);
-+   // and we must not set any environment variable to let the child process
-+   // inherit the current environment settings
-+   //AProcess.Environment.Add(gBGImg.FSLOUTPUTTYPE);
- 
-    //AProcess.Environment.Add('FSLDIR=/usr/local/fsl');
-    //AProcess.Environment.Add('FSLOUTPUTTYPE=NIFTI_GZ');
-@@ -84,18 +87,20 @@
-   lCmd: string;
- begin
-      result := false;
--     lCmd :=  extractfilepath(paramstr(0))+'bet';
--     {$IFNDEF Unix}
--     lCmd := lCmd+'.exe';
--     {$ENDIF}
--     if not PathExists (lCmd) then begin
--        lCmd := '/usr/local/fsl/bin/bet_8UI';
--        if not PathExists (lCmd) then begin
--           lCmd := '/usr/local/fsl/bin/bet';
--           if not PathExists (lCmd) then
--                 exit;
--        end;
--     end; //no bet in home folder...
-+     // On Debian we guarantee that bet is globally available if installed at all
-+     lCmd := 'bet';
-+     //lCmd :=  extractfilepath(paramstr(0))+'bet';
-+     //{$IFNDEF Unix}
-+     //lCmd := lCmd+'.exe';
-+     //{$ENDIF}
-+     //if not PathExists (lCmd) then begin
-+     //   lCmd := '/usr/local/fsl/bin/bet_8UI';
-+     //   if not PathExists (lCmd) then begin
-+     //      lCmd := '/usr/local/fsl/bin/bet';
-+     //      if not PathExists (lCmd) then
-+     //            exit;
-+     //   end;
-+     //end; //no bet in home folder...
-   lCmd := lCmd+' "'+lInFile+'" "'+lOutFile +'" -f '+floattostr(lFrac);
-   BETForm.Memo1.Lines.Add(lCmd);
-   RunCmd(lCmd);
diff --git a/debian/patches/debian_paths b/debian/patches/debian_paths
index df0ddb2..e0175bd 100644
--- a/debian/patches/debian_paths
+++ b/debian/patches/debian_paths
@@ -6,7 +6,7 @@ Author: Michael Hanke <michael.hanke at gmail.com>
 
 --- a/nifti_img_view.pas
 +++ b/nifti_img_view.pas
-@@ -1562,7 +1562,9 @@
+@@ -1648,7 +1648,9 @@
  	 LoadMonochromeLUT(lInc,gBGImg,gMRIcroOverlay[kVOIOverlayNum]);
  	 SetBGImgDefaults(gBGImg);
  	 CloseImagesClick(nil);
@@ -17,7 +17,7 @@ Author: Michael Hanke <michael.hanke at gmail.com>
  	 {$IFNDEF Unix} DragAcceptFiles(Handle, True); //engage drag and drop
           {$ENDIF}
  	 UpdateColorSchemes;
-@@ -1579,7 +1581,9 @@
+@@ -1665,7 +1667,9 @@
           YokeMenu.visible := false;
           {$ENDIF}
  {$ENDIF}
diff --git a/debian/patches/debian_version b/debian/patches/debian_version
index d8266a6..a8492b6 100644
--- a/debian/patches/debian_version
+++ b/debian/patches/debian_version
@@ -3,12 +3,12 @@ Forwarded: not-needed
 Author: Michael Hanke <michael.hanke at gmail.com>
 --- a/common/define_types.pas
 +++ b/common/define_types.pas
-@@ -17,7 +17,7 @@
+@@ -18,7 +18,7 @@
          SysUtils,classes,IniFiles,
-         {$IFDEF GUI} forms,userdir,dialogs;{$ELSE} dialogsx;{$ENDIF}
+         {$IFDEF GUI} forms,userdir, dialogs;{$ELSE} dialogsx;{$ENDIF}
  const
--     kMRIcronVers = '2 November 2010';
-+     kMRIcronVers = '2 November 2010 (Debian)';
+-     kMRIcronVers = 'April 13 2011';
++     kMRIcronVers = 'April 13 2011 (Debian)';
       NaN : double = 1/0;
       kMagicDouble : double = -111666222;
       kTxtFilter = 'Text (*.txt)|*.txt;*.csv|Comma Separated (*.csv)|*.csv';
diff --git a/debian/patches/series b/debian/patches/series
index 6e89682..080d18c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 debian_paths
 debian_version
-debian_fslbet
 lazarus_compat

-- 
Debian packaging of MRIcron