diff -Nru dustrac-2.0.5/debian/changelog dustrac-2.0.5/debian/changelog --- dustrac-2.0.5/debian/changelog 2020-02-19 20:32:46.000000000 +0000 +++ dustrac-2.0.5/debian/changelog 2020-07-23 05:42:30.000000000 +0000 @@ -1,3 +1,18 @@ +dustrac (2.0.5-2) unstable; urgency=medium + + * Backport upstream commit d41a46ac32038055bfc9fe9a907e199ed74e371c to + where needed, fixing the build with GCC 10; patch + upstream_Include-stdexcept-for-std-runtime_error.patch. (Closes: #957154) + * Add Rules-Requires-Root: no. + * Bump the debhelper compatibility to 13: + - stop passing --fail-missing to dh_missing, as it is the default now + * Stop adding the as-needed linker flag, as it is the default in binutils. + * Backport upstream commit f133fdcdcc8c3db4c86304bb1feccdedfa400301 to fix + few issues in the AppStream file; patch + upstream_appdata-a-couple-of-fixes.patch. + + -- Pino Toscano Thu, 23 Jul 2020 07:42:30 +0200 + dustrac (2.0.5-1) unstable; urgency=medium * New upstream release. (Closes: #951427) diff -Nru dustrac-2.0.5/debian/control dustrac-2.0.5/debian/control --- dustrac-2.0.5/debian/control 2020-02-19 20:25:39.000000000 +0000 +++ dustrac-2.0.5/debian/control 2020-07-23 05:23:25.000000000 +0000 @@ -2,7 +2,7 @@ Section: games Priority: optional Maintainer: Pino Toscano -Build-Depends: debhelper-compat (= 12), +Build-Depends: debhelper-compat (= 13), cmake (>= 3.1), pkg-config, qtbase5-dev (>= 5.4.0~), @@ -13,6 +13,7 @@ xauth, xvfb, Standards-Version: 4.5.0 +Rules-Requires-Root: no Homepage: https://juzzlin.github.io/DustRacing2D/ Package: dustracing2d diff -Nru dustrac-2.0.5/debian/patches/series dustrac-2.0.5/debian/patches/series --- dustrac-2.0.5/debian/patches/series 2018-01-10 22:24:59.000000000 +0000 +++ dustrac-2.0.5/debian/patches/series 2020-07-23 05:34:22.000000000 +0000 @@ -1 +1,3 @@ +upstream_Include-stdexcept-for-std-runtime_error.patch +upstream_appdata-a-couple-of-fixes.patch no-install-docs.diff diff -Nru dustrac-2.0.5/debian/patches/upstream_appdata-a-couple-of-fixes.patch dustrac-2.0.5/debian/patches/upstream_appdata-a-couple-of-fixes.patch --- dustrac-2.0.5/debian/patches/upstream_appdata-a-couple-of-fixes.patch 1970-01-01 00:00:00.000000000 +0000 +++ dustrac-2.0.5/debian/patches/upstream_appdata-a-couple-of-fixes.patch 2020-07-23 05:33:39.000000000 +0000 @@ -0,0 +1,33 @@ +From f133fdcdcc8c3db4c86304bb1feccdedfa400301 Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Fri, 28 Feb 2020 07:42:09 +0100 +Subject: [PATCH] appdata: a couple of fixes + +- fix one of the project license to be "CC-BY-SA-3.0": "CC BY-SA-3.0" + is not a recognized license +- remove extra period at the end of summary texts +--- + src/dustrac.appdata.xml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/dustrac.appdata.xml b/src/dustrac.appdata.xml +index 03ac8e97..3842661c 100644 +--- a/src/dustrac.appdata.xml ++++ b/src/dustrac.appdata.xml +@@ -2,10 +2,10 @@ + + dustrac-game.desktop + CC0-1.0 +- GPL-3.0 and CC BY-SA-3.0 ++ GPL-3.0 and CC-BY-SA-3.0 + Dust Racing 2D +- Traditional top-down car racing game including a level editor. +- Traditionelles Autorennspiel aus der Vogelperspektive, mit Leveleditor. ++ Traditional top-down car racing game including a level editor ++ Traditionelles Autorennspiel aus der Vogelperspektive, mit Leveleditor + +

+ Dust Racing 2D (Dustrac) is a tile-based, cross-platform 2D racing game written in Qt (C++) and OpenGL. +-- +2.27.0 + diff -Nru dustrac-2.0.5/debian/patches/upstream_Include-stdexcept-for-std-runtime_error.patch dustrac-2.0.5/debian/patches/upstream_Include-stdexcept-for-std-runtime_error.patch --- dustrac-2.0.5/debian/patches/upstream_Include-stdexcept-for-std-runtime_error.patch 1970-01-01 00:00:00.000000000 +0000 +++ dustrac-2.0.5/debian/patches/upstream_Include-stdexcept-for-std-runtime_error.patch 2020-07-23 05:15:18.000000000 +0000 @@ -0,0 +1,51 @@ +From d41a46ac32038055bfc9fe9a907e199ed74e371c Mon Sep 17 00:00:00 2001 +From: Pino Toscano +Date: Fri, 17 Apr 2020 13:25:12 +0200 +Subject: [PATCH] Include for std::runtime_error + +It was implicitly pulled before, and in GCC 10 it will not be anymore. +--- + src/game/audio/openaloggdata.cpp | 1 + + src/game/audio/openalsource.cpp | 1 + + src/game/audio/openalwavdata.cpp | 1 + + 3 files changed, 3 insertions(+) + +diff --git a/src/game/audio/openaloggdata.cpp b/src/game/audio/openaloggdata.cpp +index 56634c20..4a2ab882 100644 +--- a/src/game/audio/openaloggdata.cpp ++++ b/src/game/audio/openaloggdata.cpp +@@ -19,6 +19,7 @@ + + #include + #include ++#include + + #include + +diff --git a/src/game/audio/openalsource.cpp b/src/game/audio/openalsource.cpp +index 9d2bb7f5..37a4272a 100644 +--- a/src/game/audio/openalsource.cpp ++++ b/src/game/audio/openalsource.cpp +@@ -19,6 +19,7 @@ + #include + + #include ++#include + + static bool checkError() + { +diff --git a/src/game/audio/openalwavdata.cpp b/src/game/audio/openalwavdata.cpp +index 3a9fc20a..015a11d3 100644 +--- a/src/game/audio/openalwavdata.cpp ++++ b/src/game/audio/openalwavdata.cpp +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + static bool checkError() + { +-- +2.27.0 + diff -Nru dustrac-2.0.5/debian/rules dustrac-2.0.5/debian/rules --- dustrac-2.0.5/debian/rules 2018-01-10 22:22:08.000000000 +0000 +++ dustrac-2.0.5/debian/rules 2020-07-23 05:32:15.000000000 +0000 @@ -1,7 +1,5 @@ #!/usr/bin/make -f -export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed - %: dh $@ --buildsystem cmake @@ -22,6 +20,3 @@ # replace the shipped DejaVu font with a link to the packaged version find debian/tmp -name DejaVuSans-Bold.ttf -exec ln -sf /usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf {} \; find debian/tmp -name LICENCE.txt -delete - -override_dh_missing: - dh_missing --fail-missing