diff -Nru 2048-qt-0.1.6/debian/changelog 2048-qt-0.1.6/debian/changelog --- 2048-qt-0.1.6/debian/changelog 2018-04-03 12:11:34.000000000 +0000 +++ 2048-qt-0.1.6/debian/changelog 2019-04-09 17:51:06.000000000 +0000 @@ -1,26 +1,33 @@ -2048-qt (0.1.6-1build1) bionic; urgency=high +2048-qt (0.1.6-2) unstable; urgency=medium - * No change rebuild to pick up -fPIE compiler default + * d/control: + - Updated Vcs-Git and Vcs-Browser (moved to salsa) + * Added German translation to desktop file. (Closes: #781691) + * Pushed Standards-Version to latest (4.3.0). + * Updated debhelper version to 12~. + * Adding hardening option in d/rule. + * Added Window patch. (Closes: #850629) + + -- Alejandro Garrido Mota Tue, 09 Apr 2019 18:51:06 +0100 + +2048-qt (0.1.6-1) unstable; urgency=medium + + * New upstream release to unstable. (Closes: #781689) + * d/copyright: Update copyright dates and fonts path. + * Remove d/patches/FixConfigDir.diff, fixed in the new upstrea release. + * Manpage fixed in the last release. (Closes: #781690) + * d/2048-qt.manpages: Update manpage path. + * Remove d/2048-qt.desktop, now using upstream desktop file. + * Include patch to 2048-qt.desktop file to include keyword - -- Balint Reczey Tue, 03 Apr 2018 12:11:34 +0000 - -2048-qt (0.1.6-1) unstable; urgency=low - - * New upstream release to unstable. (Closes: #781689, #781690) - * Removed patches/FixConfigDir.diff, fixed in upstream release. - * 2048-qt.manpages: Update the manpage location - * Remove 2048-qt.desktop, now it's included within upstream tarball - * Update Copyright dates inside d/copyright - * Create patches/FixDesktop.diff to fix desktop. - - -- Alejandro Garrido Mota Thu, 26 Nov 2015 13:40:03 +0000 + -- Alejandro Garrido Mota Mon, 30 Nov 2015 00:49:10 +0000 2048-qt (0.1.5-3) experimental; urgency=medium - * d/control: + * d/control: - replace qt5-default metapackage to qtbase5-dev in BDI. - Push Standards-Version field. - * Set user dir configuration to from ~/.config/xiaoyong/ to + * Set user dir configuration to from ~/.config/xiaoyong/ to /.config/2048-qt/ (Closes: #767151). * d/rules: export QT_SELECT=qt5 variable to set QT version. diff -Nru 2048-qt-0.1.6/debian/compat 2048-qt-0.1.6/debian/compat --- 2048-qt-0.1.6/debian/compat 2015-11-26 15:08:52.000000000 +0000 +++ 2048-qt-0.1.6/debian/compat 2019-04-09 17:51:06.000000000 +0000 @@ -1 +1 @@ -9 +12 diff -Nru 2048-qt-0.1.6/debian/control 2048-qt-0.1.6/debian/control --- 2048-qt-0.1.6/debian/control 2018-04-03 12:11:34.000000000 +0000 +++ 2048-qt-0.1.6/debian/control 2019-04-09 17:51:06.000000000 +0000 @@ -1,23 +1,22 @@ Source: 2048-qt Section: games Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Alejandro Garrido Mota -Build-Depends: debhelper (>= 9), +Maintainer: Alejandro Garrido Mota +Build-Depends: debhelper (>= 12~), qtbase5-dev, qtdeclarative5-dev -Standards-Version: 3.9.6 +Standards-Version: 4.3.0 Homepage: https://github.com/xiaoyong/2048-Qt -Vcs-Git: git://github.com/mogaal/2048-qt.git -Vcs-Browser: https://github.com/mogaal/2048-qt +Vcs-Git: https://salsa.debian.org/alejandro/2048-qt.git +Vcs-Browser: https://salsa.debian.org/alejandro/2048-qt Package: 2048-qt Architecture: any -Depends: ${shlibs:Depends}, +Depends: ${shlibs:Depends}, ${misc:Depends}, qml-module-qtquick-controls, qml-module-qtquick-dialogs -Description: mathematics based puzzle game +Description: mathematics based puzzle game 2048 puzzle is mathematics based puzzle game where you have to slide tiles on a grid to combine them and create a tile with the number 2048. You have to merge the similar number tiles (2n) by moving the arrow keys diff -Nru 2048-qt-0.1.6/debian/copyright 2048-qt-0.1.6/debian/copyright --- 2048-qt-0.1.6/debian/copyright 2015-11-26 15:08:52.000000000 +0000 +++ 2048-qt-0.1.6/debian/copyright 2019-04-09 17:51:06.000000000 +0000 @@ -1,9 +1,9 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: 2048-qt Source: https://github.com/xiaoyong/2048-Qt Files: * -Copyright: 2014 Qiaoyong Zhong +Copyright: 2014-2015 Qiaoyong Zhong License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff -Nru 2048-qt-0.1.6/debian/patches/FixDesktop.diff 2048-qt-0.1.6/debian/patches/FixDesktop.diff --- 2048-qt-0.1.6/debian/patches/FixDesktop.diff 2015-11-26 15:08:52.000000000 +0000 +++ 2048-qt-0.1.6/debian/patches/FixDesktop.diff 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ -Description: Adjust desktop file to debian policy -Author: Alejandro Garrido Mota -Origin: vendor - -Add "Keywords" and remove the interpreter for Desktop file - -Index: 2048-qt/res/2048-qt.desktop -=================================================================== ---- 2048-qt.orig/res/2048-qt.desktop -+++ 2048-qt/res/2048-qt.desktop -@@ -1,4 +1,3 @@ --#!/usr/bin/env xdg-open - [Desktop Entry] - Name=2048-Qt - GenericName=2048-Qt -@@ -9,3 +8,4 @@ Icon=2048-qt - Terminal=false - Type=Application - Categories=Game;Math;Qt; -+Keywords=game;puzzle;2048;sliding-block-puzzle diff -Nru 2048-qt-0.1.6/debian/patches/FixDesktopFile.diff 2048-qt-0.1.6/debian/patches/FixDesktopFile.diff --- 2048-qt-0.1.6/debian/patches/FixDesktopFile.diff 1970-01-01 00:00:00.000000000 +0000 +++ 2048-qt-0.1.6/debian/patches/FixDesktopFile.diff 2019-04-09 17:51:06.000000000 +0000 @@ -0,0 +1,24 @@ +Description: Adapt desktop file to debian policy +Author: Alejandro Garrido Mota +Origin: vendor + +Fix desktop file adding Keyword tag and remove the execution interpreter + +Index: 2048-qt_debian/res/2048-qt.desktop +=================================================================== +--- 2048-qt_debian.orig/res/2048-qt.desktop ++++ 2048-qt_debian/res/2048-qt.desktop +@@ -1,11 +1,12 @@ +-#!/usr/bin/env xdg-open + [Desktop Entry] + Name=2048-Qt + GenericName=2048-Qt + Comment=The 2048 number game implemented in Qt + Comment[fr]=Jeu de réflexion et de mathématique ++Comment[de]=Das in QT implementierte 2048-Zahlenspiel + Exec=2048-qt + Icon=2048-qt + Terminal=false + Type=Application ++Keywords=game;puzzle;sliding-puzzle;2048 + Categories=Game;Math;Qt; diff -Nru 2048-qt-0.1.6/debian/patches/series 2048-qt-0.1.6/debian/patches/series --- 2048-qt-0.1.6/debian/patches/series 2015-11-26 15:08:52.000000000 +0000 +++ 2048-qt-0.1.6/debian/patches/series 2019-04-09 17:51:06.000000000 +0000 @@ -1,2 +1,3 @@ -FixDesktop.diff +window.patch +FixDesktopFile.diff FixPathBinary.diff diff -Nru 2048-qt-0.1.6/debian/patches/window.patch 2048-qt-0.1.6/debian/patches/window.patch --- 2048-qt-0.1.6/debian/patches/window.patch 1970-01-01 00:00:00.000000000 +0000 +++ 2048-qt-0.1.6/debian/patches/window.patch 2019-04-09 17:51:06.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Don't spawn the 2048-qt window at the center of the screen + 2048-qt tries to spawn its main window at the center of the current + screen, and does so by setting a few variables in QML. Unfortunately, + this has the side effect of forcing the window to remain on the primary + screen in a multiscreen setup, overriding whatever the user chooses. + This is annoying behaviour for a window that isn't a modal dialog. + . + As such, remove it. +Author: Wouter Verhelst +Bug-Debian: https://bugs.debian.org/850629 +Last-Update: 2017-04-14 + +--- + +--- 2048-qt-0.1.6.orig/qml/main.qml ++++ 2048-qt-0.1.6/qml/main.qml +@@ -13,9 +13,6 @@ ApplicationWindow { + title: qsTr("2048 Game"); + // flags: Qt.Window | Qt.WindowTitleHint | Qt.WindowMinimizeButtonHint | Qt.WindowCloseButtonHint | Qt.CustomizeWindowHint + +- x: (Screen.width - width) / 2 +- y: (Screen.height - height) / 2 +- + ExclusiveGroup { id: labelSettingsGroup } + ExclusiveGroup { id: languageSettingsGroup } diff -Nru 2048-qt-0.1.6/debian/rules 2048-qt-0.1.6/debian/rules --- 2048-qt-0.1.6/debian/rules 2015-11-26 15:08:52.000000000 +0000 +++ 2048-qt-0.1.6/debian/rules 2019-04-09 17:51:06.000000000 +0000 @@ -1,5 +1,6 @@ #!/usr/bin/make -f export QT_SELECT=qt5 +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh $@ + dh $@