This is an automated email from the git hooks/post-receive script. georgesk pushed a commit to branch master in repository populations.
commit 1b9ecefecdc4e24dee483befedd4182c12bee97c Author: Georges Khaznadar <georg...@debian.org> Date: Sun Nov 19 17:04:26 2017 +0100 fixed the Qt5 migration --- debian/changelog | 22 ++++++++++++++-------- debian/patches/qt5.patch | 12 ++++++++---- 2 files changed, 22 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2d00451..9efbec5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,21 @@ populations (1.2.33+svn0120106+dfsg-1) UNRELEASED; urgency=medium - * Team upload. - * Take over packaging in Debian Med team maintenance - * Priority: optional - * cme fix dpkg-control - * debhelper 10 - * cme fix dpkg-copyright - * Switch to Qt5 + [ Andreas Tille ] + + * [AT] Team upload + * [AT] Take over packaging in Debian Med team maintenance + * [AT] Priority: optional + * [AT] cme fix dpkg-control + * [AT] debhelper 10 + * [AT] cme fix dpkg-copyright + * [AT] Switch to Qt5 Closes: #875097 - -- Andreas Tille <ti...@debian.org> Fri, 17 Nov 2017 21:49:33 +0100 + [ Georges Khaznadar ] + + * [GK] Mofified src/CMakeFiles.txt for Qt5 (GK = ) + + -- Georges Khaznadar <georg...@debian.org> Sun, 19 Nov 2017 16:58:18 +0100 populations (1.2.33+svn0120106-2.1) unstable; urgency=low diff --git a/debian/patches/qt5.patch b/debian/patches/qt5.patch index 1b0ac4a..6a5c531 100644 --- a/debian/patches/qt5.patch +++ b/debian/patches/qt5.patch @@ -2,8 +2,10 @@ Author: Andreas Tille <ti...@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 +Index: populations-collab/CMakeFiles/Makefile.cmake +=================================================================== +--- populations-collab.orig/CMakeFiles/Makefile.cmake ++++ populations-collab/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" @@ -25,8 +27,10 @@ Description: Try to upgrade from Qt4 to Qt5 "/usr/share/cmake-2.8/Templates/CPackConfig.cmake.in" ) ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt +Index: populations-collab/src/CMakeLists.txt +=================================================================== +--- populations-collab.orig/src/CMakeLists.txt ++++ populations-collab/src/CMakeLists.txt @@ -3,7 +3,7 @@ # note that it's Qt4, not QT4 or qt4 #/usr/share/cmake-2.6/Modules/FindQt4.cmake -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/populations.git _______________________________________________ debian-med-commit mailing list debian-med-commit@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit