This is an automated email from the git hooks/post-receive script. apo pushed a commit to branch master in repository berusky2.
commit f79e5165bd36095017d851fcd0686959d8bd3754 Author: Markus Koschany <a...@debian.org> Date: Sat Aug 5 12:27:58 2017 -0400 Revision 0.10-6 Fix FTBFS with GCC 7 --- debian/changelog | 10 ++++++++ debian/clean | 1 - debian/compat | 2 +- debian/control | 6 ++--- debian/copyright | 4 ++-- debian/install | 1 - debian/menu | 6 ----- debian/patches/gcc7.patch | 61 +++++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 6 +---- 10 files changed, 78 insertions(+), 20 deletions(-) diff --git a/debian/changelog b/debian/changelog index b218432..2fa688e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +berusky2 (0.10-6) unstable; urgency=medium + + * Fix FTBFS with GCC 7. Add gcc7.patch. (Closes: #853325) + * Switch to compat level 10. + * Declare compliance with Debian Policy 4.0.0. + * Drop deprecated menu file and xpm icon. + * Use https for Format field. + + -- Markus Koschany <a...@debian.org> Sat, 05 Aug 2017 15:31:57 +0000 + berusky2 (0.10-5) unstable; urgency=medium * Declare compliance with Debian Policy 3.9.8. diff --git a/debian/clean b/debian/clean deleted file mode 100644 index fd5c11d..0000000 --- a/debian/clean +++ /dev/null @@ -1 +0,0 @@ -berusky2.xpm diff --git a/debian/compat b/debian/compat index ec63514..f599e28 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -9 +10 diff --git a/debian/control b/debian/control index 66f28f0..b3e695a 100644 --- a/debian/control +++ b/debian/control @@ -5,10 +5,8 @@ Maintainer: Debian Games Team <pkg-games-de...@lists.alioth.debian.org> Uploaders: Markus Koschany <a...@debian.org> Build-Depends: - dh-autoreconf, - debhelper (>= 9), + debhelper (>= 10), freeglut3-dev, - imagemagick, libalut-dev, libgl1-mesa-dev, libgtk2.0-dev, @@ -19,7 +17,7 @@ Build-Depends: libx11-dev, pkg-config, zlib1g-dev -Standards-Version: 3.9.8 +Standards-Version: 4.0.0 Homepage: http://anakreon.cz/?q=node/2 Vcs-Git: https://anonscm.debian.org/git/pkg-games/berusky2.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-games/berusky2.git diff --git a/debian/copyright b/debian/copyright index 80325b8..9531d85 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -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: Berusky2 Source: http://sourceforge.net/projects/berusky2/files/ @@ -13,7 +13,7 @@ License: GPL-2+ Files: debian/* Copyright: 2012, Bart Martens <ba...@debian.org> - 2013-2016, Markus Koschany <a...@debian.org> + 2013-2017, Markus Koschany <a...@debian.org> License: GPL-2+ License: GPL-2+ diff --git a/debian/install b/debian/install index 2cb451d..d09734f 100644 --- a/debian/install +++ b/debian/install @@ -1,3 +1,2 @@ -berusky2.xpm usr/share/pixmaps/ data/berusky2.desktop usr/share/applications/ debian/berusky2.png usr/share/icons/hicolor/128x128/apps diff --git a/debian/menu b/debian/menu deleted file mode 100644 index a37c639..0000000 --- a/debian/menu +++ /dev/null @@ -1,6 +0,0 @@ -?package(berusky2):needs="X11"\ - section="Games/Puzzles"\ - longtitle="Berusky II logic game based on Sokoban in 3D"\ - title="Berusky II"\ - icon="/usr/share/pixmaps/berusky2.xpm"\ - command="/usr/games/berusky2" diff --git a/debian/patches/gcc7.patch b/debian/patches/gcc7.patch new file mode 100644 index 0000000..b5eab7a --- /dev/null +++ b/debian/patches/gcc7.patch @@ -0,0 +1,61 @@ +From: Markus Koschany <a...@debian.org> +Date: Sat, 5 Aug 2017 15:24:09 +0000 +Subject: gcc7 + +Fix FTBFS with GCC 7. +Bug-Debian: https://bugs.debian.org/853325 +Origin: https://github.com/stransky/berusky2/commit/974e2e516bd28c4dea6cb2db62ebf73689aff317 +--- + src/kofola/Menu.cpp | 2 +- + src/kofola/Menu2.cpp | 2 +- + src/kofola/animend_functions.cpp | 4 ++-- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/kofola/Menu.cpp b/src/kofola/Menu.cpp +index d466e16..d213dc9 100644 +--- a/src/kofola/Menu.cpp ++++ b/src/kofola/Menu.cpp +@@ -283,7 +283,7 @@ void AnimationEvent(DWORD dwTime, AUDIO_DATA * p_ad) + char bAnim = 0; + DWORD e; + +- e = abs(dwLTime - dwTime); ++ e = abs((int)(dwLTime - dwTime)); + + for (i = 0; i < 32; i++) + if (anm[i].cmd) { +diff --git a/src/kofola/Menu2.cpp b/src/kofola/Menu2.cpp +index f9e50f4..2c7d85f 100644 +--- a/src/kofola/Menu2.cpp ++++ b/src/kofola/Menu2.cpp +@@ -232,7 +232,7 @@ void AnimationEvent2(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime) + //priprava + //BitBltU(CompositDC,0,0,1024,768,NULL,0,0,WHITENESS); + +- e = abs(dwLTime - dwTime); ++ e = abs((int)(dwLTime - dwTime)); + for (i = 0; i < 32; i++) + if (anm[i].cmd) { + if (anm[i].bStop) { +diff --git a/src/kofola/animend_functions.cpp b/src/kofola/animend_functions.cpp +index 35fc8b9..b51b65a 100644 +--- a/src/kofola/animend_functions.cpp ++++ b/src/kofola/animend_functions.cpp +@@ -359,7 +359,7 @@ void anmend_Lift(size_ptr param, size_ptr param2, size_ptr p_param) + s = ap_Play_Sound(0,0,0, pos, p_itm->p_Object->Specific[0].Index, NULL, &ad); + + if (s >= 0) { +- for(i=0;i<(abs(param)-1);i++) ++ for(i=0;i<(abs((int)param)-1);i++) + adas_Queue_Sound(s, p_itm->p_Object->Specific[1].Index); + + adas_Queue_Sound(s, p_itm->p_Object->Specific[2].Index); +@@ -371,7 +371,7 @@ void anmend_Lift(size_ptr param, size_ptr param2, size_ptr p_param) + if (s < 0) + return; + +- p_Level->LiftParticles[s].dwStop = abs(param) * 250; ++ p_Level->LiftParticles[s].dwStop = abs((int)param) * 250; + } + } + diff --git a/debian/patches/series b/debian/patches/series index a538f62..a80427b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ docs.patch data.patch fix-mmalloc-usage.patch gcc-6-FTBFS.patch +gcc7.patch diff --git a/debian/rules b/debian/rules index 9a278eb..4f02328 100755 --- a/debian/rules +++ b/debian/rules @@ -3,15 +3,11 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: - dh $@ --parallel --with autoreconf + dh $@ override_dh_auto_configure: dh_auto_configure -- \ --bindir=/usr/games -override_dh_auto_build: - convert -monitor -resize 32x32 $(CURDIR)/debian/berusky2.png $(CURDIR)/berusky2.xpm - dh_auto_build - override_dh_installchangelogs: dh_installchangelogs NEWS -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/berusky2.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits