[SCM] Packaging for teeworlds branch, master, updated. 2d194e7bcb49237986bfb29cff0414babba9d907

[Felix Geyer]

The following commit has been merged in the master branch:
commit 4ec2c0b43388058422f5285256f16c782f05da9b
Author: Felix Geyer <debfx-pkg at fobos.de>
Date:   Mon May 9 13:50:26 2011 +0200

    Update to new bam API.

diff --git a/debian/patches/system-libs.patch b/debian/patches/system-libs.patch
index 2e20fad..beb6fe5 100644
--- a/debian/patches/system-libs.patch
+++ b/debian/patches/system-libs.patch
@@ -1,6 +1,6 @@
 diff -Nur teeworlds-0.6.0.orig/bam.lua teeworlds-0.6.0/bam.lua
 --- teeworlds-0.6.0.orig/bam.lua	2011-04-09 21:15:25.000000000 +0200
-+++ teeworlds-0.6.0/bam.lua	2011-05-09 11:26:18.562860118 +0200
++++ teeworlds-0.6.0/bam.lua	2011-05-09 12:07:26.984318771 +0200
 @@ -11,6 +11,8 @@
  config:Add(OptLibrary("zlib", "zlib.h", false))
  config:Add(SDL.OptFind("sdl", true))
@@ -10,6 +10,15 @@ diff -Nur teeworlds-0.6.0.orig/bam.lua teeworlds-0.6.0/bam.lua
  config:Finalize("config.lua")
  
  -- data compiler
+@@ -165,7 +167,7 @@
+ 	end
+ 	
+ 	-- compile zlib if needed
+-	if config.zlib.value == 1 then
++	if config.zlib.value then
+ 		settings.link.libs:Add("z")
+ 		if config.zlib.include_path then
+ 			settings.cc.includes:Add(config.zlib.include_path)
 @@ -176,9 +178,29 @@
  		settings.cc.includes:Add("src/engine/external/zlib")
  	end
@@ -18,7 +27,7 @@ diff -Nur teeworlds-0.6.0.orig/bam.lua teeworlds-0.6.0/bam.lua
 -	wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
 -	pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
 +	-- compile wavpack if needed
-+	if config.wavpack.value == 1 then
++	if config.wavpack.value then
 +		settings.link.libs:Add("wavpack")
 +		if config.wavpack.include_path then
 +			settings.cc.includes:Add(config.wavpack.include_path)
@@ -30,7 +39,7 @@ diff -Nur teeworlds-0.6.0.orig/bam.lua teeworlds-0.6.0/bam.lua
 +	end
 +	
 +	-- compile pnglite if needed
-+	if config.pnglite.value == 1 then
++	if config.pnglite.value then
 +		settings.link.libs:Add("pnglite")
 +		if config.pnglite.include_path then
 +			settings.cc.includes:Add(config.pnglite.include_path)
@@ -45,7 +54,7 @@ diff -Nur teeworlds-0.6.0.orig/bam.lua teeworlds-0.6.0/bam.lua
  	engine_settings = settings:Copy()
 diff -Nur teeworlds-0.6.0.orig/src/engine/client/graphics.cpp teeworlds-0.6.0/src/engine/client/graphics.cpp
 --- teeworlds-0.6.0.orig/src/engine/client/graphics.cpp	2011-04-09 21:15:25.000000000 +0200
-+++ teeworlds-0.6.0/src/engine/client/graphics.cpp	2011-05-09 11:28:12.813386048 +0200
++++ teeworlds-0.6.0/src/engine/client/graphics.cpp	2011-05-09 12:07:13.354255984 +0200
 @@ -19,7 +19,7 @@
  #endif
  
@@ -57,7 +66,7 @@ diff -Nur teeworlds-0.6.0.orig/src/engine/client/graphics.cpp teeworlds-0.6.0/sr
  #include <engine/graphics.h>
 diff -Nur teeworlds-0.6.0.orig/src/engine/client/sound.cpp teeworlds-0.6.0/src/engine/client/sound.cpp
 --- teeworlds-0.6.0.orig/src/engine/client/sound.cpp	2011-04-09 21:15:25.000000000 +0200
-+++ teeworlds-0.6.0/src/engine/client/sound.cpp	2011-05-09 11:28:37.823501101 +0200
++++ teeworlds-0.6.0/src/engine/client/sound.cpp	2011-05-09 12:07:13.354255984 +0200
 @@ -10,7 +10,7 @@
  #include "sound.h"
  
@@ -69,7 +78,7 @@ diff -Nur teeworlds-0.6.0.orig/src/engine/client/sound.cpp teeworlds-0.6.0/src/e
  
 diff -Nur teeworlds-0.6.0.orig/src/tools/dilate.cpp teeworlds-0.6.0/src/tools/dilate.cpp
 --- teeworlds-0.6.0.orig/src/tools/dilate.cpp	2011-04-09 21:15:25.000000000 +0200
-+++ teeworlds-0.6.0/src/tools/dilate.cpp	2011-05-09 11:27:22.203153141 +0200
++++ teeworlds-0.6.0/src/tools/dilate.cpp	2011-05-09 12:07:13.354255984 +0200
 @@ -2,7 +2,7 @@
  /* If you are missing that file, acquire a complete release at teeworlds.com.                */
  #include <base/system.h>
@@ -81,7 +90,7 @@ diff -Nur teeworlds-0.6.0.orig/src/tools/dilate.cpp teeworlds-0.6.0/src/tools/di
  {
 diff -Nur teeworlds-0.6.0.orig/src/tools/tileset_borderfix.cpp teeworlds-0.6.0/src/tools/tileset_borderfix.cpp
 --- teeworlds-0.6.0.orig/src/tools/tileset_borderfix.cpp	2011-04-09 21:15:25.000000000 +0200
-+++ teeworlds-0.6.0/src/tools/tileset_borderfix.cpp	2011-05-09 11:27:12.403108027 +0200
++++ teeworlds-0.6.0/src/tools/tileset_borderfix.cpp	2011-05-09 12:07:13.354255984 +0200
 @@ -2,7 +2,7 @@
  /* If you are missing that file, acquire a complete release at teeworlds.com.                */
  #include <stdlib.h>
diff --git a/debian/rules b/debian/rules
index b6b2f09..d555bd1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ LDFLAGS += -Wl,--as-needed
 	dh $@
 
 override_dh_auto_build:
-	echo "release_settings.cc.optimize = 0" >> debian.lua
+	echo "release_settings.optimize = 0" >> debian.lua
 	echo "release_settings.cc.flags:Add(\"$(CFLAGS)\")" >> debian.lua
 	echo "release_settings.link.inputflags = release_settings.link.inputflags .. \" $(LDFLAGS)\"" >> debian.lua
 	bam -v release

-- 
Packaging for teeworlds