diff -Nru tetzle-2.1.5+dfsg1/ChangeLog tetzle-2.1.6/ChangeLog --- tetzle-2.1.5+dfsg1/ChangeLog 2019-08-07 14:01:09.000000000 +0000 +++ tetzle-2.1.6/ChangeLog 2020-04-21 00:47:04.000000000 +0000 @@ -1,3 +1,9 @@ +2.1.6 +----- +* FIXED: Did not load locales with underscores. +* Improved Windows deployment. +* Replaced deprecated code. + 2.1.5 ----- * Replaced deprecated code. diff -Nru tetzle-2.1.5+dfsg1/data/unix/tetzle.appdata.xml tetzle-2.1.6/data/unix/tetzle.appdata.xml --- tetzle-2.1.5+dfsg1/data/unix/tetzle.appdata.xml 2019-08-07 14:01:09.000000000 +0000 +++ tetzle-2.1.6/data/unix/tetzle.appdata.xml 2020-04-21 00:47:04.000000000 +0000 @@ -74,30 +74,18 @@ ModernToolkit - - none - none - none - none - none - none - none - none - none - none - none - none - none - none - none - none - none - none - none - none - + + + +
    +
  • FIXED: Did not load locales with underscores
    • +
  • Improved Windows deployment
    • +
  • Replaced deprecated code
    • +
