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

[Gonéri Le Bouder]

Author: goneri
Date: 2008-10-29 09:58:25 +0000 (Wed, 29 Oct 2008)
New Revision: 8309

Added:
   packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch
Modified:
   packages/trunk/teeworlds/debian/changelog
   packages/trunk/teeworlds/debian/patches/series
   packages/trunk/teeworlds/debian/rules
Log:
import of the changes from 0.4.2-2


Modified: packages/trunk/teeworlds/debian/changelog
===================================================================
--- packages/trunk/teeworlds/debian/changelog	2008-10-29 09:28:29 UTC (rev 8308)
+++ packages/trunk/teeworlds/debian/changelog	2008-10-29 09:58:25 UTC (rev 8309)
@@ -16,6 +16,14 @@
 
  -- Miriam Ruiz <little_miry at yahoo.es>  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 <pkg-games-devel at lists.alioth.debian.org>  Tue, 28 Oct 2008 23:53:17 +0100
+
 teeworlds (0.4.2-1) unstable; urgency=low
 
   * Initial release (Closes: #460848)

Added: packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch
===================================================================
--- packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch	                        (rev 0)
+++ packages/trunk/teeworlds/debian/patches/fix-bam-FTBFS.patch	2008-10-29 09:58:25 UTC (rev 8309)
@@ -0,0 +1,58 @@
+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;
+

Modified: packages/trunk/teeworlds/debian/patches/series
===================================================================
--- packages/trunk/teeworlds/debian/patches/series	2008-10-29 09:28:29 UTC (rev 8308)
+++ packages/trunk/teeworlds/debian/patches/series	2008-10-29 09:58:25 UTC (rev 8309)
@@ -1,2 +1,3 @@
 new-wavpack.patch
 system-libs.patch
+fix-bam-FTBFS.patch

Modified: packages/trunk/teeworlds/debian/rules
===================================================================
--- packages/trunk/teeworlds/debian/rules	2008-10-29 09:28:29 UTC (rev 8308)
+++ packages/trunk/teeworlds/debian/rules	2008-10-29 09:58:25 UTC (rev 8309)
@@ -38,14 +38,14 @@
 	dh_testdir
 	cd bam && ./make_unix.sh
 	
-build: build-bam $(QUILT_STAMPFN)
+build:  $(QUILT_STAMPFN) build-bam
 	dh_testdir
 	bam/src/bam release
 	
 
 clean: build-bam unpatch
 	dh_testdir
-	bam/src/bam -c all
+	[ ! -f bam/src/bam ] || bam/src/bam -c all
 	rm -rf bam/src/bam tmp.* bam/src/tools/txt2c
 	dh_clean