[med-svn] [populations] 01/01: Tried to convert from Qt4 to Qt5 but failed

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository populations.

commit cbbc236c4e18b1927166149d1b720648fa5de556
Author: Andreas Tille <tille at debian.org>
Date:   Sat Nov 18 00:00:15 2017 +0100

    Tried to convert from Qt4 to Qt5 but failed
---
 debian/changelog         |  2 ++
 debian/control           |  5 +++--
 debian/patches/qt5.patch | 45 +++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series    |  1 +
 debian/rules             |  2 ++
 5 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index cfba61f..2d00451 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ populations (1.2.33+svn0120106+dfsg-1) UNRELEASED; urgency=medium
   * cme fix dpkg-control
   * debhelper 10
   * cme fix dpkg-copyright
+  * Switch to Qt5
+    Closes:  #875097
 
  -- Andreas Tille <tille at debian.org>  Fri, 17 Nov 2017 21:49:33 +0100
 
diff --git a/debian/control b/debian/control
index 5867747..ce186c1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,9 @@ Section: science
 Priority: optional
 Build-Depends: debhelper (>= 10),
                cmake,
-               qt4-qmake,
-               libqt4-dev,
+               qt5-qmake,
+               qtbase5-dev,
+               qttools5-dev,
                libfontconfig1-dev,
                libfreetype6-dev,
                libglib2.0-dev,
diff --git a/debian/patches/qt5.patch b/debian/patches/qt5.patch
new file mode 100644
index 0000000..1b0ac4a
--- /dev/null
+++ b/debian/patches/qt5.patch
@@ -0,0 +1,45 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Update: Fri, 17 Nov 2017 21:49:33 +0100
+Description: Try to upgrade from Qt4 to Qt5
+
+--- a/CMakeFiles/Makefile.cmake
++++ b/CMakeFiles/Makefile.cmake
+@@ -40,16 +40,16 @@ SET(CMAKE_MAKEFILE_DEPENDS
+   "/usr/share/cmake-2.8/Modules/Compiler/GNU.cmake"
+   "/usr/share/cmake-2.8/Modules/FindPackageHandleStandardArgs.cmake"
+   "/usr/share/cmake-2.8/Modules/FindPackageMessage.cmake"
+-  "/usr/share/cmake-2.8/Modules/FindQt4.cmake"
++  "/usr/share/cmake-2.8/Modules/FindQt5.cmake"
+   "/usr/share/cmake-2.8/Modules/MacroAddFileDependencies.cmake"
+   "/usr/share/cmake-2.8/Modules/Platform/Linux-GNU-C.cmake"
+   "/usr/share/cmake-2.8/Modules/Platform/Linux-GNU-CXX.cmake"
+   "/usr/share/cmake-2.8/Modules/Platform/Linux-GNU.cmake"
+   "/usr/share/cmake-2.8/Modules/Platform/Linux.cmake"
+   "/usr/share/cmake-2.8/Modules/Platform/UnixPaths.cmake"
+-  "/usr/share/cmake-2.8/Modules/Qt4ConfigDependentSettings.cmake"
+-  "/usr/share/cmake-2.8/Modules/Qt4Macros.cmake"
+-  "/usr/share/cmake-2.8/Modules/UseQt4.cmake"
++  "/usr/share/cmake-2.8/Modules/Qt5ConfigDependentSettings.cmake"
++  "/usr/share/cmake-2.8/Modules/Qt5Macros.cmake"
++  "/usr/share/cmake-2.8/Modules/UseQt5.cmake"
+   "/usr/share/cmake-2.8/Templates/CPackConfig.cmake.in"
+   )
+ 
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -3,7 +3,7 @@
+ # note that it's Qt4, not QT4 or qt4
+ #/usr/share/cmake-2.6/Modules/FindQt4.cmake
+ SET (QT_USE_QTXML true)
+-FIND_PACKAGE( Qt4 REQUIRED )
++FIND_PACKAGE( Qt5 REQUIRED )
+ 
+ INCLUDE( ${QT_USE_FILE} )
+ 
+@@ -37,4 +37,4 @@ ELSE(WIN32)
+ 	target_link_libraries (populations ${QT_LIBRARIES} m)
+ ENDIF(WIN32)
+ 
+- 
+\ No newline at end of file
++ 
diff --git a/debian/patches/series b/debian/patches/series
index 4d2a44d..1d8895a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix-ftbfs-gcc-4.7-667327.patch
+qt5.patch
diff --git a/debian/rules b/debian/rules
index 1749cfc..3318194 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,8 @@
 
 DESTDIR=debian/populations
 
+export QT_SELECT=qt5
+
 %:
 	dh $@ 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/populations.git