+ +
    diff -Nru tetzle-2.1.5+dfsg1/debian/changelog tetzle-2.1.6/debian/changelog --- tetzle-2.1.5+dfsg1/debian/changelog 2020-03-23 06:27:41.000000000 +0000 +++ tetzle-2.1.6/debian/changelog 2020-04-21 12:45:56.000000000 +0000 @@ -1,182 +1,75 @@ -tetzle (2.1.5+dfsg1-1build1) focal; urgency=medium +tetzle (2.1.6-0ppa1~focal) focal; urgency=low - * No-change rebuild for libgcc-s1 package name change. + * Update to 2.1.6 - -- Matthias Klose Mon, 23 Mar 2020 07:27:41 +0100 + -- Graeme Gott Tue, 21 Apr 2020 12:45:56 +0000 -tetzle (2.1.5+dfsg1-1) unstable; urgency=medium +tetzle (2.1.5-0ppa1~focal) focal; urgency=low - * New upstream release + * Update to 2.1.5 - -- Jonathan Carter Thu, 24 Oct 2019 11:39:02 +0000 + -- Graeme Gott Wed, 07 Aug 2019 14:01:41 +0000 -tetzle (2.1.4+dfsg1-3) unstable; urgency=medium +tetzle (2.1.4-0ppa1~focal) focal; urgency=low - * Remove extra appdata.xml file (upstream file is now provided) - * Add copyright information for data/unix/tetzle.appdata.xml - * Add self to copyright file - * Update standards version to 4.4.1 + * Update to 2.1.4 - -- Jonathan Carter Wed, 23 Oct 2019 13:24:19 +0200 + -- Graeme Gott Mon, 25 Mar 2019 16:34:13 +0000 -tetzle (2.1.4+dfsg1-2) unstable; urgency=medium +tetzle (2.1.3-0ppa1~focal) focal; urgency=low - * Source-only upload - * Update standards version to 4.4.0 + * Update to 2.1.3 - -- Jonathan Carter Thu, 11 Jul 2019 13:28:24 +0200 + -- Graeme Gott Tue, 29 May 2018 11:22:36 +0000 -tetzle (2.1.4+dfsg1-1) unstable; urgency=medium +tetzle (2.1.2-0ppa1~focal) focal; urgency=low - * New upstream release - * Update metadata license information - * Remove no longer needed debian/docs + * Update to 2.1.2 - -- Jonathan Carter Thu, 04 Apr 2019 13:57:56 +0200 + -- Graeme Gott Thu, 28 Dec 2017 16:11:50 +0000 -tetzle (2.1.3+dfsg1-2) unstable; urgency=medium +tetzle (2.1.1-0ppa1~focal) focal; urgency=low - * Adopting package (Closes: #922886) - * Update compat to debhelper-compat (=12) - * Update standards version to 4.3.0 - * Move VCS to debian project space on salsa.debian.net + * Update to 2.1.1 - -- Jonathan Carter Fri, 22 Feb 2019 11:39:20 +0200 + -- Graeme Gott Sat, 05 Aug 2017 22:14:34 +0000 -tetzle (2.1.3+dfsg1-1) unstable; urgency=medium +tetzle (2.1.0-0ppa1~focal) focal; urgency=low - * New upstream version. - * Bumped standards version to 4.1.4 (no changes required). - * Migrated to Salsa. - * Bumped debhelper and compat level to 11. - * Updated years on d/copyright. - * Updated README.source. - * Added Files-Excluded field on d/copyright. - * Added d/docs file. + * Update to 2.1.0 - -- Innocent De Marchi Mon, 11 Jun 2018 18:25:12 +0100 + -- Graeme Gott Sun, 16 Oct 2016 21:53:39 +0000 -tetzle (2.1.2+dfsg1-1) unstable; urgency=medium +tetzle (2.0.3-0ppa4~focal) focal; urgency=low - * New upstream version. - * Bumped standards version to 4.1.3 (no changes required). + * Fix Debian packaging - -- Innocent De Marchi Sat, 06 Jan 2018 17:15:12 +0100 + -- Graeme Gott Fri, 06 Nov 2015 15:05:40 +0000 + +tetzle (2.0.3-0ppa3~focal) focal; urgency=low -tetzle (2.1.1+dfsg1-2) unstable; urgency=medium + * Fix Debian packaging - * Changed libqt5opengl5-dev build dependency by libqt5opengl5-desktop-dev - (Closes: #884395 ; LP: 935473). - * Bumped standards version to 4.1.2 (no changes required). - * Added tetrominoes word in keywords field on debian/desktop. + -- Graeme Gott Fri, 06 Nov 2015 14:29:01 +0000 + +tetzle (2.0.3-0ppa2~focal) focal; urgency=low - -- Innocent De Marchi Fri, 15 Dec 2017 17:13:25 +0100 + * Switch to Qt 5 + * Update copyright file -tetzle (2.1.1+dfsg1-1) unstable; urgency=medium + -- Graeme Gott Sun, 11 May 2014 16:58:26 +0000 - * New upstream release. - * New maintainer (Closes: #737285). - + Changed Maintainer field in debian/control file. - + Add new maintainer in debian/copyright file. - * Standards version 4.1.0: no special changes required. - * Added Categories and Keywords fields on debian/desktop file. - * Added tetzle.appdata.xml file on debian directory. - * Reintroduced debian/watch file. - * Added export DEB_BUILD_MAINT_OPTIONS on debian/rules. - * Added Vcs-Browser and Vcs-Git on debian/control file. - * Repacking sources due to unnecessary files. - + Added README.source file en debian directory (see for - details). - + Added +dfsg1 to package name. +tetzle (2.0.3-0ppa1~focal) focal; urgency=low - -- Innocent De Marchi Wed, 13 Sep 2017 07:23:17 +0100 + * Update to 2.0.3 + - Fixed OpenGL shaders not working in Windows 7 + - Fixed build failure on ARM + - Added Malay and Polish translations -tetzle (2.1.0-1) unstable; urgency=medium + -- Graeme Gott Sun, 22 Sep 2013 14:42:46 +0000 - * QA upload. - * New upstream release - - Updated build-deps to QT5 - * Removed broken watch file - * Replaced menu file with desktop file - * Added some missing information in d/copyright - * Bumped compat to 10 - * Standards version 4.0.0 +tetzle (2.0.2.1-0ppa1~focal) focal; urgency=low - -- David William Richmond Davies-Jones Thu, 29 Jun 2017 01:40:05 +0100 + * Initial release -tetzle (2.0.3-1) unstable; urgency=medium - - * QA upload. - * New upstream release - * Removed fix-arm-build.patch - fixed upstream - * Changed URLS to use HTTPS - * Converted copyright to DEP-5 - * Bumped standards version to 3.9.8 - - -- David William Richmond Jones Wed, 29 Jun 2016 06:39:28 +0100 - -tetzle (2.0.2.1-3) unstable; urgency=low - - * Fix "tetzle: build failures on ARM" - - d/p/fix-arm-build.patch - Thanks Graeme Gott for patch - (Closes: #717949) - - -- Hector Oron Mon, 05 Aug 2013 00:48:34 +0000 - -tetzle (2.0.2.1-2) unstable; urgency=low - - * QA upload, orphaning this package. - * New upstream release. - - -- Bart Martens Fri, 26 Jul 2013 17:57:14 +0000 - -tetzle (2.0.1-1) unstable; urgency=low - - * New upstream release. Closes: #668772. - * debhelper 9, no more cdbs. - * debian/patches/01_dont-draw-empty-scene.diff: Removed, is in upstream now. - * debian/patches/02_check-for-GLSL.diff: Removed, is in upstream now. - * debian/patches/03_detect-graphics-layer.diff: Removed, is in upstream now. - - -- Bart Martens Sun, 20 May 2012 06:09:10 +0000 - -tetzle (2.0.0-2) unstable; urgency=low - - * Added patches. Closes: #671738. - + debian/patches/01_dont-draw-empty-scene.diff - + debian/patches/02_check-for-GLSL.diff - + debian/patches/03_detect-graphics-layer.diff - * debian/control: Build-Conflicts: qt3-dev-tools. Closes: #565796. - - -- Bart Martens Sun, 13 May 2012 04:30:35 +0000 - -tetzle (2.0.0-1) unstable; urgency=low - - * Synced with https://launchpad.net/~gottcode/+archive/gcppa/ - * debian/control: Fixed "dpkg-source: warning: unknown information field - 'Suggests' in input data in general section of control info file". - - -- Bart Martens Thu, 02 Jun 2011 02:51:09 +0000 - -tetzle (2.0.0-0ppa2~oneiric1) oneiric; urgency=low - - * Added optional dependency on jhead. - - -- Graeme Gott Wed, 18 May 2011 20:31:13 -0400 - -tetzle (2.0.0-0ppa1~oneiric1) oneiric; urgency=low - - * New upstream release. - - -- Graeme Gott Wed, 18 May 2011 14:12:30 -0400 - -tetzle (1.2.1-1) unstable; urgency=low - - * Initial package in Debian. Closes: #530340. - * debian/patches/01_paths.diff: Added. Replaces /usr/local by /usr - and /usr/bin by /usr/games. - * debian/rules, debian/menu, debian/install: Use imagemagick to convert the - icon to .xpm format for debian/menu. - - -- Bart Martens Sun, 24 May 2009 00:19:45 +0200 + -- Graeme Gott Tue, 25 Jun 2013 20:41:01 +0000 diff -Nru tetzle-2.1.5+dfsg1/debian/compat tetzle-2.1.6/debian/compat --- tetzle-2.1.5+dfsg1/debian/compat 1970-01-01 00:00:00.000000000 +0000 +++ tetzle-2.1.6/debian/compat 2018-06-28 20:13:12.000000000 +0000 @@ -0,0 +1 @@ +10 diff -Nru tetzle-2.1.5+dfsg1/debian/control tetzle-2.1.6/debian/control --- tetzle-2.1.5+dfsg1/debian/control 2019-07-11 11:28:23.000000000 +0000 +++ tetzle-2.1.6/debian/control 2018-06-28 20:14:11.000000000 +0000 @@ -1,18 +1,14 @@ Source: tetzle Section: games Priority: optional -Maintainer: Jonathan Carter -Build-Depends: debhelper-compat (= 12), qttools5-dev-tools (>=5.2), - libqt5opengl5-desktop-dev -Standards-Version: 4.4.0 -Vcs-Browser: https://salsa.debian.org/debian/tetzle -Vcs-Git: https://salsa.debian.org/debian/tetzle.git +Maintainer: Graeme Gott +Build-Depends: debhelper (>= 9), qtbase5-dev, qttools5-dev-tools, libqt5opengl5-dev +Standards-Version: 4.1.4 Homepage: https://gottcode.org/tetzle/ Package: tetzle Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Suggests: jhead Description: Jigsaw puzzle game Any image can be imported and used to create puzzles with a wide range of sizes. Games are saved automatically, and you can select between currently diff -Nru tetzle-2.1.5+dfsg1/debian/copyright tetzle-2.1.6/debian/copyright --- tetzle-2.1.5+dfsg1/debian/copyright 2019-10-23 11:23:50.000000000 +0000 +++ tetzle-2.1.6/debian/copyright 2018-06-28 20:14:22.000000000 +0000 @@ -1,48 +1,17 @@ -Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0 +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Tetzle Upstream-Contact: Graeme Gott Source: https://gottcode.org/tetzle/ -Files-excluded: mac_deploy.sh - /tools - /windows Files: * -Copyright: 2008-2019 Graeme Gott -License: GPL-3 - -Files: data/unix/tetzle.appdata.xml -Copyright: Waivered by author(s) -License: cc0-1.0 - On Debian systems, the complete text of the Creative Commons CC0 1.0 - Universal license (CC0-1.0) can be found in - "/usr/share/common-licenses/CC0-1.0". +Copyright: 2008-2018 Graeme Gott +License: GPL-3+ Files: debian/* -Copyright: 2019 Jonathan Carter - 2017-2018 Innocent De Marchi - 2017 David William Richmond Davies-Jones - 2016 David William Richmond Jones - 2013 Hector Oron - 2011 Graeme Gott - 2009, 2011-2013 Bart Martens +Copyright: 2009-2011 Bart Martens + 2013-2018 Graeme Gott License: GPL-3+ -License: GPL-3 - 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 - the Free Software Foundation. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. - License: GPL-3+ 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 @@ -55,7 +24,7 @@ GNU General Public License for more details. . You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'. + On Debian systems, the full text of the GNU General Public License + version 3 can be found in the file `/usr/share/common-licenses/GPL-3'. diff -Nru tetzle-2.1.5+dfsg1/debian/README.source tetzle-2.1.6/debian/README.source --- tetzle-2.1.5+dfsg1/debian/README.source 2019-10-24 11:39:02.000000000 +0000 +++ tetzle-2.1.6/debian/README.source 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -In the sources, there are unnecessary files in the /tools directory -(windows .exe files for exemple). Removed this directory, /windows -and mac_deploy.sh and repacking sources withe this script: - -#! /bin/bash -tar -xvf tetzle-2.1.5.tar.gz -mv tetzle-2.1.5 tetzle-2.1.5+dfsg1 -rm -f tetzle-2.1.5+dfsg1/mac_deploy.sh -rm -r tetzle-2.1.5+dfsg1/tools -rm -r tetzle-2.1.5+dfsg1/windows -tar -zcvf tetzle_2.1.5+dfsg1.orig.tar.gz tetzle-2.1.4+dfsg1 - --- Innocent De Marchi Mon, 11 Jun 2018 18:24:12 +0100 - - -Updated version numbers above - --- Jonathan Carter Thu Apr 4 14:00:08 SAST 2019 +0200 diff -Nru tetzle-2.1.5+dfsg1/debian/rules tetzle-2.1.6/debian/rules --- tetzle-2.1.5+dfsg1/debian/rules 2019-02-22 09:38:11.000000000 +0000 +++ tetzle-2.1.6/debian/rules 2018-06-28 20:13:05.000000000 +0000 @@ -1,12 +1,13 @@ #!/usr/bin/make -f -#export DH_VERBOSE=1 -export QT_SELECT=qt5 -export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export QT_SELECT = 5 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all +DPKG_EXPORT_BUILDFLAGS = 1 +include /usr/share/dpkg/buildflags.mk %: - dh $@ + dh $@ --parallel override_dh_auto_configure: dh_auto_configure -- BINDIR=games diff -Nru tetzle-2.1.5+dfsg1/debian/source/format tetzle-2.1.6/debian/source/format --- tetzle-2.1.5+dfsg1/debian/source/format 2019-02-22 09:38:11.000000000 +0000 +++ tetzle-2.1.6/debian/source/format 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -3.0 (quilt) diff -Nru tetzle-2.1.5+dfsg1/debian/tetzle.desktop tetzle-2.1.6/debian/tetzle.desktop --- tetzle-2.1.5+dfsg1/debian/tetzle.desktop 2019-02-22 09:38:11.000000000 +0000 +++ tetzle-2.1.6/debian/tetzle.desktop 1970-01-01 00:00:00.000000000 +0000 @@ -1,9 +0,0 @@ -[Desktop Entry] -Version=1.0 -Type=Application -Name=Tetzle -Comment=Jigsaw puzzle game -Exec=tetzle -Icon=tetzle -Categories=Game;LogicGame -Keywords=Tetrominoes;Game;Puzzle; diff -Nru tetzle-2.1.5+dfsg1/debian/tetzle.docs tetzle-2.1.6/debian/tetzle.docs --- tetzle-2.1.5+dfsg1/debian/tetzle.docs 1970-01-01 00:00:00.000000000 +0000 +++ tetzle-2.1.6/debian/tetzle.docs 2017-08-05 22:14:06.000000000 +0000 @@ -0,0 +1,2 @@ +CREDITS +README diff -Nru tetzle-2.1.5+dfsg1/debian/watch tetzle-2.1.6/debian/watch --- tetzle-2.1.5+dfsg1/debian/watch 2019-02-22 09:38:11.000000000 +0000 +++ tetzle-2.1.6/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -version=4 -opts=dversionmangle=s/-\d\+dfsg// \ - https://github.com/gottcode/tetzle/tags .*/v?(\d\S*)\.tar\.gz -#opts=filenamemangle=s/.+\/v?(\d\S*)\.tar\.gz/-$1\.tar\.gz/ \ -#opts=dversionmangle=s/\.dfsg.+\/v?(\d\S*)\.tar\.gz/-$1\.tar\.gz/ \ \ No newline at end of file diff -Nru tetzle-2.1.5+dfsg1/.gitignore tetzle-2.1.6/.gitignore --- tetzle-2.1.5+dfsg1/.gitignore 2019-08-07 14:01:09.000000000 +0000 +++ tetzle-2.1.6/.gitignore 1970-01-01 00:00:00.000000000 +0000 @@ -1,5 +0,0 @@ -Makefile -build -tetzle -*.qm -*~ diff -Nru tetzle-2.1.5+dfsg1/mac_deploy.sh tetzle-2.1.6/mac_deploy.sh --- tetzle-2.1.5+dfsg1/mac_deploy.sh 1970-01-01 00:00:00.000000000 +0000 +++ tetzle-2.1.6/mac_deploy.sh 2020-04-21 00:47:04.000000000 +0000 @@ -0,0 +1,123 @@ +#!/bin/bash + +APP='Tetzle' +BUNDLE="$APP.app" +VERSION='2.1.6' + +# Remove any previous disk folder or DMG +echo -n 'Preparing... ' +rm -f "${APP}_$VERSION.dmg" +if [ -e "/Volumes/$APP" ]; then + hdiutil detach -quiet "/Volumes/$APP" +fi +rm -Rf "$APP" +echo 'Done' + +# Create disk folder +echo -n 'Copying application bundle... ' +mkdir "$APP" +cp -Rf "$BUNDLE" "$APP/" +strip "$APP/$BUNDLE/Contents/MacOS/$APP" +cp COPYING "$APP/License.txt" +echo 'Done' + +# Create ReadMe +echo -n 'Creating ReadMe... ' +cp README "$APP/Read Me.txt" +echo >> "$APP/Read Me.txt" +echo >> "$APP/Read Me.txt" +echo 'CREDITS' >> "$APP/Read Me.txt" +echo '=======' >> "$APP/Read Me.txt" +echo >> "$APP/Read Me.txt" +cat CREDITS >> "$APP/Read Me.txt" +echo >> "$APP/Read Me.txt" +echo >> "$APP/Read Me.txt" +echo 'NEWS' >> "$APP/Read Me.txt" +echo '====' >> "$APP/Read Me.txt" +echo >> "$APP/Read Me.txt" +cat ChangeLog >> "$APP/Read Me.txt" +echo 'Done' + +# Copy translations +echo -n 'Copying translations... ' +TRANSLATIONS="$APP/$BUNDLE/Contents/Resources/translations" +mkdir "$TRANSLATIONS" +cp translations/*.qm "$TRANSLATIONS" +echo 'Done' + +# Copy Qt translations +echo -n 'Copying Qt translations... ' +cp $QTDIR/translations/qt_* "$TRANSLATIONS" +cp $QTDIR/translations/qtbase_* "$TRANSLATIONS" +rm -f $TRANSLATIONS/qt_help_* +echo 'Done' + +# Copy frameworks and plugins +echo -n 'Copying frameworks and plugins... ' +macdeployqt "$APP/$BUNDLE" +rm -Rf "$APP/$BUNDLE/Contents/PlugIns/iconengines" +echo 'Done' + +# Copy background +echo -n 'Copying background... ' +mkdir "$APP/.background" +cp data/mac/background.tiff "$APP/.background/background.tiff" +echo 'Done' + +# Create disk image +echo -n 'Creating disk image... ' +hdiutil create -quiet -srcfolder "$APP" -volname "$APP" -fs HFS+ -format UDRW 'temp.dmg' +echo 'Done' + +echo -n 'Configuring disk image... ' +hdiutil attach -quiet -readwrite -noverify -noautoopen 'temp.dmg' +echo ' + tell application "Finder" + tell disk "'$APP'" + open + + tell container window + set the bounds to {400, 100, 949, 458} + set current view to icon view + set toolbar visible to false + set statusbar visible to true + set the bounds to {400, 100, 800, 460} + end tell + + set viewOptions to the icon view options of container window + tell viewOptions + set arrangement to not arranged + set icon size to 80 + set label position to bottom + set shows icon preview to true + set shows item info to false + end tell + set background picture of viewOptions to file ".background:background.tiff" + + make new alias file at container window to POSIX file "/Applications" with properties {name:"Applications"} + set position of item "'$BUNDLE'" of container window to {90, 90} + set position of item "Applications" of container window to {310, 90} + set position of item "Read Me.txt" of container window to {140, 215} + set position of item "License.txt" of container window to {260, 215} + close + open + + update without registering applications + delay 5 + end tell + end tell +' | osascript +chmod -Rf go-w "/Volumes/$APP" >& /dev/null +sync +hdiutil detach -quiet "/Volumes/$APP" +echo 'Done' + +echo -n 'Compressing disk image... ' +hdiutil convert -quiet 'temp.dmg' -format UDBZ -o "${APP}_${VERSION}.dmg" +rm -f temp.dmg +echo 'Done' + +# Clean up disk folder +echo -n 'Cleaning up... ' +rm -Rf "$APP" +echo 'Done' diff -Nru tetzle-2.1.5+dfsg1/src/board.cpp tetzle-2.1.6/src/board.cpp --- tetzle-2.1.5+dfsg1/src/board.cpp 2019-08-07 14:01:09.000000000 +0000 +++ tetzle-2.1.6/src/board.cpp 2020-04-21 00:47:04.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2008, 2010, 2011, 2012, 2014, 2015, 2016 Graeme Gott + * Copyright (C) 2008, 2010, 2011, 2012, 2014, 2015, 2016, 2019 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 @@ -906,7 +906,7 @@ void Board::wheelEvent(QWheelEvent* event) { - if (event->delta() > 0) { + if (event->angleDelta().y() > 0) { zoomIn(); } else { zoomOut(); diff -Nru tetzle-2.1.5+dfsg1/src/locale_dialog.cpp tetzle-2.1.6/src/locale_dialog.cpp --- tetzle-2.1.5+dfsg1/src/locale_dialog.cpp 2019-08-07 14:01:09.000000000 +0000 +++ tetzle-2.1.6/src/locale_dialog.cpp 2020-04-21 00:47:04.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2010, 2011, 2012, 2014, 2015, 2016, 2018, 2019 Graeme Gott + * Copyright (C) 2010, 2011, 2012, 2014, 2015, 2016, 2018, 2019, 2020 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 @@ -101,22 +101,22 @@ if (!m_current.isEmpty()) { QLocale::setDefault(m_current); } - const QLocale locale; + const QString locale = QLocale().name(); // Load translators static QTranslator translator; - if (translator.load(locale, m_appname, "", m_path)) { + if (translator.load(m_appname + locale, m_path)) { QCoreApplication::installTranslator(&translator); const QString path = QLibraryInfo::location(QLibraryInfo::TranslationsPath); static QTranslator qtbase_translator; - if (qtbase_translator.load(locale, "qtbase", "_", m_path) || qtbase_translator.load(locale, "qtbase", "_", path)) { + if (qtbase_translator.load("qtbase_" + locale, m_path) || qtbase_translator.load("qtbase_" + locale, path)) { QCoreApplication::installTranslator(&qtbase_translator); } static QTranslator qt_translator; - if (qt_translator.load(locale, "qt", "_", m_path) || qt_translator.load(locale, "qt", "_", path)) { + if (qt_translator.load("qt_" + locale, m_path) || qt_translator.load("qt_" + locale, path)) { QCoreApplication::installTranslator(&qt_translator); } } diff -Nru tetzle-2.1.5+dfsg1/src/overview.cpp tetzle-2.1.6/src/overview.cpp --- tetzle-2.1.5+dfsg1/src/overview.cpp 2019-08-07 14:01:09.000000000 +0000 +++ tetzle-2.1.6/src/overview.cpp 2020-04-21 00:47:04.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2008, 2010, 2011, 2012, 2014, 2016 Graeme Gott + * Copyright (C) 2008, 2010, 2011, 2012, 2014, 2016, 2019 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 @@ -153,7 +153,7 @@ void Overview::wheelEvent(QWheelEvent* event) { - if (event->delta() > 0) { + if (event->angleDelta().y() > 0) { zoomIn(); } else { zoomOut(); diff -Nru tetzle-2.1.5+dfsg1/src/window.cpp tetzle-2.1.6/src/window.cpp --- tetzle-2.1.5+dfsg1/src/window.cpp 2019-08-07 14:01:09.000000000 +0000 +++ tetzle-2.1.6/src/window.cpp 2020-04-21 00:47:04.000000000 +0000 @@ -1,6 +1,6 @@ /*********************************************************************** * - * Copyright (C) 2008, 2010, 2011, 2014, 2015, 2016, 2017, 2018, 2019 Graeme Gott + * Copyright (C) 2008, 2010, 2011, 2014, 2015, 2016, 2017, 2018, 2019, 2020 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("2019"), + tr("Copyright © 2008-%1 Graeme Gott").arg("2020"), tr("Released under the GPL 3 license").arg("\"http://www.gnu.org/licenses/gpl.html\"")) ); } diff -Nru tetzle-2.1.5+dfsg1/tetzle.pro tetzle-2.1.6/tetzle.pro --- tetzle-2.1.5+dfsg1/tetzle.pro 2019-08-07 14:01:09.000000000 +0000 +++ tetzle-2.1.6/tetzle.pro 2020-04-21 00:47:04.000000000 +0000 @@ -15,19 +15,17 @@ CONFIG(debug, debug|release) { CONFIG += warn_on DEFINES += QT_DEPRECATED_WARNINGS - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x051300 + DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x051400 DEFINES += QT_NO_NARROWING_CONVERSIONS_IN_CONNECT } # Allow in-tree builds -!win32 { - MOC_DIR = build - OBJECTS_DIR = build - RCC_DIR = build -} +MOC_DIR = build +OBJECTS_DIR = build +RCC_DIR = build # Set program version -VERSION = 2.1.5 +VERSION = 2.1.6 DEFINES += VERSIONSTR=\\\"$${VERSION}\\\" # Set program name diff -Nru tetzle-2.1.5+dfsg1/windows/installer.nsi tetzle-2.1.6/windows/installer.nsi --- tetzle-2.1.5+dfsg1/windows/installer.nsi 1970-01-01 00:00:00.000000000 +0000 +++ tetzle-2.1.6/windows/installer.nsi 2020-04-21 00:47:04.000000000 +0000 @@ -0,0 +1,230 @@ +;-------------------------------- +;Definitions + +!define APPNAME "Tetzle" +!define VERSIONMAJOR 2 +!define VERSIONMINOR 1 +!define VERSIONPATCH 6 +!define APPVERSION "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}" +!define ABOUTURL "https://gottcode.org/tetzle/" + +;-------------------------------- +;Includes + +!include "MUI2.nsh" +!include "FileFunc.nsh" +!include "TextFunc.nsh" + +;-------------------------------- +;General + +;Use highest compression +SetCompressor /SOLID /FINAL lzma + +;Name and file +Name "${APPNAME}" +OutFile "${APPNAME}_${APPVERSION}.exe" + +;Default installation folder +InstallDir "$PROGRAMFILES64\${APPNAME}" +InstallDirRegKey HKLM "Software\${APPNAME}" "" + +;Request application privileges for Windows Vista +RequestExecutionLevel admin + +;-------------------------------- +;Variables + +Var StartMenuFolder + +;-------------------------------- +;Interface Settings + +!define MUI_ICON "..\icons\tetzle.ico" +!define MUI_UNICON "..\icons\tetzle.ico" +!define MUI_ABORTWARNING +!define MUI_LANGDLL_ALLLANGUAGES + +;-------------------------------- +;Language Selection Dialog Settings + +;Remember the installer language +!define MUI_LANGDLL_REGISTRY_ROOT "HKLM" +!define MUI_LANGDLL_REGISTRY_KEY "Software\${APPNAME}" +!define MUI_LANGDLL_REGISTRY_VALUENAME "Installer Language" + +;-------------------------------- +;Start Menu Folder Page Settings + +!define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKLM" +!define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\${APPNAME}" +!define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" + +;-------------------------------- +;Finish Page Settings + +!define MUI_FINISHPAGE_RUN "$INSTDIR\${APPNAME}.exe" +!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\ReadMe.txt" + +;-------------------------------- +;Pages + +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "..\COPYING" +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES + +;-------------------------------- +;Languages + +!insertmacro MUI_LANGUAGE "English" ;first language is the default language +!insertmacro MUI_LANGUAGE "French" +!insertmacro MUI_LANGUAGE "German" +!insertmacro MUI_LANGUAGE "Spanish" +!insertmacro MUI_LANGUAGE "SpanishInternational" +!insertmacro MUI_LANGUAGE "SimpChinese" +!insertmacro MUI_LANGUAGE "TradChinese" +!insertmacro MUI_LANGUAGE "Japanese" +!insertmacro MUI_LANGUAGE "Korean" +!insertmacro MUI_LANGUAGE "Italian" +!insertmacro MUI_LANGUAGE "Dutch" +!insertmacro MUI_LANGUAGE "Danish" +!insertmacro MUI_LANGUAGE "Swedish" +!insertmacro MUI_LANGUAGE "Norwegian" +!insertmacro MUI_LANGUAGE "NorwegianNynorsk" +!insertmacro MUI_LANGUAGE "Finnish" +!insertmacro MUI_LANGUAGE "Greek" +!insertmacro MUI_LANGUAGE "Russian" +!insertmacro MUI_LANGUAGE "Portuguese" +!insertmacro MUI_LANGUAGE "PortugueseBR" +!insertmacro MUI_LANGUAGE "Polish" +!insertmacro MUI_LANGUAGE "Ukrainian" +!insertmacro MUI_LANGUAGE "Czech" +!insertmacro MUI_LANGUAGE "Slovak" +!insertmacro MUI_LANGUAGE "Croatian" +!insertmacro MUI_LANGUAGE "Bulgarian" +!insertmacro MUI_LANGUAGE "Hungarian" +!insertmacro MUI_LANGUAGE "Thai" +!insertmacro MUI_LANGUAGE "Romanian" +!insertmacro MUI_LANGUAGE "Latvian" +!insertmacro MUI_LANGUAGE "Macedonian" +!insertmacro MUI_LANGUAGE "Estonian" +!insertmacro MUI_LANGUAGE "Turkish" +!insertmacro MUI_LANGUAGE "Lithuanian" +!insertmacro MUI_LANGUAGE "Slovenian" +!insertmacro MUI_LANGUAGE "Serbian" +!insertmacro MUI_LANGUAGE "SerbianLatin" +!insertmacro MUI_LANGUAGE "Arabic" +!insertmacro MUI_LANGUAGE "Farsi" +!insertmacro MUI_LANGUAGE "Hebrew" +!insertmacro MUI_LANGUAGE "Indonesian" +!insertmacro MUI_LANGUAGE "Mongolian" +!insertmacro MUI_LANGUAGE "Luxembourgish" +!insertmacro MUI_LANGUAGE "Albanian" +!insertmacro MUI_LANGUAGE "Breton" +!insertmacro MUI_LANGUAGE "Belarusian" +!insertmacro MUI_LANGUAGE "Icelandic" +!insertmacro MUI_LANGUAGE "Malay" +!insertmacro MUI_LANGUAGE "Bosnian" +!insertmacro MUI_LANGUAGE "Kurdish" +!insertmacro MUI_LANGUAGE "Irish" +!insertmacro MUI_LANGUAGE "Uzbek" +!insertmacro MUI_LANGUAGE "Galician" +!insertmacro MUI_LANGUAGE "Afrikaans" +!insertmacro MUI_LANGUAGE "Catalan" +!insertmacro MUI_LANGUAGE "Esperanto" +!insertmacro MUI_LANGUAGE "Asturian" + +;-------------------------------- +;Reserve Files + +!insertmacro MUI_RESERVEFILE_LANGDLL + +;-------------------------------- +;Installer Functions + +Function .onInit + + !insertmacro MUI_LANGDLL_DISPLAY + +FunctionEnd + +;-------------------------------- +;Installer Section + +Section "install" + + ;Copy files + SetOutPath "$INSTDIR" + File /r "..\${APPNAME}\*" + + ;Registry information for add/remove programs + WriteRegStr HKLM "Software\${APPNAME}" "" "$INSTDIR" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "Publisher" "Graeme Gott" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\"" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "InstallLocation" "$\"$INSTDIR$\"" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayIcon" "$\"$INSTDIR\${APPNAME}.exe$\"" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "URLInfoAbout" "$\"${ABOUTURL}$\"" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayVersion" "${APPVERSION}" + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionMajor" ${VERSIONMAJOR} + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "VersionMinor" ${VERSIONMINOR} + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoModify" 1 + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "NoRepair" 1 + ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2 + IntFmt $0 "0x%08X" $0 + WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "EstimatedSize" "$0" + + ;Create uninstaller + WriteUninstaller "$INSTDIR\Uninstall.exe" + + ;Create shortcut + SetShellVarContext all + !insertmacro MUI_STARTMENU_WRITE_BEGIN Application + CreateDirectory "$SMPROGRAMS\$StartMenuFolder" + CreateShortCut "$SMPROGRAMS\$StartMenuFolder\${APPNAME}.lnk" "$INSTDIR\${APPNAME}.exe" + !insertmacro MUI_STARTMENU_WRITE_END + SetShellVarContext current + +SectionEnd + +;-------------------------------- +;Uninstaller Functions + +Function un.onInit + + !insertmacro MUI_UNGETLANGUAGE + +FunctionEnd + +;-------------------------------- +;Uninstaller Section + +Section "Uninstall" + + ; Remove from registry + DeleteRegKey HKLM "Software\${APPNAME}" + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" + + ;Remove files + !include files.nsh + Delete "$INSTDIR\Uninstall.exe" + + ;Remove directories + !include dirs.nsh + RMDir "$INSTDIR" + + ;Remove shortcut + SetShellVarContext all + !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuFolder + Delete "$SMPROGRAMS\$StartMenuFolder\${APPNAME}.lnk" + RMDir "$SMPROGRAMS\$StartMenuFolder" + SetShellVarContext current + +SectionEnd diff -Nru tetzle-2.1.5+dfsg1/windows_deploy.bat tetzle-2.1.6/windows_deploy.bat --- tetzle-2.1.5+dfsg1/windows_deploy.bat 2019-08-07 14:01:09.000000000 +0000 +++ tetzle-2.1.6/windows_deploy.bat 2020-04-21 00:47:04.000000000 +0000 @@ -3,12 +3,11 @@ @ECHO OFF SET APP=Tetzle -SET VERSION=2.1.5 +SET VERSION=2.1.6 ECHO Copying executable MKDIR %APP% COPY release\%APP%.exe %APP% >nul -strip %APP%\%APP%.exe ECHO Copying translations SET TRANSLATIONS=%APP%\translations @@ -16,7 +15,7 @@ COPY translations\*.qm %TRANSLATIONS% >nul ECHO Copying Qt -%QTDIR%\bin\windeployqt.exe --verbose 0 --release %APP%\%APP%.exe +%QTDIR%\bin\windeployqt.exe --verbose 0 %APP%\%APP%.exe RMDIR /S /Q %APP%\iconengines ECHO Creating ReadMe