[med-svn] r1074 - in trunk/packages/insighttoolkit/trunk/debian: . patches
smr at alioth.debian.org
smr at alioth.debian.org
Thu Jan 3 06:17:05 UTC 2008
Author: smr
Date: 2008-01-03 06:17:05 +0000 (Thu, 03 Jan 2008)
New Revision: 1074
Removed:
trunk/packages/insighttoolkit/trunk/debian/patches/01_itkPowellOptimizer.patch
trunk/packages/insighttoolkit/trunk/debian/patches/02_itkAnalyzeDbh.patch
trunk/packages/insighttoolkit/trunk/debian/patches/04_ITKConfig.patch
trunk/packages/insighttoolkit/trunk/debian/patches/05_itkIncludeDirectories.patch
Modified:
trunk/packages/insighttoolkit/trunk/debian/CMakeCache.txt.debian
trunk/packages/insighttoolkit/trunk/debian/changelog
trunk/packages/insighttoolkit/trunk/debian/control
trunk/packages/insighttoolkit/trunk/debian/rules
Log:
New upstream 3.4.0. Enable concept checking. Change maintainer to debian-med packaging team.
Modified: trunk/packages/insighttoolkit/trunk/debian/CMakeCache.txt.debian
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/CMakeCache.txt.debian 2008-01-03 06:07:20 UTC (rev 1073)
+++ trunk/packages/insighttoolkit/trunk/debian/CMakeCache.txt.debian 2008-01-03 06:17:05 UTC (rev 1074)
@@ -46,3 +46,7 @@
ITK_USE_SYSTEM_PNG:BOOL=ON
ITK_USE_SYSTEM_TIFF:BOOL=ON
ITK_USE_SYSTEM_ZLIB:BOOL=ON
+
+// Enable concept checking
+ITK_USE_CONCEPT_CHECKING:BOOL=ON
+ITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON
Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog 2008-01-03 06:07:20 UTC (rev 1073)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog 2008-01-03 06:17:05 UTC (rev 1074)
@@ -1,3 +1,20 @@
+insighttoolkit (3.4.0-1) unstable; urgency=low
+
+ * New upstream version.
+ - Obsoletes patches: 01_itkPowellOptimizer.patch,
+ 02_itkAnalyzeDbh.patch, 04_ITKConfig.patch,
+ 05_itkIncludeDirectories.patch
+
+ * control: Change maintainer to team mailing list. Add homepage.
+
+ * control:
+ * rules: Rename shared library package from libinsighttoolkit3.0 to
+ libinsighttoolkit3.4.
+
+ * CMakeCache.txt.debian: Enable concept checking.
+
+ -- Steve M. Robbins <steve at sumost.ca> Tue, 18 Dec 2007 00:33:46 -0600
+
insighttoolkit (3.2.0-2) unstable; urgency=low
* debian/patches/04_ITKConfig.patch: Don't export ITK_SOURCE_DIR.
Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control 2008-01-03 06:07:20 UTC (rev 1073)
+++ trunk/packages/insighttoolkit/trunk/debian/control 2008-01-03 06:17:05 UTC (rev 1074)
@@ -1,12 +1,13 @@
Source: insighttoolkit
+Homepage: http://www.itk.org/
Section: science
Priority: optional
-Maintainer: Gavin Baker <gavinb at antonym.org>
+Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
Uploaders: Gavin Baker <gavinb at antonym.org>, Steve M. Robbins <smr at debian.org>
Build-Depends: cdbs, patchutils, debhelper (>= 5), cmake, zlib1g-dev (>= 1.2.2), libpng12-dev, libtiff4-dev (>= 3.7.3)
Standards-Version: 3.7.2.0
-Package: libinsighttoolkit3.0
+Package: libinsighttoolkit3.4
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
@@ -29,7 +30,7 @@
Package: libinsighttoolkit-dev
Section: devel
Architecture: any
-Depends: libinsighttoolkit3.0 (= ${Source-Version})
+Depends: libinsighttoolkit3.4 (= ${Source-Version})
Description: Image processing toolkit for registration and segmentation - development
ITK is an open-source software toolkit for performing registration and
segmentation. Segmentation is the process of identifying and
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/01_itkPowellOptimizer.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/01_itkPowellOptimizer.patch 2008-01-03 06:07:20 UTC (rev 1073)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/01_itkPowellOptimizer.patch 2008-01-03 06:17:05 UTC (rev 1074)
@@ -1,44 +0,0 @@
-Index: Code/Numerics/itkPowellOptimizer.h
-===================================================================
-RCS file: /cvsroot/Insight/Insight/Code/Numerics/itkPowellOptimizer.h,v
-retrieving revision 1.8
-retrieving revision 1.9
-diff -u -b -B -r1.8 -r1.9
-@@ -25,8 +25,14 @@
- {
-
- /** \class PowellOptimizer
-- * \brief Implements Powell optimization using Brent line search - adapted from
-- * Numerical Recipes in C (first edition).
-+ * \brief Implements Powell optimization using Brent line search.
-+ *
-+ * The code in this class was adapted from the Wikipedia and the
-+ * netlib.org zeroin function.
-+ *
-+ * http://www.netlib.org/go/zeroin.f
-+ * http://en.wikipedia.org/wiki/Brent_method
-+ * http://en.wikipedia.org/wiki/Golden_section_search
- *
- * This optimizer needs a cost function.
- * Partial derivatives of that function are not required.
-@@ -47,10 +53,6 @@
- * the current parameters and at the local extreme are likely (within a second
- * order approximation) to be within this is tolerance.
- *
-- * \warning This class contains code that is covered by the Numerical
-- * Recipies copyright. The code is scheduled to be replaced/removed as
-- * soon as possible.
-- *
- * \ingroup Numerics Optimizers
- *
- */
-@@ -156,8 +158,7 @@
- void Shift(double *a, double *b, double *c, double d) const;
-
- /** The LineBracket routine from NRC. Later reimplemented from the description
-- * of the method available in the Wikipedia, this was done to replace code
-- * that was copyrighted by Numerical Recipes.
-+ * of the method available in the Wikipedia.
- *
- * Uses current origin and line direction (from SetLine) to find a triple of
- * points (ax, bx, cx) that bracket the extreme "near" the origin. Search
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/02_itkAnalyzeDbh.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/02_itkAnalyzeDbh.patch 2008-01-03 06:07:20 UTC (rev 1073)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/02_itkAnalyzeDbh.patch 2008-01-03 06:17:05 UTC (rev 1074)
@@ -1,88 +0,0 @@
-Index: Utilities/itkExtHdrs/itkAnalyzeDbh.h
-===================================================================
-RCS file: /cvsroot/Insight/Insight/Utilities/itkExtHdrs/itkAnalyzeDbh.h,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -u -b -B -r1.1 -r1.2
---- Utilities/itkExtHdrs/itkAnalyzeDbh.h 30 Oct 2006 18:42:58 -0000 1.1
-+++ Utilities/itkExtHdrs/itkAnalyzeDbh.h 26 Apr 2007 13:26:36 -0000 1.2
-@@ -1,33 +1,53 @@
--/*=========================================================================
-+/*
-+ *
-+ * Copyright (c) 1986-2006
-+ * Biomedical Imaging Resource
-+ * Mayo Clinic
-+ *
-+ * All rights reserved.
-+ *
-+ * Redistribution and use in source and binary forms, with or
-+ * without modification, are permitted provided that the following
-+ * conditions are met:
-+ *
-+ * 1) Redistributions of source code must retain the above copyright
-+ * notice, this list of conditions and the following disclaimer.
-+ *
-+ * 2) 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 Mayo Clinic 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.
-+ *
-+ */
-
--Program: Insight Segmentation & Registration Toolkit
--Module: $RCSfile: itkAnalyzeDbh.h,v $
--Language: C++
--Date: $Date: 2006/10/30 18:42:58 $
--Version: $Revision: 1.1 $
--
--Copyright (c) Insight Software Consortium. All rights reserved.
--See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm 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.
-
--=========================================================================*/
- /**
-- * \file dbh.h
-- * This file contains notes about the Analyze 7.5 file format gathered from several sources.
-- * A special note of thanks to Dennis P. Hanson (dph at mayo.edu) for his generous contributions
-- * in getting this information correct.
-- * - NOTE: The comments were addded as part of the Insight Segmentation And Registration Toolkit.
-- * - NOTE: The C-structure definitions for are under copyright by the Mayo Foundataion.
-- * - (c) Copyright, 1986-1995
-- * - Biomedical Imaging Resource
-- * - Mayo Foundation
-- * e-mail: hans-johnson at uiowa.edu
-- * Organization: The University of Iowa
-+ * \file itkAnalyzeDbh.h
-+ * This file contains notes about the Analyze 7.5 file format gathered from
-+ * several sources. A special note of thanks to Dennis P. Hanson for his
-+ * generous contributions in getting this information correct.
-+ * - NOTE: The comments were addded as part of the Insight Segmentation
-+ * And Registration Toolkit.
-+ *
- * Function: This file contains the structure definition for Analyze files
-- **************************************************************************/
-+ */
-+
-+
- #ifndef __dbh_h__
- #define __dbh_h__
-
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/04_ITKConfig.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/04_ITKConfig.patch 2008-01-03 06:07:20 UTC (rev 1073)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/04_ITKConfig.patch 2008-01-03 06:17:05 UTC (rev 1074)
@@ -1,12 +0,0 @@
---- ITKConfig.cmake.in 2006-06-08 12:39:16.000000000 -0500
-+++ ../../insighttoolkit-3.2.0/ITKConfig.cmake.in 2007-06-13 00:52:01.000000000 -0500
-@@ -5,9 +5,6 @@
- # This file is configured by ITK and used by the UseITK.cmake module
- # to load ITK's settings for an external project.
-
--# The ITK source tree.
--SET(ITK_SOURCE_DIR "@ITK_SOURCE_DIR@")
--
- # The ITK include file directories.
- SET(ITK_INCLUDE_DIRS "@ITK_INCLUDE_DIRS_CONFIG@")
-
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/05_itkIncludeDirectories.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/05_itkIncludeDirectories.patch 2008-01-03 06:07:20 UTC (rev 1073)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/05_itkIncludeDirectories.patch 2008-01-03 06:17:05 UTC (rev 1074)
@@ -1,13 +0,0 @@
---- itkIncludeDirectories.cmake 2006-11-30 17:12:59.000000000 -0600
-+++ ../../insighttoolkit-3.2.0/itkIncludeDirectories.cmake 2007-06-13 00:27:16.000000000 -0500
-@@ -135,8 +135,8 @@
-
- IF(NOT ITK_USE_SYSTEM_GDCM)
- SET(ITK_INCLUDE_DIRS_INSTALL_TREE ${ITK_INCLUDE_DIRS_INSTALL_TREE}
-- ${ITK_BINARY_DIR}/Utilities/gdcm
-- ${ITK_SOURCE_DIR}/Utilities/gdcm/src
-+ ${ITK_INSTALL_INCLUDE_PATH}/gdcm
-+ ${ITK_INSTALL_INCLUDE_PATH}/gdcm/src
- )
- ENDIF(NOT ITK_USE_SYSTEM_GDCM)
-
Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules 2008-01-03 06:07:20 UTC (rev 1073)
+++ trunk/packages/insighttoolkit/trunk/debian/rules 2008-01-03 06:17:05 UTC (rev 1074)
@@ -16,8 +16,8 @@
cp debian/CMakeCache.txt.debian $(DEB_BUILDDIR)/CMakeCache.txt
cd $(DEB_BUILDDIR) && cmake ..
-install/libinsighttoolkit3.0::
- dh_install -plibinsighttoolkit3.0 debian/tmp/usr/lib/InsightToolkit/lib*.so.* usr/lib
+install/libinsighttoolkit3.4::
+ dh_install -plibinsighttoolkit3.4 debian/tmp/usr/lib/InsightToolkit/lib*.so.* usr/lib
install/libinsighttoolkit-dev::
dh_installman -plibinsighttoolkit-dev debian/insighttoolkit.1
More information about the debian-med-commit
mailing list