diff -Nru tetzle-2.1.0/ChangeLog tetzle-2.1.1/ChangeLog --- tetzle-2.1.0/ChangeLog 2016-10-16 21:48:58.000000000 +0000 +++ tetzle-2.1.1/ChangeLog 2017-08-05 22:07:42.000000000 +0000 @@ -1,3 +1,63 @@ +commit b1135c4f77b320dd4ff5cc7b76920aef022415b2 +Author: Graeme Gott +Date: 2017-08-05 + + Bump version number. + +commit 39c8856f5a6b12fc5d25e838f981664f141b70ed +Author: Graeme Gott +Date: 2017-08-05 + + Sync translations with Transifex. + +commit 14e1de39f296ae0213f013bddf6de8589de90370 +Author: Graeme Gott +Date: 2017-07-05 + + Update deprecation warning. + +commit abaa5bbcddaf15c74899759090e9dbea9dfde093 +Author: Graeme Gott +Date: 2017-07-01 + + FIXED: Did not always install translations in Linux. + +commit 0ab1870aae4ba8304e307cc48826673a39709557 +Author: Graeme Gott +Date: 2017-04-13 + + Disable narrowing conversions in slots. + +commit 12a2d67fb704bdad2aab7d8dffff621df59412e9 +Author: Graeme Gott +Date: 2017-02-01 + + Update AppData installation directory. + +commit c6d60902d0ff67d25f7d47b24614e5b2cc00a993 +Author: Graeme Gott +Date: 2017-01-26 + + Replace deprecated code. + +commit a92f841000e6ec37cee3c24d169c0eb3dd09b6b8 +Author: Graeme Gott +Date: 2017-01-03 + + Sync translations with Transifex. + +commit e1c84580ee4d8188b0db1417383561b5126aeea3 +Author: Graeme Gott +Date: 2017-01-03 + + Update copyright year. + +commit b443c02aaa1b717fd526083860213d51da9b43b3 +Author: Graeme Gott +Date: 2016-10-29 + + Sync translations with Transifex. + commit 15f8d4a640a7b1f39274bd372c110faa6619f97a Author: Graeme Gott Date: 2016-10-16 diff -Nru tetzle-2.1.0/debian/changelog tetzle-2.1.1/debian/changelog --- tetzle-2.1.0/debian/changelog 2016-10-16 21:53:39.000000000 +0000 +++ tetzle-2.1.1/debian/changelog 2017-08-05 22:14:34.000000000 +0000 @@ -1,3 +1,9 @@ +tetzle (2.1.1-0ppa1~zesty1) zesty; urgency=low + + * Update to 2.1.1 + + -- Graeme Gott Sat, 05 Aug 2017 22:14:34 +0000 + tetzle (2.1.0-0ppa1~zesty1) zesty; urgency=low * Update to 2.1.0 diff -Nru tetzle-2.1.0/mac_deploy.sh tetzle-2.1.1/mac_deploy.sh --- tetzle-2.1.0/mac_deploy.sh 2016-10-16 21:43:29.000000000 +0000 +++ tetzle-2.1.1/mac_deploy.sh 2017-08-05 22:07:13.000000000 +0000 @@ -2,7 +2,7 @@ APP='Tetzle' BUNDLE="$APP.app" -VERSION='2.1.0' +VERSION='2.1.1' # Remove any previous disk folder or DMG echo -n 'Preparing... ' diff -Nru tetzle-2.1.0/NEWS tetzle-2.1.1/NEWS --- tetzle-2.1.0/NEWS 2016-10-16 21:46:07.000000000 +0000 +++ tetzle-2.1.1/NEWS 2017-08-05 22:06:52.000000000 +0000 @@ -1,3 +1,8 @@ +2.1.1 +----- +* FIXED: Did not always install translations in Linux +* Translation updates: German. + 2.1.0 ----- * Added support for HiDPI displays. diff -Nru tetzle-2.1.0/src/graphics_layer.cpp tetzle-2.1.1/src/graphics_layer.cpp --- tetzle-2.1.0/src/graphics_layer.cpp 2016-10-06 19:53:15.000000000 +0000 +++ tetzle-2.1.1/src/graphics_layer.cpp 2017-01-26 14:29:56.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2011, 2012, 2014, 2016 Graeme Gott + * Copyright (C) 2011, 2012, 2014, 2016, 2017 Graeme Gott * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -174,7 +174,7 @@ } if (array.start != -1) { - qCopy(data.begin(), data.end(), m_data.begin() + array.start); + std::copy(data.begin(), data.end(), m_data.begin() + array.start); if (!m_changed) { m_changed_regions.append(array); } diff -Nru tetzle-2.1.0/src/window.cpp tetzle-2.1.1/src/window.cpp --- tetzle-2.1.0/src/window.cpp 2016-10-15 15:14:47.000000000 +0000 +++ tetzle-2.1.1/src/window.cpp 2017-01-03 11:12:44.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2008, 2010, 2011, 2014, 2015, 2016 Graeme Gott + * Copyright (C) 2008, 2010, 2011, 2014, 2015, 2016, 2017 Graeme Gott * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -282,7 +282,7 @@ QMessageBox::about(this, tr("About Tetzle"), QString("

