Hi, Attached patch fixes FTBFS with gcc-4.3
Changelog:
rafkill (1.2.2-3.2) unstable; urgency=high
* Non-maintainer upload.
* debian/patches/103_gcc_4.3_fixes:
+ Fix paths to apply to src/ instead of build/.
+ Fix more gcc-4.3 FTBFS problems (Closes: #474823).
* Remove debian/patches/patch and an extra copy of 103_gcc_4.3_fixes
in root of source tree, both introduced in last NMU.
-- Ian Beckwith <[EMAIL PROTECTED]> Thu, 10 Apr 2008 01:07:50 +0100
Two files attached:
rafkill_1.2.2-3.1_1.2.2-3.2.patch - full diff against last version
103_gcc_4.3_fixes - fixed gcc-4.3 patch
I'm doing this as part of NM T&S, hopefully my AM will upload this
soon.
New package is available at:
http://erislabs.net/ianb/debian/rafkill_1.2.2-3.2.dsc
cheers,
Ian.
--
Ian Beckwith - [EMAIL PROTECTED] - http://erislabs.net/ianb/
GPG fingerprint: AF6C C0F1 1E74 424B BCD5 4814 40EC C154 A8BA C1EA
Listening to: UNKLE - Reconstructions - Djed (UNKLE Remix) [Tortoise]
diff -Naur rafkill-1.2.2-3.1/103_gcc_4.3_fixes rafkill-1.2.2/103_gcc_4.3_fixes
--- rafkill-1.2.2-3.1/103_gcc_4.3_fixes 2008-04-10 01:39:14.000000000 +0100
+++ rafkill-1.2.2/103_gcc_4.3_fixes 1970-01-01 01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
---- build/guns/gun_findgun.cpp~ 2007-04-02 21:46:07.000000000 +0000
-+++ build/guns/gun_findgun.cpp 2007-04-02 21:46:20.000000000 +0000
-@@ -5,6 +5,7 @@
- #include "weaponobj.h"
- #include "hulls/hull_weapon_machine.h"
- #include "spaceobj.h"
-+#include <cstdlib>
- #include <vector>
- #include <math.h>
-
---- build/guns/gun_machine_circle.cpp~ 2007-04-02 21:46:51.000000000 +0000
-+++ build/guns/gun_machine_circle.cpp 2007-04-02 21:46:56.000000000 +0000
-@@ -3,6 +3,7 @@
- #include "weaponobj.h"
- #include "hulls/hull_weapon_machine.h"
- #include "trigtable.h"
-+#include <cstdlib>
-
- // #define d_circle_move (2.9*8)
-
---- build/guns/gun_saber.cpp~ 2007-04-02 21:47:51.000000000 +0000
-+++ build/guns/gun_saber.cpp 2007-04-02 21:47:57.000000000 +0000
-@@ -5,6 +5,7 @@
- #include "weapons/weapon_beam.h"
- #include "spaceobj.h"
- #include "ebox.h"
-+#include <cstdlib>
- #include <vector>
-
- using namespace std;
---- build/menu.cpp~ 2007-04-02 21:43:40.000000000 +0000
-+++ build/menu.cpp 2007-04-02 21:43:51.000000000 +0000
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <cstdlib>
- #include "defs.h"
- #include "menu.h"
- #include "loadsave.h"
---- build/weapons/weapon_follow.cpp~ 2007-04-02 21:44:52.000000000 +0000
-+++ build/weapons/weapon_follow.cpp 2007-04-02 21:44:59.000000000 +0000
-@@ -3,6 +3,7 @@
- #include "weapon_follow.h"
- #include "hulls/hull_weapon_follow.h"
- #include "spaceobj.h"
-+#include <cstdlib>
- #include <vector>
-
- using namespace std;
---- build/hulls/hull_weapon_beam.cpp~ 2007-04-02 21:48:40.000000000 +0000
-+++ build/hulls/hull_weapon_beam.cpp 2007-04-02 21:48:46.000000000 +0000
-@@ -4,6 +4,7 @@
- #include "hull_weapon_beam.h"
- #include "trigtable.h"
- #include "ebox.h"
-+#include <cstdlib>
-
- #ifndef debug
- #include <iostream>
diff -Naur rafkill-1.2.2-3.1/config.log rafkill-1.2.2/config.log
--- rafkill-1.2.2-3.1/config.log 2008-04-10 01:39:14.000000000 +0100
+++ rafkill-1.2.2/config.log 2008-04-10 01:39:47.000000000 +0100
@@ -1,2 +1,2 @@
-file /tmp/he/rafkill/rafkill-1.2.2/SConstruct,line 5:
+file /tmp/buildd/rafkill-1.2.2/SConstruct,line 5:
Configure(confdir = .sconf_temp)
diff -Naur rafkill-1.2.2-3.1/debian/changelog rafkill-1.2.2/debian/changelog
--- rafkill-1.2.2-3.1/debian/changelog 2008-04-10 01:39:14.000000000 +0100
+++ rafkill-1.2.2/debian/changelog 2008-04-10 01:39:47.000000000 +0100
@@ -1,3 +1,14 @@
+rafkill (1.2.2-3.2) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * debian/patches/103_gcc_4.3_fixes:
+ + Fix paths to apply to src/ instead of build/.
+ + Fix more gcc-4.3 FTBFS problems (Closes: #474823).
+ * Remove debian/patches/patch and an extra copy of 103_gcc_4.3_fixes
+ in root of source tree, both introduced in last NMU.
+
+ -- Ian Beckwith <[EMAIL PROTECTED]> Thu, 10 Apr 2008 01:07:50 +0100
+
rafkill (1.2.2-3.1) unstable; urgency=low
* Non-maintainer upload.
diff -Naur rafkill-1.2.2-3.1/debian/patches/103_gcc_4.3_fixes rafkill-1.2.2/debian/patches/103_gcc_4.3_fixes
--- rafkill-1.2.2-3.1/debian/patches/103_gcc_4.3_fixes 2008-04-10 01:39:14.000000000 +0100
+++ rafkill-1.2.2/debian/patches/103_gcc_4.3_fixes 2008-04-10 01:39:47.000000000 +0100
@@ -1,5 +1,7 @@
---- rafkill/build/guns/gun_findgun.cpp~ 2007-04-02 21:46:07.000000000 +0000
-+++ rafkill/build/guns/gun_findgun.cpp 2007-04-02 21:46:20.000000000 +0000
+Index: rafkill-1.2.2/src/guns/gun_findgun.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/guns/gun_findgun.cpp 2006-05-07 15:50:04.000000000 +0100
++++ rafkill-1.2.2/src/guns/gun_findgun.cpp 2008-04-09 22:54:54.000000000 +0100
@@ -5,6 +5,7 @@
#include "weaponobj.h"
#include "hulls/hull_weapon_machine.h"
@@ -8,8 +10,10 @@
#include <vector>
#include <math.h>
---- rafkill/build/guns/gun_machine_circle.cpp~ 2007-04-02 21:46:51.000000000 +0000
-+++ rafkill/build/guns/gun_machine_circle.cpp 2007-04-02 21:46:56.000000000 +0000
+Index: rafkill-1.2.2/src/guns/gun_machine_circle.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/guns/gun_machine_circle.cpp 2006-05-02 02:50:40.000000000 +0100
++++ rafkill-1.2.2/src/guns/gun_machine_circle.cpp 2008-04-09 22:54:54.000000000 +0100
@@ -3,6 +3,7 @@
#include "weaponobj.h"
#include "hulls/hull_weapon_machine.h"
@@ -18,8 +22,10 @@
// #define d_circle_move (2.9*8)
---- rafkill/build/guns/gun_saber.cpp~ 2007-04-02 21:47:51.000000000 +0000
-+++ rafkill/build/guns/gun_saber.cpp 2007-04-02 21:47:57.000000000 +0000
+Index: rafkill-1.2.2/src/guns/gun_saber.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/guns/gun_saber.cpp 2006-05-02 02:52:23.000000000 +0100
++++ rafkill-1.2.2/src/guns/gun_saber.cpp 2008-04-09 22:54:54.000000000 +0100
@@ -5,6 +5,7 @@
#include "weapons/weapon_beam.h"
#include "spaceobj.h"
@@ -28,16 +34,20 @@
#include <vector>
using namespace std;
---- rafkill/build/menu.cpp~ 2007-04-02 21:43:40.000000000 +0000
-+++ rafkill/build/menu.cpp 2007-04-02 21:43:51.000000000 +0000
+Index: rafkill-1.2.2/src/menu.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/menu.cpp 2008-04-09 22:53:35.000000000 +0100
++++ rafkill-1.2.2/src/menu.cpp 2008-04-09 22:54:54.000000000 +0100
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include <cstdlib>
#include "defs.h"
#include "menu.h"
#include "loadsave.h"
---- rafkill/build/weapons/weapon_follow.cpp~ 2007-04-02 21:44:52.000000000 +0000
-+++ rafkill/build/weapons/weapon_follow.cpp 2007-04-02 21:44:59.000000000 +0000
+Index: rafkill-1.2.2/src/weapons/weapon_follow.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/weapons/weapon_follow.cpp 2006-03-25 23:29:05.000000000 +0000
++++ rafkill-1.2.2/src/weapons/weapon_follow.cpp 2008-04-09 22:54:54.000000000 +0100
@@ -3,6 +3,7 @@
#include "weapon_follow.h"
#include "hulls/hull_weapon_follow.h"
@@ -46,8 +56,10 @@
#include <vector>
using namespace std;
---- rafkill/build/hulls/hull_weapon_beam.cpp~ 2007-04-02 21:48:40.000000000 +0000
-+++ rafkill/build/hulls/hull_weapon_beam.cpp 2007-04-02 21:48:46.000000000 +0000
+Index: rafkill-1.2.2/src/hulls/hull_weapon_beam.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/hulls/hull_weapon_beam.cpp 2006-05-02 03:12:50.000000000 +0100
++++ rafkill-1.2.2/src/hulls/hull_weapon_beam.cpp 2008-04-09 22:54:54.000000000 +0100
@@ -4,6 +4,7 @@
#include "hull_weapon_beam.h"
#include "trigtable.h"
@@ -56,3 +68,39 @@
#ifndef debug
#include <iostream>
+Index: rafkill-1.2.2/src/drawer.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/drawer.cpp 2008-04-09 22:55:06.000000000 +0100
++++ rafkill-1.2.2/src/drawer.cpp 2008-04-09 22:55:55.000000000 +0100
+@@ -11,6 +11,7 @@
+ #include "trigtable.h"
+ #include "pck.h"
+ #include <iostream>
++#include <cstring>
+
+ /* TODO:
+ * Add weapon icons to HUD
+Index: rafkill-1.2.2/src/loadsave.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/loadsave.cpp 2008-04-09 22:55:19.000000000 +0100
++++ rafkill-1.2.2/src/loadsave.cpp 2008-04-09 22:55:55.000000000 +0100
+@@ -7,6 +7,7 @@
+ #include "spaceobj.h"
+ #include "strings.h"
+ #include <string>
++#include <cstring>
+ #include <vector>
+ #include "gunobj.h"
+ #include "hull.h"
+Index: rafkill-1.2.2/src/system.cpp
+===================================================================
+--- rafkill-1.2.2.orig/src/system.cpp 2008-04-09 22:55:29.000000000 +0100
++++ rafkill-1.2.2/src/system.cpp 2008-04-09 22:55:55.000000000 +0100
+@@ -1,6 +1,7 @@
+ #include "system.h"
+ #include <strings.h>
+ #include <string>
++#include <cstring>
+
+ #ifdef WINDOWS
+ static const char * type(){
diff -Naur rafkill-1.2.2-3.1/debian/patches/patch rafkill-1.2.2/debian/patches/patch
--- rafkill-1.2.2-3.1/debian/patches/patch 2008-04-10 01:39:14.000000000 +0100
+++ rafkill-1.2.2/debian/patches/patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,58 +0,0 @@
---- build/guns/gun_findgun.cpp~ 2007-04-02 21:46:07.000000000 +0000
-+++ build/guns/gun_findgun.cpp 2007-04-02 21:46:20.000000000 +0000
-@@ -5,6 +5,7 @@
- #include "weaponobj.h"
- #include "hulls/hull_weapon_machine.h"
- #include "spaceobj.h"
-+#include <cstdlib>
- #include <vector>
- #include <math.h>
-
---- build/guns/gun_machine_circle.cpp~ 2007-04-02 21:46:51.000000000 +0000
-+++ build/guns/gun_machine_circle.cpp 2007-04-02 21:46:56.000000000 +0000
-@@ -3,6 +3,7 @@
- #include "weaponobj.h"
- #include "hulls/hull_weapon_machine.h"
- #include "trigtable.h"
-+#include <cstdlib>
-
- // #define d_circle_move (2.9*8)
-
---- build/guns/gun_saber.cpp~ 2007-04-02 21:47:51.000000000 +0000
-+++ build/guns/gun_saber.cpp 2007-04-02 21:47:57.000000000 +0000
-@@ -5,6 +5,7 @@
- #include "weapons/weapon_beam.h"
- #include "spaceobj.h"
- #include "ebox.h"
-+#include <cstdlib>
- #include <vector>
-
- using namespace std;
---- build/menu.cpp~ 2007-04-02 21:43:40.000000000 +0000
-+++ build/menu.cpp 2007-04-02 21:43:51.000000000 +0000
-@@ -1,4 +1,5 @@
- #include <stdio.h>
-+#include <cstdlib>
- #include "defs.h"
- #include "menu.h"
- #include "loadsave.h"
---- build/weapons/weapon_follow.cpp~ 2007-04-02 21:44:52.000000000 +0000
-+++ build/weapons/weapon_follow.cpp 2007-04-02 21:44:59.000000000 +0000
-@@ -3,6 +3,7 @@
- #include "weapon_follow.h"
- #include "hulls/hull_weapon_follow.h"
- #include "spaceobj.h"
-+#include <cstdlib>
- #include <vector>
-
- using namespace std;
---- build/hulls/hull_weapon_beam.cpp~ 2007-04-02 21:48:40.000000000 +0000
-+++ build/hulls/hull_weapon_beam.cpp 2007-04-02 21:48:46.000000000 +0000
-@@ -4,6 +4,7 @@
- #include "hull_weapon_beam.h"
- #include "trigtable.h"
- #include "ebox.h"
-+#include <cstdlib>
-
- #ifndef debug
- #include <iostream>
diff -Naur rafkill-1.2.2-3.1/.pc/.version rafkill-1.2.2/.pc/.version
--- rafkill-1.2.2-3.1/.pc/.version 2008-04-10 01:39:14.000000000 +0100
+++ rafkill-1.2.2/.pc/.version 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-2
Index: rafkill-1.2.2/src/guns/gun_findgun.cpp
===================================================================
--- rafkill-1.2.2.orig/src/guns/gun_findgun.cpp 2006-05-07 15:50:04.000000000
+0100
+++ rafkill-1.2.2/src/guns/gun_findgun.cpp 2008-04-09 22:54:54.000000000
+0100
@@ -5,6 +5,7 @@
#include "weaponobj.h"
#include "hulls/hull_weapon_machine.h"
#include "spaceobj.h"
+#include <cstdlib>
#include <vector>
#include <math.h>
Index: rafkill-1.2.2/src/guns/gun_machine_circle.cpp
===================================================================
--- rafkill-1.2.2.orig/src/guns/gun_machine_circle.cpp 2006-05-02
02:50:40.000000000 +0100
+++ rafkill-1.2.2/src/guns/gun_machine_circle.cpp 2008-04-09
22:54:54.000000000 +0100
@@ -3,6 +3,7 @@
#include "weaponobj.h"
#include "hulls/hull_weapon_machine.h"
#include "trigtable.h"
+#include <cstdlib>
// #define d_circle_move (2.9*8)
Index: rafkill-1.2.2/src/guns/gun_saber.cpp
===================================================================
--- rafkill-1.2.2.orig/src/guns/gun_saber.cpp 2006-05-02 02:52:23.000000000
+0100
+++ rafkill-1.2.2/src/guns/gun_saber.cpp 2008-04-09 22:54:54.000000000
+0100
@@ -5,6 +5,7 @@
#include "weapons/weapon_beam.h"
#include "spaceobj.h"
#include "ebox.h"
+#include <cstdlib>
#include <vector>
using namespace std;
Index: rafkill-1.2.2/src/menu.cpp
===================================================================
--- rafkill-1.2.2.orig/src/menu.cpp 2008-04-09 22:53:35.000000000 +0100
+++ rafkill-1.2.2/src/menu.cpp 2008-04-09 22:54:54.000000000 +0100
@@ -1,4 +1,5 @@
#include <stdio.h>
+#include <cstdlib>
#include "defs.h"
#include "menu.h"
#include "loadsave.h"
Index: rafkill-1.2.2/src/weapons/weapon_follow.cpp
===================================================================
--- rafkill-1.2.2.orig/src/weapons/weapon_follow.cpp 2006-03-25
23:29:05.000000000 +0000
+++ rafkill-1.2.2/src/weapons/weapon_follow.cpp 2008-04-09 22:54:54.000000000
+0100
@@ -3,6 +3,7 @@
#include "weapon_follow.h"
#include "hulls/hull_weapon_follow.h"
#include "spaceobj.h"
+#include <cstdlib>
#include <vector>
using namespace std;
Index: rafkill-1.2.2/src/hulls/hull_weapon_beam.cpp
===================================================================
--- rafkill-1.2.2.orig/src/hulls/hull_weapon_beam.cpp 2006-05-02
03:12:50.000000000 +0100
+++ rafkill-1.2.2/src/hulls/hull_weapon_beam.cpp 2008-04-09
22:54:54.000000000 +0100
@@ -4,6 +4,7 @@
#include "hull_weapon_beam.h"
#include "trigtable.h"
#include "ebox.h"
+#include <cstdlib>
#ifndef debug
#include <iostream>
Index: rafkill-1.2.2/src/drawer.cpp
===================================================================
--- rafkill-1.2.2.orig/src/drawer.cpp 2008-04-09 22:55:06.000000000 +0100
+++ rafkill-1.2.2/src/drawer.cpp 2008-04-09 22:55:55.000000000 +0100
@@ -11,6 +11,7 @@
#include "trigtable.h"
#include "pck.h"
#include <iostream>
+#include <cstring>
/* TODO:
* Add weapon icons to HUD
Index: rafkill-1.2.2/src/loadsave.cpp
===================================================================
--- rafkill-1.2.2.orig/src/loadsave.cpp 2008-04-09 22:55:19.000000000 +0100
+++ rafkill-1.2.2/src/loadsave.cpp 2008-04-09 22:55:55.000000000 +0100
@@ -7,6 +7,7 @@
#include "spaceobj.h"
#include "strings.h"
#include <string>
+#include <cstring>
#include <vector>
#include "gunobj.h"
#include "hull.h"
Index: rafkill-1.2.2/src/system.cpp
===================================================================
--- rafkill-1.2.2.orig/src/system.cpp 2008-04-09 22:55:29.000000000 +0100
+++ rafkill-1.2.2/src/system.cpp 2008-04-09 22:55:55.000000000 +0100
@@ -1,6 +1,7 @@
#include "system.h"
#include <strings.h>
#include <string>
+#include <cstring>
#ifdef WINDOWS
static const char * type(){
signature.asc
Description: Digital signature
