Hi release team,

Please consider Teeworlds 0.4.2-2 in testing.

Teeworlds 0.4.2-2 fix a FTBFS (#481817) on those architecture:
http://buildd.debian.org/build.php?&pkg=teeworlds
 -armel
 -hppa
 -alpha
 -arm
 -s390
 -sparc
 -ia64

The changes:
 fix-bam-FTBFS.patch: a struct align fix for bam. Bam is ONLY used during
   the build process.
 rules: don't use bam before patches are applied

The debdiff:
-----------------------------------------------------------------
 debian/patches/fix-bam-FTBFS.patch    |   57 ++++++++++++++++++++++++++++++++++
 teeworlds-0.4.2/debian/changelog      |    8 ++++
 teeworlds-0.4.2/debian/patches/series |    1
 teeworlds-0.4.2/debian/rules          |    6 +--
 4 files changed, 69 insertions(+), 3 deletions(-)


diff -u teeworlds-0.4.2/debian/rules teeworlds-0.4.2/debian/rules               
                                              
--- teeworlds-0.4.2/debian/rules                                                
                                              
+++ teeworlds-0.4.2/debian/rules                                                
                                              
@@ -38,14 +38,14 @@                                                             
                                              
        dh_testdir                                                              
                                              
        cd bam && ./make_unix.sh                                                
                                              
                                                                                
                                              
-build: build-bam $(QUILT_STAMPFN)                                              
                                              
+build: patch build-bam $(QUILT_STAMPFN)                                        
                                              
        dh_testdir                                                              
                                              
        bam/src/bam release                                                     
                                              
                                                                                
                                              
                                                                                
                                              
-clean: build-bam unpatch                                                       
                                              
+clean: 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                                                                
                                              
                                                                                
                                              
diff -u teeworlds-0.4.2/debian/changelog teeworlds-0.4.2/debian/changelog       
                                              
--- teeworlds-0.4.2/debian/changelog                                            
                                              
+++ teeworlds-0.4.2/debian/changelog                                            
                                              
@@ -1,3 +1,11 @@                                                                
                                              
+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)                                          
                                              
diff -u teeworlds-0.4.2/debian/patches/series 
teeworlds-0.4.2/debian/patches/series                                           
--- teeworlds-0.4.2/debian/patches/series                                       
                                              
+++ teeworlds-0.4.2/debian/patches/series                                       
                                              
@@ -2,0 +3 @@                                                                   
                                              
+fix-bam-FTBFS.patch                                                            
                                              
only in patch2:                                                                 
                                              
unchanged:                                                                      
                                              
--- teeworlds-0.4.2.orig/debian/patches/fix-bam-FTBFS.patch                     
                                              
+++ teeworlds-0.4.2/debian/patches/fix-bam-FTBFS.patch                          
                                              
@@ -0,0 +1,57 @@                                                                
                                              
+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;

Attachment: signature.asc
Description: Digital signature

Reply via email to