[med-svn] r2421 - in trunk/packages/insighttoolkit/trunk/debian: . patches
smr at alioth.debian.org
smr at alioth.debian.org
Sat Aug 23 04:29:38 UTC 2008
Author: smr
Date: 2008-08-23 04:29:37 +0000 (Sat, 23 Aug 2008)
New Revision: 2421
Removed:
trunk/packages/insighttoolkit/trunk/debian/libinsighttoolkit3.4.lintian-overrides
trunk/packages/insighttoolkit/trunk/debian/patches/gcc43.patch
trunk/packages/insighttoolkit/trunk/debian/python-insighttoolkit.lintian-overrides
Modified:
trunk/packages/insighttoolkit/trunk/debian/changelog
trunk/packages/insighttoolkit/trunk/debian/control
trunk/packages/insighttoolkit/trunk/debian/patches/series
trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Update for release 3.8.0.
Modified: trunk/packages/insighttoolkit/trunk/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/changelog 2008-08-22 00:45:51 UTC (rev 2420)
+++ trunk/packages/insighttoolkit/trunk/debian/changelog 2008-08-23 04:29:37 UTC (rev 2421)
@@ -1,3 +1,10 @@
+insighttoolkit (3.8.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * patches/gcc43.patch: Remove; incorporated upstream.
+
+ -- Steve M. Robbins <smr at debian.org> Fri, 22 Aug 2008 23:28:19 -0500
+
insighttoolkit (3.6.0-4) UNRELEASED; urgency=low
[Steve M. Robbins]
Modified: trunk/packages/insighttoolkit/trunk/debian/control
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/control 2008-08-22 00:45:51 UTC (rev 2420)
+++ trunk/packages/insighttoolkit/trunk/debian/control 2008-08-23 04:29:37 UTC (rev 2421)
@@ -10,7 +10,7 @@
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/insighttoolkit/trunk/?rev=0&sc=0
Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/insighttoolkit/trunk/
-Package: libinsighttoolkit3.6
+Package: libinsighttoolkit3.8
Section: libs
Architecture: any
Depends: ${shlibs:Depends}
@@ -67,7 +67,7 @@
Package: libinsighttoolkit3-dev
Section: libdevel
Architecture: any
-Depends: libinsighttoolkit3.6 (= ${binary:Version}), libfftw3-dev
+Depends: libinsighttoolkit3.8 (= ${binary:Version}), libfftw3-dev
Conflicts: libinsighttoolkit-dev
Replaces: libinsighttoolkit-dev
Suggests: insighttoolkit3-examples
Deleted: trunk/packages/insighttoolkit/trunk/debian/libinsighttoolkit3.4.lintian-overrides
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/libinsighttoolkit3.4.lintian-overrides 2008-08-22 00:45:51 UTC (rev 2420)
+++ trunk/packages/insighttoolkit/trunk/debian/libinsighttoolkit3.4.lintian-overrides 2008-08-23 04:29:37 UTC (rev 2421)
@@ -1 +0,0 @@
-libinsighttoolkit3.4: package-name-doesnt-match-sonames
Deleted: trunk/packages/insighttoolkit/trunk/debian/patches/gcc43.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/gcc43.patch 2008-08-22 00:45:51 UTC (rev 2420)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/gcc43.patch 2008-08-23 04:29:37 UTC (rev 2421)
@@ -1,297 +0,0 @@
---- 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"
- #include <memory>
-+#include <cstring>
-
- namespace itk
- {
---- insighttoolkit-3.6.0.orig/Code/Common/itkNeighborhood.h
-+++ insighttoolkit-3.6.0/Code/Common/itkNeighborhood.h
-@@ -25,6 +25,7 @@
- #include "vnl/vnl_vector.h"
- #include "itkOffset.h"
- #include <vector>
-+#include <cstring>
-
- namespace itk {
-
-@@ -73,11 +74,11 @@
- typedef typename AllocatorType::const_iterator ConstIterator;
-
- /** Size and value typedef support. */
-- typedef Size<VDimension> SizeType;
-+ typedef ::itk::Size<VDimension> SizeType;
- typedef typename SizeType::SizeValueType SizeValueType;
-
- /** Radius typedef support. */
-- typedef Size<VDimension> RadiusType;
-+ typedef ::itk::Size<VDimension> RadiusType;
-
- /** Offset type used to reference neighbor locations */
- typedef Offset<VDimension> OffsetType;
---- 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>
- #include <map>
-+#include <cstring>
-
- namespace
- {
---- 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.6.0.orig/Code/Common/itkXMLFileOutputWindow.cxx
-+++ insighttoolkit-3.6.0/Code/Common/itkXMLFileOutputWindow.cxx
-@@ -20,6 +20,7 @@
-
- #include "itkXMLFileOutputWindow.h"
- #include <fstream>
-+#include <cstring>
-
- namespace itk
- {
---- 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"
- #include <iostream>
-+#include <cstdlib>
-
- namespace itk {
- Brains2HeaderBase::Brains2HeaderBase()
---- insighttoolkit-3.6.0.orig/Code/IO/itkIOCommon.cxx
-+++ insighttoolkit-3.6.0/Code/IO/itkIOCommon.cxx
-@@ -16,6 +16,7 @@
- =========================================================================*/
- #include "itkIOCommon.h"
- #include <sys/stat.h>
-+#include <cstring>
-
-
- namespace itk
---- 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>
- #include <vector>
-+#include <cstdlib>
-
- namespace itk {
- namespace fem {
---- 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>
- #include <map>
-+#include <cstdlib>
-
- namespace itk {
- namespace fem {
---- insighttoolkit-3.6.0.orig/Utilities/DICOMParser/DICOMAppHelper.h
-+++ insighttoolkit-3.6.0/Utilities/DICOMParser/DICOMAppHelper.h
-@@ -26,6 +26,7 @@
-
- #include <vector>
- #include <string>
-+#include <cstring>
-
- #include "DICOMConfig.h"
- #include "DICOMTypes.h"
---- 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>
- #include <string>
-+#include <cstring>
-
- #include "DICOMConfig.h"
- #include "DICOMBuffer.h"
---- insighttoolkit-3.6.0.orig/Utilities/DICOMParser/DICOMParser.cxx
-+++ insighttoolkit-3.6.0/Utilities/DICOMParser/DICOMParser.cxx
-@@ -38,6 +38,7 @@
-
- #include <string>
- #include <map>
-+#include <cstring>
-
- #include "DICOMConfig.h"
- #include "DICOMParser.h"
---- 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>
- #include <string>
-+#include <cstring>
-
- #include "DICOMConfig.h"
- #include "DICOMSource.h"
---- 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.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.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.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>
- #include <errno.h>
-+#include <cstring>
-
- namespace gdcm
- {
---- 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>
- #include <sys/types.h>
-+#include <cstring>
-
- #ifdef _MSC_VER
- # define getcwd _getcwd
---- 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
- #include <stdio.h> // For sprintf
-+#include <cstring>
-
- namespace gdcm
- {
---- 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>
- #include <sys/stat.h> //stat function
-+#include <cstring>
-
- #ifdef _MSC_VER
- #include <windows.h>
---- 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
- #endif
-+#include <cstring>
-
- namespace gdcm
- {
---- 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
- #include <stdio.h> // for fprintf
-+#include <cstdlib>
-
- extern "C" {
- #include "openjpeg/openjpeg.h"
---- 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"
-
- #include <vector>
-+#include <cstdlib>
-
- #define WITHOFFSETTABLE 1
-
---- 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
-
-+#include <cstdlib>
-+
- #if defined(VCL_VC) || defined(VCL_BORLAND)
- # include <crtdbg.h>
- # include <windows.h>
---- insighttoolkit-3.6.0.orig/Code/Common/itkColorTable.txx
-+++ insighttoolkit-3.6.0/Code/Common/itkColorTable.txx
-@@ -21,6 +21,7 @@
- #include "itkNumericTraits.h"
- #include "vnl/vnl_sample.h"
- #include <stdio.h>
-+#include <cstring>
-
- namespace itk
- {
---- insighttoolkit-3.6.0.orig/Code/Common/itkMetaDataObject.h
-+++ insighttoolkit-3.6.0/Code/Common/itkMetaDataObject.h
-@@ -27,6 +27,7 @@
- #include "itkFastMutexLock.h"
-
- #include <string>
-+#include <cstring>
-
- namespace itk
- {
---- insighttoolkit-3.6.0.orig/Code/Algorithms/itkAutomaticTopologyMeshSource.h
-+++ insighttoolkit-3.6.0/Code/Algorithms/itkAutomaticTopologyMeshSource.h
-@@ -127,12 +127,12 @@
- typedef typename CellType::CellAutoPointer CellAutoPointer;
-
- /** Different kinds of cells. */
-- typedef VertexCell< CellType > VertexCell;
-- typedef LineCell< CellType > LineCell;
-- typedef TriangleCell< CellType > TriangleCell;
-- typedef QuadrilateralCell< CellType > QuadrilateralCell;
-- typedef TetrahedronCell< CellType > TetrahedronCell;
-- typedef HexahedronCell< CellType > HexahedronCell;
-+ typedef itk::VertexCell< CellType > VertexCell;
-+ typedef itk::LineCell< CellType > LineCell;
-+ typedef itk::TriangleCell< CellType > TriangleCell;
-+ typedef itk::QuadrilateralCell< CellType > QuadrilateralCell;
-+ typedef itk::TetrahedronCell< CellType > TetrahedronCell;
-+ typedef itk::HexahedronCell< CellType > HexahedronCell;
-
- /** This class requires that the mesh being built use unsigned long
- * as the identifier type for all its elements. */
Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series 2008-08-22 00:45:51 UTC (rev 2420)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series 2008-08-23 04:29:37 UTC (rev 2421)
@@ -1,7 +1,6 @@
sharedforward.patch
gccxml-workaround.patch
03_examples.patch
-gcc43.patch
tcl-install.patch
pythonfiles-install.patch
Deleted: trunk/packages/insighttoolkit/trunk/debian/python-insighttoolkit.lintian-overrides
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/python-insighttoolkit.lintian-overrides 2008-08-22 00:45:51 UTC (rev 2420)
+++ trunk/packages/insighttoolkit/trunk/debian/python-insighttoolkit.lintian-overrides 2008-08-23 04:29:37 UTC (rev 2421)
@@ -1 +0,0 @@
-python-insighttoolkit: package-name-doesnt-match-sonames
Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules 2008-08-22 00:45:51 UTC (rev 2420)
+++ trunk/packages/insighttoolkit/trunk/debian/rules 2008-08-23 04:29:37 UTC (rev 2421)
@@ -4,7 +4,7 @@
include /usr/share/cdbs/1/class/makefile.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-pkg_lib = libinsighttoolkit3.6
+pkg_lib = libinsighttoolkit3.8
pkg_dev = libinsighttoolkit3-dev
pkg_python = python-insighttoolkit3
pkg_tcl = tcl8.4-insighttoolkit3
More information about the debian-med-commit
mailing list