[SCM] Packaging for spacehero branch, master, updated. upstream/0.0.5-11-gf3015a0

[Arne Wichmann]

The following commit has been merged in the master branch:
commit cccc603c5438e37fe54e49ff284fa5ae712611c8
Author: Arne Wichmann <arnew at rasentrimmer.org>
Date:   Fri Feb 20 16:27:05 2009 +0100

    Imported Upstream version 0.0.7

diff --git a/Illustrator.cpp b/Illustrator.cpp
index 744be6c..a939fef 100644
--- a/Illustrator.cpp
+++ b/Illustrator.cpp
@@ -23,7 +23,7 @@ Illustrator::Illustrator(std::string path) :
   float fx, fy;
   SDL_Surface *fontImage;
 
-  if ((fontImage = IMG_Load( (path + "data/font.png").c_str() )))
+  if ((fontImage = IMG_Load( (path + "font.png").c_str() )))
   {
     glGenTextures( 1, &font );
     glBindTexture( GL_TEXTURE_2D, font );
@@ -38,7 +38,7 @@ Illustrator::Illustrator(std::string path) :
 
     SDL_FreeSurface(fontImage);
   } else {
-    printf("Font nicht vorhanden!\n");
+    std::cerr << "Font nicht vorhanden: " << (path + "font.png") << std::endl;
     exit(1);
   }
 
diff --git a/Makefile b/Makefile
index ebf6922..c4a717b 100755
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,15 @@
 
+# Lokal: z.b. -DDEV
+-include Makefile.local
+
 CPPFLAGS+=`sdl-config --cflags`
 
 CXXFLAGS+=-Wall -Wextra -Wparentheses
 CXXFLAGS+=-Weffc++
-CXXFLAGS+=-g
-LIBS+=-lm -lGL -lGLU `sdl-config --libs` -lSDL_image -lboost_filesystem-mt
 
-# Lokal
-# z.b. -DDEV
--include Makefile.local
-
-# schnell aber nicht ansi
-CXXFLAGS+=-DFAST -DBETTER
-CXXFLAGS+=-O2
+LIBS+=-lm -lGL -lGLU `sdl-config --libs` -lSDL_image -lboost_filesystem-mt
 
+# Profiler stuff
 #CFLAGS+=-pg
 #LDFLAGS+=-pg
 
@@ -22,11 +18,11 @@ SRC+=GLdisplay.cpp
 SRC+=PictureBook.cpp
 SRC+=Illustrator.cpp
 SRC+=ButtonMaster.cpp
-SRC+=FileManager.cpp
 
 # SpaceHero
 SRC+=Level.cpp
 SRC+=Editor.cpp
+SRC+=FileManager.cpp
 SRC+=Universe.cpp 
 SRC+=Spacehero.cpp
 SRC+=SpaceDisplay.cpp
@@ -45,17 +41,30 @@ clean:
 	rm -f spacehero $(OBJS)
 	rm -f .depend
 
+INSTALL = install
+INSTALL_FILE    = $(INSTALL) -p    -o root -g root  -m  644
+INSTALL_PROGRAM = $(INSTALL) -p    -o root -g root  -m  755
+INSTALL_SCRIPT  = $(INSTALL) -p    -o root -g root  -m  755
+INSTALL_DIR     = $(INSTALL) -p -d -o root -g root  -m  755
+
+DIR_BIN=$(DESTDIR)/usr/games
+DIR_SHARED=$(DESTDIR)/usr/share/games/spacehero
+
 install:
-	install -d $(DESTDIR)/usr/games/
-	install spacehero $(DESTDIR)/usr/games/
-	install -d $(DESTDIR)/usr/share/games/spacehero/level
-	install -d $(DESTDIR)/usr/share/games/spacehero/data
-	install level/* $(DESTDIR)/usr/share/games/spacehero/level
-	install data/* $(DESTDIR)/usr/share/games/spacehero/data
+	$(INSTALL_DIR) $(DIR_BIN) $(DIR_SHARED)/level $(DIR_SHARED)/data
+	$(INSTALL_PROGRAM) spacehero $(DIR_BIN)
+	$(INSTALL_FILE) level/* $(DIR_SHARED)/level
+	$(INSTALL_FILE) data/* $(DIR_SHARED)/data
 
 dist:
 	 git archive --format=tar --prefix=spacehero/ HEAD | gzip > spacehero.tgz
 
+GBPFLAGS+= --git-pristine-tar --git-export-dir=/tmp/gbp
+	
+debs:
+	PBUILDER_OPTS=" --basetgz /var/cache/pbuilder/base-i386.tgz " git-buildpackage $(GBPFLAGS)  -B
+	git-buildpackage $(GBPFLAGS) 
+
 .depend: $(SRC)
 	$(CXX) $(CXXFLAGS) -E -MM $(SRC) > .depend
 

-- 
Packaging for spacehero