[med-svn] [fw4spl] 01/11: New upstream version, updated maintainer.
Flavien Bridault
fbridault-guest at moszumanska.debian.org
Thu Nov 24 07:49:55 UTC 2016
This is an automated email from the git hooks/post-receive script.
fbridault-guest pushed a commit to branch master
in repository fw4spl.
commit 956a180f0c48de082d0956410805ea0335265516
Author: Flavien Bridault <fbridault at ircad.fr>
Date: Wed Nov 16 17:46:48 2016 +0100
New upstream version, updated maintainer.
---
.gitignore | 2 +
debian/changelog | 13 +-
debian/control | 14 +-
debian/patches/change_launcher_name.patch | 496 ---------------------------
debian/patches/fix_arm.patch | 105 ------
debian/patches/fix_boost.patch | 548 ------------------------------
debian/patches/fix_cmakelists.patch | 48 ---
debian/patches/remove_fwItkIOTest.patch | 145 --------
debian/patches/series | 6 -
debian/patches/set_media_as_bundle.patch | 16 -
debian/rules | 6 +-
debian/source/local-options | 1 +
debian/watch | 2 +-
13 files changed, 24 insertions(+), 1378 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..4ecbc3e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+.pc
+
diff --git a/debian/changelog b/debian/changelog
index 963a7e1..ea0a37c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,19 @@
-fw4spl (0.9.2-5) UNRELEASED; urgency=medium
+fw4spl (0.11.0.2-1) UNRELEASED; urgency=medium
+ [ Andreas Tille ]
* Team upload
* Fix Homepage
Closes: #812904
- -- Andreas Tille <tille at debian.org> Wed, 27 Jan 2016 19:30:25 +0100
+ [ Flavien Bridault ]
+ * New upstream version
+ * Removed Corentin Desfarges as Uploader
+ * Added myself as Uploader
+ * d/watch: Moved to official fw4spl fork
+ * d/rules: Enabled parallel build
+ * d/control: Updated dependencies
+
+ -- Flavien Bridault <fbridault at ircad.fr> Wed, 16 Nov 2016 16:03:15 +0100
fw4spl (0.9.2-4) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 570ed63..7ff8ae5 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
Source: fw4spl
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
-Uploaders: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
+Uploaders: Flavien Bridault <fbridault at ircad.fr>
Section: science
Priority: optional
Build-Depends: debhelper (>= 9),
@@ -12,16 +12,14 @@ Build-Depends: debhelper (>= 9),
libtiff5-dev,
libcppunit-dev,
libhdf5-dev,
- libqt4-dev,
- libqt4-opengl-dev,
- libqt4-qt3support,
- libvtk5-dev,
+ libqt5opengl5-dev,
+ libqt5x11extras5-dev,
+ libvtk6-dev,
libgdcm2-dev,
- libinsighttoolkit3-dev,
+ libinsighttoolkit4-dev,
libann-dev,
libvtkgdcm2-dev,
- libvtk5.8-qt4,
- libvxl1-dev,
+ libvtk6.3-qt,
libcamp0.7-dev,
xvfb,
xauth,
diff --git a/debian/patches/change_launcher_name.patch b/debian/patches/change_launcher_name.patch
deleted file mode 100644
index 3cf6512..0000000
--- a/debian/patches/change_launcher_name.patch
+++ /dev/null
@@ -1,496 +0,0 @@
-Description: Change the name of the binary launcher
-Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
-Forwarded: no
-Last-Update: 2015-01-22
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- fw4spl.orig/Apps/Tuto01Basic/bin/build.options
-+++ fw4spl/Apps/Tuto01Basic/bin/build.options
-@@ -7,7 +7,7 @@
- 'guiQt_0-1' ,
- 'dataReg_0-1' ,
- 'servicesReg_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1' ,
- ]
-
-
---- fw4spl.orig/Apps/Tuto02DataServiceBasic/bin/build.options
-+++ fw4spl/Apps/Tuto02DataServiceBasic/bin/build.options
-@@ -9,7 +9,7 @@
- 'servicesReg_0-1' ,
- 'visu_0-1' ,
- 'visuVTKQt_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1' ,
- 'ioVTK_0-1' ,
- 'ioData_0-1' ,
- 'vtkSimpleNegato_0-1' ,
---- fw4spl.orig/Apps/Tuto03DataService/bin/build.options
-+++ fw4spl/Apps/Tuto03DataService/bin/build.options
-@@ -9,7 +9,7 @@
- 'servicesReg_0-1' ,
- 'visu_0-1' ,
- 'visuVTKQt_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1' ,
- 'ioVTK_0-1' ,
- 'ioData_0-1' ,
- 'vtkSimpleNegato_0-1' ,
---- fw4spl.orig/Apps/Tuto03DataServiceBis/bin/build.options
-+++ fw4spl/Apps/Tuto03DataServiceBis/bin/build.options
-@@ -9,7 +9,7 @@
- 'servicesReg_0-1' ,
- 'visu_0-1' ,
- 'visuVTKQt_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1' ,
- 'ioVTK_0-1' ,
- 'ioData_0-1' ,
- 'vtkSimpleMesh_0-1' ,
---- fw4spl.orig/Apps/Tuto04ComChannel/bin/build.options
-+++ fw4spl/Apps/Tuto04ComChannel/bin/build.options
-@@ -9,7 +9,7 @@
- 'servicesReg_0-1' ,
- 'visu_0-1' ,
- 'visuVTKQt_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1' ,
- 'ioVTK_0-1' ,
- 'ioData_0-1' ,
- 'vtkSimpleMesh_0-1' ,
---- fw4spl.orig/Apps/Tuto05Mesher/bin/build.options
-+++ fw4spl/Apps/Tuto05Mesher/bin/build.options
-@@ -9,7 +9,7 @@
- 'servicesReg_0-1' ,
- 'visu_0-1' ,
- 'visuVTKQt_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1' ,
- 'ioVTK_0-1' ,
- 'ioData_0-1' ,
- 'vtkSimpleNegato_0-1' ,
---- fw4spl.orig/Apps/Tuto05MesherB/bin/build.options
-+++ fw4spl/Apps/Tuto05MesherB/bin/build.options
-@@ -9,7 +9,7 @@
- 'servicesReg_0-1' ,
- 'visu_0-1' ,
- 'visuVTKQt_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1' ,
- 'ioVTK_0-1' ,
- 'ioData_0-1' ,
- 'vtkSimpleNegato_0-1' ,
---- fw4spl.orig/Apps/Tuto05MesherC/bin/build.options
-+++ fw4spl/Apps/Tuto05MesherC/bin/build.options
-@@ -9,7 +9,7 @@
- 'servicesReg_0-1' ,
- 'visu_0-1' ,
- 'visuVTKQt_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1' ,
- 'ioVTK_0-1' ,
- 'ioData_0-1' ,
- 'vtkSimpleNegato_0-1' ,
---- fw4spl.orig/Apps/Tuto06Filter/bin/build.options
-+++ fw4spl/Apps/Tuto06Filter/bin/build.options
-@@ -9,7 +9,7 @@
- 'servicesReg_0-1' ,
- 'visu_0-1' ,
- 'visuVTKQt_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1' ,
- 'ioVTK_0-1' ,
- 'ioData_0-1' ,
- 'vtkSimpleNegato_0-1' ,
---- fw4spl.orig/Apps/Tuto07LoaderForExternalData/bin/build.options
-+++ fw4spl/Apps/Tuto07LoaderForExternalData/bin/build.options
-@@ -9,7 +9,7 @@
- 'servicesReg_0-1' ,
- 'visu_0-1' ,
- 'visuVTKQt_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1' ,
- 'ioVTK_0-1' ,
- 'ioAtoms_0-1' ,
- 'ioTuto_0-1' ,
---- fw4spl.orig/Apps/Tuto08GenericScene/bin/build.options
-+++ fw4spl/Apps/Tuto08GenericScene/bin/build.options
-@@ -17,6 +17,6 @@
- 'visuVTKQt_0-1' ,
- 'visuVTKAdaptor_0-1',
- 'visu_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1',
- 'appXml_0-1' ,
- ]
---- fw4spl.orig/Apps/Tuto09MesherWithGenericScene/bin/build.options
-+++ fw4spl/Apps/Tuto09MesherWithGenericScene/bin/build.options
-@@ -2,7 +2,7 @@
- VERSION = '0-1'
-
- BUNDLES = [
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1' ,
- 'dataReg_0-1' ,
- 'servicesReg_0-1' ,
- 'gui_0-1' ,
---- fw4spl.orig/Apps/Tuto10MatrixTransformInGS/bin/build.options
-+++ fw4spl/Apps/Tuto10MatrixTransformInGS/bin/build.options
-@@ -8,7 +8,7 @@
- 'dataReg_0-1' ,
- 'servicesReg_0-1' ,
- 'visu_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1' ,
- 'ioVTK_0-1' ,
- 'ioData_0-1' ,
- 'uiIO_0-1' ,
---- fw4spl.orig/Apps/Tuto11LaunchBasicConfig/bin/build.options
-+++ fw4spl/Apps/Tuto11LaunchBasicConfig/bin/build.options
-@@ -9,7 +9,7 @@
- 'servicesReg_0-1' ,
- 'visu_0-1' ,
- 'visuVTKQt_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1' ,
- 'ioVTK_0-1' ,
- 'ioData_0-1' ,
- 'vtkSimpleNegato_0-1' ,
---- fw4spl.orig/Apps/Tuto12Picker/bin/build.options
-+++ fw4spl/Apps/Tuto12Picker/bin/build.options
-@@ -17,6 +17,6 @@
- 'visuVTKQt_0-1' ,
- 'visuVTKAdaptor_0-1',
- 'visu_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1',
- 'appXml_0-1' ,
- ]
---- fw4spl.orig/Apps/Tuto13Scene2D/bin/build.options
-+++ fw4spl/Apps/Tuto13Scene2D/bin/build.options
-@@ -7,7 +7,7 @@
- 'guiQt_0-1' ,
- 'dataReg_0-1' ,
- 'servicesReg_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1' ,
- 'scene2D_0-1' ,
- 'uiVisu_0-1' ,
- 'uiVisuQt_0-1'
---- fw4spl.orig/Apps/Tuto14MeshGenerator/bin/build.options
-+++ fw4spl/Apps/Tuto14MeshGenerator/bin/build.options
-@@ -16,6 +16,6 @@
- 'visuVTKQt_0-1' ,
- 'visuVTKAdaptor_0-1',
- 'visu_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1',
- 'appXml_0-1' ,
- ]
---- fw4spl.orig/Apps/Tuto15Multithread/bin/build.options
-+++ fw4spl/Apps/Tuto15Multithread/bin/build.options
-@@ -9,7 +9,7 @@
- 'servicesReg_0-1' ,
- 'visu_0-1' ,
- 'visuVTKQt_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1' ,
- 'ioVTK_0-1' ,
- 'ioData_0-1' ,
- 'vtkSimpleMesh_0-1' ,
---- fw4spl.orig/Apps/Tuto15MultithreadCtrl/bin/build.options
-+++ fw4spl/Apps/Tuto15MultithreadCtrl/bin/build.options
-@@ -1,6 +1,6 @@
- TYPE = 'bundle'
- VERSION = '0-1'
--REQUIREMENTS = ['launcher_0-1' ]
-+REQUIREMENTS = ['fwLauncher_0-1' ]
-
- BUNDLES = [
- # 'io_0-1' ,
---- fw4spl.orig/Apps/TutoGui/bin/build.options
-+++ fw4spl/Apps/TutoGui/bin/build.options
-@@ -6,7 +6,7 @@
- 'guiQt_0-1' ,
- 'dataReg_0-1' ,
- 'servicesReg_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1' ,
- 'appXml_0-1' ,
- ]
-
---- fw4spl.orig/Apps/TutoPython/bin/build.options
-+++ fw4spl/Apps/TutoPython/bin/build.options
-@@ -11,7 +11,7 @@
- 'dataReg',
- 'servicesReg',
- 'appXml_0-1',
-- 'launcher_0-1',
-+ 'fwLauncher_0-1',
- ]
-
-
---- fw4spl.orig/Apps/TutoVectorField/bin/build.options
-+++ fw4spl/Apps/TutoVectorField/bin/build.options
-@@ -17,7 +17,7 @@
- 'visuVTKQt_0-1' ,
- 'visuVTKAdaptor_0-1',
- 'visu_0-1' ,
-- 'launcher_0-1' ,
-+ 'fwLauncher_0-1',
- 'appXml_0-1' ,
- ]
-
---- fw4spl.orig/Apps/VRRender/bin/build.options
-+++ fw4spl/Apps/VRRender/bin/build.options
-@@ -18,7 +18,7 @@
- 'monitor_0-1',
- 'monitorQt_0-1',
- 'ctrlMemory_0-1',
-- 'launcher_0-1',
-+ 'fwLauncher_0-1',
- 'ioITK_0-1',
- 'ioVTK_0-1',
- 'ioVtkGdcm_0-1',
---- fw4spl.orig/Apps/Tuto01Basic/Properties.cmake
-+++ fw4spl/Apps/Tuto01Basic/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS io appXml gui guiQt dataReg servicesReg launcher )
-+set( REQUIREMENTS io appXml gui guiQt dataReg servicesReg fwLauncher )
-
---- fw4spl.orig/Apps/Tuto02DataServiceBasic/Properties.cmake
-+++ fw4spl/Apps/Tuto02DataServiceBasic/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS io appXml gui guiQt dataReg servicesReg launcher visu visuVTKQt ioData ioVTK vtkSimpleNegato )
-+set( REQUIREMENTS io appXml gui guiQt dataReg servicesReg fwLauncher visu visuVTKQt ioData ioVTK vtkSimpleNegato )
-
---- fw4spl.orig/Apps/Tuto02DataServiceBasicCtrl/Properties.cmake
-+++ fw4spl/Apps/Tuto02DataServiceBasicCtrl/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES fwData fwServices fwCom fwRuntime )
--set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt ioData ioVTK vtkSimpleNegato launcher )
-+set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt ioData ioVTK vtkSimpleNegato fwLauncher )
-
---- fw4spl.orig/Apps/Tuto03DataService/Properties.cmake
-+++ fw4spl/Apps/Tuto03DataService/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt launcher ioVTK ioData vtkSimpleNegato uiIO appXml )
-+set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt fwLauncher ioVTK ioData vtkSimpleNegato uiIO appXml )
-
---- fw4spl.orig/Apps/Tuto03DataServiceBis/Properties.cmake
-+++ fw4spl/Apps/Tuto03DataServiceBis/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt launcher ioVTK ioData vtkSimpleMesh uiIO appXml )
-+set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt fwLauncher ioVTK ioData vtkSimpleMesh uiIO appXml )
-
---- fw4spl.orig/Apps/Tuto04ComChannel/Properties.cmake
-+++ fw4spl/Apps/Tuto04ComChannel/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt launcher ioVTK ioData vtkSimpleMesh uiIO appXml )
-+set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt fwLauncher ioVTK ioData vtkSimpleMesh uiIO appXml )
-
---- fw4spl.orig/Apps/Tuto05Mesher/Properties.cmake
-+++ fw4spl/Apps/Tuto05Mesher/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt launcher ioVTK ioData vtkSimpleNegato vtkSimpleMesh vtkCompositeMesh uiIO opVTKMesh opImageFilter appXml )
-+set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt fwLauncher ioVTK ioData vtkSimpleNegato vtkSimpleMesh vtkCompositeMesh uiIO opVTKMesh opImageFilter appXml )
-
---- fw4spl.orig/Apps/Tuto05MesherB/Properties.cmake
-+++ fw4spl/Apps/Tuto05MesherB/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt launcher ioVTK ioData vtkSimpleNegato vtkSimpleMesh vtkCompositeMesh uiIO opVTKMesh opImageFilter appXml )
-+set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt fwLauncher ioVTK ioData vtkSimpleNegato vtkSimpleMesh vtkCompositeMesh uiIO opVTKMesh opImageFilter appXml )
-
---- fw4spl.orig/Apps/Tuto05MesherC/Properties.cmake
-+++ fw4spl/Apps/Tuto05MesherC/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt launcher ioVTK ioData vtkSimpleNegato vtkSimpleMesh vtkCompositeMesh uiIO opVTKMesh opImageFilter appXml )
-+set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt fwLauncher ioVTK ioData vtkSimpleNegato vtkSimpleMesh vtkCompositeMesh uiIO opVTKMesh opImageFilter appXml )
-
---- fw4spl.orig/Apps/Tuto06Filter/Properties.cmake
-+++ fw4spl/Apps/Tuto06Filter/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt launcher ioVTK ioData vtkSimpleNegato uiIO opImageFilter appXml )
-+set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt fwLauncher ioVTK ioData vtkSimpleNegato uiIO opImageFilter appXml )
-
---- fw4spl.orig/Apps/Tuto07LoaderForExternalData/Properties.cmake
-+++ fw4spl/Apps/Tuto07LoaderForExternalData/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt launcher ioVTK ioAtoms ioTuto vtkSimpleNegato uiIO ctrlSelection appXml )
-+set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt fwLauncher ioVTK ioAtoms ioTuto vtkSimpleNegato uiIO ctrlSelection appXml )
-
---- fw4spl.orig/Apps/Tuto08GenericScene/Properties.cmake
-+++ fw4spl/Apps/Tuto08GenericScene/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS dataReg ctrlSelection gui guiQt ioData ioVTK io servicesReg uiVisuQt uiImageQt uiIO visuVTK visuVTKQt visuVTKAdaptor visu launcher appXml )
-+set( REQUIREMENTS dataReg ctrlSelection gui guiQt ioData ioVTK io servicesReg uiVisuQt uiImageQt uiIO visuVTK visuVTKQt visuVTKAdaptor visu fwLauncher appXml )
-
---- fw4spl.orig/Apps/Tuto09MesherWithGenericScene/Properties.cmake
-+++ fw4spl/Apps/Tuto09MesherWithGenericScene/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS launcher dataReg servicesReg gui guiQt io visu ioData ioVTK uiVisuQt uiImageQt uiReconstructionQt uiMedDataQt uiIO visuVTK visuVTKQt visuVTKAdaptor opVTKMesh ctrlSelection appXml )
-+set( REQUIREMENTS fwLauncher dataReg servicesReg gui guiQt io visu ioData ioVTK uiVisuQt uiImageQt uiReconstructionQt uiMedDataQt uiIO visuVTK visuVTKQt visuVTKAdaptor opVTKMesh ctrlSelection appXml )
-
---- fw4spl.orig/Apps/Tuto10MatrixTransformInGS/Properties.cmake
-+++ fw4spl/Apps/Tuto10MatrixTransformInGS/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS io gui guiQt dataReg servicesReg visu launcher ioVTK ioData uiIO uiVisuQt visuVTK visuVTKQt visuVTKAdaptor appXml )
-+set( REQUIREMENTS io gui guiQt dataReg servicesReg visu fwLauncher ioVTK ioData uiIO uiVisuQt visuVTK visuVTKQt visuVTKAdaptor appXml )
-
---- fw4spl.orig/Apps/Tuto11LaunchBasicConfig/Properties.cmake
-+++ fw4spl/Apps/Tuto11LaunchBasicConfig/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt launcher ioVTK ioData vtkSimpleNegato uiIO appXml )
-+set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt fwLauncher ioVTK ioData vtkSimpleNegato uiIO appXml )
-
---- fw4spl.orig/Apps/Tuto12Picker/Properties.cmake
-+++ fw4spl/Apps/Tuto12Picker/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS dataReg ctrlSelection gui guiQt ioData ioVTK io servicesReg uiVisuQt uiImageQt uiIO visuVTK visuVTKQt visuVTKAdaptor visu launcher appXml )
-+set( REQUIREMENTS dataReg ctrlSelection gui guiQt ioData ioVTK io servicesReg uiVisuQt uiImageQt uiIO visuVTK visuVTKQt visuVTKAdaptor visu fwLauncher appXml )
-
---- fw4spl.orig/Apps/Tuto13Scene2D/Properties.cmake
-+++ fw4spl/Apps/Tuto13Scene2D/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS io appXml gui guiQt dataReg servicesReg launcher scene2D uiVisu uiVisuQt )
-+set( REQUIREMENTS io appXml gui guiQt dataReg servicesReg fwLauncher scene2D uiVisu uiVisuQt )
-
---- fw4spl.orig/Apps/Tuto14MeshGenerator/Properties.cmake
-+++ fw4spl/Apps/Tuto14MeshGenerator/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS dataReg ctrlSelection gui guiQt ioData ioVTK io servicesReg uiVisuQt uiIO visuVTK visuVTKQt visuVTKAdaptor visu launcher appXml )
-+set( REQUIREMENTS dataReg ctrlSelection gui guiQt ioData ioVTK io servicesReg uiVisuQt uiIO visuVTK visuVTKQt visuVTKAdaptor visu fwLauncher appXml )
-
---- fw4spl.orig/Apps/Tuto15Multithread/Properties.cmake
-+++ fw4spl/Apps/Tuto15Multithread/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt ioVTK ioData vtkSimpleMesh uiIO appXml launcher )
-+set( REQUIREMENTS io gui guiQt dataReg servicesReg visu visuVTKQt ioVTK ioData vtkSimpleMesh uiIO appXml fwLauncher )
-
---- fw4spl.orig/Apps/Tuto15MultithreadCtrl/Properties.cmake
-+++ fw4spl/Apps/Tuto15MultithreadCtrl/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES fwData fwServices fwCom fwThread fwComEd )
--set( REQUIREMENTS dataReg servicesReg launcher )
-+set( REQUIREMENTS dataReg servicesReg fwLauncher )
-
---- fw4spl.orig/Apps/TutoGui/Properties.cmake
-+++ fw4spl/Apps/TutoGui/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS io appXml gui guiQt guiWx dataReg servicesReg launcher )
-+set( REQUIREMENTS io appXml gui guiQt guiWx dataReg servicesReg fwLauncher )
-
---- fw4spl.orig/Apps/TutoPython/Properties.cmake
-+++ fw4spl/Apps/TutoPython/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES fwPython )
--set( REQUIREMENTS io ioVTK uiIO guiQt binding uiPython dataReg servicesReg appXml launcher )
-+set( REQUIREMENTS io ioVTK uiIO guiQt binding uiPython dataReg servicesReg appXml fwLauncher )
-
---- fw4spl.orig/Apps/TutoVectorField/Properties.cmake
-+++ fw4spl/Apps/TutoVectorField/Properties.cmake
-@@ -3,5 +3,5 @@
- set( VERSION 0.1 )
- set( TYPE BUNDLE )
- set( DEPENDENCIES )
--set( REQUIREMENTS dataReg ctrlSelection gui guiQt ioData ioVTK io servicesReg uiVisuQt uiImageQt uiIO visuVTK visuVTKQt visuVTKAdaptor visu launcher appXml )
-+set( REQUIREMENTS dataReg ctrlSelection gui guiQt ioData ioVTK io servicesReg uiVisuQt uiImageQt uiIO visuVTK visuVTKQt visuVTKAdaptor visu fwLauncher appXml )
-
---- fw4spl.orig/Apps/VRRender/Properties.cmake
-+++ fw4spl/Apps/VRRender/Properties.cmake
-@@ -16,7 +16,7 @@
- monitor
- monitorQt
- ctrlMemory
-- launcher
-+ fwLauncher
- ioVTK
- ioVtkGdcm
- uiIO
---- fw4spl.orig/launcher/Properties.cmake
-+++ fw4spl/launcher/Properties.cmake
-@@ -1,5 +1,5 @@
-
--set( NAME launcher )
-+set( NAME fwLauncher )
- set( VERSION 0.1 )
- set( TYPE EXECUTABLE )
- set( DEPENDENCIES fwCore fwRuntime )
---- fw4spl.orig/SrcLib/core/fwGuiWx/src/fwGuiWx/App.cpp
-+++ fw4spl/SrcLib/core/fwGuiWx/src/fwGuiWx/App.cpp
-@@ -83,9 +83,9 @@
- m_locale = new wxLocale();
- ::boost::filesystem::path pathLauncher;
- #ifdef SPECIALINSTALL
-- pathLauncher = SHAREPATH / "launcher_0-1" / "locale" ;
-+ pathLauncher = SHAREPATH / "fwLauncher_0-1" / "locale" ;
- #else
-- pathLauncher = ::boost::filesystem::current_path() / "share" / "launcher_0-1" / "locale" ;
-+ pathLauncher = ::boost::filesystem::current_path() / "share" / "fwLauncher_0-1" / "locale" ;
- #endif
-
- wxLocale::AddCatalogLookupPathPrefix( ::fwGuiWx::std2wx( pathLauncher.string() ));
diff --git a/debian/patches/fix_arm.patch b/debian/patches/fix_arm.patch
deleted file mode 100644
index a21d3da..0000000
--- a/debian/patches/fix_arm.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-Description: Fix arm compilation
-Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
-Forwarded: no
-Last-Update: 2015-07-22
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- fw4spl.orig/Apps/VRRender/Properties.cmake
-+++ fw4spl/Apps/VRRender/Properties.cmake
-@@ -13,8 +13,6 @@
- gui
- guiQt
- memory
-- monitor
-- monitorQt
- ctrlMemory
- fwLauncher
- ioVTK
---- fw4spl.orig/Apps/VRRender/rc/configurations/VRRenderBase.xml
-+++ fw4spl/Apps/VRRender/rc/configurations/VRRenderBase.xml
-@@ -41,13 +41,11 @@
- <gui>
- <layout>
- <menu name="File" />
-- <menu name="Monitor" />
- <menu name="Help" />
- </layout>
- </gui>
- <registry>
- <menu sid="menu_file" start="yes" />
-- <menu sid="menu_monitor" start="yes" />
- <menu sid="menu_help" start="yes" />
- </registry>
- </service>
-@@ -67,33 +65,6 @@
- </registry>
- </service>
-
-- <service uid="menu_monitor" type="::fwGui::IMenuSrv" impl="::gui::aspect::DefaultMenuSrv" autoConnect="no" >
-- <gui>
-- <layout>
-- <menuItem name="ClassFactoryRegistry information"/>
-- <menuItem name="Framework related object metrics"/>
-- <separator />
-- <menuItem name="Show contributions tree"/>
-- <separator />
-- <menuItem name="Memory"/>
-- <menuItem name="Change dump status" style="check" />
-- <menuItem name="Dump all" />
-- <menuItem name="Increase memory consumption"/>
-- <menuItem name="Decrease memory consumption"/>
-- </layout>
-- </gui>
-- <registry>
-- <menuItem sid="action_ClassFactoryRegistryInfo" start="yes" />
-- <menuItem sid="action_fwMetrics" start="yes" />
-- <menuItem sid="action_ComponentsTree" start="yes" />
-- <menuItem sid="action_MemInfo" start="yes" />
-- <menuItem sid="action_ChangeDumpStatus" start="yes" />
-- <menuItem sid="dumpAll" start="yes" />
-- <menuItem sid="action_incMemConsum" start="yes" />
-- <menuItem sid="action_decMemConsum" start="yes" />
-- </registry>
-- </service>
--
- <service uid="menu_help" type="::fwGui::IMenuSrv" impl="::gui::aspect::DefaultMenuSrv" autoConnect="no">
- <gui>
- <layout>
-@@ -136,25 +107,6 @@
- </config>
- </service>
-
--
-- <service uid="action_fwMetrics" type="::fwGui::IActionSrv" impl="::monitor::action::fwMetrics" autoConnect="no" />
-- <service uid="action_MemInfo" type="::fwGui::IActionSrv" impl="::monitor::action::MemoryInfo" autoConnect="no" />
-- <service uid="action_incMemConsum" type="::fwGui::IActionSrv" impl="::monitor::action::MemoryConsumption" autoConnect="no">
-- <config mode="increase" value="256" />
-- </service>
-- <service uid="action_decMemConsum" type="::fwGui::IActionSrv" impl="::monitor::action::MemoryConsumption" autoConnect="no">
-- <config mode="decrease" />
-- </service>
--
-- <service uid="action_ClassFactoryRegistryInfo" type="::fwGui::IActionSrv" impl="::monitor::action::ClassFactoryRegistryInfo" autoConnect="no" />
-- <service uid="action_ComponentsTree" type="::fwGui::IActionSrv" impl="::monitor::action::ComponentsTree" autoConnect="no" />
-- <service uid="action_ChangeDumpStatus" type="::fwGui::IActionSrv" impl="::gui::action::SConfigLauncher" autoConnect="no">
-- <config>
-- <appConfig id="DumpFrameConfig" />
-- </config>
-- </service>
-- <service uid="dumpAll" impl="::monitor::action::SDumpAll" type="::fwGui::IActionSrv" autoConnect="no" />
--
- <proxy channel="dynamicView">
- <slot>dynamicView/receive</slot>
- </proxy>
---- fw4spl.orig/Apps/VRRender/rc/profile.xml
-+++ fw4spl/Apps/VRRender/rc/profile.xml
-@@ -25,9 +25,7 @@
- <activate id="uiTF" version="0-1" />
-
- <activate id="ctrlMemory" version="0-1" />
-- <activate id="monitor" version="0-1" />
- <activate id="memory" version="0-1" />
-- <activate id="monitorQt" version="0-1" />
-
- <activate id="media" version="0-1" />
-
diff --git a/debian/patches/fix_boost.patch b/debian/patches/fix_boost.patch
deleted file mode 100644
index 67208c4..0000000
--- a/debian/patches/fix_boost.patch
+++ /dev/null
@@ -1,548 +0,0 @@
---- fw4spl.orig/SrcLib/core/fwDataIO/src/fwDataIO/reader/TriangularMeshReader.cpp
-+++ fw4spl/SrcLib/core/fwDataIO/src/fwDataIO/reader/TriangularMeshReader.cpp
-@@ -12,8 +12,8 @@
- #include <boost/spirit/include/qi.hpp>
- #include <boost/spirit/include/phoenix_core.hpp>
- #include <boost/spirit/include/phoenix_operator.hpp>
--#include <boost/spirit/home/phoenix/statement/sequence.hpp>
--#include <boost/spirit/home/phoenix/container.hpp>
-+#include <boost/phoenix/statement/sequence.hpp>
-+#include <boost/phoenix/stl/container.hpp>
-
- #include <fwData/Object.hpp>
- #include <fwData/TriangularMesh.hpp>
---- fw4spl.orig/SrcLib/core/fwDataIO/src/fwDataIO/reader/MeshReader.cpp
-+++ fw4spl/SrcLib/core/fwDataIO/src/fwDataIO/reader/MeshReader.cpp
-@@ -13,11 +13,11 @@
- #include <boost/spirit/include/qi.hpp>
- #include <boost/spirit/include/phoenix_core.hpp>
- #include <boost/spirit/include/phoenix_operator.hpp>
--#include <boost/spirit/home/phoenix/statement/sequence.hpp>
--#include <boost/spirit/home/phoenix/container.hpp>
--#include <boost/spirit/home/phoenix/bind/bind_member_function.hpp>
--#include <boost/spirit/home/phoenix/core/argument.hpp>
--#include <boost/spirit/home/phoenix/operator/bitwise.hpp>
-+#include <boost/phoenix/statement/sequence.hpp>
-+#include <boost/phoenix/stl/container.hpp>
-+#include <boost/phoenix/bind/bind_member_function.hpp>
-+#include <boost/phoenix/core/argument.hpp>
-+#include <boost/phoenix/operator/bitwise.hpp>
-
- #include <fwData/Object.hpp>
- #include <fwData/TriangularMesh.hpp>
-@@ -244,11 +244,11 @@
-
- mesh->clear();
-
-- if (!parseTrian2(buffer, buffer+length, mesh))
-+ /*if (!parseTrian2(buffer, buffer+length, mesh))
- {
- OSLM_ERROR( "Bad file format : " << path.string());
- throw std::ios_base::failure("Unable to open " + path.string() + " : Bad file format.");
-- }
-+ }*/
-
- }
-
---- fw4spl.orig/SrcLib/core/fwDataIO/test/tu/include/FileNameParser.hpp
-+++ fw4spl/SrcLib/core/fwDataIO/test/tu/include/FileNameParser.hpp
-@@ -10,8 +10,8 @@
- #include <boost/spirit/include/qi.hpp>
- #include <boost/spirit/include/phoenix_core.hpp>
- #include <boost/spirit/include/phoenix_operator.hpp>
--#include <boost/spirit/home/phoenix/statement/sequence.hpp>
--#include <boost/spirit/home/phoenix/container.hpp>
-+#include <boost/phoenix/statement/sequence.hpp>
-+#include <boost/phoenix/stl/container.hpp>
-
-
-
---- fw4spl.orig/SrcLib/core/fwDataIO/src/fwDataIO/reader/DictionaryReader.cpp
-+++ fw4spl/SrcLib/core/fwDataIO/src/fwDataIO/reader/DictionaryReader.cpp
-@@ -29,8 +29,8 @@
- #include <boost/spirit/include/phoenix_core.hpp>
- #include <boost/spirit/include/phoenix_operator.hpp>
- #include <boost/spirit/include/phoenix_bind.hpp>
--#include <boost/spirit/home/phoenix/statement/sequence.hpp>
--#include <boost/spirit/home/phoenix/container.hpp>
-+#include <boost/phoenix/statement/sequence.hpp>
-+#include <boost/phoenix/stl/container.hpp>
- #include <boost/spirit/include/phoenix_stl.hpp>
-
- #include <boost/fusion/include/adapt_struct.hpp>
---- fw4spl.orig/SrcLib/core/fwGuiQt/include/fwGuiQt/App.hpp
-+++ fw4spl/SrcLib/core/fwGuiQt/include/fwGuiQt/App.hpp
-@@ -9,7 +9,9 @@
-
- #include <QApplication>
-
--#include <fwRuntime/profile/Profile.hpp>
-+#ifndef Q_MOC_RUN
-+ #include <fwRuntime/profile/Profile.hpp>
-+#endif
-
- #include "fwGuiQt/config.hpp"
-
---- fw4spl.orig/SrcLib/core/fwGuiQt/include/fwGuiQt/layoutManager/FrameLayoutManager.hpp
-+++ fw4spl/SrcLib/core/fwGuiQt/include/fwGuiQt/layoutManager/FrameLayoutManager.hpp
-@@ -13,7 +13,9 @@
-
- #include <fwCore/base.hpp>
-
--#include <fwGui/layoutManager/IFrameLayoutManager.hpp>
-+#ifndef Q_MOC_RUN
-+ #include <fwGui/layoutManager/IFrameLayoutManager.hpp>
-+#endif
-
- #include "fwGuiQt/container/QtContainer.hpp"
- #include "fwGuiQt/config.hpp"
---- fw4spl.orig/SrcLib/core/fwGuiQt/include/fwGuiQt/dialog/ProgressDialog.hpp
-+++ fw4spl/SrcLib/core/fwGuiQt/include/fwGuiQt/dialog/ProgressDialog.hpp
-@@ -19,7 +19,9 @@
- #include <QStatusBar>
- #include <QString>
-
--#include <fwGui/dialog/IProgressDialog.hpp>
-+#ifndef Q_MOC_RUN
-+ #include <fwGui/dialog/IProgressDialog.hpp>
-+#endif
-
- #include "fwGuiQt/config.hpp"
- #include "fwGuiQt/container/QtContainer.hpp"
---- fw4spl.orig/Bundles/LeafUI/guiQt/include/guiQt/editor/Code.hpp
-+++ fw4spl/Bundles/LeafUI/guiQt/include/guiQt/editor/Code.hpp
-@@ -14,8 +14,10 @@
- #include <QSyntaxHighlighter>
-
- #include <fwTools/Failed.hpp>
--#include <gui/editor/IEditor.hpp>
-
-+#ifndef Q_MOC_RUN
-+ #include <gui/editor/IEditor.hpp>
-+#endif
-
- #include "guiQt/config.hpp"
-
---- fw4spl.orig/Bundles/LeafUI/guiQt/include/guiQt/editor/DynamicView.hpp
-+++ fw4spl/Bundles/LeafUI/guiQt/include/guiQt/editor/DynamicView.hpp
-@@ -13,14 +13,16 @@
- #include <QObject>
- #include <QPointer>
-
--#include <fwTools/Failed.hpp>
-+#ifndef Q_MOC_RUN
-+ #include <fwTools/Failed.hpp>
-
--#include <gui/view/IView.hpp>
-+ #include <gui/view/IView.hpp>
-
--#include <fwServices/AppConfigManager.hpp>
--#include <fwGuiQt/container/QtContainer.hpp>
-+ #include <fwServices/AppConfigManager.hpp>
-+ #include <fwGuiQt/container/QtContainer.hpp>
-
--#include <fwActivities/registry/Activities.hpp>
-+ #include <fwActivities/registry/Activities.hpp>
-+#endif
-
- #include "guiQt/config.hpp"
-
---- fw4spl.orig/Bundles/LeafUI/uiGenericQt/include/uiGenericQt/action/SShowAbout.hpp
-+++ fw4spl/Bundles/LeafUI/uiGenericQt/include/uiGenericQt/action/SShowAbout.hpp
-@@ -11,10 +11,11 @@
- #include <QSize>
- #include <QUrl>
-
--#include <boost/filesystem/path.hpp>
--
--#include <fwGui/IActionSrv.hpp>
-+#ifndef Q_MOC_RUN
-+ #include <boost/filesystem/path.hpp>
-
-+ #include <fwGui/IActionSrv.hpp>
-+#endif
- #include "uiGenericQt/config.hpp"
-
- namespace uiGeneric
---- fw4spl.orig/Bundles/LeafUI/uiGenericQt/include/uiGenericQt/action/ShowAcknowledgments.hpp
-+++ fw4spl/Bundles/LeafUI/uiGenericQt/include/uiGenericQt/action/ShowAcknowledgments.hpp
-@@ -9,11 +9,14 @@
-
- #include <QObject>
- #include <QUrl>
--#include <boost/filesystem/path.hpp>
-
--#include <fwGui/IActionSrv.hpp>
-+#ifndef Q_MOC_RUN
-+ #include <boost/filesystem/path.hpp>
-
--#include "uiGenericQt/config.hpp"
-+ #include <fwGui/IActionSrv.hpp>
-+
-+ #include "uiGenericQt/config.hpp"
-+#endif
-
- namespace uiGeneric
- {
---- fw4spl.orig/Bundles/LeafUI/uiGenericQt/include/uiGenericQt/action/ShowRevInfo.hpp
-+++ fw4spl/Bundles/LeafUI/uiGenericQt/include/uiGenericQt/action/ShowRevInfo.hpp
-@@ -13,12 +13,13 @@
- #include <QObject>
- #include <QTextDocument>
-
--#include <boost/filesystem/path.hpp>
-+#ifndef Q_MOC_RUN
-+ #include <boost/filesystem/path.hpp>
-
--#include <fwGui/IActionSrv.hpp>
--
--#include "uiGenericQt/config.hpp"
-+ #include <fwGui/IActionSrv.hpp>
-
-+ #include "uiGenericQt/config.hpp"
-+#endif
- namespace uiGeneric
- {
-
---- fw4spl.orig/Bundles/LeafUI/uiImageQt/include/uiImageQt/ImageTransparency.hpp
-+++ fw4spl/Bundles/LeafUI/uiImageQt/include/uiImageQt/ImageTransparency.hpp
-@@ -15,12 +15,13 @@
- #include <QAction>
-
- #include <fwTools/Failed.hpp>
--
-+#ifndef Q_MOC_RUN
- #include <fwData/Point.hpp>
-
- #include <gui/editor/IEditor.hpp>
-
- #include "uiImageQt/config.hpp"
-+#endif
-
- namespace uiImage
- {
---- fw4spl.orig/Bundles/LeafUI/uiImageQt/include/uiImageQt/ImageInfo.hpp
-+++ fw4spl/Bundles/LeafUI/uiImageQt/include/uiImageQt/ImageInfo.hpp
-@@ -13,12 +13,13 @@
- #include <QPointer>
-
- #include <fwTools/Failed.hpp>
--
-+#ifndef Q_MOC_RUN
- #include <fwData/Point.hpp>
-
- #include <gui/editor/IEditor.hpp>
-
- #include "uiImageQt/config.hpp"
-+#endif
-
- namespace uiImage
- {
---- fw4spl.orig/Bundles/LeafUI/uiImageQt/include/uiImageQt/ShowScanEditor.hpp
-+++ fw4spl/Bundles/LeafUI/uiImageQt/include/uiImageQt/ShowScanEditor.hpp
-@@ -10,10 +10,10 @@
- #include <QObject>
- #include <QPointer>
- #include <QIcon>
--
-+#ifndef Q_MOC_RUN
- #include <fwTools/Failed.hpp>
- #include <gui/editor/IEditor.hpp>
--
-+#endif
- #include "uiImageQt/config.hpp"
-
- class QPushButton;
---- fw4spl.orig/Bundles/LeafUI/uiImageQt/include/uiImageQt/SliceListEditor.hpp
-+++ fw4spl/Bundles/LeafUI/uiImageQt/include/uiImageQt/SliceListEditor.hpp
-@@ -9,10 +9,10 @@
-
- #include <QObject>
- #include <QPointer>
--
-+#ifndef Q_MOC_RUN
- #include <fwTools/Failed.hpp>
- #include <gui/editor/IEditor.hpp>
--
-+#endif
- #include "uiImageQt/config.hpp"
-
- class QMenu;
---- fw4spl.orig/Bundles/LeafUI/uiImageQt/include/uiImageQt/SliceListEditor2.hpp
-+++ fw4spl/Bundles/LeafUI/uiImageQt/include/uiImageQt/SliceListEditor2.hpp
-@@ -9,10 +9,10 @@
-
- #include <QObject>
- #include <QPointer>
--
-+#ifndef Q_MOC_RUN
- #include <fwTools/Failed.hpp>
- #include <gui/editor/IEditor.hpp>
--
-+#endif
- #include "uiImageQt/config.hpp"
-
- class QMenu;
---- fw4spl.orig/Bundles/LeafUI/uiImageQt/include/uiImageQt/WindowLevel.hpp
-+++ fw4spl/Bundles/LeafUI/uiImageQt/include/uiImageQt/WindowLevel.hpp
-@@ -9,13 +9,13 @@
-
- #include <QObject>
- #include <QPointer>
--
-+#ifndef Q_MOC_RUN
- #include <fwTools/Failed.hpp>
- #include <fwData/Integer.hpp>
- #include <gui/editor/IEditor.hpp>
-
- #include <fwComEd/helper/MedicalImageAdaptor.hpp>
--
-+#endif
- #include "uiImageQt/config.hpp"
-
- class QAction;
---- fw4spl.orig/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/editor/SModelSeriesList.hpp
-+++ fw4spl/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/editor/SModelSeriesList.hpp
-@@ -11,9 +11,9 @@
- #include <QObject>
-
- #include <fwTools/Failed.hpp>
--
-+#ifndef Q_MOC_RUN
- #include <gui/editor/IEditor.hpp>
--
-+#endif
- #include "uiMedDataQt/config.hpp"
-
- class QListWidget;
---- fw4spl.orig/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/editor/SOrganTransformation.hpp
-+++ fw4spl/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/editor/SOrganTransformation.hpp
-@@ -12,11 +12,11 @@
-
- #include <map>
- #include <string>
--
-+#ifndef Q_MOC_RUN
- #include <fwData/Reconstruction.hpp>
- #include <fwData/TransformationMatrix3D.hpp>
- #include <gui/editor/IEditor.hpp>
--
-+#endif
- #include "uiMedDataQt/config.hpp"
-
-
---- fw4spl.orig/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/editor/SSeries.hpp
-+++ fw4spl/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/editor/SSeries.hpp
-@@ -11,10 +11,11 @@
- #include <QPointer>
-
- #include <fwCom/Signal.hpp>
--
-+#ifndef Q_MOC_RUN
- #include <gui/editor/IEditor.hpp>
-
- #include "uiMedDataQt/config.hpp"
-+#endif
-
- class QPushButton;
-
---- fw4spl.orig/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/widget/Selector.hpp
-+++ fw4spl/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/widget/Selector.hpp
-@@ -16,12 +16,13 @@
- #include <QStandardItem>
- #include <QModelIndex>
- #include <QVector>
--
-+#ifndef Q_MOC_RUN
- #include <fwMedData/Series.hpp>
- #include <fwMedData/Study.hpp>
-
- #include "uiMedDataQt/config.hpp"
- #include "uiMedDataQt/widget/SelectorModel.hpp"
-+#endif
-
- namespace uiMedData
- {
---- fw4spl.orig/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/widget/SelectorModel.hpp
-+++ fw4spl/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/widget/SelectorModel.hpp
-@@ -14,10 +14,10 @@
- #include <QPointer>
- #include <QStandardItemModel>
- #include <QStandardItem>
--
-+#ifndef Q_MOC_RUN
- #include <fwMedData/Series.hpp>
- #include <fwMedData/Study.hpp>
--
-+#endif
- #include "uiMedDataQt/config.hpp"
-
- namespace uiMedData
---- fw4spl.orig/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/editor/SSelector.hpp
-+++ fw4spl/Bundles/LeafUI/uiMedDataQt/include/uiMedDataQt/editor/SSelector.hpp
-@@ -11,13 +11,14 @@
- #include <QPointer>
- #include <QObject>
- #include <QVector>
--
-+#ifndef Q_MOC_RUN
- #include <fwData/Vector.hpp>
-
- #include <gui/editor/IEditor.hpp>
-
- #include "uiMedDataQt/config.hpp"
- #include "uiMedDataQt/widget/Selector.hpp"
-+#endif
-
-
- namespace uiMedData
---- fw4spl.orig/Bundles/LeafUI/uiReconstructionQt/include/uiReconstructionQt/OrganMaterialEditor.hpp
-+++ fw4spl/Bundles/LeafUI/uiReconstructionQt/include/uiReconstructionQt/OrganMaterialEditor.hpp
-@@ -11,9 +11,9 @@
- #include <QPointer>
-
- #include <fwTools/Failed.hpp>
--
-+#ifndef Q_MOC_RUN
- #include <gui/editor/IEditor.hpp>
--
-+#endif
- #include "uiReconstructionQt/config.hpp"
-
- class QSlider;
---- fw4spl.orig/Bundles/LeafUI/uiReconstructionQt/include/uiReconstructionQt/RepresentationEditor.hpp
-+++ fw4spl/Bundles/LeafUI/uiReconstructionQt/include/uiReconstructionQt/RepresentationEditor.hpp
-@@ -11,13 +11,14 @@
- #include <QPointer>
-
- #include <fwTools/Failed.hpp>
-+#ifndef Q_MOC_RUN
- #include <fwData/Material.hpp>
-
--
- #include <gui/editor/IEditor.hpp>
--
-+#endif
- #include "uiReconstructionQt/config.hpp"
-
-+
- class QRadioButton;
- class QCheckBox;
- class QButtonGroup;
---- fw4spl.orig/Bundles/LeafUI/uiMeasurementQt/include/uiMeasurementQt/editor/Distance.hpp
-+++ fw4spl/Bundles/LeafUI/uiMeasurementQt/include/uiMeasurementQt/editor/Distance.hpp
-@@ -10,10 +10,10 @@
- #include <QObject>
- #include <QPointer>
- #include <QPushButton>
--
-+#ifndef Q_MOC_RUN
- #include <fwTools/Failed.hpp>
- #include <gui/editor/IEditor.hpp>
--
-+#endif
- #include "uiMeasurementQt/config.hpp"
-
- namespace uiMeasurement
---- fw4spl.orig/Bundles/LeafUI/uiVisuQt/include/uiVisuQt/BasicFloatEditor.hpp
-+++ fw4spl/Bundles/LeafUI/uiVisuQt/include/uiVisuQt/BasicFloatEditor.hpp
-@@ -10,11 +10,11 @@
- #include <QObject>
- #include <QPointer>
- #include <QLineEdit>
--
-+#ifndef Q_MOC_RUN
- #include <fwTools/Failed.hpp>
-
- #include <gui/editor/IEditor.hpp>
--
-+#endif
- #include "uiVisuQt/config.hpp"
-
- namespace uiVisu
---- fw4spl.orig/Bundles/LeafUI/uiVisuQt/include/uiVisuQt/PointEditor.hpp
-+++ fw4spl/Bundles/LeafUI/uiVisuQt/include/uiVisuQt/PointEditor.hpp
-@@ -13,11 +13,11 @@
- #include <QPointer>
-
- #include <fwTools/Failed.hpp>
--
-+#ifndef Q_MOC_RUN
- #include <fwData/Point.hpp>
-
- #include <gui/editor/IEditor.hpp>
--
-+#endif
- #include "uiVisuQt/config.hpp"
-
- namespace uiVisu
---- fw4spl.orig/Bundles/LeafUI/uiVisuQt/include/uiVisuQt/SnapshotEditor.hpp
-+++ fw4spl/Bundles/LeafUI/uiVisuQt/include/uiVisuQt/SnapshotEditor.hpp
-@@ -11,8 +11,9 @@
- #include <QPointer>
-
- #include <fwTools/Failed.hpp>
-+#ifndef Q_MOC_RUN
- #include <gui/editor/IEditor.hpp>
--
-+#endif
- #include "uiVisuQt/config.hpp"
-
- class QPushButton;
---- fw4spl.orig/Bundles/LeafUI/uiVisuQt/include/uiVisuQt/TransformationMatrixEditor.hpp
-+++ fw4spl/Bundles/LeafUI/uiVisuQt/include/uiVisuQt/TransformationMatrixEditor.hpp
-@@ -12,9 +12,9 @@
- #include <QSlider>
-
- #include <fwTools/Failed.hpp>
--
-+#ifndef Q_MOC_RUN
- #include <gui/editor/IEditor.hpp>
--
-+#endif
- #include "uiVisuQt/config.hpp"
-
- namespace uiVisu
---- fw4spl.orig/Bundles/LeafVisu/scene2D/include/scene2D/Scene2DGraphicsView.hpp
-+++ fw4spl/Bundles/LeafVisu/scene2D/include/scene2D/Scene2DGraphicsView.hpp
-@@ -11,10 +11,11 @@
- #include <QResizeEvent>
- #include <QGraphicsScene>
- #include <QPaintEvent>
--
-+#ifndef Q_MOC_RUN
- #include "scene2D/config.hpp"
- #include "scene2D/data/Viewport.hpp"
- #include "scene2D/data/Event.hpp"
-+#endif
-
- namespace scene2D
- {
---- fw4spl.orig/Bundles/LeafUI/uiTF/include/uiTF/TransferFunctionEditor.hpp
-+++ fw4spl/Bundles/LeafUI/uiTF/include/uiTF/TransferFunctionEditor.hpp
-@@ -8,12 +8,12 @@
- #define _UITF_TRANSFERFUNCTIONEDITOR_HPP_
-
- #include <QObject>
--
-+#ifndef Q_MOC_RUN
- #include <fwData/Composite.hpp>
- #include <fwData/TransferFunction.hpp>
-
- #include <gui/editor/IEditor.hpp>
--
-+#endif
- #include "export.hpp"
-
- class QComboBox;
---- fw4spl.orig/SrcLib/io/fwAtomsBoostIO/src/fwAtomsBoostIO/Writer.cpp
-+++ fw4spl/SrcLib/io/fwAtomsBoostIO/src/fwAtomsBoostIO/Writer.cpp
-@@ -304,7 +304,7 @@
- break;
- case XML:
- {
-- ::boost::property_tree::xml_writer_settings<char> settings(' ', 4);
-+ ::boost::property_tree::xml_writer_settings< std::string > settings('\t', 4);
- ::boost::property_tree::xml_parser::write_xml(*os, root, settings);
- break;
- }
diff --git a/debian/patches/fix_cmakelists.patch b/debian/patches/fix_cmakelists.patch
deleted file mode 100644
index 5a24604..0000000
--- a/debian/patches/fix_cmakelists.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-Description: Fix CMake issue (CMake had to be launched twice to work)
-Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
-Forwarded: no
-Last-Update: 2015-02-04
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -8,9 +8,9 @@
- include(CheckVariableExists)
- include(CMakeParseArguments)
-
--option(CLASSIC_INSTALL ON)
--#set(CLASSIC_INSTALL OFF)
-+option(CLASSIC_INSTALL "Build fw4spl with classic mode" OFF)
- set( EXTERNAL_LIBRARIES ${CMAKE_CURRENT_SOURCE_DIR}/CMake/Modules/ )
-+set( CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/CMake/Modules/ )
-
- if(CLASSIC_INSTALL)
- set( LIBRARY_OUTPUT_DIR "lib" )
-@@ -583,8 +583,10 @@
- endmacro()
-
-
-+if(CLASSIC_INSTALL)
-+ set(EXTERNAL_LIBRARIES CACHE PATH "External libraries location")
-+endif()
-
--set(EXTERNAL_LIBRARIES CACHE PATH "External libraries location")
- if(EXTERNAL_LIBRARIES)
- list(APPEND CMAKE_PREFIX_PATH ${EXTERNAL_LIBRARIES})
- list(APPEND CMAKE_MODULE_PATH ${EXTERNAL_LIBRARIES})
-@@ -597,6 +599,7 @@
- endif(EXTERNAL_LIBRARIES)
-
-
-+if(CLASSIC_INSTALL)
- set(PROJECTS_TO_BUILD CACHE STRING
- "List of projects that will be configured for build.
- Leave empty to configure all projects"
-@@ -605,6 +608,7 @@
- set(PROJECTS_TO_INSTALL CACHE STRING
- "List of projects for which the installation rules will be created."
- )
-+endif(CLASSIC_INSTALL)
-
-
- file(GLOB_RECURSE PROJECTS_PROPERTIES */Properties.cmake)
diff --git a/debian/patches/remove_fwItkIOTest.patch b/debian/patches/remove_fwItkIOTest.patch
deleted file mode 100644
index 477d765..0000000
--- a/debian/patches/remove_fwItkIOTest.patch
+++ /dev/null
@@ -1,145 +0,0 @@
-Description: Remove a failing unit test
-Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
-Forwarded: no
-Last-Update: 2015-02-20
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/SrcLib/io/fwItkIO/test/tu/src/ImageConversionTest.cpp
-+++ /dev/null
-@@ -1,136 +0,0 @@
--/* ***** BEGIN LICENSE BLOCK *****
-- * FW4SPL - Copyright (C) IRCAD, 2009-2012.
-- * Distributed under the terms of the GNU Lesser General Public License (LGPL) as
-- * published by the Free Software Foundation.
-- * ****** END LICENSE BLOCK ****** */
--
--#include <fwData/Object.hpp>
--
--#include <fwDataCamp/visitor/CompareObjects.hpp>
--
--#include <fwTest/generator/Image.hpp>
--#include <fwTest/helper/compare.hpp>
--
--#include <fwItkIO/itk.hpp>
--
--#include "helper.hpp"
--#include "ImageConversionTest.hpp"
--
--// Registers the fixture into the 'registry'
--CPPUNIT_TEST_SUITE_REGISTRATION( ::fwItkIO::ut::ImageConversionTest );
--
--namespace fwItkIO
--{
--namespace ut
--{
--
--//------------------------------------------------------------------------------
--
--void ImageConversionTest::setUp()
--{
-- // Set up context before running a test.
-- srand(time(NULL));
--}
--
--//------------------------------------------------------------------------------
--
--void ImageConversionTest::tearDown()
--{
-- // Clean up after the test run.
--}
--
--//------------------------------------------------------------------------------
--
--void ImageConversionTest::testConversion()
--{
-- // create Image
-- ::fwData::Image::sptr image = ::fwData::Image::New();
-- ::fwTest::generator::Image::generateRandomImage(image, ::fwTools::Type::create("int16"));
--
-- typedef itk::Image< ::boost::int16_t , 3 > ImageType;
-- ImageType::Pointer itkImage = ::fwItkIO::itkImageFactory<ImageType>( image );
--
-- ::fwData::Image::sptr image2 = ::fwData::Image::New();
-- bool image2ManagesHisBuffer = false;
-- ::fwItkIO::dataImageFactory< ImageType >( itkImage, image2, image2ManagesHisBuffer );
--
-- ::fwItkIO::ut::helper::roundSpacing(image);
-- ::fwItkIO::ut::helper::roundSpacing(image2);
--
-- ::fwTest::helper::ExcludeSetType exclude;
-- exclude.insert("array.isOwner");
--
-- CPPUNIT_ASSERT(::fwTest::helper::compare(image, image2, exclude));
--
-- bool image3ManagesHisBuffer = false;
-- ::fwData::Image::sptr image3 = ::fwItkIO::dataImageFactory< ImageType >( itkImage, image3ManagesHisBuffer );
-- CPPUNIT_ASSERT(::fwTest::helper::compare(image, image3, exclude));
--}
--
--//------------------------------------------------------------------------------
--
--void ImageConversionTest::stressTest()
--{
-- stressTestForAType< ::boost::int8_t >();
-- stressTestForAType< ::boost::uint8_t >();
--
-- stressTestForAType< ::boost::int16_t >();
-- stressTestForAType< ::boost::uint16_t >();
--
-- stressTestForAType< ::boost::int32_t >();
-- stressTestForAType< ::boost::uint32_t >();
--
-- stressTestForAType< ::boost::int64_t >();
-- stressTestForAType< ::boost::uint64_t >();
--
-- stressTestForAType< float >();
-- stressTestForAType< double >();
--}
--
--//------------------------------------------------------------------------------
--
--void ImageConversionTest::testConversion2D()
--{
-- // create Image
-- ::fwData::Image::sptr image = ::fwData::Image::New();
-- const ::boost::uint8_t dim = 2;
-- ::fwData::Image::SizeType size(dim);
-- size[0] = rand()%100 + 2;
-- size[1] = rand()%100 + 2;
-- std::vector<double> spacing(dim);
-- spacing[0] = (rand()%200 +1) / 100.;
-- spacing[1] = (rand()%200 +1) / 100.;
-- std::vector<double> origin(dim);
-- origin[0] = (rand()%200 - 100) / 3.;
-- origin[1] = (rand()%200 - 100) / 3.;
-- ::fwTools::Type type = ::fwTools::Type::create< ::boost::int16_t >();
--
-- ::fwTest::generator::Image::generateImage(image, size, spacing, origin, type);
-- ::fwData::Array::sptr array = image->getDataArray();
-- ::fwTest::generator::Image::randomizeArray(array);
--
-- typedef itk::Image< ::boost::int16_t , 2 > ImageType;
--
-- ImageType::Pointer itkImage = ::fwItkIO::itkImageFactory<ImageType>( image );
--
-- ::fwData::Image::sptr image2 = ::fwData::Image::New();
-- bool image2ManagesHisBuffer = false;
-- ::fwItkIO::dataImageFactory< ImageType >( itkImage, image2, image2ManagesHisBuffer );
--
-- ::fwItkIO::ut::helper::roundSpacing(image);
-- ::fwItkIO::ut::helper::roundSpacing(image2);
--
-- ::fwTest::helper::ExcludeSetType exclude;
-- exclude.insert("array.isOwner");
--
-- CPPUNIT_ASSERT(::fwTest::helper::compare(image, image2, exclude));
--
-- bool image3ManagesHisBuffer = false;
-- ::fwData::Image::sptr image3 = ::fwItkIO::dataImageFactory< ImageType >( itkImage, image3ManagesHisBuffer );
-- CPPUNIT_ASSERT(::fwTest::helper::compare(image, image3, exclude));
--}
--
--//------------------------------------------------------------------------------
--
--} //namespace ut
--} //namespace fwItkIO
diff --git a/debian/patches/series b/debian/patches/series
index 9d596d3..2a569ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,2 @@
-change_launcher_name.patch
-remove_fwItkIOTest.patch
-set_media_as_bundle.patch
fix_unit_tests.patch
-fix_cmakelists.patch
fix_missing_hdf5.patch
-fix_arm.patch
-fix_boost.patch
diff --git a/debian/patches/set_media_as_bundle.patch b/debian/patches/set_media_as_bundle.patch
deleted file mode 100644
index 1f6e171..0000000
--- a/debian/patches/set_media_as_bundle.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Consider the "media" directory as a fw4spl bundle
-Author: Corentin Desfarges <corentin.desfarges.dev at gmail.com>
-Forwarded: no
-Last-Update: 2015-01-05
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Apps/VRRender/rc/profile.xml
-+++ b/Apps/VRRender/rc/profile.xml
-@@ -29,6 +29,7 @@
- <activate id="memory" version="0-1" />
- <activate id="monitorQt" version="0-1" />
-
-+ <activate id="media" version="0-1" />
-
- <activate id="scene2D" version="0-1" />
-
diff --git a/debian/rules b/debian/rules
index 8a7002f..2d6a4fe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,10 +11,10 @@ CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
%:
- dh $@ --max-parallel=1
+ dh $@ --parallel
override_dh_auto_configure:
- dh_auto_configure -- -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE -DCMAKE_INSTALL_RPATH="/usr/lib/fw4spl" -Wno-dev
+ dh_auto_configure -- -DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE -DDEBIAN_INSTALL=ON -DCMAKE_INSTALL_RPATH="/usr/lib/fw4spl" -Wno-dev
override_dh_auto_install:
dh_auto_install --destdir=debian/fw4spl
@@ -25,7 +25,7 @@ override_dh_auto_test:
echo "test disabled"
override_dh_shlibdeps:
- dh_shlibdeps -v -l/usr/lib:/usr/lib/fw4spl:/usr/lib/fw4spl/Bundles:/usr/lib/fw4spl/Bundles/gui_0-1/:/usr/lib/fw4spllssss/Bundles:/usr/lib/fw4spl/Bundles/io_0-1/:/usr/lib/fw4spl/Bundles:/usr/lib/fw4spl/Bundles/ctrlSelection_0-1/:/usr/lib/fw4spl/Bundles/ioITK_0-1/
+ dh_shlibdeps -v -l/usr/lib:/usr/lib/fw4spl:/usr/lib/fw4spl/Bundles:/usr/lib/fw4spl/Bundles/gui_0-1/:/usr/lib/fw4spl/Bundles:/usr/lib/fw4spl/Bundles/io_0-1/:/usr/lib/fw4spl/Bundles:/usr/lib/fw4spl/Bundles/ctrlSelection_0-1/:/usr/lib/fw4spl/Bundles/ioITK_0-1/
diff --git a/debian/source/local-options b/debian/source/local-options
new file mode 100644
index 0000000..4aceb10
--- /dev/null
+++ b/debian/source/local-options
@@ -0,0 +1 @@
+unapply-patches
diff --git a/debian/watch b/debian/watch
index 6e5418e..8acd054 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
version=3
-https://github.com/corentindesfarges/fw4spl/releases .*/archive/(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
+https://github.com/fw4spl-org/fw4spl/releases .*/archive/fw4spl_(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/fw4spl.git
More information about the debian-med-commit
mailing list