r6196 - in packages/trunk/rrootage/debian: . patches

Peter De Wachter pdewacht-guest at alioth.debian.org
Tue Mar 18 23:44:55 UTC 2008 

Author: pdewacht-guest
Date: 2008-03-18 23:44:54 +0000 (Tue, 18 Mar 2008)
New Revision: 6196

Modified:
   packages/trunk/rrootage/debian/changelog
   packages/trunk/rrootage/debian/control
   packages/trunk/rrootage/debian/patches/01_makefile.patch
   packages/trunk/rrootage/debian/patches/07_use_system_bulletml.patch
Log:
don't link needlessly against freeglut3


Modified: packages/trunk/rrootage/debian/changelog
===================================================================
--- packages/trunk/rrootage/debian/changelog	2008-03-18 23:40:51 UTC (rev 6195)
+++ packages/trunk/rrootage/debian/changelog	2008-03-18 23:44:54 UTC (rev 6196)
@@ -13,6 +13,7 @@
 
   [ Peter De Wachter ]
   * Fix URL macro in manpage.
+  * Don't link against freeglut3 (not needed, rrootage uses only GL and GLU).
 
  -- Miriam Ruiz <little_miry at yahoo.es>  Mon, 24 Sep 2007 10:11:10 +0200
 

Modified: packages/trunk/rrootage/debian/control
===================================================================
--- packages/trunk/rrootage/debian/control	2008-03-18 23:40:51 UTC (rev 6195)
+++ packages/trunk/rrootage/debian/control	2008-03-18 23:44:54 UTC (rev 6196)
@@ -4,7 +4,8 @@
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Miriam Ruiz <little_miry at yahoo.es>, Dafydd Harries <daf at debian.org>
 Build-Depends: debhelper (>= 5), quilt, libsdl1.2-dev, libsdl-mixer1.2-dev,
- freeglut3-dev, libbulletml-dev, libboost-dev
+ libglu1-mesa-dev | libglu-dev, libgl1-mesa-dev | libgl-dev,
+ libbulletml-dev, libboost-dev
 Standards-Version: 3.7.3
 Homepage: http://rrootage.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/rrootage/

Modified: packages/trunk/rrootage/debian/patches/01_makefile.patch
===================================================================
--- packages/trunk/rrootage/debian/patches/01_makefile.patch	2008-03-18 23:40:51 UTC (rev 6195)
+++ packages/trunk/rrootage/debian/patches/01_makefile.patch	2008-03-18 23:44:54 UTC (rev 6196)
@@ -2,11 +2,9 @@
 # Copyright (C) 2005  Dafydd Harries <daf at debian.org>
 # Distributed under the same license as the game. See debian/copyright.
 
-Index: rrootage-0.23a/src/makefile.lin
-===================================================================
---- rrootage-0.23a.orig/src/makefile.lin	2007-08-29 19:48:32.000000000 +0000
-+++ rrootage-0.23a/src/makefile.lin	2007-08-29 19:55:02.000000000 +0000
-@@ -7,10 +7,11 @@
+--- a/src/makefile.lin
++++ b/src/makefile.lin
+@@ -7,15 +7,16 @@
  CC     = gcc
  CXX    = g++
  
@@ -15,8 +13,25 @@
  
  DEFAULT_CFLAGS = `sdl-config --cflags`
 -LDFLAGS        = `sdl-config --libs` -L. -lglut -lbulletml -lSDL_mixer -mwindows -lstdc++
-+#LDFLAGS        = `sdl-config --libs` -L. -lglut -lbulletml -lSDL_mixer -mwindows -lstdc++
-+LDFLAGS        = `sdl-config --libs` -L. -lglut bulletml/libbulletml.a -lSDL_mixer -lstdc++
++#LDFLAGS        = `sdl-config --libs` -L. -lGLU -lGL -lbulletml -lSDL_mixer -mwindows
++LDFLAGS        = `sdl-config --libs` -L. -lGLU -lGL bulletml/libbulletml.a -lSDL_mixer
  #-lglu32 -lopengl32 -lmingw32 -lmingwex
- MORE_CFLAGS = -DLINUX -O3 -Wall
+-MORE_CFLAGS = -DLINUX -O3 -Wall
++MORE_CFLAGS = -O2 -Wall
  
+-CFLAGS   = $(DEFAULT_CFLAGS) $(MORE_CFLAGS)
+-CPPFLAGS = $(DEFAULT_CFLAGS) $(MORE_CFLAGS) -I./bulletml/
++CFLAGS   = $(DEFAULT_CFLAGS) $(MORE_CFLAGS) -DLINUX
++CPPFLAGS = $(DEFAULT_CFLAGS) $(MORE_CFLAGS) -DLINUX -I./bulletml/
+ 
+ OBJS =	$(NAME).$(O) \
+ 	foe.$(O) foecommand.$(O) barragemanager.$(O) boss.$(O) ship.$(O) laser.$(O) \
+@@ -26,7 +27,7 @@
+ 	#$(NAME)_res.$(O)
+ 
+ $(PROG): $(OBJS)
+-	$(CC) $(CFLAGS) -o $(PROG) $(OBJS) $(LDFLAGS)
++	$(CXX) $(CPPFLAGS) -o $(PROG) $(OBJS) $(LDFLAGS)
+ 
+ #$(NAME)_res.o: $(NAME).rc
+ #	windres -i $(NAME).rc -o $(NAME)_res.o

