diff -u xevil-2.02r2/debian/rules xevil-2.02r2/debian/rules --- xevil-2.02r2/debian/rules +++ xevil-2.02r2/debian/rules @@ -11,13 +11,18 @@ DEBUG_OPT += -O2 endif +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + PARFLAGS = -j $(NUMJOBS) +endif + export FORCEHOSTTYPE=debian-linux build: build-stamp build-stamp: dh_testdir - $(MAKE) DEBUG_OPT="$(DEBUG_OPT)" + $(MAKE) $(PARFLAGS) DEBUG_OPT="$(DEBUG_OPT)" touch build-stamp diff -u xevil-2.02r2/debian/control xevil-2.02r2/debian/control --- xevil-2.02r2/debian/control +++ xevil-2.02r2/debian/control @@ -3,11 +3,12 @@ Priority: optional Maintainer: Brandon Barnes Build-Depends: debhelper (>= 5), libx11-dev, libxpm-dev, x11proto-core-dev -Standards-Version: 3.8.3 +Standards-Version: 3.9.2 Package: xevil Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Homepage: http://www.xevil.com/ Description: A violent side-scrolling game for X XEvil is a 3rd person, side-view, fast-action, kill-them-before-they-kill-you game. Fight against either diff -u xevil-2.02r2/debian/copyright xevil-2.02r2/debian/copyright --- xevil-2.02r2/debian/copyright +++ xevil-2.02r2/debian/copyright @@ -25 +25 @@ -License can be found in /usr/share/common-licenses/GPL file. +License can be found in /usr/share/common-licenses/GPL-2 file. diff -u xevil-2.02r2/debian/changelog xevil-2.02r2/debian/changelog --- xevil-2.02r2/debian/changelog +++ xevil-2.02r2/debian/changelog @@ -1,3 +1,18 @@ +xevil (2.02r2-10) unstable; urgency=low + + * Fixed bug that sometimes prevented X resources from being read properly. + Thank you, Rowan Vince, for finding the bug and providing a patch. + (Closes: #622100) + * Enabled parallel building in rules file when using DEB_BUILD_OPTIONS + * Added Homepage field to control file + * copyright file now points to GPL-2 instead of GPL + * Explicitly state that package uses source format 1.0 by adding file + debian/source/format + * Added xevil.doc-base file to describe installed documentation + * Set Standards Version to 3.9.2 (no changes) + + -- Brandon Barnes Tue, 12 Apr 2011 21:54:00 -0700 + xevil (2.02r2-9) unstable; urgency=low * changed several char * to const char * so xevil will compile with gcc 4.4+ diff -u xevil-2.02r2/cmn/game.cpp xevil-2.02r2/cmn/game.cpp --- xevil-2.02r2/cmn/game.cpp +++ xevil-2.02r2/cmn/game.cpp @@ -2254,10 +2254,10 @@ strm << "right_" << keysNames[n]; else strm << "right_" << keysNames[n] << "_2"; - const char *option = strm.str().c_str(); + const string & option = strm.str(); // Should we free value?? - char *value = XGetDefault(ui->get_dpy(0),XEVIL_CLASS,option); + char *value = XGetDefault(ui->get_dpy(0),XEVIL_CLASS,option.c_str()); if (value) { KeySym keysym = XStringToKeysym(value); if (keysym != NoSymbol) @@ -2273,10 +2273,10 @@ strm << "left_" << keysNames[n]; else strm << "left_" << keysNames[n] << "_2"; - const char *option = strm.str().c_str(); + const string & option = strm.str(); // Should we free value?? - char *value = XGetDefault(ui->get_dpy(0),XEVIL_CLASS,option); + char *value = XGetDefault(ui->get_dpy(0),XEVIL_CLASS,option.c_str()); if (value) { KeySym keysym = XStringToKeysym(value); if (keysym != NoSymbol) only in patch2: unchanged: --- xevil-2.02r2.orig/debian/xevil.doc-base +++ xevil-2.02r2/debian/xevil.doc-base @@ -0,0 +1,9 @@ +Document: xevil +Title: Xevil Instructions +Author: Steve Hardt +Abstract: The XEvil 2.X Instruction Manual +Section: Games/Action + +Format: HTML +Index: /usr/share/doc/xevil/instructions/instructions.html +Files: /usr/share/doc/xevil/instructions/* only in patch2: unchanged: --- xevil-2.02r2.orig/debian/source/format +++ xevil-2.02r2/debian/source/format @@ -0,0 +1 @@ +1.0