Author: goneri
Date: 2008-11-03 23:47:19 +0000 (Mon, 03 Nov 2008)
New Revision: 8325
Added:
packages/tags/teeworlds/0.4.3-1/
packages/tags/teeworlds/0.4.3-1/debian/changelog
packages/tags/teeworlds/0.4.3-1/debian/control
packages/tags/teeworlds/0.4.3-1/debian/patches/dont-link-with-asound.diff
packages/tags/teeworlds/0.4.3-1/debian/patches/fix-bam-FTBFS.patch
packages/tags/teeworlds/0.4.3-1/debian/patches/new-wavpack.patch
packages/tags/teeworlds/0.4.3-1/debian/patches/series
packages/tags/teeworlds/0.4.3-1/debian/patches/system-libs.patch
packages/tags/teeworlds/0.4.3-1/debian/rules
Removed:
packages/tags/teeworlds/0.4.3-1/debian/changelog
packages/tags/teeworlds/0.4.3-1/debian/control
packages/tags/teeworlds/0.4.3-1/debian/patches/fix-bam-FTBFS.patch
packages/tags/teeworlds/0.4.3-1/debian/patches/new-wavpack.patch
packages/tags/teeworlds/0.4.3-1/debian/patches/series
packages/tags/teeworlds/0.4.3-1/debian/patches/system-libs.patch
packages/tags/teeworlds/0.4.3-1/debian/rules
Log:
tag teeworlds 0.4.3-1
Copied: packages/tags/teeworlds/0.4.3-1 (from rev 8318,
packages/trunk/teeworlds)
Property changes on: packages/tags/teeworlds/0.4.3-1
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: packages/tags/teeworlds/0.4.3-1/debian/changelog
===================================================================
--- packages/trunk/teeworlds/debian/changelog 2008-11-03 17:17:26 UTC (rev
8318)
+++ packages/tags/teeworlds/0.4.3-1/debian/changelog 2008-11-03 23:47:19 UTC
(rev 8325)
@@ -1,31 +0,0 @@
-teeworlds (0.4.3-1) UNRELEASED; urgency=low
-
- [ Ansgar Burchardt ]
- * debian/control: Add Homepage field
-
- [ Miriam Ruiz ]
- * New Upstream Release
- - Auto team balance
- - Anti-spam fixes
- - Added clear collision to the editor
- - Fixed issue with cursor being hidden on some maps
- - New version notifier
- - F10 for screenshots now works in the editor
- * Upgraded Standards-Version from 3.7.3 to 3.8.0: No changes needed
- * Added README.source file
-
- -- Miriam Ruiz <[EMAIL PROTECTED]> Mon, 06 Oct 2008 17:06:30 +0200
-
-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 <[EMAIL PROTECTED]> Tue, 28 Oct 2008 23:53:17 +0100
-
-teeworlds (0.4.2-1) unstable; urgency=low
-
- * Initial release (Closes: #460848)
-
- -- Jack Coulter <[EMAIL PROTECTED]> Sun, 13 Apr 2008 18:48:12 +1000
Copied: packages/tags/teeworlds/0.4.3-1/debian/changelog (from rev 8320,
packages/trunk/teeworlds/debian/changelog)
===================================================================
--- packages/tags/teeworlds/0.4.3-1/debian/changelog
(rev 0)
+++ packages/tags/teeworlds/0.4.3-1/debian/changelog 2008-11-03 23:47:19 UTC
(rev 8325)
@@ -0,0 +1,33 @@
+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 <[EMAIL PROTECTED]> 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 <[EMAIL PROTECTED]> Tue, 28 Oct 2008 23:53:17 +0100
+
+teeworlds (0.4.2-1) unstable; urgency=low
+
+ * Initial release (Closes: #460848)
+
+ -- Jack Coulter <[EMAIL PROTECTED]> Sun, 13 Apr 2008 18:48:12 +1000
Deleted: packages/tags/teeworlds/0.4.3-1/debian/control
===================================================================
--- packages/trunk/teeworlds/debian/control 2008-11-03 17:17:26 UTC (rev
8318)
+++ packages/tags/teeworlds/0.4.3-1/debian/control 2008-11-03 23:47:19 UTC
(rev 8325)
@@ -1,44 +0,0 @@
-Source: teeworlds
-Section: games
-Priority: optional
-Maintainer: Debian Games Team <[EMAIL PROTECTED]>
-Uploaders: Jack Coulter <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), unzip, python, libasound2-dev, freeglut3-dev,
- portaudio19-dev, zlib1g-dev, libwavpack-dev, libglfw-dev, quilt,
- libpnglite-dev, libx11-dev, libxrandr-dev
-Standards-Version: 3.8.0
-Homepage: http://www.teeworlds.com/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/teeworlds
-Vcs-Browser:
http://svn.debian.org/wsvn/pkg-games/packages/trunk/teeworlds/?op=log
-
-Package: teeworlds
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, teeworlds-data
-Suggests: teeworlds-server
-Description: An online multi-player platform 2D shooter
- This package contains the client binary for Teeworlds.
- .
- The game features cartoon-themed graphics and physics, and relies heavily
- on classic shooter weaponry and gameplay.
- The controls are heavily inspired by the FPS genre of computer games.
-
-Package: teeworlds-server
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, teeworlds-data
-Suggests: teeworlds-server
-Description: Server for Teeworlds; an online multi-player platform 2D shooter
- This package contains the server binary for Teeworlds.
- .
- The game features cartoon-themed graphics and physics, and relies heavily
- on classic shooter weaponry and gameplay.
- The controls are heavily inspired by the FPS genre of computer games.
-
-Package: teeworlds-data
-Architecture: all
-Suggests: teeworlds-server, teeworlds
-Description: Data for Teeworlds; an online multi-player platform 2D shooter
- This package contains the static data for Teeworlds.
- .
- The game features cartoon-themed graphics and physics, and relies heavily
- on classic shooter weaponry and gameplay.
- The controls are heavily inspired by the FPS genre of computer games.
Copied: packages/tags/teeworlds/0.4.3-1/debian/control (from rev 8320,
packages/trunk/teeworlds/debian/control)
===================================================================
--- packages/tags/teeworlds/0.4.3-1/debian/control
(rev 0)
+++ packages/tags/teeworlds/0.4.3-1/debian/control 2008-11-03 23:47:19 UTC
(rev 8325)
@@ -0,0 +1,44 @@
+Source: teeworlds
+Section: games
+Priority: optional
+Maintainer: Debian Games Team <[EMAIL PROTECTED]>
+Uploaders: Jack Coulter <[EMAIL PROTECTED]>, Gonéri Le Bouder <[EMAIL
PROTECTED]>
+Build-Depends: debhelper (>= 5), unzip, python, freeglut3-dev,
+ portaudio19-dev, zlib1g-dev, libwavpack-dev, libglfw-dev, quilt,
+ libpnglite-dev, libx11-dev, libxrandr-dev
+Standards-Version: 3.8.0
+Homepage: http://www.teeworlds.com/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-games/packages/trunk/teeworlds
+Vcs-Browser:
http://svn.debian.org/wsvn/pkg-games/packages/trunk/teeworlds/?op=log
+
+Package: teeworlds
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, teeworlds-data (=
${source:Version})
+Suggests: teeworlds-server
+Description: An online multi-player platform 2D shooter
+ This package contains the client binary for Teeworlds.
+ .
+ The game features cartoon-themed graphics and physics, and relies heavily
+ on classic shooter weaponry and gameplay.
+ The controls are heavily inspired by the FPS genre of computer games.
+
+Package: teeworlds-server
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, teeworlds-data (=
${source:Version})
+Suggests: teeworlds-server
+Description: Server for Teeworlds; an online multi-player platform 2D shooter
+ This package contains the server binary for Teeworlds.
+ .
+ The game features cartoon-themed graphics and physics, and relies heavily
+ on classic shooter weaponry and gameplay.
+ The controls are heavily inspired by the FPS genre of computer games.
+
+Package: teeworlds-data
+Architecture: all
+Suggests: teeworlds-server, teeworlds
+Description: Data for Teeworlds; an online multi-player platform 2D shooter
+ This package contains the static data for Teeworlds.
+ .
+ The game features cartoon-themed graphics and physics, and relies heavily
+ on classic shooter weaponry and gameplay.
+ The controls are heavily inspired by the FPS genre of computer games.
Copied:
packages/tags/teeworlds/0.4.3-1/debian/patches/dont-link-with-asound.diff (from
rev 8324, packages/trunk/teeworlds/debian/patches/dont-link-with-asound.diff)
===================================================================
--- packages/tags/teeworlds/0.4.3-1/debian/patches/dont-link-with-asound.diff
(rev 0)
+++ packages/tags/teeworlds/0.4.3-1/debian/patches/dont-link-with-asound.diff
2008-11-03 23:47:19 UTC (rev 8325)
@@ -0,0 +1,12 @@
+Index: b/default.bam
+===================================================================
+--- a/default.bam
++++ b/default.bam
+@@ -299,7 +299,6 @@
+ client_settings.linker.frameworks:add("AudioToolbox")
+ client_settings.linker.frameworks:add("AudioUnit")
+ else
+- client_settings.linker.libs:add("asound")
+ client_settings.linker.libs:add("X11")
+ client_settings.linker.libs:add("GL")
+ client_settings.linker.libs:add("GLU")
Deleted: packages/tags/teeworlds/0.4.3-1/debian/patches/fix-bam-FTBFS.patch
===================================================================
--- packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch 2008-11-03
17:17:26 UTC (rev 8318)
+++ packages/tags/teeworlds/0.4.3-1/debian/patches/fix-bam-FTBFS.patch
2008-11-03 23:47:19 UTC (rev 8325)
@@ -1,58 +0,0 @@
-diff --git a/bam/src/context.h b/bam/src/context.h
-index 640c6d8..288b294 100644
---- a/bam/src/context.h
-+++ b/bam/src/context.h
-@@ -4,7 +4,7 @@ struct TARGET
- {
- struct NODE *node;
- struct TARGET *next;
--};
-+} __attribute__((packed));
-
- struct CONTEXT
- {
-@@ -19,7 +19,7 @@ struct CONTEXT
-
- struct TARGET *firsttarget;
- struct NODE *defaulttarget;
--};
-+} __attribute__((packed));
-
- const char *context_get_path(lua_State *L);
- struct CONTEXT *context_get_pointer(lua_State *L);
-diff --git a/bam/src/main.c b/bam/src/main.c
-index 0d18bbd..33f5c19 100644
---- a/bam/src/main.c
-+++ b/bam/src/main.c
-@@ -325,7 +325,7 @@ struct CPPDEPPATH
- {
- char *path;
- struct CPPDEPPATH *next;
--};
-+} __attribute__((packed));
-
- struct CPPDEPINFO
- {
-diff --git a/bam/src/node.h b/bam/src/node.h
-index 7cf3273..8e7490f 100644
---- a/bam/src/node.h
-+++ b/bam/src/node.h
-@@ -6,7 +6,7 @@ struct DEPENDENCY
- {
- struct NODE *node;
- struct DEPENDENCY *next;
--};
-+} __attribute__((packed));
-
- /**/
- struct NODE
-@@ -32,7 +32,7 @@ struct NODE
- unsigned int cached:1;
-
- unsigned int workstatus:2; /* 0 = undone, 1 = in the workings, 2 = done*/
--};
-+} __attribute__((packed));
-
- struct HEAP;
- struct GRAPH;
-
Copied: packages/tags/teeworlds/0.4.3-1/debian/patches/fix-bam-FTBFS.patch
(from rev 8324, packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch)
===================================================================
--- packages/tags/teeworlds/0.4.3-1/debian/patches/fix-bam-FTBFS.patch
(rev 0)
+++ packages/tags/teeworlds/0.4.3-1/debian/patches/fix-bam-FTBFS.patch
2008-11-03 23:47:19 UTC (rev 8325)
@@ -0,0 +1,77 @@
+Index: b/bam/src/context.h
+===================================================================
+--- a/bam/src/context.h
++++ b/bam/src/context.h
+@@ -4,7 +4,7 @@
+ {
+ struct NODE *node;
+ struct TARGET *next;
+-};
++} __attribute__((packed));
+
+ struct CONTEXT
+ {
+@@ -19,7 +19,7 @@
+
+ struct TARGET *firsttarget;
+ struct NODE *defaulttarget;
+-};
++} __attribute__((packed));
+
+ const char *context_get_path(lua_State *L);
+ struct CONTEXT *context_get_pointer(lua_State *L);
+Index: b/bam/src/main.c
+===================================================================
+--- a/bam/src/main.c
++++ b/bam/src/main.c
+@@ -325,13 +325,13 @@
+ {
+ char *path;
+ struct CPPDEPPATH *next;
+-};
++} __attribute__((packed));
+
+ struct CPPDEPINFO
+ {
+ struct NODE *node;
+ struct CPPDEPPATH *first_path;
+-};
++} __attribute__((packed));
+
+ /* */
+ static int dependency_cpp_callback(void *user, const char *filename, int sys)
+Index: b/bam/src/node.h
+===================================================================
+--- a/bam/src/node.h
++++ b/bam/src/node.h
+@@ -6,7 +6,7 @@
+ {
+ struct NODE *node;
+ struct DEPENDENCY *next;
+-};
++} __attribute__((packed));
+
+ /**/
+ struct NODE
+@@ -32,7 +32,7 @@
+ unsigned int cached:1;
+
+ unsigned int workstatus:2; /* 0 = undone, 1 = in the workings, 2 =
done*/
+-};
++} __attribute__((packed));
+
+ struct HEAP;
+ struct GRAPH;
+Index: b/default.bam
+===================================================================
+--- a/default.bam
++++ b/default.bam
+@@ -292,8 +292,6 @@
+ client_settings.linker.libs:add("dsound.lib")
+ end
+
+- external_settings = settings:copy()
+-
+ engine = Compile(engine_settings, Collect("src/engine/*.c"))
+ client = Compile(client_settings, Collect("src/engine/client/*.c"))
+ server = Compile(server_settings, Collect("src/engine/server/*.c"))
Deleted: packages/tags/teeworlds/0.4.3-1/debian/patches/new-wavpack.patch
===================================================================
--- packages/trunk/teeworlds/debian/patches/new-wavpack.patch 2008-11-03
17:17:26 UTC (rev 8318)
+++ packages/tags/teeworlds/0.4.3-1/debian/patches/new-wavpack.patch
2008-11-03 23:47:19 UTC (rev 8325)
@@ -1,50 +0,0 @@
-Index: teeworlds-0.4.2/src/engine/client/ec_snd.c
-===================================================================
---- teeworlds-0.4.2.orig/src/engine/client/ec_snd.c 2008-04-18
09:11:33.000000000 +1000
-+++ teeworlds-0.4.2/src/engine/client/ec_snd.c 2008-04-18 09:13:45.000000000
+1000
-@@ -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.4.3-1/debian/patches/new-wavpack.patch (from
rev 8324, packages/trunk/teeworlds/debian/patches/new-wavpack.patch)
===================================================================
--- packages/tags/teeworlds/0.4.3-1/debian/patches/new-wavpack.patch
(rev 0)
+++ packages/tags/teeworlds/0.4.3-1/debian/patches/new-wavpack.patch
2008-11-03 23:47:19 UTC (rev 8325)
@@ -0,0 +1,50 @@
+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);
+
Deleted: packages/tags/teeworlds/0.4.3-1/debian/patches/series
===================================================================
--- packages/trunk/teeworlds/debian/patches/series 2008-11-03 17:17:26 UTC
(rev 8318)
+++ packages/tags/teeworlds/0.4.3-1/debian/patches/series 2008-11-03
23:47:19 UTC (rev 8325)
@@ -1,3 +0,0 @@
-new-wavpack.patch
-system-libs.patch
-fix-bam-FTBFS.patch
Copied: packages/tags/teeworlds/0.4.3-1/debian/patches/series (from rev 8324,
packages/trunk/teeworlds/debian/patches/series)
===================================================================
--- packages/tags/teeworlds/0.4.3-1/debian/patches/series
(rev 0)
+++ packages/tags/teeworlds/0.4.3-1/debian/patches/series 2008-11-03
23:47:19 UTC (rev 8325)
@@ -0,0 +1,4 @@
+dont-link-with-asound.diff
+new-wavpack.patch
+system-libs.patch
+fix-bam-FTBFS.patch
Deleted: packages/tags/teeworlds/0.4.3-1/debian/patches/system-libs.patch
===================================================================
--- packages/trunk/teeworlds/debian/patches/system-libs.patch 2008-11-03
17:17:26 UTC (rev 8318)
+++ packages/tags/teeworlds/0.4.3-1/debian/patches/system-libs.patch
2008-11-03 23:47:19 UTC (rev 8325)
@@ -1,216 +0,0 @@
-Index: teeworlds-0.4.3-src/default.bam
-===================================================================
---- teeworlds-0.4.3-src.orig/default.bam 2008-08-31 15:30:59.000000000
+0200
-+++ teeworlds-0.4.3-src/default.bam 2008-10-06 17:21:38.000000000 +0200
-@@ -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,30 +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 +264,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
-@@ -301,8 +278,13 @@
- else
- client_settings.linker.libs:add("asound")
- 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")
-@@ -311,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"))
-@@ -333,22 +312,22 @@
- 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, version server and master server
- client_exe = Link(client_settings, "teeworlds", game_shared,
game_client,
-- engine, client, game_editor, glfw, portaudio, zlib, pnglite,
wavpack,
-+ engine, client, game_editor, pnglite,
- client_link_other)
-
- server_exe = Link(server_settings, "teeworlds_srv", engine, server,
-- game_shared, game_server, zlib)
-+ game_shared, game_server)
-
- versionserver_exe = Link(server_settings, "versionsrv", versionserver,
-- engine, zlib)
-+ engine)
-
- masterserver_exe = Link(server_settings, "mastersrv", masterserver,
-- engine, zlib)
-+ engine)
-
- if platform == "macosx" then
- osxlaunch_exe = Link(client_settings, "TeeLaunch", osxlaunch)
-Index: teeworlds-0.4.3-src/scripts/gen_keys.py
-===================================================================
---- teeworlds-0.4.3-src.orig/scripts/gen_keys.py 2008-08-31
15:30:59.000000000 +0200
-+++ teeworlds-0.4.3-src/scripts/gen_keys.py 2008-10-06 17:18:56.000000000
+0200
-@@ -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: teeworlds-0.4.3-src/src/engine/client/ec_gfx.c
-===================================================================
---- teeworlds-0.4.3-src.orig/src/engine/client/ec_gfx.c 2008-08-31
15:30:58.000000000 +0200
-+++ teeworlds-0.4.3-src/src/engine/client/ec_gfx.c 2008-10-06
17:18:56.000000000 +0200
-@@ -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: teeworlds-0.4.3-src/src/engine/client/ec_inp.c
-===================================================================
---- teeworlds-0.4.3-src.orig/src/engine/client/ec_inp.c 2008-08-31
15:30:58.000000000 +0200
-+++ teeworlds-0.4.3-src/src/engine/client/ec_inp.c 2008-10-06
17:18:56.000000000 +0200
-@@ -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: teeworlds-0.4.3-src/src/engine/client/ec_snd.c
-===================================================================
---- teeworlds-0.4.3-src.orig/src/engine/client/ec_snd.c 2008-10-06
17:18:39.000000000 +0200
-+++ teeworlds-0.4.3-src/src/engine/client/ec_snd.c 2008-10-06
17:18:56.000000000 +0200
-@@ -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: teeworlds-0.4.3-src/src/engine/e_datafile.c
-===================================================================
---- teeworlds-0.4.3-src.orig/src/engine/e_datafile.c 2008-08-31
15:30:58.000000000 +0200
-+++ teeworlds-0.4.3-src/src/engine/e_datafile.c 2008-10-06
17:18:56.000000000 +0200
-@@ -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: teeworlds-0.4.3-src/src/engine/external/pnglite/pnglite.c
-===================================================================
---- teeworlds-0.4.3-src.orig/src/engine/external/pnglite/pnglite.c
2008-08-31 15:30:58.000000000 +0200
-+++ teeworlds-0.4.3-src/src/engine/external/pnglite/pnglite.c 2008-10-06
17:18:56.000000000 +0200
-@@ -5,7 +5,7 @@
- #define USE_ZLIB 1
-
- #if USE_ZLIB
--#include "../zlib/zlib.h"
-+#include <zlib.h>
- #else
- #include "zlite.h"
- #endif
-Index: teeworlds-0.4.3-src/src/tools/dilate.c
-===================================================================
---- teeworlds-0.4.3-src.orig/src/tools/dilate.c 2008-08-31
15:30:58.000000000 +0200
-+++ teeworlds-0.4.3-src/src/tools/dilate.c 2008-10-06 17:18:56.000000000
+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.4.3-src/src/tools/tileset_borderfix.c
-===================================================================
---- teeworlds-0.4.3-src.orig/src/tools/tileset_borderfix.c 2008-08-31
15:30:58.000000000 +0200
-+++ teeworlds-0.4.3-src/src/tools/tileset_borderfix.c 2008-10-06
17:18:56.000000000 +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
- {
Copied: packages/tags/teeworlds/0.4.3-1/debian/patches/system-libs.patch (from
rev 8324, packages/trunk/teeworlds/debian/patches/system-libs.patch)
===================================================================
--- packages/tags/teeworlds/0.4.3-1/debian/patches/system-libs.patch
(rev 0)
+++ packages/tags/teeworlds/0.4.3-1/debian/patches/system-libs.patch
2008-11-03 23:47:19 UTC (rev 8325)
@@ -0,0 +1,186 @@
+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
+ {
Deleted: packages/tags/teeworlds/0.4.3-1/debian/rules
===================================================================
--- packages/trunk/teeworlds/debian/rules 2008-11-03 17:17:26 UTC (rev
8318)
+++ packages/tags/teeworlds/0.4.3-1/debian/rules 2008-11-03 23:47:19 UTC
(rev 8325)
@@ -1,103 +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-bam:
- dh_testdir
- cd bam && ./make_unix.sh
-
-build: $(QUILT_STAMPFN) build-bam
- dh_testdir
- bam/src/bam release
-
-
-clean: build-bam unpatch
- dh_testdir
- [ ! -f bam/src/bam ] || bam/src/bam -c all
- rm -rf bam/src/bam tmp.* bam/src/tools/txt2c
- dh_clean
-
-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_desktop -pteeworlds debian/teeworlds.desktop
-
- 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.4.3-1/debian/rules (from rev 8323,
packages/trunk/teeworlds/debian/rules)
===================================================================
--- packages/tags/teeworlds/0.4.3-1/debian/rules
(rev 0)
+++ packages/tags/teeworlds/0.4.3-1/debian/rules 2008-11-03 23:47:19 UTC
(rev 8325)
@@ -0,0 +1,104 @@
+#!/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}
+
+bam/src/bam: $(QUILT_STAMPFN)
+ dh_testdir
+ cd bam && ./make_unix.sh
+
+build: $(QUILT_STAMPFN) bam/src/bam
+ dh_testdir
+ bam/src/bam release
+
+
+clean: $(QUILT_STAMPFN) bam/src/bam
+ dh_testdir
+ bam/src/bam -c all
+ quilt pop -a -f
+ rm -rf bam/src/bam tmp.* bam/src/tools/txt2c debian/stamp-patched
bam/src/bam .pc bam/src/internal_base.h
+ dh_clean
+
+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_desktop -pteeworlds debian/teeworlds.desktop
+
+ 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
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-games-commits
