r9287 - in packages/trunk/stormbaancoureur/debian: . patches

[Gonéri Le Bouder]

Author: goneri
Date: 2009-03-29 21:17:54 +0000 (Sun, 29 Mar 2009)
New Revision: 9287

Added:
   packages/trunk/stormbaancoureur/debian/patches/makefile.patch
Modified:
   packages/trunk/stormbaancoureur/debian/changelog
   packages/trunk/stormbaancoureur/debian/control
   packages/trunk/stormbaancoureur/debian/patches/series
Log:
[ Gonéri Le Bouder ]
* Add plib-dev as an alternative to libplib-dev
* Merge makefile_cflags.patch and makefile_libode.patch in
  makefile.patch
* change makefile so it calls ode-config to get the correct
  gcc parameter for ODE (-I/usr/include -DdDOUBLE)


Modified: packages/trunk/stormbaancoureur/debian/changelog
===================================================================
--- packages/trunk/stormbaancoureur/debian/changelog	2009-03-29 16:45:19 UTC (rev 9286)
+++ packages/trunk/stormbaancoureur/debian/changelog	2009-03-29 21:17:54 UTC (rev 9287)
@@ -1,9 +1,17 @@
-stormbaancoureur (2.1.5-3.1) UNRELEASED; urgency=low
+stormbaancoureur (2.1.5-3.1) unstable; urgency=medium
 
+  [ Paul Wise ]
   * Fix the plib build-dep to libplib-dev
 
- -- Paul Wise <pabs at debian.org>  Thu, 19 Mar 2009 14:03:09 +0900
+  [ Gonéri Le Bouder ]
+  * Add plib-dev as an alternative to libplib-dev
+  * Merge makefile_cflags.patch and makefile_libode.patch in 
+    makefile.patch
+  * change makefile so it calls ode-config to get the correct
+    gcc parameter for ODE (-I/usr/include -DdDOUBLE)
 
+ -- Gonéri Le Bouder <goneri at rulezlan.org>  Sun, 29 Mar 2009 23:13:30 +0200
+
 stormbaancoureur (2.1.5-3) unstable; urgency=low
 
   [ Gonéri Le Bouder ]

Modified: packages/trunk/stormbaancoureur/debian/control
===================================================================
--- packages/trunk/stormbaancoureur/debian/control	2009-03-29 16:45:19 UTC (rev 9286)
+++ packages/trunk/stormbaancoureur/debian/control	2009-03-29 21:17:54 UTC (rev 9287)
@@ -7,7 +7,7 @@
  Barry deFreese <bdefreese at debian.org>,
  Gonéri Le Bouder <goneri at rulezlan.org>
 Build-Depends: debhelper (>= 5.0.51), quilt,
- libplib-dev, libode-dev (>=2:0.10.1) | libode0-dev |
+ libplib-dev | plib-dev, libode-dev (>=2:0.10.1) | libode0-dev |
  libode-nonfree0-dev, freeglut3-dev, libasound2-dev
 Standards-Version: 3.8.1
 Homepage: http://bram.creative4vision.nl/stormbaancoureur/

Added: packages/trunk/stormbaancoureur/debian/patches/makefile.patch
===================================================================
--- packages/trunk/stormbaancoureur/debian/patches/makefile.patch	                        (rev 0)
+++ packages/trunk/stormbaancoureur/debian/patches/makefile.patch	2009-03-29 21:17:54 UTC (rev 9287)
@@ -0,0 +1,38 @@
+diff -urN stormbaancoureur-2.0.1.orig/src-stormbaancoureur/Makefile stormbaancoureur-2.0.1/src-stormbaancoureur/Makefile
+--- stormbaancoureur-2.0.1.orig/src-stormbaancoureur/Makefile	2008-01-03 09:35:21.000000000 -0500
++++ stormbaancoureur-2.0.1/src-stormbaancoureur/Makefile	2008-01-03 09:36:01.000000000 -0500
+@@ -45,7 +45,7 @@
+ 
+ 
+ LIBS=\
+-  $(ODEPREFIX)/$(LIBDIRNAME)/libode.a \
++  -lode \
+   -lplibssgaux -lplibssg -lplibsg -lplibpu -lplibfnt -lplibul \
+   -lglut -lGLU -lGL -lasound
+ --- stormbaancoureur-2.1.5.orig/src-stormbaancoureur/Makefile
++++ stormbaancoureur-2.1.5/src-stormbaancoureur/Makefile
+@@ -8,6 +8,8 @@
+ CXX=g++
+ LIBDIRNAME=lib
+ 
++CFLAGS=-02 -g -Wall
++
+ # END OF CUSTOM SETTINGS
+ 
+ CXXFLAGS=\
+@@ -17,11 +19,13 @@
+   -I../src-common \
+   -I. \
+   -DGAMEVERSION=$(VERSION) \
+-  -O2 -g -Wall
++  $(CFLAGS) \
++  `ode-config --cflags`
+ 
+ LFLAGS=\
+   -L$(PLIBPREFIX)/$(LIBDIRNAME) \
+-  -L/usr/X11R6/$(LIBDIRNAME)
++  -L/usr/X11R6/$(LIBDIRNAME) \
++  `ode-config --libs`
+ 
+ 
+ OBJS=\

Modified: packages/trunk/stormbaancoureur/debian/patches/series
===================================================================
--- packages/trunk/stormbaancoureur/debian/patches/series	2009-03-29 16:45:19 UTC (rev 9286)
+++ packages/trunk/stormbaancoureur/debian/patches/series	2009-03-29 21:17:54 UTC (rev 9287)
@@ -1,4 +1,3 @@
-makefile_libode.patch
-makefile_cflags.patch
+makefile.patch
 fullscreen_optional.patch
 gcc44.patch