[med-svn] [itksnap] 04/07: Update to new upstream release
Gert Wollny
gewo at moszumanska.debian.org
Fri Apr 7 06:37:18 UTC 2017
This is an automated email from the git hooks/post-receive script.
gewo pushed a commit to branch master
in repository itksnap.
commit 3923139c4c7d0bc6e2eec1ae291c2f63f23944dd
Author: Gert Wollny <gewo at debian.org>
Date: Thu Apr 6 16:15:45 2017 +0000
Update to new upstream release
---
debian/changelog | 12 +++
debian/control | 2 +-
debian/itksnap.docs | 2 +-
.../01_add_required_vtklibraries_and_gdcm.patch | 27 +----
debian/patches/02_vtk_6.3.patch | 117 ---------------------
debian/patches/series | 2 +-
6 files changed, 18 insertions(+), 144 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2e49a73..800d71c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+itksnap (3.6.0-1~exp1) experimental; urgency=medium
+
+ * New upstream version 3.6.0
+ * d/control: GW: Update uploader email address to @debian.org
+ * d/p/01: - update patch
+ * d/p/02: - drop patch, applied upstream
+ * d/itksnap.docs: update to ReleaseNotes.md
+ * d/copyright: update file format and exclude matlab code and
+ precompiled modules
+
+ -- Gert Wollny <gewo at debian.org> Thu, 06 Apr 2017 15:22:54 +0000
+
itksnap (3.4.0-2) unstable; urgency=medium
* d/p: Refresh patch 01
diff --git a/debian/control b/debian/control
index 9a2878e..da20161 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: itksnap
Maintainer: NeuroDebian Team <team at neuro.debian.net>
Uploaders: Michael Hanke <mih at debian.org>,
Yaroslav Halchenko <debian at onerussian.com>,
- Gert Wollny <gw.fossdev at gmail.com>
+ Gert Wollny <gewo at debian.org>
Section: science
Priority: optional
Build-Depends: debhelper (>= 9.0.0),
diff --git a/debian/itksnap.docs b/debian/itksnap.docs
index 428bcbb..c50bf9c 100644
--- a/debian/itksnap.docs
+++ b/debian/itksnap.docs
@@ -1,2 +1,2 @@
-ReleaseNotes.txt
+ReleaseNotes.md
README.html
diff --git a/debian/patches/01_add_required_vtklibraries_and_gdcm.patch b/debian/patches/01_add_required_vtklibraries_and_gdcm.patch
index 59b95d9..fdbf922 100644
--- a/debian/patches/01_add_required_vtklibraries_and_gdcm.patch
+++ b/debian/patches/01_add_required_vtklibraries_and_gdcm.patch
@@ -7,7 +7,7 @@ Last-Update: 2015-01-08
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -876,6 +876,8 @@
+@@ -923,6 +923,8 @@
# ITK Libraries
SET(SNAP_ITK_LIBS ${ITK_LIBRARIES})
@@ -15,29 +15,8 @@ Last-Update: 2015-01-08
+INCLUDE (${GDCM_USE_FILE})
# Core VTK libraries
- SET(SNAP_VTK_LIBS
-@@ -883,8 +885,10 @@
- vtkCommonCore
- vtkRenderingCore
- vtkRenderingFreeType
-+ vtkRenderingFreeTypeFontConfig
- vtkRenderingFreeTypeOpenGL
- vtkRenderingOpenGL
-+ vtkRenderingMatplotlib
- vtkRenderingVolume
- vtkRenderingVolumeOpenGL
- vtkFiltersCore
-@@ -895,6 +899,9 @@
- vtkIOExport
- vtkIOGeometry
- vtkIOLegacy
-+ vtkIOImage
-+ vtkIOMPIImage
-+ vtkIOMPIParallel
- )
-
- # System libraries
-@@ -902,6 +909,7 @@
+ SET(SNAP_VTK_LIBS ${VTK_LIBRARIES})
+@@ -939,6 +941,7 @@
${OPENGL_LIBRARIES}
${OPENGL_glu_LIBRARY}
${SYSTEM_LIBS}
diff --git a/debian/patches/02_vtk_6.3.patch b/debian/patches/02_vtk_6.3.patch
deleted file mode 100644
index b7dec2e..0000000
--- a/debian/patches/02_vtk_6.3.patch
+++ /dev/null
@@ -1,117 +0,0 @@
---- a/GUI/Qt/View/GenericView3D.cxx
-+++ b/GUI/Qt/View/GenericView3D.cxx
-@@ -23,7 +23,7 @@
- {
- public:
- static CursorPlacementInteractorStyle* New();
-- vtkTypeRevisionMacro(CursorPlacementInteractorStyle, vtkInteractorStyleTrackballCamera)
-+ vtkTypeMacro(CursorPlacementInteractorStyle, vtkInteractorStyleTrackballCamera)
-
- irisGetSetMacro(Model, Generic3DModel *)
-
-@@ -46,7 +46,7 @@
- {
- public:
- static SpraycanInteractorStyle* New();
-- vtkTypeRevisionMacro(SpraycanInteractorStyle, vtkInteractorStyleTrackballCamera)
-+ vtkTypeMacro(SpraycanInteractorStyle, vtkInteractorStyleTrackballCamera)
-
- irisGetSetMacro(Model, Generic3DModel *)
-
-@@ -99,7 +99,7 @@
- {
- public:
- static ScalpelInteractorStyle* New();
-- vtkTypeRevisionMacro(ScalpelInteractorStyle, vtkInteractorStyleTrackballCamera)
-+ vtkTypeMacro(ScalpelInteractorStyle, vtkInteractorStyleTrackballCamera)
-
- irisGetSetMacro(Model, Generic3DModel *)
-
-@@ -189,13 +189,10 @@
-
-
-
--vtkCxxRevisionMacro(CursorPlacementInteractorStyle, "$Revision: 1.1 $")
- vtkStandardNewMacro(CursorPlacementInteractorStyle)
-
--vtkCxxRevisionMacro(SpraycanInteractorStyle, "$Revision: 1.1 $")
- vtkStandardNewMacro(SpraycanInteractorStyle)
-
--vtkCxxRevisionMacro(ScalpelInteractorStyle, "$Revision: 1.1 $")
- vtkStandardNewMacro(ScalpelInteractorStyle)
-
-
---- a/GUI/Renderer/IntensityCurveVTKRenderer.cxx
-+++ b/GUI/Renderer/IntensityCurveVTKRenderer.cxx
-@@ -326,12 +326,11 @@
- {
- this->MouseMoved = false;
-
-- if (mouse.Button == vtkContextMouseEvent::LEFT_BUTTON)
-+ if (mouse.GetButton() == vtkContextMouseEvent::LEFT_BUTTON)
- {
-- double pos[2];
-- pos[0] = mouse.Pos[0];
-- pos[1] = mouse.Pos[1];
-- vtkIdType pointUnderMouse = this->FindPoint(pos);
-+ vtkVector2f pos = mouse.GetPos();
-+ double p[2] = {pos[0], pos[1]};
-+ vtkIdType pointUnderMouse = this->FindPoint(p);
- this->SetCurrentPoint(pointUnderMouse);
- return true;
- }
---- a/GUI/Renderer/Window3DPicker.cxx
-+++ b/GUI/Renderer/Window3DPicker.cxx
-@@ -114,6 +114,5 @@
- m_Model = NULL;
- }
-
--vtkCxxRevisionMacro(Window3DPicker, "$Revision: 1.1 $")
- vtkStandardNewMacro(Window3DPicker)
-
---- a/GUI/Renderer/Window3DPicker.h
-+++ b/GUI/Renderer/Window3DPicker.h
-@@ -11,7 +11,7 @@
- public:
- static Window3DPicker *New();
-
-- vtkTypeRevisionMacro(Window3DPicker, vtkPicker)
-+ vtkTypeMacro(Window3DPicker, vtkPicker)
-
- irisGetSetMacro(Model, Generic3DModel *)
-
---- a/Logic/LevelSet/SnakeParametersPreviewPipeline.cxx
-+++ b/Logic/LevelSet/SnakeParametersPreviewPipeline.cxx
-@@ -221,9 +221,9 @@
- m_CurrentCurve.reserve(pd->GetNumberOfCells() * 2);
- for(int i=0;i<pd->GetNumberOfCells();i++)
- {
-- vtkFloatingPointType *pt1 = pd->GetPoint(pd->GetCell(i)->GetPointId(0));
-+ double *pt1 = pd->GetPoint(pd->GetCell(i)->GetPointId(0));
- m_CurrentCurve.push_back(Vector2d(pt1[0] + 0.5,pt1[1] + 0.5));
-- vtkFloatingPointType *pt2 = pd->GetPoint(pd->GetCell(i)->GetPointId(1));
-+ double *pt2 = pd->GetPoint(pd->GetCell(i)->GetPointId(1));
- m_CurrentCurve.push_back(Vector2d(pt2[0] + 0.5,pt2[1] + 0.5));
- }
- }
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -886,7 +886,6 @@
- vtkRenderingCore
- vtkRenderingFreeType
- vtkRenderingFreeTypeFontConfig
-- vtkRenderingFreeTypeOpenGL
- vtkRenderingOpenGL
- vtkRenderingMatplotlib
- vtkRenderingVolume
-@@ -904,6 +903,10 @@
- vtkIOMPIParallel
- )
-
-+IF ((VTK_MAJOR_VERSION EQUAL 6) AND (VTK_MINOR_VERSION LESS 3))
-+ SET(SNAP_VTK_LIBS "${SNAP_VTK_LIBS}" vtkRenderingFreeTypeOpenGL)
-+ENDIF()
-+
- # System libraries
- SET(SNAP_SYSTEM_LIBS
- ${OPENGL_LIBRARIES}
diff --git a/debian/patches/series b/debian/patches/series
index 732cec2..bda277d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
01_add_required_vtklibraries_and_gdcm.patch
-02_vtk_6.3.patch
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/itksnap.git
More information about the debian-med-commit
mailing list