[med-svn] [mricron] 05/05: Packaging update (nothing fancy)

[Michael Hanke]

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

mih pushed a commit to branch master
in repository mricron.

commit e42fa3de8b831236b9547bb06d36617ba39fcc60
Author: Michael Hanke <michael.hanke at gmail.com>
Date:   Fri Oct 3 10:57:20 2014 +0200

    Packaging update (nothing fancy)
---
 debian/changelog              |  8 ++++++++
 debian/control                |  2 +-
 debian/patches/debian_paths   |  4 ++--
 debian/patches/debian_version | 14 ++++++++------
 debian/patches/series         |  1 +
 debian/patches/syntax_fixes   | 35 +++++++++++++++++++++++++++++++++++
 6 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3793ecf..e83fd31 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mricron (0.20140704.1~dfsg.1-1) unstable; urgency=medium
+
+  * New upstream release (Closes: #722056).
+  * Added patch with syntactical fixes.
+  * Bumped Standards-version to 3.9.5, no changes necessary.
+
+ -- Michael Hanke <mih at debian.org>  Fri, 03 Oct 2014 10:54:33 +0200
+
 mricron (0.20130828.1~dfsg.1-1) unstable; urgency=low
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 89594ad..2d8f65b 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 7.0.50~),
  lazarus-src,
  libgtk2.0-dev,
  imagemagick
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Section: science
 Homepage: http://www.cabiatl.com/mricro/mricron/index.html
 Vcs-Browser: http://git.debian.org/?p=debian-med/mricron.git
diff --git a/debian/patches/debian_paths b/debian/patches/debian_paths
index 9d054d7..fe418c5 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
-@@ -1685,7 +1685,9 @@
+@@ -1694,7 +1694,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;
-@@ -1702,7 +1704,9 @@
+@@ -1711,7 +1713,9 @@
           YokeMenu.visible := false;
           {$ENDIF}
  {$ENDIF}
diff --git a/debian/patches/debian_version b/debian/patches/debian_version
index 4682910..b23c6e8 100644
--- a/debian/patches/debian_version
+++ b/debian/patches/debian_version
@@ -1,14 +1,16 @@
 Description: Identify the Debian package version as such
 Forwarded: not-needed
 Author: Michael Hanke <michael.hanke at gmail.com>
+diff --git a/common/define_types.pas b/common/define_types.pas
+index 589205f..e695faa 100755
 --- a/common/define_types.pas
 +++ b/common/define_types.pas
-@@ -18,7 +18,7 @@
+@@ -18,7 +18,7 @@ interface
          SysUtils,classes,IniFiles,
          {$IFDEF GUI} forms,userdir, dialogs{$ELSE}dialogsx{$ENDIF};
  const
--     kMRIcronVersDate = '28 August 2013';
-+     kMRIcronVersDate = '28 August 2013 (Debian)';
-      {$ifdef CPU32}
-      kMRIcronVers = kMRIcronVersDate+' 32bit';
-      {$ELSE}
+-     kMRIcronVersDate = '4JULY2014';
++     kMRIcronVersDate = '4JULY2014 (Debian)';
+      {$IFDEF FPC}
+       {$ifdef CPU32}
+       kMRIcronVers = kMRIcronVersDate+' 32bit BSD License';
diff --git a/debian/patches/series b/debian/patches/series
index c4e95b9..f2231ad 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+syntax_fixes
 lazarus_modern
 debian_paths
 debian_version
diff --git a/debian/patches/syntax_fixes b/debian/patches/syntax_fixes
new file mode 100644
index 0000000..5fcd5b0
--- /dev/null
+++ b/debian/patches/syntax_fixes
@@ -0,0 +1,35 @@
+diff --git a/nifti_img.pas b/nifti_img.pas
+index 641d697..62ff7a0 100755
+--- a/nifti_img.pas
++++ b/nifti_img.pas
+@@ -1748,7 +1748,7 @@ begin
+ 	 //lScaleShl10 := ComputeInvZoomShl10(SelectedImageNum,lImage);
+ 	 //ImgForm.StatusLabel.Caption := inttostr(InvZoomShl10);
+   {$IFNDEF Darwin}
+-     please check if next line required for this OS! 8/8/2014
++	 {please check if next line required for this OS! 8/8/2014}
+   {$ENDIF}
+   lX := lX -1;
+          if (gBGImg.FlipSag) and (lPanel = 2) then
+@@ -2297,7 +2297,7 @@ begin
+   {$IFDEF FPC} //recent versions of Lazarus (1.2) do handle this, but will put .gz not .nii.gz
+   if ImgForm.SaveDialog1.filterIndex > 0 then begin
+      {$IFNDEF Darwin}
+-         check next line in each OS
++	  {check next line in each OS}
+      {$ENDIF}
+      lExt := GetExtensionFromFilterAtIndex(ImgForm.SaveDialog1.Filter,ImgForm.SaveDialog1.FilterIndex); //8/8/2014 check on OSX 10.4
+      lFilename := ChangeFileExtX(lFilename,lExt);
+diff --git a/render.pas b/render.pas
+index 933ecf7..b259e64 100755
+--- a/render.pas
++++ b/render.pas
+@@ -706,7 +706,7 @@ begin
+ 
+      lImage.Picture.Graphic := RenderForm.RenderImageBUP.Picture.Graphic;
+      {$IFNDEF Darwin}
+-        xxxx make sure next line required on this OS!
++	 {xxxx make sure next line required on this OS!}
+      {$ENDIF}
+      lImage.Canvas.Draw(0,0,RenderForm.RenderImageBUP.Picture.Graphic);
+      //lImage.Picture.Bitmap := RenderForm.RenderImageBUP.Picture.Bitmap;    //xxxx

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mricron.git