%1 %2
%3
%4
%5

") .arg(tr("Tetzle"), QCoreApplication::applicationVersion(), tr("A jigsaw puzzle with tetrominoes for pieces"), - tr("Copyright © 2008-%1 Graeme Gott").arg("2016"), + tr("Copyright © 2008-%1 Graeme Gott").arg("2017"), tr("Released under the GPL 3 license").arg("\"http://www.gnu.org/licenses/gpl.html\"")) ); } diff -Nru tetzle-2.1.0/tetzle.pro tetzle-2.1.1/tetzle.pro --- tetzle-2.1.0/tetzle.pro 2016-10-16 21:43:38.000000000 +0000 +++ tetzle-2.1.1/tetzle.pro 2017-08-05 22:07:05.000000000 +0000 @@ -12,6 +12,10 @@ QMAKE_INFO_PLIST = data/mac/Info.plist } +DEFINES += QT_DEPRECATED_WARNINGS +DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x050900 +DEFINES += QT_NO_NARROWING_CONVERSIONS_IN_CONNECT + # Allow in-tree builds !win32 { MOC_DIR = build @@ -20,7 +24,7 @@ } # Set program version -VERSION = 2.1.0 +VERSION = 2.1.1 DEFINES += VERSIONSTR=\\\"$${VERSION}\\\" # Set program name @@ -115,9 +119,9 @@ desktop.path = $$PREFIX/share/applications/ appdata.files = data/unix/tetzle.appdata.xml - appdata.path = $$PREFIX/share/appdata/ + appdata.path = $$PREFIX/share/metainfo/ - qm.files = translations/*.qm + qm.files = $$replace(TRANSLATIONS, .ts, .qm) qm.path = $$PREFIX/share/tetzle/translations/ qm.CONFIG += no_check_exist diff -Nru tetzle-2.1.0/translations/tetzle_de.ts tetzle-2.1.1/translations/tetzle_de.ts --- tetzle-2.1.0/translations/tetzle_de.ts 2016-10-07 14:31:57.000000000 +0000 +++ tetzle-2.1.1/translations/tetzle_de.ts 2017-08-05 22:04:31.000000000 +0000 @@ -427,7 +427,7 @@ A jigsaw puzzle with tetrominoes for pieces - Ein Puzzlespiel mit Tetrominos als Puzzleteile + Ein Puzzlespiel mit Tetrominos als Puzzleteilen Copyright © 2008-%1 Graeme Gott @@ -453,11 +453,11 @@ main Select OpenGL version. - + OpenGL-Version auswählen. version - + Version diff -Nru tetzle-2.1.0/translations/tetzle_lt.ts tetzle-2.1.1/translations/tetzle_lt.ts --- tetzle-2.1.0/translations/tetzle_lt.ts 2016-10-07 14:31:57.000000000 +0000 +++ tetzle-2.1.1/translations/tetzle_lt.ts 2017-08-05 22:04:31.000000000 +0000 @@ -453,11 +453,11 @@ main Select OpenGL version. - + Pasirinkite OpenGL versiją. version - + versija diff -Nru tetzle-2.1.0/translations/tetzle_ms.ts tetzle-2.1.1/translations/tetzle_ms.ts --- tetzle-2.1.0/translations/tetzle_ms.ts 2016-10-07 14:32:09.000000000 +0000 +++ tetzle-2.1.1/translations/tetzle_ms.ts 2017-08-05 22:04:31.000000000 +0000 @@ -453,11 +453,11 @@ main Select OpenGL version. - + Pilih versi OpenGL version - + versi diff -Nru tetzle-2.1.0/translations/tetzle_pl.ts tetzle-2.1.1/translations/tetzle_pl.ts --- tetzle-2.1.0/translations/tetzle_pl.ts 2016-10-07 14:31:57.000000000 +0000 +++ tetzle-2.1.1/translations/tetzle_pl.ts 2017-08-05 22:04:31.000000000 +0000 @@ -453,11 +453,11 @@ main Select OpenGL version. - + Wybierz wersję OpenGL. version - + wersja diff -Nru tetzle-2.1.0/translations/tetzle_ro.ts tetzle-2.1.1/translations/tetzle_ro.ts --- tetzle-2.1.0/translations/tetzle_ro.ts 2016-10-07 14:31:57.000000000 +0000 +++ tetzle-2.1.1/translations/tetzle_ro.ts 2017-08-05 22:04:31.000000000 +0000 @@ -453,11 +453,11 @@ main Select OpenGL version. - + Selectaţi versiunea OpenGL. version - + versiunea diff -Nru tetzle-2.1.0/windows/installer.nsi tetzle-2.1.1/windows/installer.nsi --- tetzle-2.1.0/windows/installer.nsi 2016-10-16 21:43:47.000000000 +0000 +++ tetzle-2.1.1/windows/installer.nsi 2017-08-05 22:07:19.000000000 +0000 @@ -4,7 +4,7 @@ !define APPNAME "Tetzle" !define VERSIONMAJOR 2 !define VERSIONMINOR 1 -!define VERSIONPATCH 0 +!define VERSIONPATCH 1 !define APPVERSION "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}" !define ABOUTURL "https://gottcode.org/tetzle/"