r8239 - in packages/trunk/teeworlds/debian: . patches

Mon Oct 6 15:45:13 UTC 2008

Author: miriam
Date: 2008-10-06 15:45:12 +0000 (Mon, 06 Oct 2008)
New Revision: 8239

Added:
   packages/trunk/teeworlds/debian/README.source
Modified:
   packages/trunk/teeworlds/debian/changelog
   packages/trunk/teeworlds/debian/control
   packages/trunk/teeworlds/debian/patches/system-libs.patch
Log:
New Upstream Release



Added: packages/trunk/teeworlds/debian/README.source
===================================================================

--- packages/trunk/teeworlds/debian/README.source	                        (rev 0)
+++ packages/trunk/teeworlds/debian/README.source	2008-10-06 15:45:12 UTC (rev 8239)
@@ -0,0 +1,58 @@
+teeworlds for Debian
+--------------------
+
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+To get the fully patched source after unpacking the source package, cd to
+the root level of the source package and run:
+
+    quilt push -a
+
+The last patch listed in debian/patches/series will become the current
+patch.
+
+To add a new set of changes, first run quilt push -a, and then run:
+
+    quilt new <patch>
+
+where <patch> is a descriptive name for the patch, used as the filename in
+debian/patches.  Then, for every file that will be modified by this patch,
+run:
+
+    quilt add <file>
+
+before editing those files.  You must tell quilt with quilt add what files
+will be part of the patch before making changes or quilt will not work
+properly.  After editing the files, run:
+
+    quilt refresh
+
+to save the results as a patch.
+
+Alternately, if you already have an external patch and you just want to
+add it to the build system, run quilt push -a and then:
+
+    quilt import -P <patch> /path/to/patch
+    quilt push -a
+
+(add -p 0 to quilt import if needed). <patch> as above is the filename to
+use in debian/patches.  The last quilt push -a will apply the patch to
+make sure it works properly.
+
+To remove an existing patch from the list of patches that will be applied,
+run:
+
+    quilt delete <patch>
+
+You may need to run quilt pop -a to unapply patches first before running
+this command.
+
+The source code of the game has been repackaged to also include the source
+code for bam [1], a build system on which teeworld depends [2].
+
+[1] http://teeworlds.com/files/bam.zip
+[2] http://www.teeworlds.com/?page=docs&wiki=CompilingEverything
+
+ -- Miriam Ruiz <little_miry at yahoo.es>  Mon, 06 Oct 2008 17:06:30 +0200

Modified: packages/trunk/teeworlds/debian/changelog
===================================================================
--- packages/trunk/teeworlds/debian/changelog	2008-10-06 12:26:53 UTC (rev 8238)
+++ packages/trunk/teeworlds/debian/changelog	2008-10-06 15:45:12 UTC (rev 8239)
@@ -1,9 +1,21 @@
-teeworlds (0.4.2-2) UNRELEASED; urgency=low
+teeworlds (0.4.3-1) UNRELEASED; urgency=low
 
-  * debian/control: add Homepage field 
+  [ Ansgar Burchardt ]
+  * debian/control: Add Homepage field 
 
- -- Ansgar Burchardt <ansgar at 43-1.org>  Thu, 29 May 2008 19:34:18 +0200
+  [ 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 <little_miry at yahoo.es>  Mon, 06 Oct 2008 17:06:30 +0200
+
 teeworlds (0.4.2-1) unstable; urgency=low
 
   * Initial release (Closes: #460848)

Modified: packages/trunk/teeworlds/debian/control
===================================================================
--- packages/trunk/teeworlds/debian/control	2008-10-06 12:26:53 UTC (rev 8238)
+++ packages/trunk/teeworlds/debian/control	2008-10-06 15:45:12 UTC (rev 8239)
@@ -6,10 +6,10 @@
 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
-Standards-Version: 3.7.3
-Homepage: http://www.teeworlds.com/
 
 Package: teeworlds
 Architecture: any

Modified: packages/trunk/teeworlds/debian/patches/system-libs.patch
===================================================================
--- packages/trunk/teeworlds/debian/patches/system-libs.patch	2008-10-06 12:26:53 UTC (rev 8238)
+++ packages/trunk/teeworlds/debian/patches/system-libs.patch	2008-10-06 15:45:12 UTC (rev 8239)
@@ -1,7 +1,7 @@
-Index: teeworlds-0.4.2/default.bam
+Index: teeworlds-0.4.3-src/default.bam
 ===================================================================
---- teeworlds-0.4.2.orig/default.bam	2008-04-18 09:16:00.000000000 +1000
-+++ teeworlds-0.4.2/default.bam	2008-04-18 17:35:40.000000000 +1000
+--- 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
@@ -83,34 +83,38 @@
  
  	engine = Compile(engine_settings, Collect("src/engine/*.c"))
  	client = Compile(client_settings, Collect("src/engine/client/*.c"))
-@@ -332,19 +311,19 @@
+@@ -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)
++ 		tools[i] = Link(settings, toolname, v, engine)
  	end
  	
- 	-- build client, server and master server
+ 	-- 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,
++ 		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)
++ 		game_shared, game_server)
  
