diff -Nru cutemaze-1.2.4/ChangeLog cutemaze-1.2.5/ChangeLog
--- cutemaze-1.2.4/ChangeLog 2018-07-20 15:34:52.000000000 +0000
+++ cutemaze-1.2.5/ChangeLog 2019-08-07 13:29:34.000000000 +0000
@@ -1,3 +1,10 @@
+1.2.5
+-----
+* FIXED: Window icon didn't work in Wayland.
+* Improved loading locales.
+* Improved Windows deployment.
+* Replaced deprecated code.
+
1.2.4
-----
* FIXED: Automatic high DPI support.
diff -Nru cutemaze-1.2.4/cutemaze.pro cutemaze-1.2.5/cutemaze.pro
--- cutemaze-1.2.4/cutemaze.pro 2018-07-20 15:34:52.000000000 +0000
+++ cutemaze-1.2.5/cutemaze.pro 2019-08-07 13:29:34.000000000 +0000
@@ -1,8 +1,8 @@
lessThan(QT_MAJOR_VERSION, 5) {
- error("CuteMaze requires Qt 5.2 or greater")
+ error("CuteMaze requires Qt 5.9 or greater")
}
-equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 2) {
- error("CuteMaze requires Qt 5.2 or greater")
+equals(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 9) {
+ error("CuteMaze requires Qt 5.9 or greater")
}
TEMPLATE = app
@@ -12,7 +12,7 @@
CONFIG(debug, debug|release) {
CONFIG += warn_on
DEFINES += QT_DEPRECATED_WARNINGS
- DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x051100
+ DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x051300
DEFINES += QT_NO_NARROWING_CONVERSIONS_IN_CONNECT
}
@@ -24,7 +24,7 @@
}
# Set program version
-VERSION = 1.2.4
+VERSION = 1.2.5
DEFINES += VERSIONSTR=\\\"$${VERSION}\\\"
# Set program name
@@ -74,7 +74,9 @@
macx {
ICON = icons/cutemaze.icns
} else:win32 {
- RC_FILE = icons/icon.rc
+ RC_ICONS = icons/cutemaze.ico
+ QMAKE_TARGET_DESCRIPTION = "Simple maze game"
+ QMAKE_TARGET_COPYRIGHT = "Copyright (C) 2019 Graeme Gott"
} else:unix {
RESOURCES += icons/icon.qrc
diff -Nru cutemaze-1.2.4/debian/changelog cutemaze-1.2.5/debian/changelog
--- cutemaze-1.2.4/debian/changelog 2018-07-22 10:43:34.000000000 +0000
+++ cutemaze-1.2.5/debian/changelog 2019-08-07 13:29:35.000000000 +0000
@@ -1,68 +1,65 @@
-cutemaze (1.2.4-1) unstable; urgency=medium
+cutemaze (1.2.5-0ppa1~eoan) eoan; urgency=low
- * New upstream version.
- * Bump standards to 4.1.5.
- * Removed installchangelogs from d/rules (the
- upstream added a changelog to sources).
+ * Update to 1.2.5
- -- Innocent De Marchi Sun, 22 Jul 2018 12:16:05 +0100
+ -- Graeme Gott Wed, 07 Aug 2019 13:29:35 +0000
-cutemaze (1.2.3-1) unstable; urgency=medium
+cutemaze (1.2.4-0ppa1~eoan) eoan; urgency=low
- * New upstream version 1.2.3.
- * Updated dates and write secure URI in d/copyright.
- * Removed add-desktop-keyword.patch (has been added by the
- author in the sources).
+ * Update to 1.2.4
- -- Innocent De Marchi Sun, 10 Jun 2018 18:08:12 +0100
+ -- Graeme Gott Fri, 20 Jul 2018 16:11:53 +0000
-cutemaze (1.2.2-1) unstable; urgency=medium
+cutemaze (1.2.3-0ppa1~eoan) eoan; urgency=low
- * New upstream version 1.2.2 (Closes: #896444).
- * Bump standards to 4.1.4.
- * Updated dates and write secure URI in d/copyright.
- * Bumped to debhelper and compat level 11.
- * Bumped to Standards-Version 4.1.4.
- * Removed unnecessary dh argument --parallel on d/rules.
- * Added override_dh_installchangelogs to install upstream NEWS file.
- * Drop deprecated debian/menu file.
- * Install upstream manpage (removed debian manpage).
- * Migrated to the salsa repository.
- * Added debian/upstream/metadata file.
+ * Update to 1.2.3
- -- Innocent De Marchi Sat, 21 Apr 2018 18:11:23 +0100
+ -- Graeme Gott Tue, 29 May 2018 10:22:59 +0000
-cutemaze (1.2.0-1) unstable; urgency=medium
+cutemaze (1.2.2-0ppa1~eoan) eoan; urgency=low
- * New upstream version 1.2.0
- * Bump standards to 3.9.8
- - no changes needed
- * Updated Vcs fields to secure schema
- * Updated emails and dates in d/copyright
- * Added hardening to d/rules
- * qttools5-dev-tools added to build deps
+ * Update to 1.2.2
- -- Dariusz Dwornikowski Sat, 21 Jan 2017 14:01:55 +0100
+ -- Graeme Gott Tue, 26 Dec 2017 16:54:01 +0000
-cutemaze (1.1.1-3) unstable; urgency=medium
+cutemaze (1.2.1-0ppa1~eoan) eoan; urgency=low
- * Removed hardcoded library build dependencies (Closes: #767176)
+ * Update to 1.2.1
- -- Dariusz Dwornikowski Sat, 08 Nov 2014 06:52:09 +0100
+ -- Graeme Gott Sun, 30 Jul 2017 17:26:13 +0000
-cutemaze (1.1.1-2) unstable; urgency=medium
+cutemaze (1.2.0-0ppa1~eoan) eoan; urgency=low
- * Copyright added for icons/oxygen/*
- * Added gbp.conf to d/
- * Removed qt5-default from Build-Deps
- - added libqt5gui5, libqt5core5a, libqt5svg5, libqt5widgets
- * Bump standards to 3.9.6
- - no changes needed
+ * Update to 1.2.0
- -- Dariusz Dwornikowski Sat, 08 Nov 2014 06:51:40 +0100
+ -- Graeme Gott Wed, 12 Oct 2016 20:32:42 +0000
-cutemaze (1.1.1-1) unstable; urgency=low
+cutemaze (1.1.1-0ppa3~eoan) eoan; urgency=low
- * Initial release (Closes: #748088)
+ * Add SVG build dependency
- -- Dariusz Dwornikowski Tue, 13 May 2014 19:04:53 +0800
+ -- Graeme Gott Sun, 11 May 2014 18:21:09 +0000
+
+cutemaze (1.1.1-0ppa2~eoan) eoan; urgency=low
+
+ * Switch to Qt 5
+ * Update copyright file
+
+ -- Graeme Gott Sun, 11 May 2014 16:29:24 +0000
+
+cutemaze (1.1.1-0ppa1~eoan) eoan; urgency=low
+
+ * Update to 1.1.1
+ - Added dialog to switch translation.
+ - Added support for Qt 5.
+ - Removed Qtopia support.
+ - Translation updates: French, German, Hebrew, Polish, Portugese (Brazil),
+ Romanian, Russian, Spanish, Turkish.
+
+ -- Graeme Gott Mon, 03 Feb 2014 23:49:57 +0000
+
+cutemaze (1.1.0-0ppa1~eoan) eoan; urgency=low
+
+ * Initial release
+
+ -- Graeme Gott Tue, 25 Jun 2013 16:27:16 +0000
diff -Nru cutemaze-1.2.4/debian/clean cutemaze-1.2.5/debian/clean
--- cutemaze-1.2.4/debian/clean 2018-07-22 10:43:34.000000000 +0000
+++ cutemaze-1.2.5/debian/clean 1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-*.o
-*.cpp
diff -Nru cutemaze-1.2.4/debian/compat cutemaze-1.2.5/debian/compat
--- cutemaze-1.2.4/debian/compat 2018-07-22 10:43:34.000000000 +0000
+++ cutemaze-1.2.5/debian/compat 2018-06-28 19:51:00.000000000 +0000
@@ -1 +1 @@
-11
+10
diff -Nru cutemaze-1.2.4/debian/control cutemaze-1.2.5/debian/control
--- cutemaze-1.2.4/debian/control 2018-07-22 10:43:34.000000000 +0000
+++ cutemaze-1.2.5/debian/control 2018-06-28 19:50:52.000000000 +0000
@@ -1,26 +1,16 @@
Source: cutemaze
Section: games
Priority: optional
-Maintainer: Debian Games Team
-Uploaders: Innocent De Marchi
-Build-Depends:
- debhelper (>= 11),
- qttools5-dev-tools,
- libqt5svg5-dev,
- pkg-config,
- qtbase5-dev,
-Standards-Version: 4.1.5
+Maintainer: Graeme Gott
+Build-Depends: debhelper (>= 9), qtbase5-dev, qttools5-dev-tools, libqt5svg5-dev
+Standards-Version: 4.1.4
Homepage: https://gottcode.org/cutemaze/
-Vcs-Git: https://salsa.debian.org/games-team/cutemaze.git
-Vcs-Browser: https://salsa.debian.org/games-team/cutemaze
Package: cutemaze
Architecture: any
-Depends:
- ${misc:Depends},
- ${shlibs:Depends}
-Description: single player maze game
- CuteMaze is a simple, top-down game in which mazes are randomly generated
- using one of a choice of several different algorithms. You move the character
- through the maze while hunting for targets (cheese, by default) -
- the game is won once all of these targets have been picked up.
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: A simple, top-down maze game
+ A game where mazes are randomly generated using one of a choice
+ of several different algorithms. You move the character through
+ the maze while hunting for targets (cheese, by default)--the
+ game is won once all of these targets have been picked up.
diff -Nru cutemaze-1.2.4/debian/copyright cutemaze-1.2.5/debian/copyright
--- cutemaze-1.2.4/debian/copyright 2018-07-22 10:43:34.000000000 +0000
+++ cutemaze-1.2.5/debian/copyright 2018-06-28 19:50:38.000000000 +0000
@@ -1,39 +1,14 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: CuteMaze
Upstream-Contact: Graeme Gott
-Source: https://gottode.org/connectagram/
+Source: https://gottcode.org/cutemaze/
Files: *
-Copyright: 2000-2018 Graeme Gott
+Copyright: 2008-2018 Graeme Gott
License: GPL-3+
-Files: icons/oxygen/*
-Copyright: 2007 Nuno Pinheiro ,
- 2007 David Vignoni ,
- 2007 David Miller ,
- 2007 Johann Ollivier Lapeyre ,
- 2007 Kenneth Wimer ,
- 2007 Riccardo Iaconelli ,
- and others
-License: LGPL-3+
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 3 of the License, or (at your option) any later version.
- .
- This library 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
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library. If not, see .
- .
- On Debian systems, the complete text of the GNU Lesser General Public
- License version 3 can be found in /usr/share/common-licenses/LGPL-3
-
Files: debian/*
-Copyright: 2014-2017 Dariusz Dwornikowski
- 2018 Innocent De Marchi
+Copyright: 2013-2018 Graeme Gott
License: GPL-3+
License: GPL-3+
@@ -47,5 +22,8 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
- On Debian systems, the complete text of the GNU General
- Public License version 3 can be found in `/usr/share/common-licenses/GPL-3'.
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see .
+ .
+ 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 cutemaze-1.2.4/debian/cutemaze.docs cutemaze-1.2.5/debian/cutemaze.docs
--- cutemaze-1.2.4/debian/cutemaze.docs 1970-01-01 00:00:00.000000000 +0000
+++ cutemaze-1.2.5/debian/cutemaze.docs 2017-07-30 17:37:01.000000000 +0000
@@ -0,0 +1,2 @@
+README
+CREDITS
diff -Nru cutemaze-1.2.4/debian/cutemaze.xpm cutemaze-1.2.5/debian/cutemaze.xpm
--- cutemaze-1.2.4/debian/cutemaze.xpm 2018-07-22 10:43:34.000000000 +0000
+++ cutemaze-1.2.5/debian/cutemaze.xpm 1970-01-01 00:00:00.000000000 +0000
@@ -1,141 +0,0 @@
-/* XPM */
-static char *c[] = {
-/* columns rows colors chars-per-pixel */
-"32 32 103 2 ",
-" c black",
-". c #0AC2072C0126",
-"X c #12120C620157",
-"o c #14140DB801AC",
-"O c #10660C6204AF",
-"+ c #10BB0DB80EB9",
-"@ c #18E01010023B",
-"# c #1E4313CB0328",
-"$ c #161614140EB9",
-"% c #189911D20848",
-"& c #1ADB131308C9",
-"* c #1696129212D3",
-"= c #1C1C176D17C2",
-"- c #1D73186E186E",
-"; c #32EE213004C4",
-": c #33A121B40472",
-"> c #3F3128D305DB",
-", c #3F9534511BFF",
-"< c #2C2C24242525",
-"1 c #32A02EE622B5",
-"2 c #37802D762E53",
-"3 c #378D2DD82F85",
-"4 c #38CB2E2E2EE6",
-"5 c #35CF32CC25BF",
-"6 c #3CAA38A62997",
-"7 c #39722F2F30DB",
-"8 c #3EE9333334DF",
-"9 c #3F0633DE358B",
-"0 c #42092AD50623",
-"q c #440B2B810606",
-"w c #44EF2CD7065C",
-"e c #460D2D83065C",
-"r c #48482ED9065C",
-"t c #4F6C33DE087A",
-"y c #535336360841",
-"u c #549436B607C8",
-"i c #5A5A39C80897",
-"p c #5D7A3C3C085E",
-"a c #5F093D200909",
-"s c #513438C710F4",
-"d c #54543B021167",
-"f c #452834FC2CF4",
-"g c #444438813AA8",
-"h c #45FD38CB3B84",
-"j c #469C3A573C3C",
-"k c #565640961A1A",
-"l c #575743261E90",
-"z c #66664197095F",
-"x c #68A1432609B4",
-"c c #6A87447D0B28",
-"v c #718E48F30A7C",
-"b c #751F4AF50AB5",
-"n c #78784F160E2B",
-"m c #7EF050FB0BEF",
-"M c #5C3F48BA2340",
-"N c #4E1549BB366F",
-"B c #5802430A33DE",
-"V c #511841083ECD",
-"C c #63F25A043C03",
-"Z c #6A6A5CEB3B02",
-"A c #737355C73900",
-"S c #4CA23F3F4197",
-"D c #561D469C492C",
-"F c #5CCE4BF64EF9",
-"G c #5D07571E4007",
-"H c #5F424E4E5033",
-"J c #65BB5F5F45F0",
-"K c #650F52E155E4",
-"L c #6BC1583B5B3E",
-"P c #779461D36565",
-"I c #78F9632366E7",
-"U c #7F7F68BE6C89",
-"Y c #83F554FF0C7E",
-"T c #83D955AB0E2B",
-"R c #852F559D0C62",
-"E c #8917583B0CD4",
-"W c #8B6E59030CD4",
-"Q c #8CFE5A930D0D",
-"! c #95235FB50DD5",
-"~ c #969660D20E2B",
-"^ c #984261B70E0E",
-"/ c #994362620DF1",
-"( c #9B0C63710E56",
-") c #9B7E63B90E64",
-"_ c #9EBB66100ED6",
-"` c #9F75664A0EC8",
-"' c #A0D9674A0ED6",
-"] c #A1BE67D90EF2",
-"[ c #A1BE67F60F0F",
-"{ c #A2A268680F0F",
-"} c #83117AD05A21",
-"| c #876B7F635D6B",
-" . c #844B6CC2701A",
-".. c #8AFC721C7620",
-"X. c #95958CE266F5",
-"o. c #9999907369A2",
-"O. c #A5FB9BD471E3",
-"+. c #AF76A48778CE",
-"@. c #A2DB85A28A6D",
-"#. c #BD84B25C8265",
-"$. c #C48BB8D5876A",
-"%. c #C7A1BB958963",
-"&. c None",
-/* pixels */
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.h &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.H < &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&. @ c y . &.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.> _ T # &.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.w v i ; &.&.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.O z b x > $ &.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.5 G X.X.s { / l +.X.6 &.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.N $.$.#.d { ! M %.%.| &.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.J C d ~ { { T Z O.} &.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.y / { { { { n , 1 &.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.m { { { { { ` 0 &.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.o Q { { { { { { w &.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.X / { { { { { { r &.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.I % / { { { { { { w 8 2 &.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.U V Q { { { { { ` A @.h &.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.2 a { { { { { E B 7 &.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.; R { { { ' u &.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.; R { ) p &.&.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.f % &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&...- &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&. .- &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.P &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.L &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.K &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.F &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.D &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.S &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.h &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.g &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.7 &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.* &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.",
-"&.&.&.&.&.&.&.&.&.&.&.&.&.&.&.+ &.&.&.&.&.&.&.&.&.&.&.&.&.&.&.&."
-};
diff -Nru cutemaze-1.2.4/debian/dirs cutemaze-1.2.5/debian/dirs
--- cutemaze-1.2.4/debian/dirs 2018-07-22 10:43:34.000000000 +0000
+++ cutemaze-1.2.5/debian/dirs 1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-usr/games
-usr/share/icons/hicolor/48x48/
-usr/share/applications/
diff -Nru cutemaze-1.2.4/debian/gbp.conf cutemaze-1.2.5/debian/gbp.conf
--- cutemaze-1.2.4/debian/gbp.conf 2018-07-22 10:43:34.000000000 +0000
+++ cutemaze-1.2.5/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000
@@ -1,7 +0,0 @@
-[DEFAULT]
-debian-branch=master
-pristine-tar = True
-
-[buildpackage]
-export-dir = ../build-area/
-
diff -Nru cutemaze-1.2.4/debian/install cutemaze-1.2.5/debian/install
--- cutemaze-1.2.4/debian/install 2018-07-22 10:43:34.000000000 +0000
+++ cutemaze-1.2.5/debian/install 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-debian/cutemaze.xpm /usr/share/pixmaps
diff -Nru cutemaze-1.2.4/debian/manpages cutemaze-1.2.5/debian/manpages
--- cutemaze-1.2.4/debian/manpages 2018-07-22 10:43:34.000000000 +0000
+++ cutemaze-1.2.5/debian/manpages 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-doc/cutemaze.6
diff -Nru cutemaze-1.2.4/debian/rules cutemaze-1.2.5/debian/rules
--- cutemaze-1.2.4/debian/rules 2018-07-22 10:43:34.000000000 +0000
+++ cutemaze-1.2.5/debian/rules 2018-06-28 19:51:06.000000000 +0000
@@ -1,16 +1,13 @@
#!/usr/bin/make -f
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
+export QT_SELECT = 5
-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
-DFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+DPKG_EXPORT_BUILDFLAGS = 1
+include /usr/share/dpkg/buildflags.mk
%:
- dh $@
+ dh $@ --parallel
override_dh_auto_configure:
- /usr/bin/qmake -qt5 -makefile -nocache \
- QMAKE_LFLAGS_RELEASE="$(LDFLAGS)" QMAKE_CFLAGS_RELEASE="$(CFLAGS)" \
- QMAKE_CXXFLAGS_RELEASE="$(CXXFLAGS)" QMAKE_CPPFLAGS_RELEASE="$(CPPFLAGS)" PREFIX=/usr BINDIR=games
+ dh_auto_configure -- BINDIR=games
diff -Nru cutemaze-1.2.4/debian/source/format cutemaze-1.2.5/debian/source/format
--- cutemaze-1.2.4/debian/source/format 2018-07-22 10:43:34.000000000 +0000
+++ cutemaze-1.2.5/debian/source/format 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-3.0 (quilt)
diff -Nru cutemaze-1.2.4/debian/upstream/metadata cutemaze-1.2.5/debian/upstream/metadata
--- cutemaze-1.2.4/debian/upstream/metadata 2018-07-22 10:43:34.000000000 +0000
+++ cutemaze-1.2.5/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-Contact: Graeme Gott
-Name: cutemaze
-Homepage: https://gottcode.org/cutemaze
-Reference:
- Author: Graeme Gott
- Title: Documentation
- Year: 2017
- Type: manual
- URL: https://gottcode.org/cutemaze/
-Watch: https://github.com/gottcode/cutemaze/releases .*/archive/v(\d[\d\.]+)\.tar\.gz
diff -Nru cutemaze-1.2.4/debian/watch cutemaze-1.2.5/debian/watch
--- cutemaze-1.2.4/debian/watch 2018-07-22 10:43:34.000000000 +0000
+++ cutemaze-1.2.5/debian/watch 1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-version=3
-https://github.com/gottcode/cutemaze/releases .*/archive/v(\d[\d\.]+)\.tar\.gz
-
diff -Nru cutemaze-1.2.4/.gitignore cutemaze-1.2.5/.gitignore
--- cutemaze-1.2.4/.gitignore 2018-07-20 15:34:52.000000000 +0000
+++ cutemaze-1.2.5/.gitignore 1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-Makefile
-build
-cutemaze
-*.qm
-*~
diff -Nru cutemaze-1.2.4/icons/cutemaze.appdata.xml cutemaze-1.2.5/icons/cutemaze.appdata.xml
--- cutemaze-1.2.4/icons/cutemaze.appdata.xml 2018-07-20 15:34:52.000000000 +0000
+++ cutemaze-1.2.5/icons/cutemaze.appdata.xml 2019-08-07 13:29:34.000000000 +0000
@@ -98,6 +98,16 @@
+
+
+
+ - FIXED: Window icon didn't work in Wayland
+ - Improved loading locales
+ - Improved Windows deployment
+ - Replaced deprecated code
+
+
+
diff -Nru cutemaze-1.2.4/icons/icon.rc cutemaze-1.2.5/icons/icon.rc
--- cutemaze-1.2.4/icons/icon.rc 2018-07-20 15:34:52.000000000 +0000
+++ cutemaze-1.2.5/icons/icon.rc 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-IDI_ICON1 ICON DISCARDABLE "cutemaze.ico"
diff -Nru cutemaze-1.2.4/mac_deploy.sh cutemaze-1.2.5/mac_deploy.sh
--- cutemaze-1.2.4/mac_deploy.sh 2018-07-20 15:34:52.000000000 +0000
+++ cutemaze-1.2.5/mac_deploy.sh 2019-08-07 13:29:34.000000000 +0000
@@ -2,7 +2,7 @@
APP='CuteMaze'
BUNDLE="$APP.app"
-VERSION='1.2.4'
+VERSION='1.2.5'
# Remove any previous disk folder or DMG
echo -n 'Preparing... '
diff -Nru cutemaze-1.2.4/src/locale_dialog.cpp cutemaze-1.2.5/src/locale_dialog.cpp
--- cutemaze-1.2.4/src/locale_dialog.cpp 2018-07-20 15:34:52.000000000 +0000
+++ cutemaze-1.2.5/src/locale_dialog.cpp 2019-08-07 13:29:34.000000000 +0000
@@ -1,6 +1,6 @@
/***********************************************************************
*
- * Copyright (C) 2010, 2011, 2012, 2014, 2015, 2016, 2018 Graeme Gott
+ * Copyright (C) 2010, 2011, 2012, 2014, 2015, 2016, 2018, 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
@@ -98,50 +98,38 @@
// Find current locale
m_current = QSettings().value("Locale/Language").toString();
- QString current = !m_current.isEmpty() ? m_current : QLocale::system().name();
- QStringList translations = findTranslations();
- if (!translations.contains(m_appname + current)) {
- current = current.left(2);
- if (!translations.contains(m_appname + current)) {
- current.clear();
- }
- }
- if (!current.isEmpty()) {
- QLocale::setDefault(current);
- } else {
- current = "en";
+ if (!m_current.isEmpty()) {
+ QLocale::setDefault(m_current);
}
+ const QLocale locale;
// Load translators
- static QTranslator qt_translator;
- qt_translator.load("qt_" + current, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
- QCoreApplication::installTranslator(&qt_translator);
-
- static QTranslator qtbase_translator;
- if (translations.contains("qtbase_" + current) || translations.contains("qtbase_" + current.left(2))) {
- qtbase_translator.load("qtbase_" + current, m_path);
- } else {
- qtbase_translator.load("qtbase_" + current, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
- }
- QCoreApplication::installTranslator(&qtbase_translator);
-
static QTranslator translator;
- translator.load(m_appname + current, m_path);
- QCoreApplication::installTranslator(&translator);
+ if (translator.load(locale, m_appname, "", m_path)) {
+ QCoreApplication::installTranslator(&translator);
- // Work around bug in Qt 5 where text direction is not loaded
- QGuiApplication::setLayoutDirection(QLocale(current).textDirection());
+ 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)) {
+ QCoreApplication::installTranslator(&qtbase_translator);
+ }
+
+ static QTranslator qt_translator;
+ if (qt_translator.load(locale, "qt", "_", m_path) || qt_translator.load(locale, "qt", "_", path)) {
+ QCoreApplication::installTranslator(&qt_translator);
+ }
+ }
}
//-----------------------------------------------------------------------------
QString LocaleDialog::languageName(const QString& language)
{
- QString lang_code = language.left(5);
- QLocale locale(lang_code);
QString name;
- if (lang_code.length() > 2) {
- if (locale.name() == lang_code) {
+ const QLocale locale(language);
+ if (language.contains('_')) {
+ if (locale.name() == language) {
name = locale.nativeLanguageName() + " (" + locale.nativeCountryName() + ")";
} else {
name = locale.nativeLanguageName() + " (" + language + ")";
diff -Nru cutemaze-1.2.4/src/main.cpp cutemaze-1.2.5/src/main.cpp
--- cutemaze-1.2.4/src/main.cpp 2018-07-20 15:34:52.000000000 +0000
+++ cutemaze-1.2.5/src/main.cpp 2019-08-07 13:29:34.000000000 +0000
@@ -1,6 +1,6 @@
/***********************************************************************
*
- * Copyright (C) 2007, 2008, 2012, 2014, 2015, 2018 Graeme Gott
+ * Copyright (C) 2007, 2008, 2012, 2014, 2015, 2018, 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
@@ -24,7 +24,7 @@
int main(int argc, char** argv)
{
-#if !defined(Q_OS_MAC) && (QT_VERSION >= QT_VERSION_CHECK(5,6,0))
+#if !defined(Q_OS_MAC)
if (!qEnvironmentVariableIsSet("QT_DEVICE_PIXEL_RATIO")
&& !qEnvironmentVariableIsSet("QT_AUTO_SCREEN_SCALE_FACTOR")
&& !qEnvironmentVariableIsSet("QT_SCALE_FACTOR")
@@ -40,6 +40,7 @@
app.setOrganizationName("GottCode");
#if !defined(Q_OS_WIN) && !defined(Q_OS_MAC)
app.setWindowIcon(QIcon::fromTheme("cutemaze", QIcon(":/cutemaze.png")));
+ app.setDesktopFileName("cutemaze");
#endif
app.setAttribute(Qt::AA_UseHighDpiPixmaps, true);
diff -Nru cutemaze-1.2.4/src/settings.cpp cutemaze-1.2.5/src/settings.cpp
--- cutemaze-1.2.4/src/settings.cpp 2018-07-20 15:34:52.000000000 +0000
+++ cutemaze-1.2.5/src/settings.cpp 2019-08-07 13:29:34.000000000 +0000
@@ -186,7 +186,7 @@
connect(buttons, &QDialogButtonBox::rejected, this, &Settings::reject);
QVBoxLayout* layout = new QVBoxLayout(this);
- layout->setMargin(10);
+ layout->setContentsMargins(10, 10, 10, 10);
layout->setSpacing(18);
layout->addWidget(tabs);
layout->addWidget(buttons);
@@ -235,10 +235,10 @@
m_themes_preview = new QLabel(themes_tab);
m_themes_selector = new QComboBox(themes_tab);
- connect(m_themes_selector, static_cast(&QComboBox::currentIndexChanged), this, &Settings::themeSelected);
+ connect(m_themes_selector, &QComboBox::currentTextChanged, this, &Settings::themeSelected);
QHBoxLayout* themes_selector_layout = new QHBoxLayout;
- themes_selector_layout->setMargin(0);
+ themes_selector_layout->setContentsMargins(0, 0, 0, 0);
themes_selector_layout->addWidget(m_themes_selector, 1);
QPushButton* add_button = new QPushButton(tr("Add"), themes_tab);
diff -Nru cutemaze-1.2.4/src/window.cpp cutemaze-1.2.5/src/window.cpp
--- cutemaze-1.2.4/src/window.cpp 2018-07-20 15:34:52.000000000 +0000
+++ cutemaze-1.2.5/src/window.cpp 2019-08-07 13:29:34.000000000 +0000
@@ -1,6 +1,6 @@
/***********************************************************************
*
- * Copyright (C) 2007, 2008, 2009, 2012, 2014, 2015, 2016, 2017, 2018 Graeme Gott
+ * Copyright (C) 2007, 2008, 2009, 2012, 2014, 2015, 2016, 2017, 2018, 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
@@ -176,7 +176,7 @@
QMessageBox::about(this, tr("About"), QString("%1 %2
%3
%4
%5
%6
%7")
.arg(tr("CuteMaze"), QCoreApplication::applicationVersion(),
tr("A top-down maze game"),
- tr("Copyright © 2007-%1 Graeme Gott").arg("2018"),
+ tr("Copyright © 2007-%1 Graeme Gott").arg("2019"),
tr("Released under the GPL 3 license").arg("\"http://www.gnu.org/licenses/gpl.html\""),
tr("Icons are from the Oxygen theme").arg("\"http://www.oxygen-icons.org/\""),
tr("Used under the LGPL 3 license").arg("\"http://www.gnu.org/licenses/lgpl.html\""))
diff -Nru cutemaze-1.2.4/windows/installer.nsi cutemaze-1.2.5/windows/installer.nsi
--- cutemaze-1.2.4/windows/installer.nsi 2018-07-20 15:34:52.000000000 +0000
+++ cutemaze-1.2.5/windows/installer.nsi 2019-08-07 13:29:34.000000000 +0000
@@ -4,7 +4,7 @@
!define APPNAME "CuteMaze"
!define VERSIONMAJOR 1
!define VERSIONMINOR 2
-!define VERSIONPATCH 4
+!define VERSIONPATCH 5
!define APPVERSION "${VERSIONMAJOR}.${VERSIONMINOR}.${VERSIONPATCH}"
!define ABOUTURL "https://gottcode.org/cutemaze/"
@@ -26,7 +26,7 @@
OutFile "${APPNAME}_${APPVERSION}.exe"
;Default installation folder
-InstallDir "$PROGRAMFILES\${APPNAME}"
+InstallDir "$PROGRAMFILES64\${APPNAME}"
InstallDirRegKey HKLM "Software\${APPNAME}" ""
;Request application privileges for Windows Vista
diff -Nru cutemaze-1.2.4/windows_deploy.bat cutemaze-1.2.5/windows_deploy.bat
--- cutemaze-1.2.4/windows_deploy.bat 2018-07-20 15:34:52.000000000 +0000
+++ cutemaze-1.2.5/windows_deploy.bat 2019-08-07 13:29:34.000000000 +0000
@@ -3,7 +3,7 @@
@ECHO OFF
SET APP=CuteMaze
-SET VERSION=1.2.4
+SET VERSION=1.2.5
ECHO Copying executable
MKDIR %APP%