Author: goneri
Date: 2009-08-22 13:39:40 +0000 (Sat, 22 Aug 2009)
New Revision: 10174
Added:
packages/tags/teeworlds/0.5.1-3/
packages/tags/teeworlds/0.5.1-3/debian/changelog
packages/tags/teeworlds/0.5.1-3/debian/patches/new-wavpack.patch
packages/tags/teeworlds/0.5.1-3/debian/patches/series
packages/tags/teeworlds/0.5.1-3/debian/patches/system-libs.patch
packages/tags/teeworlds/0.5.1-3/debian/rules
Removed:
packages/tags/teeworlds/0.5.1-3/debian/changelog
packages/tags/teeworlds/0.5.1-3/debian/patches/new-wavpack.patch
packages/tags/teeworlds/0.5.1-3/debian/patches/series
packages/tags/teeworlds/0.5.1-3/debian/patches/system-libs.patch
packages/tags/teeworlds/0.5.1-3/debian/rules
Log:
tag teeworlds 0.5.1-3
Deleted: packages/tags/teeworlds/0.5.1-3/debian/changelog
===================================================================
--- packages/trunk/teeworlds/debian/changelog 2009-08-21 01:31:46 UTC (rev
10162)
+++ packages/tags/teeworlds/0.5.1-3/debian/changelog 2009-08-22 13:39:40 UTC
(rev 10174)
@@ -1,78 +0,0 @@
-teeworlds (0.5.1-3) UNRELEASED; urgency=low
-
- [ Gonéri Le Bouder ]
- * Clean the teeworld binary
-
- [ Paul Wise ]
- * Fix bashism in the --help option of the teeworlds-server script
- (Closes: #530198)
-
- -- Gonéri Le Bouder <gon...@rulezlan.org> Sun, 10 May 2009 23:38:35 +0200
-
-teeworlds (0.5.1-2) unstable; urgency=low
-
- * Fix the ouput of teeworlds-server --help with /bin/sh ->
- /bin/bash (Closes: #511600)
- * Standard version 3.8.1
-
- -- Gonéri Le Bouder <gon...@rulezlan.org> Sun, 12 Apr 2009 02:32:37 +0200
-
-teeworlds (0.5.1-1) unstable; urgency=low
-
- * New upstream release (Closes: #511875, #517002)
- - Bam has its own release now
- - Update debian/copyright
- - BuildDepends on libsdl1.2-dev
- - Update the clean target
- * teeworlds-server doesn't suggest teeworlds-server anymore
-
- -- Gonéri Le Bouder <gon...@rulezlan.org> Fri, 23 Jan 2009 23:09:01 +0100
-
-teeworlds (0.4.3-3) experimental; urgency=low
-
- * add a loop in teeworld wrapper to poke the screensaver and avoid freeze
- (Closes: #480902)
-
- -- Gonéri Le Bouder <gon...@rulezlan.org> Sun, 11 Jan 2009 20:05:45 +0100
-
-teeworlds (0.4.3-2) experimental; urgency=low
-
- [ Gonéri Le Bouder ]
- * Apply Michel Dänzer patch to avoid crash on big endian arch
- (Closes: #504704)
-
- -- Gonéri Le Bouder <gon...@rulezlan.org> Sun, 14 Dec 2008 01:55:34 +0100
-
-teeworlds (0.4.3-1) experimental; urgency=low
-
- [ Ansgar Burchardt ]
- * debian/control: Add Homepage field
-
- [ Miriam Ruiz ]
- * Upgraded Standards-Version from 3.7.3 to 3.8.0: No changes needed
- * Added README.source file
-
- [ Gonéri Le Bouder ]
- * New Upstream Release
- * Refresh the patches
- * Don't link against libasound2 anymore
- + add dont-link-with-asound.diff
- + remove libasound2-dev from the build-deps
- * Add myself in uploader
- * Versioned dependency against teeworlds-data (= ${source:Version})
-
- -- Gonéri Le Bouder <gon...@rulezlan.org> Tue, 04 Nov 2008 00:54:25 +0100
-
-teeworlds (0.4.2-2) unstable; urgency=low
-
- [ Gonéri Le Bouder ]
- * Fix the build on SPARC (Closes: #481817)
- + add fix-bam-FTBFS.patch
-
- -- Debian Games Team <pkg-games-de...@lists.alioth.debian.org> Tue, 28 Oct
2008 23:53:17 +0100
-
-teeworlds (0.4.2-1) unstable; urgency=low
-
- * Initial release (Closes: #460848)
-
- -- Jack Coulter <jsci...@gmail.com> Sun, 13 Apr 2008 18:48:12 +1000
Copied: packages/tags/teeworlds/0.5.1-3/debian/changelog (from rev 10173,
packages/trunk/teeworlds/debian/changelog)
===================================================================
--- packages/tags/teeworlds/0.5.1-3/debian/changelog
(rev 0)
+++ packages/tags/teeworlds/0.5.1-3/debian/changelog 2009-08-22 13:39:40 UTC
(rev 10174)
@@ -0,0 +1,80 @@
+teeworlds (0.5.1-3) unstable; urgency=low
+
+ [ Gonéri Le Bouder ]
+ * Clean: clean the teeworld binary, the embedded libs and correctly
+ call unpatch
+ * refresh the system-libs.patch and new-wavpack.patch and apply them
+
+ [ Paul Wise ]
+ * Fix bashism in the --help option of the teeworlds-server script
+ (Closes: #530198)
+
+ -- Gonéri Le Bouder <gon...@rulezlan.org> Sun, 10 May 2009 23:38:35 +0200
+
+teeworlds (0.5.1-2) unstable; urgency=low
+
+ * Fix the ouput of teeworlds-server --help with /bin/sh ->
+ /bin/bash (Closes: #511600)
+ * Standard version 3.8.1
+
+ -- Gonéri Le Bouder <gon...@rulezlan.org> Sun, 12 Apr 2009 02:32:37 +0200
+
+teeworlds (0.5.1-1) unstable; urgency=low
+
+ * New upstream release (Closes: #511875, #517002)
+ - Bam has its own release now
+ - Update debian/copyright
+ - BuildDepends on libsdl1.2-dev
+ - Update the clean target
+ * teeworlds-server doesn't suggest teeworlds-server anymore
+
+ -- Gonéri Le Bouder <gon...@rulezlan.org> Fri, 23 Jan 2009 23:09:01 +0100
+
+teeworlds (0.4.3-3) experimental; urgency=low
+
+ * add a loop in teeworld wrapper to poke the screensaver and avoid freeze
+ (Closes: #480902)
+
+ -- Gonéri Le Bouder <gon...@rulezlan.org> Sun, 11 Jan 2009 20:05:45 +0100
+
+teeworlds (0.4.3-2) experimental; urgency=low
+
+ [ Gonéri Le Bouder ]
+ * Apply Michel Dänzer patch to avoid crash on big endian arch
+ (Closes: #504704)
+
+ -- Gonéri Le Bouder <gon...@rulezlan.org> Sun, 14 Dec 2008 01:55:34 +0100
+
+teeworlds (0.4.3-1) experimental; urgency=low
+
+ [ Ansgar Burchardt ]
+ * debian/control: Add Homepage field
+
+ [ Miriam Ruiz ]
+ * Upgraded Standards-Version from 3.7.3 to 3.8.0: No changes needed
+ * Added README.source file
+
+ [ Gonéri Le Bouder ]
+ * New Upstream Release
+ * Refresh the patches
+ * Don't link against libasound2 anymore
+ + add dont-link-with-asound.diff
+ + remove libasound2-dev from the build-deps
+ * Add myself in uploader
+ * Versioned dependency against teeworlds-data (= ${source:Version})
+
+ -- Gonéri Le Bouder <gon...@rulezlan.org> Tue, 04 Nov 2008 00:54:25 +0100
+
+teeworlds (0.4.2-2) unstable; urgency=low
+
+ [ Gonéri Le Bouder ]
+ * Fix the build on SPARC (Closes: #481817)
+ + add fix-bam-FTBFS.patch
+
+ -- Debian Games Team <pkg-games-de...@lists.alioth.debian.org> Tue, 28 Oct
2008 23:53:17 +0100
+
+teeworlds (0.4.2-1) unstable; urgency=low
+
+ * Initial release (Closes: #460848)
+
+ -- Jack Coulter <jsci...@gmail.com> Sun, 13 Apr 2008 18:48:12 +1000
Deleted: packages/tags/teeworlds/0.5.1-3/debian/patches/new-wavpack.patch
===================================================================
--- packages/trunk/teeworlds/debian/patches/new-wavpack.patch 2009-08-21
01:31:46 UTC (rev 10162)
+++ packages/tags/teeworlds/0.5.1-3/debian/patches/new-wavpack.patch
2009-08-22 13:39:40 UTC (rev 10174)
@@ -1,50 +0,0 @@
-Index: b/src/engine/client/ec_snd.c
-===================================================================
---- a/src/engine/client/ec_snd.c
-+++ b/src/engine/client/ec_snd.c
-@@ -371,14 +371,6 @@
- snd->num_frames = num_frames;
- }
-
--
--static FILE *file = NULL;
--
--static int read_data(void *buffer, int size)
--{
-- return fread(buffer, 1, size, file);
--}
--
- int snd_load_wv(const char *filename)
- {
- SAMPLE *snd;
-@@ -394,19 +386,12 @@
- if(!sound_enabled)
- return 1;
-
-- file = fopen(filename, "rb"); /* TODO: use system.h stuff for this */
-- if(!file)
-- {
-- dbg_msg("sound/wv", "failed to open %s", filename);
-- return -1;
-- }
--
- sid = snd_alloc_id();
- if(sid < 0)
- return -1;
- snd = &samples[sid];
-
-- context = WavpackOpenFileInput(read_data, error);
-+ context = WavpackOpenFileInput(filename, error, OPEN_2CH_MAX, 0);
- if (context)
- {
- int samples = WavpackGetNumSamples(context);
-@@ -461,9 +446,6 @@
- dbg_msg("sound/wv", "failed to open %s: %s", filename, error);
- }
-
-- fclose(file);
-- file = NULL;
--
- if(config.debug)
- dbg_msg("sound/wv", "loaded %s", filename);
-
Copied: packages/tags/teeworlds/0.5.1-3/debian/patches/new-wavpack.patch (from
rev 10173, packages/trunk/teeworlds/debian/patches/new-wavpack.patch)
===================================================================
--- packages/tags/teeworlds/0.5.1-3/debian/patches/new-wavpack.patch
(rev 0)
+++ packages/tags/teeworlds/0.5.1-3/debian/patches/new-wavpack.patch
2009-08-22 13:39:40 UTC (rev 10174)
@@ -0,0 +1,49 @@
+diff --git a/src/engine/client/ec_snd.c b/src/engine/client/ec_snd.c
+index 034dfb2..67e819c 100644
+--- a/src/engine/client/ec_snd.c
++++ b/src/engine/client/ec_snd.c
+@@ -359,13 +359,6 @@ static void rate_convert(int sid)
+ }
+
+
+-static IOHANDLE file = NULL;
+-
+-static int read_data(void *buffer, int size)
+-{
+- return io_read(file, buffer, size);
+-}
+-
+ int snd_load_wv(const char *filename)
+ {
+ SAMPLE *snd;
+@@ -381,19 +374,12 @@ int snd_load_wv(const char *filename)
+ if(!sound_enabled)
+ return 1;
+
+- file = engine_openfile(filename, IOFLAG_READ); /* TODO: use system.h
stuff for this */
+- if(!file)
+- {
+- dbg_msg("sound/wv", "failed to open %s", filename);
+- return -1;
+- }
+-
+ sid = snd_alloc_id();
+ if(sid < 0)
+ return -1;
+ snd = &samples[sid];
+
+- context = WavpackOpenFileInput(read_data, error);
++ context = WavpackOpenFileInput(filename, error, OPEN_2CH_MAX, 0);
+ if (context)
+ {
+ int samples = WavpackGetNumSamples(context);
+@@ -448,9 +434,6 @@ int snd_load_wv(const char *filename)
+ dbg_msg("sound/wv", "failed to open %s: %s", filename, error);
+ }
+
+- io_close(file);
+- file = NULL;
+-
+ if(config.debug)
+ dbg_msg("sound/wv", "loaded %s", filename);
+
Deleted: packages/tags/teeworlds/0.5.1-3/debian/patches/series
===================================================================
--- packages/trunk/teeworlds/debian/patches/series 2009-08-21 01:31:46 UTC
(rev 10162)
+++ packages/tags/teeworlds/0.5.1-3/debian/patches/series 2009-08-22
13:39:40 UTC (rev 10174)
@@ -1,5 +0,0 @@
-#fix-big-endian.diff
-#dont-link-with-asound.diff
-#new-wavpack.patch
-#system-libs.patch
-#fix-bam-FTBFS.patch
Copied: packages/tags/teeworlds/0.5.1-3/debian/patches/series (from rev 10173,
packages/trunk/teeworlds/debian/patches/series)
===================================================================
--- packages/tags/teeworlds/0.5.1-3/debian/patches/series
(rev 0)
+++ packages/tags/teeworlds/0.5.1-3/debian/patches/series 2009-08-22
13:39:40 UTC (rev 10174)
@@ -0,0 +1,5 @@
+#fix-big-endian.diff
+#dont-link-with-asound.diff
+system-libs.patch
+new-wavpack.patch
+#fix-bam-FTBFS.patch
Deleted: packages/tags/teeworlds/0.5.1-3/debian/patches/system-libs.patch
===================================================================
--- packages/trunk/teeworlds/debian/patches/system-libs.patch 2009-08-21
01:31:46 UTC (rev 10162)
+++ packages/tags/teeworlds/0.5.1-3/debian/patches/system-libs.patch
2009-08-22 13:39:40 UTC (rev 10174)
@@ -1,186 +0,0 @@
-Index: b/default.bam
-===================================================================
---- a/default.bam
-+++ b/default.bam
-@@ -214,7 +214,6 @@
-
- -- set some platform specific settings
- settings.cc.includes:add("src")
-- settings.cc.includes:add("src/external/zlib")
-
- if family == "unix" then
- if platform == "macosx" then
-@@ -232,6 +231,8 @@
- end
-
- settings.linker.libs:add("pthread")
-+ settings.linker.libs:add("z")
-+ settings.linker.libs:add("pnglite")
- end
- elseif family == "windows" then
- glfw_platform = "win32"
-@@ -244,29 +245,6 @@
- settings.linker.libs:add("shell32.lib")
- end
-
-- -- build glfw
-- glfw_settings = settings:copy()
-- glfw_settings.cc.includes:add("src/external/glfw/include")
-- glfw_settings.cc.includes:add("src/engine/external/glfw/lib")
-- glfw_settings.cc.includes:add("src/engine/external/glfw/lib/" ..
glfw_platform)
--
-- glfw = Compile(glfw_settings, Collect(
-- "src/engine/external/glfw/lib/*.c",
-- "src/engine/external/glfw/lib/" .. glfw_platform .. "/*.c"))
--
-- -- build portaudio
-- pa_settings = settings:copy()
-- pa_settings.cc.defines:add("PA_USE_" .. string.upper(pa_hostapi))
-- pa_settings.cc.defines:add("PA_NO_WMME")
-- pa_settings.cc.defines:add("PA_NO_ASIO")
-- pa_settings.cc.includes:add("src/engine/external/portaudio/include")
-- pa_settings.cc.includes:add("src/engine/external/portaudio/src/common")
-- pa_settings.cc.includes:add("src/engine/external/portaudio/src/os/" ..
pa_platform)
--
-- portaudio = Compile(pa_settings,
-- Collect("src/engine/external/portaudio/src/common/*.c"),
-- Collect("src/engine/external/portaudio/src/os/" .. pa_platform
.. "/*.c"),
-- Collect("src/engine/external/portaudio/src/hostapi/" ..
pa_hostapi .. "/*.c"))
-
- -- build game components
- engine_settings = settings:copy()
-@@ -287,7 +265,7 @@
-
- -- client
- client_settings = engine_settings:copy()
-- client_settings.cc.includes:add("src/external/glfw/include")
-+ client_settings.cc.includes:add("/usr/include/GL")
-
- if family == "unix" then
- if platform == "macosx" then
-@@ -300,8 +278,13 @@
- client_settings.linker.frameworks:add("AudioUnit")
- else
- client_settings.linker.libs:add("X11")
-+ client_settings.linker.libs:add("Xrandr")
- client_settings.linker.libs:add("GL")
- client_settings.linker.libs:add("GLU")
-+ client_settings.linker.libs:add("z")
-+ client_settings.linker.libs:add("wavpack")
-+ client_settings.linker.libs:add("portaudio")
-+ client_settings.linker.libs:add("glfw")
- end
- elseif family == "windows" then
- client_settings.linker.libs:add("opengl32.lib")
-@@ -310,9 +293,6 @@
- end
-
- external_settings = settings:copy()
-- zlib = Compile(external_settings,
Collect("src/engine/external/zlib/*.c"))
-- wavpack = Compile(external_settings,
Collect("src/engine/external/wavpack/*.c"))
-- pnglite = Compile(external_settings,
Collect("src/engine/external/pnglite/*.c"))
-
- engine = Compile(engine_settings, Collect("src/engine/*.c"))
- client = Compile(client_settings, Collect("src/engine/client/*.c"))
-@@ -331,19 +311,18 @@
- tools = {}
- for i,v in objs do
- toolname = PathFilename(PathBase(v))
-- tools[i] = Link(settings, toolname, v, engine, zlib)
-+ tools[i] = Link(settings, toolname, v, engine)
- end
-
- -- build client, server and master server
- client_exe = Link(client_settings, "teeworlds", game_shared,
game_client,
-- engine, client, game_editor, glfw, portaudio, zlib, pnglite,
wavpack,
-- client_link_other)
-+ engine, client, game_editor, client_link_other)
-
- server_exe = Link(server_settings, "teeworlds_srv", engine, server,
-- game_shared, game_server, zlib)
-+ game_shared, game_server)
-
- masterserver_exe = Link(server_settings, "mastersrv", masterserver,
-- engine, zlib)
-+ engine)
-
- if platform == "macosx" then
- osxlaunch_exe = Link(client_settings, "TeeLaunch", osxlaunch)
-Index: b/scripts/gen_keys.py
-===================================================================
---- a/scripts/gen_keys.py
-+++ b/scripts/gen_keys.py
-@@ -1,7 +1,7 @@
- import sys, os
-
- # load header
--glfw = "src/engine/external/glfw/include/GL/glfw.h"
-+glfw = "/usr/include/GL/glfw.h"
- lines = [line.strip() for line in file(glfw).readlines()]
-
- # genereate keys.h file
-Index: b/src/engine/client/ec_gfx.c
-===================================================================
---- a/src/engine/client/ec_gfx.c
-+++ b/src/engine/client/ec_gfx.c
-@@ -1,6 +1,6 @@
- /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
--#include <engine/external/glfw/include/GL/glfw.h>
--#include <engine/external/pnglite/pnglite.h>
-+#include <GL/glfw.h>
-+#include <pnglite.h>
-
- #include <engine/e_system.h>
- #include <engine/e_client_interface.h>
-Index: b/src/engine/client/ec_inp.c
-===================================================================
---- a/src/engine/client/ec_inp.c
-+++ b/src/engine/client/ec_inp.c
-@@ -1,6 +1,6 @@
- /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
- #include <string.h>
--#include <engine/external/glfw/include/GL/glfw.h>
-+#include <GL/glfw.h>
-
- #include <engine/e_system.h>
- #include <engine/e_client_interface.h>
-Index: b/src/engine/client/ec_snd.c
-===================================================================
---- a/src/engine/client/ec_snd.c
-+++ b/src/engine/client/ec_snd.c
-@@ -3,8 +3,8 @@
- #include <engine/e_client_interface.h>
- #include <engine/e_config.h>
-
--#include <engine/external/portaudio/include/portaudio.h>
--#include <engine/external/wavpack/wavpack.h>
-+#include <portaudio.h>
-+#include <wavpack/wavpack.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <math.h>
-Index: b/src/engine/e_datafile.c
-===================================================================
---- a/src/engine/e_datafile.c
-+++ b/src/engine/e_datafile.c
-@@ -1,7 +1,7 @@
- /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
- #include "e_system.h"
- #include "e_datafile.h"
--#include "external/zlib/zlib.h"
-+#include <zlib.h>
-
- static const int DEBUG=0;
-
-Index: b/src/tools/dilate.c
-===================================================================
---- a/src/tools/dilate.c
-+++ b/src/tools/dilate.c
-@@ -1,6 +1,6 @@
- /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-
--#include "../engine/external/pnglite/pnglite.c"
-+#include <pnglite.h>
-
- typedef struct pixel_t
- {
Copied: packages/tags/teeworlds/0.5.1-3/debian/patches/system-libs.patch (from
rev 10173, packages/trunk/teeworlds/debian/patches/system-libs.patch)
===================================================================
--- packages/tags/teeworlds/0.5.1-3/debian/patches/system-libs.patch
(rev 0)
+++ packages/tags/teeworlds/0.5.1-3/debian/patches/system-libs.patch
2009-08-22 13:39:40 UTC (rev 10174)
@@ -0,0 +1,109 @@
+From 867ae42dc44aeceb318a2970d0634766d3c19845 Mon Sep 17 00:00:00 2001
+From: =?utf-8?q?Gon=C3=A9ri=20Le=20Bouder?= <gon...@rulezlan.org>
+Date: Sat, 22 Aug 2009 14:21:39 +0200
+Subject: [PATCH 1/2] load system lib if possible
+
+---
+ default.bam | 30 +++++++++++++++++++++++++++---
+ src/engine/client/ec_gfx.c | 2 +-
+ src/engine/client/ec_snd.c | 2 +-
+ 3 files changed, 29 insertions(+), 5 deletions(-)
+
+Index: teeworlds-0.5.1/default.bam
+===================================================================
+--- teeworlds-0.5.1.orig/default.bam 2009-08-22 14:52:11.339935327 +0200
++++ teeworlds-0.5.1/default.bam 2009-08-22 14:52:16.143931013 +0200
+@@ -7,6 +7,8 @@
+ config:Add(OptFindCompiler())
+ config:Add(OptTestCompileC("stackprotector", "int main(){return 0;}",
"-fstack-protector -fstack-protector-all"))
+ config:Add(OptFindLibrary("zlib", "zlib.h", false))
++config:Add(OptFindLibrary("pnglite", "pnglite.h", false))
++config:Add(OptFindLibrary("wavpack", "wavpack/wavpack.h", false))
+ config:Add(SDL.OptFind("sdl", true))
+ config:Finalize("config.bam")
+
+@@ -150,9 +152,31 @@
+ settings.cc.includes:Add("src/engine/external/zlib")
+ end
+
+- -- build the small libraries
+- wavpack = Compile(settings, Collect("src/engine/external/wavpack/*.c"))
+- pnglite = Compile(settings, Collect("src/engine/external/pnglite/*.c"))
++ -- compile pnglite if needed
++ if config.pnglite.value == 1 then
++ settings.link.libs:Add("pnglite")
++ if config.pnglite.include_path then
++ settings.cc.includes:Add(config.pnglite.include_path)
++ end
++ pnglite = {}
++ else
++ pnglite = Compile(settings,
Collect("src/engine/external/pnglite/*.c"))
++ settings.cc.includes:Add("src/engine/external/pnglite")
++ end
++
++ -- compile wavpack if needed
++ if config.wavpack.value == 1 then
++ settings.link.libs:Add("wavpack")
++ if config.wavpack.include_path then
++ settings.cc.includes:Add(config.wavpack.include_path)
++ end
++ wavpack = {}
++ else
++ wavpack = Compile(settings,
Collect("src/engine/external/wavpack/*.c"))
++ settings.cc.includes:Add("src/engine/external")
++ end
++
++
+
+ -- build game components
+ engine_settings = settings:Copy()
+Index: teeworlds-0.5.1/src/engine/client/ec_gfx.c
+===================================================================
+--- teeworlds-0.5.1.orig/src/engine/client/ec_gfx.c 2009-08-22
14:52:11.491926006 +0200
++++ teeworlds-0.5.1/src/engine/client/ec_gfx.c 2009-08-22 14:52:16.143931013
+0200
+@@ -18,7 +18,7 @@
+ #endif
+
+ #include <base/system.h>
+-#include <engine/external/pnglite/pnglite.h>
++#include <pnglite.h>
+
+ #include <engine/e_client_interface.h>
+ #include <engine/e_engine.h>
+Index: teeworlds-0.5.1/src/engine/client/ec_snd.c
+===================================================================
+--- teeworlds-0.5.1.orig/src/engine/client/ec_snd.c 2009-08-22
14:52:11.439913667 +0200
++++ teeworlds-0.5.1/src/engine/client/ec_snd.c 2009-08-22 14:52:16.143931013
+0200
+@@ -6,7 +6,7 @@
+
+ #include "SDL.h"
+
+-#include <engine/external/wavpack/wavpack.h>
++#include <wavpack/wavpack.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
+Index: teeworlds-0.5.1/src/tools/dilate.c
+===================================================================
+--- teeworlds-0.5.1.orig/src/tools/dilate.c 2009-08-22 14:52:11.403909861
+0200
++++ teeworlds-0.5.1/src/tools/dilate.c 2009-08-22 14:52:16.143931013 +0200
+@@ -1,6 +1,6 @@
+ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+
+-#include "../engine/external/pnglite/pnglite.c"
++#include <pnglite.h>
+
+ typedef struct pixel_t
+ {
+Index: teeworlds-0.5.1/src/tools/tileset_borderfix.c
+===================================================================
+--- teeworlds-0.5.1.orig/src/tools/tileset_borderfix.c 2009-08-22
14:52:11.367913739 +0200
++++ teeworlds-0.5.1/src/tools/tileset_borderfix.c 2009-08-22
14:52:25.220912175 +0200
+@@ -1,6 +1,6 @@
+ /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
+
+-#include "../engine/external/pnglite/pnglite.c"
++#include <pnglite.h>
+
+ typedef struct pixel_t
+ {
Deleted: packages/tags/teeworlds/0.5.1-3/debian/rules
===================================================================
--- packages/trunk/teeworlds/debian/rules 2009-08-21 01:31:46 UTC (rev
10162)
+++ packages/tags/teeworlds/0.5.1-3/debian/rules 2009-08-22 13:39:40 UTC
(rev 10174)
@@ -1,99 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-include /usr/share/quilt/quilt.make
-DEB_SOURCE_PACKAGE:=$(shell dpkg-parsechangelog | grep Source |cut -f2 -d" ")
-VERSION:=$(shell dpkg-parsechangelog | grep Version | cut -d" " -f2|cut -d"-"
-f1)
-TMPDIR:=$(shell mktemp -dp./)
-
-
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-
-get-orig-source:
- uscan --force-download --no-symlink
- tar -xvf ../teeworlds-$(VERSION)-src.tar.gz -C $(TMPDIR)
- cd $(TMPDIR)/teeworlds-$(VERSION)-src; \
- wget http://teeworlds.com/files/bam.zip; \
- unzip bam.zip; \
- rm bam.zip; \
- tar -c * | gzip --best -c - > \
- ../../../${DEB_SOURCE_PACKAGE}_$(VERSION).orig.tar.gz
- rm ../teeworlds-$(VERSION)-src.tar.gz
- rm -rf ${TMPDIR}
-
-build: $(QUILT_STAMPFN)
- dh_testdir
- bam release
-
-
-clean: $(QUILT_STAMPFN)
- dh_testdir
- bam -c
- find -type f -name '*.o' -exec rm {} \;
- rm -rf tmp.* debian/stamp-patched .pc config.bam fake_server map_resave
crapnet tileset_borderfix teeworlds_srv dilate versionsrv packetgen mastersrv
teeworlds
- dh_clean datasrc/*.pyc
-
-install: install-indep install-arch
-
-
-install-indep:
- dh_testdir
- dh_testroot
- dh_clean -k -i
- dh_installdirs -i
- find data -type f -exec chmod 644 {} \;
- dh_install -i -pteeworlds-data data /usr/share/games/teeworlds/
-
-install-arch: build
- dh_testdir
- dh_testroot
- dh_clean -k -s
- dh_installdirs -s
-
- dh_installman -pteeworlds debian/teeworlds.6
- dh_installman -pteeworlds-server debian/teeworlds-server.6
-
- dh_install -s
-
-
-# Build architecture-independent files here.
-binary-indep: install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture-dependent files here.
-binary-arch: install-arch
- $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
-
-# Build architecture-dependent files here.
-binary-common:
- dh_testdir
- dh_testroot
- dh_installdocs
- dh_installmenu
- dh_installchangelogs
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-
-binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install install-indep
install-arch
Copied: packages/tags/teeworlds/0.5.1-3/debian/rules (from rev 10173,
packages/trunk/teeworlds/debian/rules)
===================================================================
--- packages/tags/teeworlds/0.5.1-3/debian/rules
(rev 0)
+++ packages/tags/teeworlds/0.5.1-3/debian/rules 2009-08-22 13:39:40 UTC
(rev 10174)
@@ -0,0 +1,102 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+include /usr/share/quilt/quilt.make
+DEB_SOURCE_PACKAGE:=$(shell dpkg-parsechangelog | grep Source |cut -f2 -d" ")
+VERSION:=$(shell dpkg-parsechangelog | grep Version | cut -d" " -f2|cut -d"-"
-f1)
+TMPDIR:=$(shell mktemp -dp./)
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+get-orig-source:
+ uscan --force-download --no-symlink
+ tar -xvf ../teeworlds-$(VERSION)-src.tar.gz -C $(TMPDIR)
+ cd $(TMPDIR)/teeworlds-$(VERSION)-src; \
+ wget http://teeworlds.com/files/bam.zip; \
+ unzip bam.zip; \
+ rm bam.zip; \
+ tar -c * | gzip --best -c - > \
+ ../../../${DEB_SOURCE_PACKAGE}_$(VERSION).orig.tar.gz
+ rm ../teeworlds-$(VERSION)-src.tar.gz
+ rm -rf ${TMPDIR}
+
+build: $(QUILT_STAMPFN)
+ dh_testdir
+ bam release
+
+
+clean:
+ dh_testdir
+ bam -c
+ QUILT_PATCHES=$(QUILT_PATCH_DIR) quilt --quiltrc /dev/null pop -a -R ||
test $$? = 2
+ find -type f -name '*.o' -exec rm {} \;
+ rm -rf src/engine/external # Drop the embedded libs to be sure with link
+# the system side lib
+ rm -rf tmp.* debian/stamp-patched .pc config.bam fake_server map_resave
crapnet tileset_borderfix teeworlds_srv dilate versionsrv packetgen mastersrv
teeworlds
+ dh_clean datasrc/*.pyc
+
+install: install-indep install-arch
+
+
+install-indep:
+ dh_testdir
+ dh_testroot
+ dh_clean -k -i
+ dh_installdirs -i
+ find data -type f -exec chmod 644 {} \;
+ dh_install -i -pteeworlds-data data /usr/share/games/teeworlds/
+
+install-arch: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k -s
+ dh_installdirs -s
+
+ dh_installman -pteeworlds debian/teeworlds.6
+ dh_installman -pteeworlds-server debian/teeworlds-server.6
+
+ dh_install -s
+
+
+# Build architecture-independent files here.
+binary-indep: install-indep
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+# Build architecture-dependent files here.
+binary-arch: install-arch
+ $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+# Build architecture-dependent files here.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_installdocs
+ dh_installmenu
+ dh_installchangelogs
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-indep
install-arch
_______________________________________________
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
