r8324 - packages/trunk/teeworlds/debian/patches
Gonéri Le Bouder
goneri at alioth.debian.org
Mon Nov 3 23:37:38 UTC 2008
Author: goneri
Date: 2008-11-03 23:37:37 +0000 (Mon, 03 Nov 2008)
New Revision: 8324
Modified:
packages/trunk/teeworlds/debian/patches/dont-link-with-asound.diff
packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch
packages/trunk/teeworlds/debian/patches/new-wavpack.patch
packages/trunk/teeworlds/debian/patches/series
packages/trunk/teeworlds/debian/patches/system-libs.patch
Log:
refresh the patches with
quilt pop -a; while quilt push; do quilt refresh -pab; done
like the lintian suggest
Modified: packages/trunk/teeworlds/debian/patches/dont-link-with-asound.diff
===================================================================
--- packages/trunk/teeworlds/debian/patches/dont-link-with-asound.diff 2008-11-03 23:36:03 UTC (rev 8323)
+++ packages/trunk/teeworlds/debian/patches/dont-link-with-asound.diff 2008-11-03 23:37:37 UTC (rev 8324)
@@ -1,7 +1,7 @@
-Index: default.bam
+Index: b/default.bam
===================================================================
---- default.bam.orig
-+++ default.bam
+--- a/default.bam
++++ b/default.bam
@@ -299,7 +299,6 @@
client_settings.linker.frameworks:add("AudioToolbox")
client_settings.linker.frameworks:add("AudioUnit")
Modified: packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch
===================================================================
--- packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch 2008-11-03 23:36:03 UTC (rev 8323)
+++ packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch 2008-11-03 23:37:37 UTC (rev 8324)
@@ -1,7 +1,7 @@
-Index: bam/src/context.h
+Index: b/bam/src/context.h
===================================================================
---- bam/src/context.h.orig
-+++ bam/src/context.h
+--- a/bam/src/context.h
++++ b/bam/src/context.h
@@ -4,7 +4,7 @@
{
struct NODE *node;
@@ -20,10 +20,10 @@
const char *context_get_path(lua_State *L);
struct CONTEXT *context_get_pointer(lua_State *L);
-Index: bam/src/main.c
+Index: b/bam/src/main.c
===================================================================
---- bam/src/main.c.orig
-+++ bam/src/main.c
+--- a/bam/src/main.c
++++ b/bam/src/main.c
@@ -325,13 +325,13 @@
{
char *path;
@@ -40,10 +40,10 @@
/* */
static int dependency_cpp_callback(void *user, const char *filename, int sys)
-Index: bam/src/node.h
+Index: b/bam/src/node.h
===================================================================
---- bam/src/node.h.orig
-+++ bam/src/node.h
+--- a/bam/src/node.h
++++ b/bam/src/node.h
@@ -6,7 +6,7 @@
{
struct NODE *node;
@@ -62,10 +62,10 @@
struct HEAP;
struct GRAPH;
-Index: default.bam
+Index: b/default.bam
===================================================================
---- default.bam.orig
-+++ default.bam
+--- a/default.bam
++++ b/default.bam
@@ -292,8 +292,6 @@
client_settings.linker.libs:add("dsound.lib")
end
Modified: packages/trunk/teeworlds/debian/patches/new-wavpack.patch
===================================================================
--- packages/trunk/teeworlds/debian/patches/new-wavpack.patch 2008-11-03 23:36:03 UTC (rev 8323)
+++ packages/trunk/teeworlds/debian/patches/new-wavpack.patch 2008-11-03 23:37:37 UTC (rev 8324)
@@ -1,7 +1,7 @@
-Index: teeworlds-0.4.2/src/engine/client/ec_snd.c
+Index: b/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
+--- a/src/engine/client/ec_snd.c
++++ b/src/engine/client/ec_snd.c
@@ -371,14 +371,6 @@
snd->num_frames = num_frames;
}
Modified: packages/trunk/teeworlds/debian/patches/series
===================================================================
--- packages/trunk/teeworlds/debian/patches/series 2008-11-03 23:36:03 UTC (rev 8323)
+++ packages/trunk/teeworlds/debian/patches/series 2008-11-03 23:37:37 UTC (rev 8324)
@@ -1,4 +1,4 @@
-dont-link-with-asound.diff -p0
-new-wavpack.patch -p1
-system-libs.patch -p0
-fix-bam-FTBFS.patch -p0
+dont-link-with-asound.diff
+new-wavpack.patch
+system-libs.patch
+fix-bam-FTBFS.patch
Modified: packages/trunk/teeworlds/debian/patches/system-libs.patch
===================================================================
--- packages/trunk/teeworlds/debian/patches/system-libs.patch 2008-11-03 23:36:03 UTC (rev 8323)
+++ packages/trunk/teeworlds/debian/patches/system-libs.patch 2008-11-03 23:37:37 UTC (rev 8324)
@@ -1,7 +1,7 @@
-Index: default.bam
+Index: b/default.bam
===================================================================
---- default.bam.orig
-+++ default.bam
+--- a/default.bam
++++ b/default.bam
@@ -214,7 +214,6 @@
-- set some platform specific settings
@@ -106,10 +106,10 @@
if platform == "macosx" then
osxlaunch_exe = Link(client_settings, "TeeLaunch", osxlaunch)
-Index: scripts/gen_keys.py
+Index: b/scripts/gen_keys.py
===================================================================
---- scripts/gen_keys.py.orig
-+++ scripts/gen_keys.py
+--- a/scripts/gen_keys.py
++++ b/scripts/gen_keys.py
@@ -1,7 +1,7 @@
import sys, os
@@ -119,10 +119,10 @@
lines = [line.strip() for line in file(glfw).readlines()]
# genereate keys.h file
-Index: src/engine/client/ec_gfx.c
+Index: b/src/engine/client/ec_gfx.c
===================================================================
---- src/engine/client/ec_gfx.c.orig
-+++ 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>
@@ -132,10 +132,10 @@
#include <engine/e_system.h>
#include <engine/e_client_interface.h>
-Index: src/engine/client/ec_inp.c
+Index: b/src/engine/client/ec_inp.c
===================================================================
---- src/engine/client/ec_inp.c.orig
-+++ 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>
@@ -144,10 +144,10 @@
#include <engine/e_system.h>
#include <engine/e_client_interface.h>
-Index: src/engine/client/ec_snd.c
+Index: b/src/engine/client/ec_snd.c
===================================================================
---- src/engine/client/ec_snd.c.orig
-+++ 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>
@@ -159,10 +159,10 @@
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
-Index: src/engine/e_datafile.c
+Index: b/src/engine/e_datafile.c
===================================================================
---- src/engine/e_datafile.c.orig
-+++ 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"
@@ -172,10 +172,10 @@
static const int DEBUG=0;
-Index: src/tools/dilate.c
+Index: b/src/tools/dilate.c
===================================================================
---- src/tools/dilate.c.orig
-+++ 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 */
More information about the Pkg-games-commits
mailing list