Control: tags -1 confirmed patch Hello,
thanks for your reports! I'm attaching a debdiff with the latest changes of brutalchess that fixes the FTBFS and the broken -p option. Unfortunately the only way to fix the latter is to disable the "quake" option because those models were never shipped by upstream. The changes are also available in the team's svn repository. See also http://sourceforge.net/p/brutalchess/discussion/468400/thread/459b2db8/ Regards, Markus
diff -Nru brutalchess-0.5.2+dfsg/debian/brutalchess.desktop brutalchess-0.5.2+dfsg/debian/brutalchess.desktop --- brutalchess-0.5.2+dfsg/debian/brutalchess.desktop 2008-03-29 18:50:07.000000000 +0100 +++ brutalchess-0.5.2+dfsg/debian/brutalchess.desktop 2013-12-21 14:13:29.000000000 +0100 @@ -7,3 +7,4 @@ Terminal=false Type=Application Categories=Game;BoardGame; +Keywords=chess;3D;game;board; diff -Nru brutalchess-0.5.2+dfsg/debian/changelog brutalchess-0.5.2+dfsg/debian/changelog --- brutalchess-0.5.2+dfsg/debian/changelog 2012-04-15 11:29:53.000000000 +0200 +++ brutalchess-0.5.2+dfsg/debian/changelog 2013-12-21 14:13:29.000000000 +0100 @@ -1,3 +1,21 @@ +brutalchess (0.5.2+dfsg-5) unstable; urgency=medium + + [ Markus Koschany ] + * Team upload. + * Add FreeType.patch. Update fontloader.h to detect the latest version of + FreeType2 and make the software compile again. (Closes: #732235) + * Bump Standards-Version to 3.9.5, no changes. + * Add keywords to desktop file. + * debian/control: Depend on fonts-dejavu instead of ttf-dejavu. + * Add disable-quake-pieces.patch. The -p quake option is useless and causes a + segmentation fault since upstream never shipped the quake models because of + copyright concerns. (Closes: #732227) + + [ Evgeni Golov ] + * Correct Vcs-* URLs to point to anonscm.debian.org. + + -- Markus Koschany <[email protected]> Sat, 21 Dec 2013 13:12:53 +0100 + brutalchess (0.5.2+dfsg-4) unstable; urgency=low [ Iain Lane ] diff -Nru brutalchess-0.5.2+dfsg/debian/control brutalchess-0.5.2+dfsg/debian/control --- brutalchess-0.5.2+dfsg/debian/control 2012-04-15 11:05:44.000000000 +0200 +++ brutalchess-0.5.2+dfsg/debian/control 2013-12-21 14:13:29.000000000 +0100 @@ -5,15 +5,15 @@ Uploaders: Barry deFreese <[email protected]>, Vincent Legout <[email protected]> Build-Depends: debhelper (>= 9), dh-autoreconf, libsdl-image1.2-dev, libfreetype6-dev, libxmu-dev, libxi-dev, libgl1-mesa-dev, - sharutils, -Standards-Version: 3.9.3 + sharutils +Standards-Version: 3.9.5 Homepage: http://brutalchess.sf.net/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/brutalchess/ -Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/brutalchess/ +Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/brutalchess/ +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/brutalchess/ Package: brutalchess Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ttf-dejavu +Depends: ${shlibs:Depends}, ${misc:Depends}, fonts-dejavu Description: 3D chess game with reflection of the chessmen Brutal Chess features full 3D graphics, an advanced particle engine, and several different levels of intelligent AI, inspired by the once popular diff -Nru brutalchess-0.5.2+dfsg/debian/patches/disable-quake-pieces.patch brutalchess-0.5.2+dfsg/debian/patches/disable-quake-pieces.patch --- brutalchess-0.5.2+dfsg/debian/patches/disable-quake-pieces.patch 1970-01-01 01:00:00.000000000 +0100 +++ brutalchess-0.5.2+dfsg/debian/patches/disable-quake-pieces.patch 2013-12-21 14:13:29.000000000 +0100 @@ -0,0 +1,44 @@ +From: Markus Koschany <[email protected]> +Date: Sat, 21 Dec 2013 13:56:00 +0100 +Subject: disable quake pieces + +The quake pieces were never officially shipped by upstream because they are +copyrighted. This patch disables the -p quake option because it is useless and +causes a segmentation fault. + +Bug: http://bugs.debian.org/732227 +--- + src/utils.cpp | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/src/utils.cpp b/src/utils.cpp +index e1ccb4b..8138118 100644 +--- a/src/utils.cpp ++++ b/src/utils.cpp +@@ -38,8 +38,6 @@ void printUsage() + cerr << " -l PLAYER1 PLAYER2 --player1=PLAYER1\t\t Set your player and opponent. Choices are brutal,\n"; + cerr << " --player2=PLAYER2\t\t faile, human, random, test, xboard."; + cerr << endl << endl; +- cerr << " -p PIECE_SET --pieces=PIECE_SET\t\t Select the piece set. Choices are basic, quake."; +- cerr << endl << endl; + cerr << " -r --reflections=on|off\t\t\t Turn off reflections, on by default."; + cerr << endl << endl; + cerr << " -s --shadows=on|off\t\t\t\t Turn off shadows, on by default."; +@@ -156,8 +154,6 @@ void parseCommandLine(int argc, char* argv[]) + opts->pieces = BASIC; + } else if(args[i+1] == "debug") { + opts->pieces = DEBUG; +- } else if(args[i+1] == "quake") { +- opts->pieces = QUAKE; + } else { + printUsage(); + } +@@ -167,8 +163,6 @@ void parseCommandLine(int argc, char* argv[]) + opts->pieces = BASIC; + } else if(args[i].substr(9, args[i].size()) == "debug") { + opts->pieces = DEBUG; +- } else if(args[i].substr(9, args[i].size()) == "quake") { +- opts->pieces = QUAKE; + } else { + printUsage(); + } diff -Nru brutalchess-0.5.2+dfsg/debian/patches/FreeType.patch brutalchess-0.5.2+dfsg/debian/patches/FreeType.patch --- brutalchess-0.5.2+dfsg/debian/patches/FreeType.patch 1970-01-01 01:00:00.000000000 +0100 +++ brutalchess-0.5.2+dfsg/debian/patches/FreeType.patch 2013-12-21 14:13:29.000000000 +0100 @@ -0,0 +1,28 @@ +From: Markus Koschany <[email protected]> +Date: Sat, 21 Dec 2013 13:09:45 +0100 +Subject: FreeType + +Bug: http://bugs.debian.org/732235 +--- + src/fontloader.h | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/fontloader.h b/src/fontloader.h +index 745b9eb..66bf6e7 100644 +--- a/src/fontloader.h ++++ b/src/fontloader.h +@@ -13,10 +13,10 @@ + #include <ft2build.h> + #include FT_FREETYPE_H + +-#include <freetype/freetype.h> +-#include <freetype/ftglyph.h> +-#include <freetype/ftoutln.h> +-#include <freetype/fttrigon.h> ++#include <freetype2/freetype.h> ++#include <freetype2/ftglyph.h> ++#include <freetype2/ftoutln.h> ++#include <freetype2/fttrigon.h> + + // Other Headers we'll need. + #include <vector> diff -Nru brutalchess-0.5.2+dfsg/debian/patches/series brutalchess-0.5.2+dfsg/debian/patches/series --- brutalchess-0.5.2+dfsg/debian/patches/series 2012-04-04 21:20:20.000000000 +0200 +++ brutalchess-0.5.2+dfsg/debian/patches/series 2013-12-21 14:13:29.000000000 +0100 @@ -4,3 +4,5 @@ 04_ftbs_gcc4.3_413483.diff 05_use_our_fonts.diff 06_gcc-4.7.patch +FreeType.patch +disable-quake-pieces.patch
signature.asc
Description: OpenPGP digital signature