Modified: packages/trunk/rrootage/debian/patches/07_use_system_bulletml.patch
===================================================================
--- packages/trunk/rrootage/debian/patches/07_use_system_bulletml.patch	2008-03-18 23:40:51 UTC (rev 6195)
+++ packages/trunk/rrootage/debian/patches/07_use_system_bulletml.patch	2008-03-18 23:44:54 UTC (rev 6196)
@@ -1,23 +1,19 @@
 # Copyright (C) 2007  Miriam Ruiz <little_miry at yahoo.es>
 # Distributed under the same license as the game. See debian/copyright.
 
-Index: rrootage-0.23a/src/makefile.lin
-===================================================================
---- rrootage-0.23a.orig/src/makefile.lin	2007-08-29 20:13:42.000000000 +0000
-+++ rrootage-0.23a/src/makefile.lin	2007-08-29 20:16:12.000000000 +0000
+--- a/src/makefile.lin
++++ b/src/makefile.lin
 @@ -11,12 +11,12 @@
  
  DEFAULT_CFLAGS = `sdl-config --cflags`
- #LDFLAGS        = `sdl-config --libs` -L. -lglut -lbulletml -lSDL_mixer -mwindows -lstdc++
--LDFLAGS        = `sdl-config --libs` -L. -lglut bulletml/libbulletml.a -lSDL_mixer -lstdc++
-+LDFLAGS        = `sdl-config --libs` -L. -lglut -lbulletml -lSDL_mixer -lstdc++
+ #LDFLAGS        = `sdl-config --libs` -L. -lGLU -lGL -lbulletml -lSDL_mixer -mwindows
+-LDFLAGS        = `sdl-config --libs` -L. -lGLU -lGL bulletml/libbulletml.a -lSDL_mixer
++LDFLAGS        = `sdl-config --libs` -L. -lGLU -lGL -lbulletml -lSDL_mixer
  #-lglu32 -lopengl32 -lmingw32 -lmingwex
--MORE_CFLAGS = -DLINUX -O3 -Wall
-+MORE_CFLAGS = -O2 -Wall
+ MORE_CFLAGS = -O2 -Wall
  
--CFLAGS   = $(DEFAULT_CFLAGS) $(MORE_CFLAGS)
--CPPFLAGS = $(DEFAULT_CFLAGS) $(MORE_CFLAGS) -I./bulletml/
-+CFLAGS   = $(DEFAULT_CFLAGS) $(MORE_CFLAGS) -DLINUX
+ CFLAGS   = $(DEFAULT_CFLAGS) $(MORE_CFLAGS) -DLINUX
+-CPPFLAGS = $(DEFAULT_CFLAGS) $(MORE_CFLAGS) -DLINUX -I./bulletml/
 +CPPFLAGS = $(DEFAULT_CFLAGS) $(MORE_CFLAGS) -DLINUX
  
  OBJS =	$(NAME).$(O) \
@@ -29,10 +25,8 @@
 +
  clean:
  	$(RM) $(PROG) *.$(O)
-Index: rrootage-0.23a/src/barragemanager.h
-===================================================================
---- rrootage-0.23a.orig/src/barragemanager.h	2007-08-29 20:14:22.000000000 +0000
-+++ rrootage-0.23a/src/barragemanager.h	2007-08-29 20:15:35.000000000 +0000
+--- a/src/barragemanager.h
++++ b/src/barragemanager.h
 @@ -12,9 +12,9 @@
  #ifndef BARRAGEMANAGER_H_
  #define BARRAGEMANAGER_H_
@@ -46,10 +40,8 @@
  
  typedef struct {
    BulletMLParser *bulletml;
-Index: rrootage-0.23a/src/foe.h
-===================================================================
---- rrootage-0.23a.orig/src/foe.h	2007-08-29 20:14:53.000000000 +0000
-+++ rrootage-0.23a/src/foe.h	2007-08-29 20:16:05.000000000 +0000
+--- a/src/foe.h
++++ b/src/foe.h
 @@ -17,9 +17,9 @@
  #include "foe_mtd.h"
  }
@@ -63,10 +55,8 @@
  #include "foecommand.h"
  #include "barragemanager.h"
  #include "boss.h"
-Index: rrootage-0.23a/src/foecommand.cc
-===================================================================
---- rrootage-0.23a.orig/src/foecommand.cc	2007-08-29 20:14:28.000000000 +0000
-+++ rrootage-0.23a/src/foecommand.cc	2007-08-29 20:15:44.000000000 +0000
+--- a/src/foecommand.cc
++++ b/src/foecommand.cc
 @@ -9,9 +9,9 @@
   *
   * @version $Revision: 1.2 $
@@ -80,10 +70,8 @@
  #include "foe.h"
  
  extern "C" {
-Index: rrootage-0.23a/src/foecommand.h
-===================================================================
---- rrootage-0.23a.orig/src/foecommand.h	2007-08-29 20:14:34.000000000 +0000
-+++ rrootage-0.23a/src/foecommand.h	2007-08-29 20:15:54.000000000 +0000
+--- a/src/foecommand.h
++++ b/src/foecommand.h
 @@ -12,9 +12,9 @@
  #ifndef FOECOMMAND_H_
  #define FOECOMMAND_H_

More information about the Pkg-games-commits mailing list