[Debian-med-packaging] [SCM] mricron branch, debian, updated. upstream/0.20100422.1.dfsg.1-20-gb276924

Fri Jul 30 02:09:57 UTC 2010

The following commit has been merged in the debian branch:
commit b27692400efbe21412f80a8b559a207074cbdbef
Author: Michael Hanke <michael.hanke at gmail.com>
Date:   Thu Jul 29 22:09:01 2010 -0400

    New code, packaging update, finished copyright check.

diff --git a/debian/changelog b/debian/changelog
index fcb5bb9..a54e34e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mricron (0.20100725.1~dfsg.1-1) UNRELEASED; urgency=low
+
+  * New upstream code.
+  * Bumped Standards-version to 3.9.0, included full text of the BSD license
+    in the copyright file.
+
+ -- Michael Hanke <michael.hanke at gmail.com>  Thu, 29 Jul 2010 22:07:43 -0400
+
 mricron (0.20100422.2~dfsg.1-1) UNRELEASED; urgency=low
 
   * New upstream code.
diff --git a/debian/control b/debian/control
index 1894089..d9751f9 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.8.4
+Standards-Version: 3.9.0
 Section: science
 Homepage: http://www.cabiatl.com/mricro/mricron/index.html
 XS-DM-Upload-Allowed: yes
diff --git a/debian/copyright b/debian/copyright
index 91a67aa..88385f0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,6 +6,30 @@ Upstream-Source: http://www.cabiatl.com/CABI/beta/
 Files: *
 Copyright: Copyright 2006-2010, Chris Rorden
 License: BSD
+  Redistribution and use in source and binary forms, with or without
+  modification, are permitted provided that the following conditions are met:
+
+  Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+  Redistributions in binary form must reproduce the above copyright notice, this
+  list of conditions and the following disclaimer in the documentation and/or
+  other materials provided with the distribution.  Neither the names of the
+  copyright owners nor the names of this project (MRIcron) may be used to
+  endorse or promote products derived from this software without specific prior
+  written permission.
+
+  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
   On Debian systems the full text of the BSD License can be found in the
   `/usr/share/common-licenses/BSD' file.
 
@@ -53,8 +77,9 @@ License: Modified LGPL
 
 Files: common/{DiskSpaceKludge,GraphicsMathLibrary}.pas
 Copyright: Copyright 1982-1998, Earl F. Glynn
-License: Unknown
-  http://www.efg2.com/Lab/Library/Delphi/Graphics/GraphicsMathLibrary.PAS.TXT
+License: BSD
+  The original author gave approval to ship these files under the same terms as
+  MRICRON itself (see above for the full license text).
 
 
 Files: common/gzio2.pas
diff --git a/debian/mricron.lintian-overrides b/debian/mricron.lintian-overrides
index 0a3eeee..4c3ab10 100644
--- a/debian/mricron.lintian-overrides
+++ b/debian/mricron.lintian-overrides
@@ -1,4 +1,4 @@
-# This is a pascal program that is complete self-contained and does not link
+# This is a pascal program that is completely self-contained and does not link
 # against anything -- not even statically against some internal convenience
 # library, and since it is pascal, not even against libc
 mricron: statically-linked-binary ./usr/bin/dcm2nii
diff --git a/debian/patches/debian_paths b/debian/patches/debian_paths
index 8eb2a99..5be9c49 100644
--- a/debian/patches/debian_paths
+++ b/debian/patches/debian_paths
@@ -6,25 +6,25 @@ Author: Michael Hanke <michael.hanke at gmail.com>
 
 --- a/nifti_img_view.pas
 +++ b/nifti_img_view.pas
-@@ -1613,7 +1613,9 @@
- 	 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;
-@@ -1630,7 +1632,9 @@
-          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
- 		 gMRUstr[lInc] := '';
+@@ -1641,7 +1641,9 @@
+ 	 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;
+@@ -1658,7 +1660,9 @@
+          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
diff --git a/debian/rules b/debian/rules
index 4a8e6ca..abd0a27 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
+	-rm dcm2nii/dcm2niigui dcm2nii/dcm2niigui.rc
 	-rm npm/npm
 	-rm iconfinal-*.xpm mricron.xpm
 	dh_clean

-- 
Debian packaging of MRIcron