+ 	versionserver_exe = Link(server_settings, "versionsrv", versionserver,
+-		engine, zlib)
++ 		engine)
+ 		
  	masterserver_exe = Link(server_settings, "mastersrv", masterserver,
 -		engine, zlib)
-+		engine)
++ 		engine)
  
  	if platform == "macosx" then
  		osxlaunch_exe = Link(client_settings, "TeeLaunch", osxlaunch)
-Index: teeworlds-0.4.2/scripts/gen_keys.py
+Index: teeworlds-0.4.3-src/scripts/gen_keys.py
 ===================================================================
---- teeworlds-0.4.2.orig/scripts/gen_keys.py	2008-04-18 09:21:02.000000000 +1000
-+++ teeworlds-0.4.2/scripts/gen_keys.py	2008-04-18 09:21:15.000000000 +1000
+--- 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
  
@@ -120,10 +124,10 @@
  lines = [line.strip() for line in file(glfw).readlines()]
  
  # genereate keys.h file
-Index: teeworlds-0.4.2/src/engine/client/ec_gfx.c
+Index: teeworlds-0.4.3-src/src/engine/client/ec_gfx.c
 ===================================================================
---- teeworlds-0.4.2.orig/src/engine/client/ec_gfx.c	2008-04-18 09:21:39.000000000 +1000
-+++ teeworlds-0.4.2/src/engine/client/ec_gfx.c	2008-04-18 15:16:05.000000000 +1000
+--- 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>
@@ -133,10 +137,10 @@
  
  #include <engine/e_system.h>
  #include <engine/e_client_interface.h>
-Index: teeworlds-0.4.2/src/engine/client/ec_inp.c
+Index: teeworlds-0.4.3-src/src/engine/client/ec_inp.c
 ===================================================================
---- teeworlds-0.4.2.orig/src/engine/client/ec_inp.c	2008-04-18 09:22:13.000000000 +1000
-+++ teeworlds-0.4.2/src/engine/client/ec_inp.c	2008-04-18 09:22:25.000000000 +1000
+--- 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>
@@ -145,10 +149,10 @@
  
  #include <engine/e_system.h>
  #include <engine/e_client_interface.h>
-Index: teeworlds-0.4.2/src/engine/client/ec_snd.c
+Index: teeworlds-0.4.3-src/src/engine/client/ec_snd.c
 ===================================================================
---- teeworlds-0.4.2.orig/src/engine/client/ec_snd.c	2008-04-18 09:22:41.000000000 +1000
-+++ teeworlds-0.4.2/src/engine/client/ec_snd.c	2008-04-18 09:23:01.000000000 +1000
+--- 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>
@@ -160,10 +164,10 @@
  #include <stdio.h>
  #include <stdlib.h>
  #include <math.h>
-Index: teeworlds-0.4.2/src/engine/e_datafile.c
+Index: teeworlds-0.4.3-src/src/engine/e_datafile.c
 ===================================================================
---- teeworlds-0.4.2.orig/src/engine/e_datafile.c	2008-04-18 09:23:19.000000000 +1000
-+++ teeworlds-0.4.2/src/engine/e_datafile.c	2008-04-18 09:23:33.000000000 +1000
+--- 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"
@@ -173,10 +177,10 @@
  
  static const int DEBUG=0;
  
-Index: teeworlds-0.4.2/src/engine/external/pnglite/pnglite.c
+Index: teeworlds-0.4.3-src/src/engine/external/pnglite/pnglite.c
 ===================================================================
---- teeworlds-0.4.2.orig/src/engine/external/pnglite/pnglite.c	2008-04-18 09:23:53.000000000 +1000
-+++ teeworlds-0.4.2/src/engine/external/pnglite/pnglite.c	2008-04-18 09:24:05.000000000 +1000
+--- 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
  
@@ -186,10 +190,10 @@
  #else
  #include "zlite.h"
  #endif
-Index: teeworlds-0.4.2/src/tools/dilate.c
+Index: teeworlds-0.4.3-src/src/tools/dilate.c
 ===================================================================
---- teeworlds-0.4.2.orig/src/tools/dilate.c	2008-04-18 11:05:45.000000000 +1000
-+++ teeworlds-0.4.2/src/tools/dilate.c	2008-04-18 11:05:52.000000000 +1000
+--- 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 */
  
@@ -198,10 +202,10 @@
  
  typedef struct pixel_t
  {
-Index: teeworlds-0.4.2/src/tools/tileset_borderfix.c
+Index: teeworlds-0.4.3-src/src/tools/tileset_borderfix.c
 ===================================================================
---- teeworlds-0.4.2.orig/src/tools/tileset_borderfix.c	2008-04-18 11:06:00.000000000 +1000
-+++ teeworlds-0.4.2/src/tools/tileset_borderfix.c	2008-04-18 15:16:08.000000000 +1000
+--- 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 */
  


