[med-svn] r1843 - in trunk/packages/insighttoolkit/trunk/debian: . patches
smr at alioth.debian.org
smr at alioth.debian.org
Sat May 10 01:44:06 UTC 2008
Author: smr
Date: 2008-05-10 01:44:05 +0000 (Sat, 10 May 2008)
New Revision: 1843
Modified:
trunk/packages/insighttoolkit/trunk/debian/changelog
trunk/packages/insighttoolkit/trunk/debian/control
trunk/packages/insighttoolkit/trunk/debian/patches/gcc43.patch
trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Adapt to new upstream 3.6.0.
Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog 2008-05-10 01:32:34 UTC (rev 1842)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog 2008-05-10 01:44:05 UTC (rev 1843)
@@ -1,3 +1,9 @@
+insighttoolkit (3.6.0-1) UNRELEASED; urgency=low
+
+ * New upstream.
+
+ -- Steve M. Robbins <smr at debian.org> Thu, 08 May 2008 13:12:32 -0500
+
insighttoolkit (3.4.0-4) unstable; urgency=low
* rules:
Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control 2008-05-10 01:32:34 UTC (rev 1842)
+++ trunk/packages/insighttoolkit/trunk/debian/control 2008-05-10 01:44:05 UTC (rev 1843)
@@ -8,7 +8,7 @@
XS-Python-Version: current
Standards-Version: 3.7.3
-Package: libinsighttoolkit3.4
+Package: libinsighttoolkit3.6
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
@@ -48,7 +48,7 @@
Package: libinsighttoolkit-dev
Section: devel
Architecture: any
-Depends: libinsighttoolkit3.4 (= ${binary:Version}), libfftw3-dev
+Depends: libinsighttoolkit3.6 (= ${binary:Version}), libfftw3-dev
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
Modified: trunk/packages/insighttoolkit/trunk/debian/patches/gcc43.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/gcc43.patch 2008-05-10 01:32:34 UTC (rev 1842)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/gcc43.patch 2008-05-10 01:44:05 UTC (rev 1843)
@@ -1,5 +1,5 @@
---- insighttoolkit-3.4.0.orig/Code/Common/itkByteSwapper.txx
-+++ insighttoolkit-3.4.0/Code/Common/itkByteSwapper.txx
+--- insighttoolkit-3.6.0.orig/Code/Common/itkByteSwapper.txx
++++ insighttoolkit-3.6.0/Code/Common/itkByteSwapper.txx
@@ -22,6 +22,7 @@
#include "itkByteSwapper.h"
#include "itkObjectFactory.h"
@@ -8,8 +8,8 @@
namespace itk
{
---- insighttoolkit-3.4.0.orig/Code/Common/itkNeighborhood.h
-+++ insighttoolkit-3.4.0/Code/Common/itkNeighborhood.h
+--- insighttoolkit-3.6.0.orig/Code/Common/itkNeighborhood.h
++++ insighttoolkit-3.6.0/Code/Common/itkNeighborhood.h
@@ -73,11 +73,11 @@
typedef typename AllocatorType::const_iterator ConstIterator;
@@ -24,8 +24,8 @@
/** Offset type used to reference neighbor locations */
typedef Offset<VDimension> OffsetType;
---- insighttoolkit-3.4.0.orig/Code/Common/itkObjectFactoryBase.cxx
-+++ insighttoolkit-3.4.0/Code/Common/itkObjectFactoryBase.cxx
+--- insighttoolkit-3.6.0.orig/Code/Common/itkObjectFactoryBase.cxx
++++ insighttoolkit-3.6.0/Code/Common/itkObjectFactoryBase.cxx
@@ -29,6 +29,7 @@
#include <ctype.h>
#include <algorithm>
@@ -34,19 +34,19 @@
namespace
{
---- insighttoolkit-3.4.0.orig/Code/Common/itkVariableLengthVector.txx
-+++ insighttoolkit-3.4.0/Code/Common/itkVariableLengthVector.txx
-@@ -20,6 +20,8 @@
- #include "itkVariableLengthVector.h"
+--- insighttoolkit-3.6.0.orig/Code/Common/itkVariableLengthVector.txx
++++ insighttoolkit-3.6.0/Code/Common/itkVariableLengthVector.txx
+@@ -21,6 +21,8 @@
#include "itkNumericTraitsVariableLengthVectorPixel.h"
+ #include "vnl/vnl_math.h"
+#include <cstring>
+
namespace itk
{
---- insighttoolkit-3.4.0.orig/Code/Common/itkXMLFileOutputWindow.cxx
-+++ insighttoolkit-3.4.0/Code/Common/itkXMLFileOutputWindow.cxx
+--- insighttoolkit-3.6.0.orig/Code/Common/itkXMLFileOutputWindow.cxx
++++ insighttoolkit-3.6.0/Code/Common/itkXMLFileOutputWindow.cxx
@@ -20,6 +20,7 @@
#include "itkXMLFileOutputWindow.h"
@@ -55,8 +55,8 @@
namespace itk
{
---- insighttoolkit-3.4.0.orig/Code/IO/itkBrains2HeaderBase.cxx
-+++ insighttoolkit-3.4.0/Code/IO/itkBrains2HeaderBase.cxx
+--- insighttoolkit-3.6.0.orig/Code/IO/itkBrains2HeaderBase.cxx
++++ insighttoolkit-3.6.0/Code/IO/itkBrains2HeaderBase.cxx
@@ -21,6 +21,7 @@
#include "itkBrains2HeaderBase.h"
#include "itkBrains2HeaderFactory.h"
@@ -65,8 +65,8 @@
namespace itk {
Brains2HeaderBase::Brains2HeaderBase()
---- insighttoolkit-3.4.0.orig/Code/IO/itkIOCommon.cxx
-+++ insighttoolkit-3.4.0/Code/IO/itkIOCommon.cxx
+--- insighttoolkit-3.6.0.orig/Code/IO/itkIOCommon.cxx
++++ insighttoolkit-3.6.0/Code/IO/itkIOCommon.cxx
@@ -16,6 +16,7 @@
=========================================================================*/
#include "itkIOCommon.h"
@@ -75,8 +75,8 @@
namespace itk
---- insighttoolkit-3.4.0.orig/Code/Numerics/FEM/itkFEMObjectFactory.h
-+++ insighttoolkit-3.4.0/Code/Numerics/FEM/itkFEMObjectFactory.h
+--- insighttoolkit-3.6.0.orig/Code/Numerics/FEM/itkFEMObjectFactory.h
++++ insighttoolkit-3.6.0/Code/Numerics/FEM/itkFEMObjectFactory.h
@@ -20,6 +20,7 @@
#include "itkFastMutexLock.h"
#include <string>
@@ -85,8 +85,8 @@
namespace itk {
namespace fem {
---- insighttoolkit-3.4.0.orig/Code/Numerics/FEM/itkVisitorDispatcher.h
-+++ insighttoolkit-3.4.0/Code/Numerics/FEM/itkVisitorDispatcher.h
+--- insighttoolkit-3.6.0.orig/Code/Numerics/FEM/itkVisitorDispatcher.h
++++ insighttoolkit-3.6.0/Code/Numerics/FEM/itkVisitorDispatcher.h
@@ -22,6 +22,7 @@
#include "itkFastMutexLock.h"
#include <typeinfo>
@@ -95,8 +95,8 @@
namespace itk {
namespace fem {
---- insighttoolkit-3.4.0.orig/Utilities/DICOMParser/DICOMAppHelper.h
-+++ insighttoolkit-3.4.0/Utilities/DICOMParser/DICOMAppHelper.h
+--- insighttoolkit-3.6.0.orig/Utilities/DICOMParser/DICOMAppHelper.h
++++ insighttoolkit-3.6.0/Utilities/DICOMParser/DICOMAppHelper.h
@@ -26,6 +26,7 @@
#include <vector>
@@ -105,8 +105,8 @@
#include "DICOMConfig.h"
#include "DICOMTypes.h"
---- insighttoolkit-3.4.0.orig/Utilities/DICOMParser/DICOMBuffer.cxx
-+++ insighttoolkit-3.4.0/Utilities/DICOMParser/DICOMBuffer.cxx
+--- insighttoolkit-3.6.0.orig/Utilities/DICOMParser/DICOMBuffer.cxx
++++ insighttoolkit-3.6.0/Utilities/DICOMParser/DICOMBuffer.cxx
@@ -27,6 +27,7 @@
#include <iomanip>
#include <stdio.h>
@@ -115,8 +115,8 @@
#include "DICOMConfig.h"
#include "DICOMBuffer.h"
---- insighttoolkit-3.4.0.orig/Utilities/DICOMParser/DICOMParser.cxx
-+++ insighttoolkit-3.4.0/Utilities/DICOMParser/DICOMParser.cxx
+--- insighttoolkit-3.6.0.orig/Utilities/DICOMParser/DICOMParser.cxx
++++ insighttoolkit-3.6.0/Utilities/DICOMParser/DICOMParser.cxx
@@ -38,6 +38,7 @@
#include <string>
@@ -125,8 +125,8 @@
#include "DICOMConfig.h"
#include "DICOMParser.h"
---- insighttoolkit-3.4.0.orig/Utilities/DICOMParser/DICOMSource.cxx
-+++ insighttoolkit-3.4.0/Utilities/DICOMParser/DICOMSource.cxx
+--- insighttoolkit-3.6.0.orig/Utilities/DICOMParser/DICOMSource.cxx
++++ insighttoolkit-3.6.0/Utilities/DICOMParser/DICOMSource.cxx
@@ -27,6 +27,7 @@
#include <iomanip>
#include <stdio.h>
@@ -135,48 +135,38 @@
#include "DICOMConfig.h"
#include "DICOMSource.h"
---- insighttoolkit-3.4.0.orig/Utilities/MetaIO/metaCommand.cxx
-+++ insighttoolkit-3.4.0/Utilities/MetaIO/metaCommand.cxx
-@@ -22,6 +22,7 @@
-
+--- insighttoolkit-3.6.0.orig/Utilities/MetaIO/metaCommand.cxx
++++ insighttoolkit-3.6.0/Utilities/MetaIO/metaCommand.cxx
+@@ -23,6 +23,7 @@
#include <stdio.h>
+ #include <string.h>
#include <string>
+#include <cstring>
#if (METAIO_USE_NAMESPACE)
namespace METAIO_NAMESPACE {
---- insighttoolkit-3.4.0.orig/Utilities/MetaIO/metaImage.cxx
-+++ insighttoolkit-3.4.0/Utilities/MetaIO/metaImage.cxx
-@@ -21,6 +21,7 @@
- #include <string>
+--- insighttoolkit-3.6.0.orig/Utilities/MetaIO/metaImage.cxx
++++ insighttoolkit-3.6.0/Utilities/MetaIO/metaImage.cxx
+@@ -22,6 +22,7 @@
#include <string.h> // for memcpy
+ #include <stdlib.h> // for atoi
#include <math.h>
+#include <cstdlib>
#if defined (__BORLANDC__) && (__BORLANDC__ >= 0x0580)
#include <mem.h>
---- insighttoolkit-3.4.0.orig/Utilities/MetaIO/metaOutput.cxx
-+++ insighttoolkit-3.4.0/Utilities/MetaIO/metaOutput.cxx
-@@ -33,6 +33,7 @@
- #endif
+--- insighttoolkit-3.6.0.orig/Utilities/MetaIO/metaOutput.cxx
++++ insighttoolkit-3.6.0/Utilities/MetaIO/metaOutput.cxx
+@@ -35,6 +35,7 @@
+ #include <string.h>
#include <typeinfo>
+#include <cstring>
#if (METAIO_USE_NAMESPACE)
namespace METAIO_NAMESPACE {
---- insighttoolkit-3.4.0.orig/Utilities/MetaIO/metaUtils.h
-+++ insighttoolkit-3.4.0/Utilities/MetaIO/metaUtils.h
-@@ -53,6 +53,7 @@
- #include <vector>
- #include <string>
- #include <typeinfo>
-+#include <cstring>
-
- #if (METAIO_USE_NAMESPACE)
- namespace METAIO_NAMESPACE {
---- insighttoolkit-3.4.0.orig/Utilities/gdcm/src/gdcmDebug.h
-+++ insighttoolkit-3.4.0/Utilities/gdcm/src/gdcmDebug.h
+--- insighttoolkit-3.6.0.orig/Utilities/gdcm/src/gdcmDebug.h
++++ insighttoolkit-3.6.0/Utilities/gdcm/src/gdcmDebug.h
@@ -25,6 +25,7 @@
#include <fstream>
#include <assert.h>
@@ -185,8 +175,8 @@
namespace gdcm
{
---- insighttoolkit-3.4.0.orig/Utilities/gdcm/src/gdcmDicomDir.cxx
-+++ insighttoolkit-3.4.0/Utilities/gdcm/src/gdcmDicomDir.cxx
+--- insighttoolkit-3.6.0.orig/Utilities/gdcm/src/gdcmDicomDir.cxx
++++ insighttoolkit-3.6.0/Utilities/gdcm/src/gdcmDicomDir.cxx
@@ -42,6 +42,7 @@
#include <string>
#include <algorithm>
@@ -195,8 +185,8 @@
#ifdef _MSC_VER
# define getcwd _getcwd
---- insighttoolkit-3.4.0.orig/Utilities/gdcm/src/gdcmDictSet.cxx
-+++ insighttoolkit-3.4.0/Utilities/gdcm/src/gdcmDictSet.cxx
+--- insighttoolkit-3.6.0.orig/Utilities/gdcm/src/gdcmDictSet.cxx
++++ insighttoolkit-3.6.0/Utilities/gdcm/src/gdcmDictSet.cxx
@@ -21,6 +21,7 @@
#include <fstream>
#include <stdlib.h> // For getenv
@@ -205,8 +195,8 @@
namespace gdcm
{
---- insighttoolkit-3.4.0.orig/Utilities/gdcm/src/gdcmDirList.cxx
-+++ insighttoolkit-3.4.0/Utilities/gdcm/src/gdcmDirList.cxx
+--- insighttoolkit-3.6.0.orig/Utilities/gdcm/src/gdcmDirList.cxx
++++ insighttoolkit-3.6.0/Utilities/gdcm/src/gdcmDirList.cxx
@@ -24,6 +24,7 @@
#include <assert.h>
#include <errno.h>
@@ -215,8 +205,8 @@
#ifdef _MSC_VER
#include <windows.h>
---- insighttoolkit-3.4.0.orig/Utilities/gdcm/src/gdcmDocEntrySet.cxx
-+++ insighttoolkit-3.4.0/Utilities/gdcm/src/gdcmDocEntrySet.cxx
+--- insighttoolkit-3.6.0.orig/Utilities/gdcm/src/gdcmDocEntrySet.cxx
++++ insighttoolkit-3.6.0/Utilities/gdcm/src/gdcmDocEntrySet.cxx
@@ -29,6 +29,7 @@
#if defined(__BORLANDC__)
#include <mem.h> // for memset
@@ -225,8 +215,8 @@
namespace gdcm
{
---- insighttoolkit-3.4.0.orig/Utilities/gdcm/src/gdcmJpeg2000.cxx
-+++ insighttoolkit-3.4.0/Utilities/gdcm/src/gdcmJpeg2000.cxx
+--- insighttoolkit-3.6.0.orig/Utilities/gdcm/src/gdcmJpeg2000.cxx
++++ insighttoolkit-3.6.0/Utilities/gdcm/src/gdcmJpeg2000.cxx
@@ -25,6 +25,7 @@
#include <mem.h> // for memset
#endif
@@ -235,8 +225,8 @@
extern "C" {
#include "openjpeg/openjpeg.h"
---- insighttoolkit-3.4.0.orig/Utilities/gdcm/src/gdcmPixelWriteConvert.cxx
-+++ insighttoolkit-3.4.0/Utilities/gdcm/src/gdcmPixelWriteConvert.cxx
+--- insighttoolkit-3.6.0.orig/Utilities/gdcm/src/gdcmPixelWriteConvert.cxx
++++ insighttoolkit-3.6.0/Utilities/gdcm/src/gdcmPixelWriteConvert.cxx
@@ -25,6 +25,7 @@
#include "gdcmUtil.h"
@@ -245,8 +235,8 @@
#define WITHOFFSETTABLE 1
---- insighttoolkit-3.4.0.orig/Utilities/vxl/core/testlib/testlib_main.cxx
-+++ insighttoolkit-3.4.0/Utilities/vxl/core/testlib/testlib_main.cxx
+--- insighttoolkit-3.6.0.orig/Utilities/vxl/core/testlib/testlib_main.cxx
++++ insighttoolkit-3.6.0/Utilities/vxl/core/testlib/testlib_main.cxx
@@ -7,6 +7,8 @@
#include <vcl_exception.h>
#endif
Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules 2008-05-10 01:32:34 UTC (rev 1842)
+++ trunk/packages/insighttoolkit/trunk/debian/rules 2008-05-10 01:44:05 UTC (rev 1843)
@@ -25,8 +25,8 @@
common-configure-arch:: $(DEB_BUILDDIR)/CMakeCache.txt
cd $(DEB_BUILDDIR) && cmake ..
-install/libinsighttoolkit3.4::
- dh_install -plibinsighttoolkit3.4 -XPython debian/tmp/usr/lib/InsightToolkit/lib*.so.* usr/lib
+install/libinsighttoolkit3.6::
+ dh_install -plibinsighttoolkit3.6 -XPython debian/tmp/usr/lib/InsightToolkit/lib*.so.* usr/lib
install/python-insighttoolkit::
dh_install -ppython-insighttoolkit -XlibSwig debian/tmp/usr/lib/InsightToolkit/*Python.so* $(PYEXTDIR)
More information about the debian-med-commit
mailing list