r10827 - in packages/trunk/supertuxkart/debian: . patches

Christoph Egger christoph at alioth.debian.org
Wed Mar 10 23:08:48 UTC 2010 

Author: christoph
Date: 2010-03-10 23:08:45 +0000 (Wed, 10 Mar 2010)
New Revision: 10827

Added:
   packages/trunk/supertuxkart/debian/patches/build-against-system-enet.patch
Modified:
   packages/trunk/supertuxkart/debian/changelog
   packages/trunk/supertuxkart/debian/clean
   packages/trunk/supertuxkart/debian/control
   packages/trunk/supertuxkart/debian/patches/series
   packages/trunk/supertuxkart/debian/rules
Log:
Build against system libenet, cleanup

Modified: packages/trunk/supertuxkart/debian/changelog
===================================================================
--- packages/trunk/supertuxkart/debian/changelog	2010-03-07 19:21:33 UTC (rev 10826)
+++ packages/trunk/supertuxkart/debian/changelog	2010-03-10 23:08:45 UTC (rev 10827)
@@ -1,12 +1,16 @@
 supertuxkart (0.6.2+dfsg1-2) unstable; urgency=low
 
-  * Change my E-Mail Adress
+  * Change my E-Mail Address
   * Kill some whitespaces at the end of lines
