[med-svn] [SCM] mricron branch, master, updated. upstream/0.20100725.1.dfsg.1-35-g6372972

[Michael Hanke]

The following commit has been merged in the master branch:
commit 1c99381070b7ba850a1836668c83aa85b8b5196b
Author: Michael Hanke <michael.hanke at gmail.com>
Date:   Sun Aug 22 08:34:15 2010 -0400

    New release (+ Debian version patch)
    
    Also bumped standards to 3.9.1 and adjusted clean rule for new content.

diff --git a/common/define_types.pas b/common/define_types.pas
index ed56a2c..06faa95 100644
--- a/common/define_types.pas
+++ b/common/define_types.pas
@@ -17,7 +17,7 @@ interface
         SysUtils,classes,IniFiles,
         {$IFDEF GUI} forms,userdir,dialogs;{$ELSE} dialogsx;{$ENDIF}
 const
-     kMRIcronVers = '20 August 2010';
+     kMRIcronVers = '20 August 2010 (Debian)';
      NaN : double = 1/0;
      kMagicDouble : double = -111666222;
      kTxtFilter = 'Text (*.txt)|*.txt;*.csv|Comma Separated (*.csv)|*.csv';
diff --git a/debian/changelog b/debian/changelog
index 17b6d00..8f24af3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+mricron (0.20100820.1~dfsg.1-1) unstable; urgency=low
+
+  * New upstream code.
+  * Add patch to identify the Debian package version as such in the 'About'
+    dialog.
+  * Bumped Standards-version to 3.9.1, no changes necessary.
+
+ -- Michael Hanke <michael.hanke at gmail.com>  Sun, 22 Aug 2010 08:32:25 -0400
+
 mricron (0.20100725.1~dfsg.1-1) unstable; urgency=low
 
   * New upstream code.
diff --git a/debian/control b/debian/control
index cb07a4a..7a35bc0 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: extra
 Maintainer: NeuroDebian Team <team at neuro.debian.net>
 Uploaders: Michael Hanke <michael.hanke at gmail.com>, Yaroslav Halchenko <debian at onerussian.com>
 Build-Depends: debhelper (>= 7.0.50~), lcl-utils, lcl-gtk2 | lcl-gtk, lcl-units, fp-units-gfx, fp-units-misc, libgtk2.0-dev, imagemagick
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Section: science
 Homepage: http://www.cabiatl.com/mricro/mricron/index.html
 XS-DM-Upload-Allowed: yes
diff --git a/debian/patches/debian_paths b/debian/patches/debian_paths
index 5be9c49..505a9da 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
-@@ -1641,7 +1641,9 @@
+@@ -1564,7 +1564,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;
-@@ -1658,7 +1660,9 @@
+@@ -1581,7 +1583,9 @@
           YokeMenu.visible := false;
           {$ENDIF}
  {$ENDIF}
diff --git a/debian/patches/debian_version b/debian/patches/debian_version
new file mode 100644
index 0000000..d3e0882
--- /dev/null
+++ b/debian/patches/debian_version
@@ -0,0 +1,14 @@
+Description: Identify the Debian package version as such
+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 @@
+         SysUtils,classes,IniFiles,
+         {$IFDEF GUI} forms,userdir,dialogs;{$ELSE} dialogsx;{$ENDIF}
+ const
+-     kMRIcronVers = '20 August 2010';
++     kMRIcronVers = '20 August 2010 (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 8702ef2..399d8bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 debian_paths
+debian_version
diff --git a/debian/rules b/debian/rules
index 510599a..a3a9399 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ override_dh_clean:
 	find . -name '*.compiled' -delete
 	-rm mricron.rc mricron.lrs mricron
 	-rm dcm2nii/dcm2nii
-	-rm dcm2nii/dcm2niigui dcm2nii/dcm2niigui.rc
+	-rm dcm2nii/dcm2niigui
 	-rm npm/npm
 	-rm iconfinal-*.xpm mricron.xpm
 	dh_clean
diff --git a/nifti_img_view.pas b/nifti_img_view.pas
index 2792c3b..4bb598f 100644
--- a/nifti_img_view.pas
+++ b/nifti_img_view.pas
@@ -1564,7 +1564,9 @@ begin
 	 LoadMonochromeLUT(lInc,gBGImg,gMRIcroOverlay[kVOIOverlayNum]);
 	 SetBGImgDefaults(gBGImg);
 	 CloseImagesClick(nil);
-	 gColorSchemeDir := extractfilepath(paramstr(0))+'lut';
+	 // Fixed path on Debian
+	 //gColorSchemeDir := extractfilepath(paramstr(0))+'lut';
+	 gColorSchemeDir := '/usr/share/mricron/lut';
 	 {$IFNDEF Unix} DragAcceptFiles(Handle, True); //engage drag and drop
          {$ENDIF}
 	 UpdateColorSchemes;
@@ -1581,7 +1583,9 @@ begin
          YokeMenu.visible := false;
          {$ENDIF}
 {$ENDIF}
-	 gTemplateDir := extractfilepath(paramstr(0))+'templates';
+	 // Fixed path on Debian
+	 //gTemplateDir := extractfilepath(paramstr(0))+'templates';
+	 gTemplateDir := '/usr/share/mricron/templates';
 	 UpdateTemplates;
 
 	 for lInc := 1 to knMRU do

-- 
Debian packaging of MRIcron