[med-svn] r5416 - trunk/packages/insighttoolkit/trunk/debian

[Steven Michael Robbins]

Author: smr
Date: 2010-11-06 19:25:49 +0000 (Sat, 06 Nov 2010)
New Revision: 5416

Modified:
   trunk/packages/insighttoolkit/trunk/debian/changelog
   trunk/packages/insighttoolkit/trunk/debian/copyright
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Add Code/Review to ITK build.

Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog	2010-11-05 13:55:54 UTC (rev 5415)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog	2010-11-06 19:25:49 UTC (rev 5416)
@@ -1,3 +1,14 @@
+insighttoolkit (3.20.0-4) experimental; urgency=low
+
+  * rules: Really remove parallel build.
+  
+  * insighttoolkit_3.20.0.orig-review.tar.bz2: New.  Contains contents of
+    upstream "Code/Review" directory, heretofore removed from the .orig
+    tarball.
+  * rules: Build using Review and Review/Statistics.
+
+ -- Steve M. Robbins <smr at debian.org>  Fri, 05 Nov 2010 20:25:09 -0500
+
 insighttoolkit (3.20.0-3) experimental; urgency=low
 
   * rules: Remove parallel build; still broken with cswig wrapping.  See

Modified: trunk/packages/insighttoolkit/trunk/debian/copyright
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/copyright	2010-11-05 13:55:54 UTC (rev 5415)
+++ trunk/packages/insighttoolkit/trunk/debian/copyright	2010-11-06 19:25:49 UTC (rev 5416)
@@ -1000,3 +1000,62 @@
 
   Jean-loup Gailly        Mark Adler
   jloup at gzip.org          madler at alumni.caltech.edu
+
+
+
+		Code/Review Licenses
+		--------------------
+
+These files are contained in upstream Code/Review directory, packaged
+in the insighttoolkit_3.20.0.orig-review.tar.bz2 tarball.
+
+The majority are covered by the ITK copyright, above.  Exceptions are
+listed below.
+
+itkTransformToDeformationFieldSource.h
+itkTransformToDeformationFieldSource.txx
+
+Carries both the ITK copyright and license as well as:
+
+  Copyright (c) University Medical Center Utrecht. All rights
+  reserved.  See src/CopyrightElastix.txt or
+  http://elastix.isi.uu.nl/legal.php for details.
+
+  This software is distributed WITHOUT ANY WARRANTY; without even the
+  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+  PURPOSE. See the above copyright notices for more information.
+
+The license from http://elastix.isi.uu.nl/legal.php is:
+
+  Copyright (c) 2004-2010 University Medical Center Utrecht
+  All rights reserved.
+
+  License:
+
+  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 name of the University Medical Center Utrecht nor the names of
+      its contributors 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.

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2010-11-05 13:55:54 UTC (rev 5415)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2010-11-06 19:25:49 UTC (rev 5416)
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
-DEB_BUILD_PARALLEL = false
+# Uncomment to build in parallel, according to DEB_BUILD_OPTIONS
+#DEB_BUILD_PARALLEL = true
 
 # Using install/fast bypasses the install->all dependency,
 # avoiding a complete rebuild by "make install".
@@ -56,6 +57,8 @@
 	-DITK_CSWIG_PYTHON:BOOL=ON \
 	-DITK_CSWIG_TCL:BOOL=ON \
 	-DITK_DATA_ROOT:PATH=ITK_DATA_ROOT_NOTFOUND \
+	-DITK_USE_REVIEW:BOOL=ON \
+	-DITK_USE_REVIEW_STATISTICS:BOOL=ON \
 	-DITK_USE_SYSTEM_GDCM:BOOL=ON \
 	-DITK_USE_SYSTEM_JPEG:BOOL=ON \
 	-DITK_USE_SYSTEM_PNG:BOOL=ON \
@@ -75,6 +78,9 @@
 	-DTK_INCLUDE_PATH:PATH=/usr/include/tcl$(TCLVERS) \
 	-DTK_LIBRARY:FILEPATH=/usr/lib/libtk$(TCLVERS).so
 
+pre-build::
+	test -d Code/Review || mv review Code/Review
+
 common-build-arch::
 	echo "$(pkg_tcl): non-dev-pkg-with-shlib-symlink" > debian/$(pkg_tcl).lintian-overrides
 	echo "$(pkg_tcl): package-name-doesnt-match-sonames" >> debian/$(pkg_tcl).lintian-overrides