-  * Explicitely link against libGLU (Closes: #556477) taking the patch from
+  * Explicitly link against libGLU (Closes: #556477) taking the patch from
     Ubuntu
   * Remove KiBi from Uploaders on his request
+  * Build against system libenet, makes stk build on GNU/kFreeBSD and is
+    the right thing anyway
+  * Add misc:Depends to -data package
+  * Bump standards version from 3.8.3 to .4 (no changes needed)
 
- -- Christoph Egger <christoph at debian.org>  Mon, 22 Feb 2010 21:18:53 +0100
+ -- Christoph Egger <christoph at debian.org>  Wed, 10 Mar 2010 23:51:14 +0100
 
 supertuxkart (0.6.2+dfsg1-1) unstable; urgency=low
 

Modified: packages/trunk/supertuxkart/debian/clean
===================================================================
--- packages/trunk/supertuxkart/debian/clean	2010-03-07 19:21:33 UTC (rev 10826)
+++ packages/trunk/supertuxkart/debian/clean	2010-03-10 23:08:45 UTC (rev 10827)
@@ -1,3 +1,27 @@
 config.sub
 config.guess
 debian/supertuxkart.6
+Makefile.in
+aclocal.m4
+configure
+data/Makefile.in
+data/fonts/Makefile.in
+data/grandprix/Makefile.in
+data/items/Makefile.in
+data/karts/Makefile.in
+data/models/Makefile.in
+data/music/Makefile.in
+data/po/Makefile.in
+data/sfx/Makefile.in
+data/textures/Makefile.in
+data/tracks/Makefile.in
+depcomp
+doc/Makefile.in
+install-sh
+missing
+src/Makefile.in
+src/bullet/Demos/OpenGL/Makefile.in
+src/bullet/Makefile.in
+src/bullet/src/Makefile.in
+src/enet/Makefile.in
+src/ide/Makefile.in

Modified: packages/trunk/supertuxkart/debian/control
===================================================================
--- packages/trunk/supertuxkart/debian/control	2010-03-07 19:21:33 UTC (rev 10826)
+++ packages/trunk/supertuxkart/debian/control	2010-03-10 23:08:45 UTC (rev 10827)
@@ -2,12 +2,24 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
- Alexander Reichle-Schmehl <tolimar at debian.org>, Christoph Egger <christoph at debian.org>
-Build-Depends: debhelper (>= 7.0.0~), autotools-dev, plib1.8.4-dev,
- libsdl-ttf2.0-dev, libsdl-image1.2-dev, docbook-to-man, libopenal-dev,
- libalut-dev, libmikmod2-dev, libvorbis-dev, quilt
-Standards-Version: 3.8.3
+Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>,
+ Sam Hocevar (Debian packages) <sam+deb at zoy.org>,
+ Alexander Reichle-Schmehl <tolimar at debian.org>,
+ Christoph Egger <christoph at debian.org>
+Build-Depends: debhelper (>= 7.0.0~),
+ autotools-dev,
+ libplib-dev,
+ libsdl-ttf2.0-dev,
+ libsdl-image1.2-dev,
+ docbook-to-man,
+ libopenal-dev,
+ libalut-dev,
+ libmikmod2-dev,
+ libvorbis-dev,
+ quilt,
+ automake,
+ libenet-dev
+Standards-Version: 3.8.4
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/supertuxkart/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-games/packages/trunk/supertuxkart/?op=log
 Homepage: http://supertuxkart.sf.net/
@@ -32,6 +44,7 @@
 Package: supertuxkart-data
 Architecture: all
 Suggests: supertuxkart
+Depends: ${misc:Depends}
 Description: data for the supertuxkart kart racing game
  SuperTuxKart is an enhanced version of TuxKart, the kart racing game
  originally done by Steve Baker, featuring Tux and a bunch of his friends.

Added: packages/trunk/supertuxkart/debian/patches/build-against-system-enet.patch
===================================================================
--- packages/trunk/supertuxkart/debian/patches/build-against-system-enet.patch	                        (rev 0)
+++ packages/trunk/supertuxkart/debian/patches/build-against-system-enet.patch	2010-03-10 23:08:45 UTC (rev 10827)
@@ -0,0 +1,40 @@
+--- supertuxkart-0.6.2+dfsg1.orig/Makefile.am
++++ supertuxkart-0.6.2+dfsg1/Makefile.am
+@@ -1,6 +1,6 @@
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = $(BULLETTREE) $(ENETTREE) src doc data
++SUBDIRS = $(BULLETTREE) src doc data
+ 
+ EXTRA_DIST = \
+  README.cygwin \
+--- supertuxkart-0.6.2+dfsg1.orig/data/Makefile.am
++++ supertuxkart-0.6.2+dfsg1/data/Makefile.am
+@@ -6,7 +6,6 @@
+ dist_pkgdata_DATA = \
+  $(shell find $(srcdir) -name "*.data") \
+  $(shell find $(srcdir) -name "*.items") \
+- $(shell find $(srcdir) -name "*.projectile") \
+  $(shell find $(srcdir) -name "*.cup") \
+  $(shell find $(srcdir) -maxdepth 1 -name "*.challenge") \
+  $(shell find $(srcdir) -name "*.collectable") \
+--- supertuxkart-0.6.2+dfsg1.orig/src/Makefile.am
++++ supertuxkart-0.6.2+dfsg1/src/Makefile.am
+@@ -6,7 +6,7 @@
+ bin_PROGRAMS = supertuxkart
+ 
+ AM_CPPFLAGS = -DSUPERTUXKART_DATADIR="\"$(datadir)/games/$(PACKAGE)/\""  \
+- -I$(srcdir)/bullet/src/ -I$(srcdir)/enet/include/
++ -I$(srcdir)/bullet/src/
+ 
+ supertuxkart_SOURCES = \
+  main.cpp \
+@@ -300,7 +300,7 @@
+ # Link in the specific gcc 4.1 bug work around
+ supertuxkart_LDADD = libstatic_ssg.a \
+         -lplibjs -lplibsl -lplibssg -lplibpu -lplibfnt -lplibsg \
+-        -lplibul -lplibssgaux $(bullet_LIBS) $(enet_LIBS) $(glut_LIBS) \
++        -lplibul -lplibssgaux -lenet $(bullet_LIBS)  $(glut_LIBS) \
+         $(opengl_LIBS) $(sdl_LIBS) $(openal_LIBS) $(oggvorbis_LIBS) \
+         $(INTLLIBS)
+ 

Modified: packages/trunk/supertuxkart/debian/patches/series
===================================================================
--- packages/trunk/supertuxkart/debian/patches/series	2010-03-07 19:21:33 UTC (rev 10826)
+++ packages/trunk/supertuxkart/debian/patches/series	2010-03-10 23:08:45 UTC (rev 10827)
@@ -1 +1,2 @@
 # Nothing to do right now
+build-against-system-enet.patch

Modified: packages/trunk/supertuxkart/debian/rules
===================================================================
--- packages/trunk/supertuxkart/debian/rules	2010-03-07 19:21:33 UTC (rev 10826)
+++ packages/trunk/supertuxkart/debian/rules	2010-03-10 23:08:45 UTC (rev 10827)
@@ -27,6 +27,8 @@
 	cp -f /usr/share/misc/config.sub config.sub
 	cp -f /usr/share/misc/config.guess config.guess
 
+	autoreconf -vfi
+
 #	Add here commands to configure the package.
 	CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --bindir=/usr/games

More information about the Pkg-games-commits mailing list