[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: ITP/NMU: assaultcube assaultcube-data

On 06/05/11 16:17, Gonéri Le Bouder wrote:

2011/5/6 Arand Nash<ienorand@gmail.com>:

On 06/05/11 09:16, Guillem Jover wrote:



I think this makes it strictly non-free:

(...)
|additional clause specific to Cube:
  |
|4. Source versions may not be "relicensed" under a different license
|   without my explicitly written permission.

No this is ok as soon as the current license is free.

Best regards,


Ok then, I've cleaned and modified it to go in contrib now.

On 06/05/11 09:03, Gonéri Le Bouder wrote:

2011/5/6 mentors.debian.net <support@mentors.debian.net>:

The upload of the package 'assaultcube' to mentors.debian.net was
successful. URL of your package is:
http://mentors.debian.net/debian/pool/non-free/a/assaultcube

Uploaded version: 1.1.0.4repack1-0.1
Package maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>

(You receive this mail as you are listed in the 'Uploaders' field of
the assaultcube package. Please tell the package maintainer if you
no longer participate in the maintenance of that package so that you
can get removed there.)

The mentors.debian.net team


#Import run: 2011-05-06T07:47:16.709124



Hi I took a look on the package,

bot.cpp
g++ -O3 -fomit-frame-pointer -Wall -fsigned-char -rdynamic -I. -Ibot
-I../enet/include -I/usr/include `sdl-config --cflags` -idirafter
../include   -c -o bot/botmanager.o bot/botmanager.cpp
g++ -O3 -fomit-frame-pointer -Wall -fsigned-char -rdynamic -I. -Ibot
-I../enet/include -I/usr/include `sdl-config --cflags` -idirafter
../include   -c -o bot/bot_ai.o bot/bot_ai.cpp
g++ -O3 -fomit-frame-pointer -Wall -fsigned-char -rdynamic -I. -Ibot
-I../enet/include -I/usr/include `sdl-config --cflags` -idirafter
../include   -c -o bot/bot_util.o bot/bot_util.cpp
g++ -O3 -fomit-frame-pointer -Wall -fsigned-char -rdynamic -I. -Ibot
-I../enet/include -I/usr/include `sdl-config --cflags` -idirafter
../include   -c -o bot/bot_waypoint.o bot/bot_waypoint.cpp
g++ -O3 -fomit-frame-pointer -Wall -fsigned-char -rdynamic -I. -Ibot
-I../enet/include -I/usr/include `sdl-config --cflags` -idirafter
../include   -c -o bot/ac_bot.o bot/ac_bot.cpp
g++ -O3 -fomit-frame-pointer -Wall -fsigned-char -rdynamic -I. -Ibot
-I../enet/include -I/usr/include `sdl-config --cflags` -idirafter
../include   -c -o bot/ac_bot_ai.o bot/ac_bot_ai.cpp
bot/ac_bot_ai.cpp: In member function 'virtual entity*
CACBot::SearchForEnts(bool, float, float)':
bot/ac_bot_ai.cpp:105:12: warning: variable 'flNearestDist' set but
not used [-Wunused-but-set-variable]
g++ -O3 -fomit-frame-pointer -Wall -fsigned-char -rdynamic -o
ac_client crypto.o audiomanager.o client.o clientgame.o clients2c.o
command.o console.o docs.o editing.o entities.o i18n.o log.o main.o
menus.o oggstream.o openal.o packetqueue.o physics.o protocol.o
rendercubes.o rendergl.o renderhud.o rendermodel.o renderparticles.o
rendertext.o rndmap.o scoreboard.o serverms.o server.o serverbrowser.o
shadow.o sound.o soundlocation.o soundscheduler.o stream.o texture.o
tools.o water.o weapon.o wizard.o world.o worldio.o worldlight.o
worldocull.o worldrender.o zip.o bot/bot.o bot/botmanager.o
bot/bot_ai.o bot/bot_util.o bot/bot_waypoint.o bot/ac_bot.o
bot/ac_bot_ai.o  -L../enet/.libs -lenet -L/usr/lib64 `sdl-config
--libs` -lSDL_image -lz -lGL -lopenal -lvorbisfile
/usr/bin/ld: console.o: undefined reference to symbol 'XFree'
/usr/bin/ld: note: 'XFree' is defined in DSO /usr/lib64/libX11.so.6 so
try adding it to the linker command line
/usr/lib64/libX11.so.6: could not read symbols: Invalid operation
collect2: ld returned 1 exit status
make[1]: *** [client] Error 1
make[1]: Leaving directory `/tmp/buildd/assaultcube-1.1.0.4repack1/source/src'
dh_auto_build: make -j1 returned exit code 2
make: *** [build] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2
E: Failed autobuilding of package
I: unmounting /var/cache/pbuilder/result filesystem
I: unmounting /var/cache/pbuilder/ccache filesystem
I: unmounting /home/goneri/pkg-games/packages/trunk/build-area filesystem
I: unmounting dev/pts filesystem
I: unmounting proc filesystem
I: cleaning the build env
I: removing directory /var/cache/pbuilder/build//8384 and its subdirectories


I add to apply this patch to fix the issue:
--- assaultcube-1.1.0.4repack1.orig/source/src/Makefile
+++ assaultcube-1.1.0.4repack1/source/src/Makefile
@@ -26,7 +26,7 @@ USRLIB=$(shell if [ -e /usr/lib64 ]; the
 override CXXFLAGS+= -rdynamic
 CLIENT_INCLUDES= $(INCLUDES) -I/usr/include `sdl-config --cflags`
-idirafter ../include
 # -lSDL_ttf
-CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) `sdl-config --libs`
-lSDL_image -lz -lGL -lopenal -lvorbisfile
+CLIENT_LIBS= -L../enet/.libs -lenet -L$(USRLIB) `sdl-config --libs`
-lSDL_image -lz -lGL -lopenal -lvorbisfile -lX11
 endif

 CLIENT_OBJS= \



I've added this.


The clean rule does not clean all the generated files, i've to do it myself:
rm -rf source/enet/Makefile source/enet/callbacks.lo
source/enet/compress.lo source/enet/host.lo source/enet/libenet.la
source/enet/libenet.pc source/enet/libtool source/enet/list.lo
source/enet/packet.lo  source/enet/peer.lo source/enet/protocol.lo
source/enet/unix.lo source/enet/win32.lo bin_unix source/enet/.libs
source/src/cube.h.gch
I've moved to the main cleaning being done by a patched Makefile instead now, it should hopefully get rid of everything, (tend to always slap these things into git, hence I get lazy with clean targets :). 


libenet-dev but the package is not linked against it. Is it something expected?
I've discussed this before with the main developer of Enet (RE is another game using Enet which I plan on maybe getting into debian at some point in the future). 

The short answer is, upstream says no:
15:47 < arand> Hmm, enet 1.3.1 made it into testing... I need to figure out how to make RE build without embedded enet in a sane way... 
15:50 < eihrul_> don't
15:50 < eihrul_> build with enet included in RE
15:50 < arand> Is there a large diff?
15:50 < eihrul_> not currently, but there has been in the past and may be in the future 
(...)
15:55 < eihrul_> it is a part of the sauerbraten engine
15:55 < eihrul_> the fact that it has also been isolated and release as a separate library for the benefit of others is irrelevant 

and:
14:27 < arand_> eihrul_: Would it make any sense to link current version of assaultcube against libenet-dev in Debian, or is the case the same as in RE here, and enet shouldn't be dabbled with? 
14:40 < eihrul_> same


Lintian found 3 issues:
W: assaultcube source: out-of-date-standards-version 3.8.3 (current is 3.9.2)
E: assaultcube: unstripped-binary-or-object usr/lib/games/assaultcube/ac_client
E: assaultcube: unstripped-binary-or-object usr/lib/games/assaultcube/ac_server



I think these should be addressed now
The new version with these fixes, and serveral others, should be up on mentors.debian.net now.
I'm not quite sure how to get the lintian NMU warnings to go away, is that at all important? Should I be adding myself to the Uploaders: in the control file once I'm part of the games team..?
I have applied for the games team and uploaded my public ssh key on alioth as well. 

- arand
Reply to: