r8908 - in packages/trunk/vdrift/debian: . patches

Gonéri Le Bouder goneri at alioth.debian.org
Sun Feb 22 00:34:36 UTC 2009 

Author: goneri
Date: 2009-02-22 00:34:35 +0000 (Sun, 22 Feb 2009)
New Revision: 8908

Added:
   packages/trunk/vdrift/debian/patches/dont_build_Bullet_extras_and_demo.diff
   packages/trunk/vdrift/debian/patches/fix_scons.diff
   packages/trunk/vdrift/debian/patches/scon_link_bullet.diff
   packages/trunk/vdrift/debian/vdrift.docs
Modified:
   packages/trunk/vdrift/debian/changelog
   packages/trunk/vdrift/debian/control
   packages/trunk/vdrift/debian/patches/series
   packages/trunk/vdrift/debian/rules
Log:
- dfsg: drop the bullet-2.66/Extras directory
- Merge vdrift-{minimal,full} in vdrift-data
- Add two patches:
 + dont_build_Bullet_extras_and_demo.diff: to speed up the build
 + scon_link_bullet.diff: avoid a linker problem with bullet, already
   fixed upstream


Modified: packages/trunk/vdrift/debian/changelog
===================================================================
--- packages/trunk/vdrift/debian/changelog	2009-02-21 23:26:56 UTC (rev 8907)
+++ packages/trunk/vdrift/debian/changelog	2009-02-22 00:34:35 UTC (rev 8908)
@@ -4,7 +4,12 @@
   * New upstream release, the license (see #420965) issue is fixed
    - Remove fix_datadir.diff
    - Add build-dependency: libsdl-gfx1.2-dev, libglew1.5-dev
-   - dfsg: drop the bullet-2.66 directory
+   - dfsg: drop the bullet-2.66/Extras directory
+   - Merge vdrift-{minimal,full} in vdrift-data
+   - Add two patches:
+    + dont_build_Bullet_extras_and_demo.diff: to speed up the build
+    + scon_link_bullet.diff: avoid a linker problem with bullet, already
+      fixed upstream 
   * remove the Applications category from the desktop file since
     it's not an official category
     http://standards.freedesktop.org/menu-spec/latest/apa.html

Modified: packages/trunk/vdrift/debian/control
===================================================================
--- packages/trunk/vdrift/debian/control	2009-02-21 23:26:56 UTC (rev 8907)
+++ packages/trunk/vdrift/debian/control	2009-02-22 00:34:35 UTC (rev 8908)
@@ -5,7 +5,7 @@
 Uploaders: Gonéri Le Bouder <goneri at rulezlan.org>
 Build-Depends: debhelper (>= 5.0.0), libsdl-dev, libsdl-image1.2-dev,
  libsdl-net1.2-dev, libopenal-dev, libalut-dev, scons, docbook-to-man,
- gettext, quilt, libsdl-gfx1.2-dev, libglew1.5-dev
+ gettext, quilt, libsdl-gfx1.2-dev, libglew1.5-dev, cmake
 Standards-Version: 3.7.2
 Homepage: http://vdrift.net
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/vdrift/
@@ -13,8 +13,7 @@
 
 Package: vdrift
 Architecture: amd64 i386 ia64 powerpc
-Depends: ${shlibs:Depends}, ${misc:Depends}, vdrift-minimal (>= ${Source-Version})
-Recommends: vdrift-full
+Depends: ${shlibs:Depends}, ${misc:Depends}, vdrift-data (>= ${Source-Version})
 Description: drift racing simulation
  VDrift is a cross-platform, open source driving simulation made with drift
  racing in mind. It's powered by the excellent Vamos physics engine.
@@ -40,3 +39,12 @@
  A GeForce2 with 32 MB of VRAM or better is required to play,
  but a GeForce3 with 64 MB VRAM or better is recommended.
 
+Package: vdrift-data
+Architecture: all
+Description: drift racing simulation
+ VDrift is a cross-platform, open source driving simulation made with drift
+ racing in mind. It's powered by the excellent Vamos physics engine.
+ .
+ This game is in the early stages of development but is already very playable.
+ .
+ This package provides the data files for VDrift.

Added: packages/trunk/vdrift/debian/patches/dont_build_Bullet_extras_and_demo.diff
===================================================================
--- packages/trunk/vdrift/debian/patches/dont_build_Bullet_extras_and_demo.diff	                        (rev 0)
+++ packages/trunk/vdrift/debian/patches/dont_build_Bullet_extras_and_demo.diff	2009-02-22 00:34:35 UTC (rev 8908)
@@ -0,0 +1,11 @@
+--- vdrift-2008.08.05.dfsg.orig/bullet-2.66/CMakeLists.txt
++++ vdrift-2008.08.05.dfsg/bullet-2.66/CMakeLists.txt
+@@ -2,6 +2,6 @@
+ 
+ IF (NOT CMAKE_BUILD_TYPE)
+  SET(CMAKE_BUILD_TYPE "Release")
+-ENDIF (NOT CMAKE_BUILD_TYPE) 
++ENDIF (NOT CMAKE_BUILD_TYPE)
+ 
+-SUBDIRS(src Demos Extras)
++SUBDIRS(src)

Added: packages/trunk/vdrift/debian/patches/fix_scons.diff
===================================================================
--- packages/trunk/vdrift/debian/patches/fix_scons.diff	                        (rev 0)
+++ packages/trunk/vdrift/debian/patches/fix_scons.diff	2009-02-22 00:34:35 UTC (rev 8908)
@@ -0,0 +1,25 @@
+--- vdrift-2008.08.05.dfsg.orig/src/SConscript
++++ vdrift-2008.08.05.dfsg/src/SConscript
+@@ -69,7 +69,7 @@
+ #--------------------------#
+ appdir = ""
+ vdrift_install = None
+-common_libs = ['SDL_image', 'SDL_net', 'SDL_gfx', 'libbulletcollision', 'libbulletmath', 'vorbisfile']
++common_libs = ['SDL_image', 'SDL_net', 'SDL_gfx', 'libbulletCollision', 'libbulletMath', 'vorbisfile']
+ if ( 'darwin' == sys.platform ):
+     vdrift_install = "${PRODUCT_NAME}.app"
+     pkgbase = "%s/Contents" % vdrift_install
+@@ -113,11 +113,11 @@
+     local_env.Append( FRAMEWORKS = [ common_libs, 'Foundation', 'AppKit'] )
+     src.append(['../tools/osx/SDLMain.m', '../tools/osx/config_mac.mm'])
+ elif ( 'win32' == sys.platform or 'cygwin' == sys.platform ):
+-    local_env.Append(LIBPATH = ['/usr/lib/mingw', '#bullet-2.66/out/mingwx86/optimize/libs', '#bullet-2.66/out/ntx86/optimize/libs']);
++    local_env.Append(LIBPATH = ['/usr/lib/mingw', '#bullet-2.66/src/BulletCollision', '#bullet-2.66/src/LinearMath']);
+     libs_link = ['opengl32', 'glu32', 'glew32', 'mingw32', 'SDLmain', 'SDL', common_libs ]
+ else:
+     local_env.ParseConfig('sdl-config --cflags --libs')
+-    local_env.Append(LIBPATH = ['/usr/X11R6/lib', '#bullet-2.66/out/linux/optimize/libs', '#bullet-2.66/out/linuxx86/optimize/libs'])
++    local_env.Append(LIBPATH = ['/usr/X11R6/lib', '#bullet-2.66/src/BulletCollision', '#bullet-2.66/src/LinearMath'])
+     libs_link = ['GL', 'GLU', 'GLEW', common_libs]
+ 
+ local_env.Append(LIBS = libs_link)

Added: packages/trunk/vdrift/debian/patches/scon_link_bullet.diff
===================================================================
--- packages/trunk/vdrift/debian/patches/scon_link_bullet.diff	                        (rev 0)
+++ packages/trunk/vdrift/debian/patches/scon_link_bullet.diff	2009-02-22 00:34:35 UTC (rev 8908)
@@ -0,0 +1,20 @@
+--- vdrift-2008.08.05.dfsg.orig/src/SConscript
++++ vdrift-2008.08.05.dfsg/src/SConscript
+@@ -69,7 +69,7 @@
+ #--------------------------#
+ appdir = ""
+ vdrift_install = None
+-common_libs = ['SDL_image', 'SDL_net', 'SDL_gfx', 'libbulletcollision', 'libbulletmath', 'vorbisfile']
++common_libs = ['SDL_image', 'SDL_net', 'SDL_gfx', 'LibBulletDynamics', 'LibBulletCollision', 'LibLinearMath', 'vorbisfile']
+ if ( 'darwin' == sys.platform ):
+     vdrift_install = "${PRODUCT_NAME}.app"
+     pkgbase = "%s/Contents" % vdrift_install
+@@ -117,7 +117,7 @@
+     libs_link = ['opengl32', 'glu32', 'glew32', 'mingw32', 'SDLmain', 'SDL', common_libs ]
+ else:
+     local_env.ParseConfig('sdl-config --cflags --libs')
+-    local_env.Append(LIBPATH = ['/usr/X11R6/lib', '#bullet-2.66/out/linux/optimize/libs', '#bullet-2.66/out/linuxx86/optimize/libs'])
++    local_env.Append(LIBPATH = ['/usr/lib/mingw', '#bullet-2.66/src/BulletDynamics', '#bullet-2.66/src/LinearMath', '#bullet-2.66/src/BulletCollision']);
+     libs_link = ['GL', 'GLU', 'GLEW', common_libs]
+ 
+ local_env.Append(LIBS = libs_link)

Modified: packages/trunk/vdrift/debian/patches/series
===================================================================
--- packages/trunk/vdrift/debian/patches/series	2009-02-21 23:26:56 UTC (rev 8907)
+++ packages/trunk/vdrift/debian/patches/series	2009-02-22 00:34:35 UTC (rev 8908)
@@ -0,0 +1,2 @@
+dont_build_Bullet_extras_and_demo.diff
+scon_link_bullet.diff

Modified: packages/trunk/vdrift/debian/rules
===================================================================
--- packages/trunk/vdrift/debian/rules	2009-02-21 23:26:56 UTC (rev 8907)
+++ packages/trunk/vdrift/debian/rules	2009-02-22 00:34:35 UTC (rev 8908)
@@ -15,6 +15,7 @@
 configure: configure-stamp
 configure-stamp:
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
+	cd bullet-2.66 && cmake .
 	dh_testdir
 
 
@@ -22,17 +23,18 @@
 
 build-stamp: configure-stamp 
 	dh_testdir
+	cd bullet-2.66 && $(MAKE)
 	docbook-to-man debian/vdrift.sgml > debian/vdrift.6
 	scons use_binreloc=0 prefix=/usr bin=/games datadir=/share/games/vdrift/data release=1 opcode=1
 #	cd vdrift-2007-03-23-src && scons  release=1
-	msgfmt -c -o vdrift-2007-03-23-src/po/nl.mo vdrift-2007-03-23-src/po/nl.po
+	msgfmt -c -o po/nl.mo po/nl.po
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -rf debian/vdrift.6 .sconsign.dblite .sconf_temp build
-	dh_clean debian/vdrift.6 .sconsign.dblite .sconf_temp build
+	rm -rf debian/vdrift.6 .sconsign.dblite .sconf_temp build po/nl.mo
+	dh_clean
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 
 install: build
@@ -42,18 +44,15 @@
 	dh_installdirs
 	#scons install
 	mkdir -p debian/tmp/usr/games/
-	cp vdrift-2007-03-23-src/build/vdrift debian/tmp/usr/games/	
+	cp build/vdrift debian/tmp/usr/games/	
 	# i18n
 	mkdir -p debian/tmp/usr/share/locale/nl/LC_MESSAGES/
-	cp vdrift-2007-03-23-src/po/nl.mo debian/tmp/usr/share/locale/nl/LC_MESSAGES/
-	# doc
-	mkdir -p debian/tmp/usr/share/doc/vdrift
-	cp vdrift-2007-03-23-src/docs/* debian/tmp/usr/share/doc/vdrift
-	mv debian/tmp/usr/share/doc/vdrift/ChangeLog debian/tmp/usr/share/doc/vdrift/changelog
+	cp po/nl.mo debian/tmp/usr/share/locale/nl/LC_MESSAGES/
 	# pixmaps
 	mkdir -p debian/tmp/usr/share/pixmaps
 	cp debian/vdrift.xpm debian/tmp/usr/share/pixmaps
 
+
 # Build architecture-independent files here.
 binary-indep: build install
 # We have nothing to do by default.
@@ -64,7 +63,7 @@
 	dh_testroot
 	dh_installchangelogs 
 	dh_installdocs
-	dh_installexamples
+	dh_install -pvdrift-data -XSCon data /usr/share/games
 	dh_install
 	dh_installmenu
 	dh_installman debian/vdrift.6

Added: packages/trunk/vdrift/debian/vdrift.docs
===================================================================
--- packages/trunk/vdrift/debian/vdrift.docs	                        (rev 0)
+++ packages/trunk/vdrift/debian/vdrift.docs	2009-02-22 00:34:35 UTC (rev 8908)
@@ -0,0 +1,4 @@
+docs/AUTHORS
+docs/ChangeLog
+docs/NEWS
+docs/README

More information about the Pkg-games-commits mailing list