diff -Nru connectagram-1.2.5/ChangeLog connectagram-1.2.6/ChangeLog --- connectagram-1.2.5/ChangeLog 2017-07-30 15:46:16.000000000 +0000 +++ connectagram-1.2.6/ChangeLog 2017-12-26 15:39:15.000000000 +0000 @@ -1,3 +1,15 @@ +commit 531fdf249e4563aeb4592507b16a819c206a93ef +Author: Graeme Gott +Date: 2017-12-26 + + Bump version number. + +commit ba4aeb074659d39ad7ae5aea90cfc0e18d4bd02a +Author: Graeme Gott +Date: 2017-12-22 + + FIXED: Could not compile with Qt 5.10. + commit 71933d93361be6195d2f38206920720c280e1089 Author: Graeme Gott Date: 2017-07-30 diff -Nru connectagram-1.2.5/connectagram.pro connectagram-1.2.6/connectagram.pro --- connectagram-1.2.5/connectagram.pro 2017-07-30 15:45:10.000000000 +0000 +++ connectagram-1.2.6/connectagram.pro 2017-12-26 15:38:34.000000000 +0000 @@ -1,4 +1,7 @@ -lessThan(QT_VERSION, 5.2) { +lessThan(QT_MAJOR_VERSION, 5) { + error("Connectagram requires Qt 5.2 or greater") +} +equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) { error("Connectagram requires Qt 5.2 or greater") } @@ -7,7 +10,7 @@ CONFIG += warn_on c++11 DEFINES += QT_DEPRECATED_WARNINGS -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050900 +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x051000 DEFINES += QT_NO_NARROWING_CONVERSIONS_IN_CONNECT # Allow in-tree builds @@ -18,7 +21,7 @@ } # Set program version -VERSION = 1.2.5 +VERSION = 1.2.6 DEFINES += VERSIONSTR=\\\"$${VERSION}\\\" # Set program name diff -Nru connectagram-1.2.5/debian/changelog connectagram-1.2.6/debian/changelog --- connectagram-1.2.5/debian/changelog 2017-07-30 15:56:38.000000000 +0000 +++ connectagram-1.2.6/debian/changelog 2017-12-26 15:50:23.000000000 +0000 @@ -1,3 +1,9 @@ +connectagram (1.2.6-0ppa2~artful1) artful; urgency=low + + * Update to 1.2.6 + + -- Graeme Gott Tue, 26 Dec 2017 15:50:23 +0000 + connectagram (1.2.5-0ppa2~artful1) artful; urgency=low * Fix incorrect AppData installation. diff -Nru connectagram-1.2.5/debian/connectagram.install connectagram-1.2.6/debian/connectagram.install --- connectagram-1.2.5/debian/connectagram.install 2017-07-30 15:56:38.000000000 +0000 +++ connectagram-1.2.6/debian/connectagram.install 2017-07-30 16:21:39.000000000 +0000 @@ -1,6 +1,6 @@ usr/games/connectagram -usr/share/metainfo/ usr/share/applications/ usr/share/icons/ usr/share/man/ +usr/share/metainfo/ usr/share/pixmaps/ diff -Nru connectagram-1.2.5/mac_deploy.sh connectagram-1.2.6/mac_deploy.sh --- connectagram-1.2.5/mac_deploy.sh 2017-07-30 15:45:03.000000000 +0000 +++ connectagram-1.2.6/mac_deploy.sh 2017-12-26 15:38:49.000000000 +0000 @@ -2,7 +2,7 @@ APP='Connectagram' BUNDLE="$APP.app" -VERSION='1.2.5' +VERSION='1.2.6' # Remove any previous disk folder or DMG echo -n 'Preparing... ' diff -Nru connectagram-1.2.5/NEWS connectagram-1.2.6/NEWS --- connectagram-1.2.5/NEWS 2017-07-30 15:45:46.000000000 +0000 +++ connectagram-1.2.6/NEWS 2017-12-26 15:38:16.000000000 +0000 @@ -1,3 +1,7 @@ +1.2.6 +----- +* FIXED: Could not compile with Qt 5.10. + 1.2.5 ----- * FIXED: Did not always install translations in Linux. diff -Nru connectagram-1.2.5/windows/installer.nsi connectagram-1.2.6/windows/installer.nsi --- connectagram-1.2.5/windows/installer.nsi 2017-07-30 15:45:17.000000000 +0000 +++ connectagram-1.2.6/windows/installer.nsi 2017-12-26 15:38:42.000000000 +0000 @@ -4,7 +4,7 @@ !define APPNAME "Connectagram" !define VERSIONMAJOR 1 !define VERSIONMINOR 2 -!define VERSIONPATCH 5 +!define VERSIONPATCH 6 !define APPVERSION "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}" !define ABOUTURL "https://gottcode.org/connectagram/"