debian/changelog

 sofa-framework (19.06.01+dfsg2-1) UNRELEASED; urgency=medium
 
+  [ Andreas Tille ]
   * New upstream version
   * Point watch file to Github
   * Upstream now uses qwt 6
@@ -10,6 +11,10 @@ sofa-framework (19.06.01+dfsg2-1) UNRELEASED; urgency=medium
   * debhelper-compat 12
   * Standards-Version: 4.4.0
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Switch to Qt 5 (Closes: 875184).
+  * Add missing build dependencies.
+
  -- Andreas Tille <tille@debian.org>  Tue, 10 Sep 2019 22:24:48 +0200
 
 sofa-framework (1.0~beta4-12) unstable; urgency=medium

debian/control

@@ -3,13 +3,15 @@ Maintainer: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.
 Uploaders: Andreas Tille <tille@debian.org>
 Section: graphics
 Priority: optional
-Build-Depends: debhelper-compat (= 12),
-               cmake,
+Build-Depends: cmake,
+               debhelper-compat (= 12),
                freeglut3-dev,
                libboost-dev,
+               libboost-filesystem-dev,
                libboost-graph-dev,
-               libboost-thread-dev,
+               libboost-program-options-dev,
                libboost-system-dev,
+               libboost-thread-dev,
                libeigen3-dev,
                libglew-dev,
                libnewmat10-dev,
@@ -17,13 +19,13 @@ Build-Depends: debhelper-compat (= 12),
                libqt4-dev,
                libqt4-opengl-dev,
                libqwt-qt5-dev,
-               libtinyxml-dev,
                libsuitesparse-dev,
+               libtinyxml-dev,
                libxml2-dev,
                nlohmann-json3-dev,
-               pkg-config
-Build-Depends-Indep: doxygen,
-                     graphviz
+               pkg-config,
+               qtbase5-dev
+Build-Depends-Indep: doxygen, graphviz
 Build-Conflicts: qt3-dev-tools
 Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/med-team/sofa-framework
@@ -48,8 +50,7 @@ Description: GUI for the Simulation Open Framework Architecture (SOFA)
 Package: libsofa1-dev
 Architecture: any
 Section: libdevel
-Depends: libsofa1 (= ${binary:Version}),
-         ${misc:Depends}
+Depends: libsofa1 (= ${binary:Version}), ${misc:Depends}
 Suggests: sofa-tutorials
 Description: Simulation Open Framework Architecture - development
  SOFA is an Open Source framework primarily targeted at
@@ -64,8 +65,7 @@ Description: Simulation Open Framework Architecture - development
 Package: libsofa1
 Architecture: any
 Section: libs
-Depends: ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Simulation Open Framework Architecture - runtime
  SOFA is an Open Source framework primarily targeted at
  real-time simulation, with an emphasis on medical simulation.

debian/patches/use_debian_packaged_libs.patch

@@ -2,6 +2,14 @@ Author: Andreas Tille <tille@debian.org>
 Last-Update: Wed, 30 Jan 2019 20:09:44 +0100
 Description: Use Debian packaged libs
 
+---
+ CMakeLists.txt                                               |    1 
+ SofaKernel/SofaFramework/CMakeLists.txt                      |    3 
+ SofaKernel/SofaFramework/SofaFrameworkConfig.cmake.in        |    3 
+ applications/projects/xmlconvert-displayflags/CMakeLists.txt |    3 
+ extlibs/CMakeLists.txt                                       |   34 +----------
+ 5 files changed, 12 insertions(+), 32 deletions(-)
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -158,7 +158,6 @@ option(SOFA_BUILD_TESTS "Compile the aut
@@ -14,7 +22,7 @@ Description: Use Debian packaged libs
  ## Active or not the use of ccache
 --- a/extlibs/CMakeLists.txt
 +++ b/extlibs/CMakeLists.txt
-@@ -1,33 +1,5 @@
+@@ -1,37 +1,15 @@
  cmake_minimum_required(VERSION 3.1)
  
 -set(EXTLIBS_TARGETS
@@ -48,3 +56,49 @@ Description: Use Debian packaged libs
  ####################################
  
  ## Necessary ones
+ 
++# We use PkgConfig to find tinyXML's configurations.
++
++find_package(PkgConfig REQUIRED)
++
++pkg_check_modules(TinyXML REQUIRED IMPORTED_TARGET GLOBAL tinyxml)
++
+ find_package(CSparse QUIET)
+ if(NOT CSparse_FOUND)
+     add_subdirectory(csparse)
+--- a/SofaKernel/SofaFramework/CMakeLists.txt
++++ b/SofaKernel/SofaFramework/CMakeLists.txt
+@@ -87,7 +87,8 @@ if(NOT SOFA_NO_OPENGL)
+ endif()
+ 
+ ## tinyxml
+-find_package(TinyXML REQUIRED)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(TinyXML REQUIRED IMPORTED_TARGET GLOBAL tinyxml)
+ list(APPEND SOFAFRAMEWORK_DEPENDENCY_LINK tinyxml)
+ set(SOFA_HAVE_TINYXML 1)
+ 
+--- a/applications/projects/xmlconvert-displayflags/CMakeLists.txt
++++ b/applications/projects/xmlconvert-displayflags/CMakeLists.txt
+@@ -1,7 +1,8 @@
+ cmake_minimum_required(VERSION 3.1)
+ project(xmlconvert-displayflags)
+ 
+-find_package(TinyXML REQUIRED)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(TinyXML REQUIRED IMPORTED_TARGET GLOBAL tinyxml)
+ 
+ add_executable(${PROJECT_NAME} xmlvisitor.h xmlvisitor.cpp main.cpp)
+ target_link_libraries(${PROJECT_NAME} TinyXML SofaCore)
+--- a/SofaKernel/SofaFramework/SofaFrameworkConfig.cmake.in
++++ b/SofaKernel/SofaFramework/SofaFrameworkConfig.cmake.in
+@@ -14,7 +14,8 @@ endif()
+ 
+ include(SofaMacros)
+ 
+-find_package(TinyXML REQUIRED)
++find_package(PkgConfig REQUIRED)
++pkg_check_modules(TinyXML REQUIRED IMPORTED_TARGET GLOBAL tinyxml)
+ 
+ set(SOFA_HAVE_ZLIB "@SOFA_HAVE_ZLIB@")
+ set(SOFA_HAVE_GLEW "@SOFA_HAVE_GLEW@")

debian/sofa-apps.install

+debian/sofa		usr/bin
 debian/sofa.desktop	usr/share/applications
 debian/sofa.xpm		usr/share/pixmaps
-debian/sofa		usr/bin

debian/sofa-data.install

-share		usr/share/sofa
 examples	usr/share/sofa
+share		usr/share/sofa