NMU for aqsis uploaded, Patch attached.
diff -u aqsis-1.2.0/debian/changelog aqsis-1.2.0/debian/changelog --- aqsis-1.2.0/debian/changelog +++ aqsis-1.2.0/debian/changelog @@ -1,3 +1,13 @@ +aqsis (1.2.0-2.1) unstable; urgency=medium + + * Non-maintainer upload. + * fix ftbfs by including string.h in various sources (closes: #470971). + * build against libopenexr6 (closes: #476739). + * apply Ubuntu patch to debian/aqsis-libsc2a.install to fix + missing libjpg2tif.so.1 problem (closes: #473151). + + -- Colin Tuckley <[EMAIL PROTECTED]> Tue, 20 May 2008 14:37:25 +0100 + aqsis (1.2.0-2) unstable; urgency=low * Added support for quilt in debian/control and debian/rules. diff -u aqsis-1.2.0/debian/aqsis-libsc2a.install aqsis-1.2.0/debian/aqsis-libsc2a.install --- aqsis-1.2.0/debian/aqsis-libsc2a.install +++ aqsis-1.2.0/debian/aqsis-libsc2a.install @@ -2 +2,12 @@ -usr/lib/aqsis/ +usr/lib/aqsis/*.so +usr/lib/aqsis/plugins/libbake2tif.so +#don't install bmp2tif, failed linking to jpg2tif +#usr/lib/aqsis/plugins/libbmp2tif.so +usr/lib/aqsis/plugins/libdbo_plane.so +usr/lib/aqsis/plugins/libexr2tif.so +usr/lib/aqsis/plugins/libgif2tif.so +usr/lib/aqsis/plugins/libjpg2tif.so +usr/lib/aqsis/plugins/libpcx2tif.so +#usr/lib/aqsis/plugins/libpng2tif.so +usr/lib/aqsis/plugins/libppm2tif.so +#usr/lib/aqsis/plugins/libtga2tif.so only in patch2: unchanged: --- aqsis-1.2.0.orig/NSIS.py +++ aqsis-1.2.0/NSIS.py @@ -24,7 +24,7 @@ import SCons.Builder import SCons.Util import SCons.Scanner -import SCons.Sig +#import SCons.Sig import os.path import glob only in patch2: unchanged: --- aqsis-1.2.0.orig/renderer/ddmanager/ddmanager.cpp +++ aqsis-1.2.0/renderer/ddmanager/ddmanager.cpp @@ -24,6 +24,7 @@ */ +#include <string.h> #include "aqsis.h" #ifdef AQSIS_SYSTEM_WIN32 only in patch2: unchanged: --- aqsis-1.2.0.orig/renderer/render/stats.cpp +++ aqsis-1.2.0/renderer/render/stats.cpp @@ -31,6 +31,7 @@ #include <iomanip> #include <iostream> #include <math.h> +#include <string.h> START_NAMESPACE( Aqsis ) only in patch2: unchanged: --- aqsis-1.2.0.orig/renderer/render/renderer.cpp +++ aqsis-1.2.0/renderer/render/renderer.cpp @@ -26,6 +26,7 @@ #include "aqsis.h" #include <time.h> +#include <string.h> #include "imagebuffer.h" #include "lights.h" only in patch2: unchanged: --- aqsis-1.2.0.orig/renderer/render/ri_cache.h +++ aqsis-1.2.0/renderer/render/ri_cache.h @@ -32,6 +32,8 @@ #include "ri.h" #include "renderer.h" +#include <string.h> + START_NAMESPACE( Aqsis ) only in patch2: unchanged: --- aqsis-1.2.0.orig/renderer/render/blobby.cpp +++ aqsis-1.2.0/renderer/render/blobby.cpp @@ -29,6 +29,7 @@ * */ #include <stdio.h> +#include <string.h> #include <math.h> #include <vector> #include <list> only in patch2: unchanged: --- aqsis-1.2.0.orig/renderer/render/bucket.cpp +++ aqsis-1.2.0/renderer/render/bucket.cpp @@ -26,6 +26,7 @@ #include "MultiTimer.h" #include "aqsis.h" +#include <string.h> #ifdef WIN32 #include <windows.h> only in patch2: unchanged: --- aqsis-1.2.0.orig/renderer/render/environment.cpp +++ aqsis-1.2.0/renderer/render/environment.cpp @@ -26,6 +26,7 @@ #include "aqsis.h" #include <math.h> +#include <string.h> #include <iostream> #include <fstream> only in patch2: unchanged: --- aqsis-1.2.0.orig/renderer/render/texturemap.cpp +++ aqsis-1.2.0/renderer/render/texturemap.cpp @@ -30,6 +30,7 @@ #include <math.h> #include <iostream> #include <fstream> +#include <string.h> #include "texturemap.h" #include "rifile.h" only in patch2: unchanged: --- aqsis-1.2.0.orig/renderer/render/condition.cpp +++ aqsis-1.2.0/renderer/render/condition.cpp @@ -27,6 +27,7 @@ \author Michel Joron ([EMAIL PROTECTED]) */ +#include <string.h> #include "aqsis.h" #include "renderer.h" #include "logging.h" only in patch2: unchanged: --- aqsis-1.2.0.orig/renderer/render/shadowmap.cpp +++ aqsis-1.2.0/renderer/render/shadowmap.cpp @@ -29,6 +29,7 @@ #include <math.h> #include <iostream> #include <fstream> +#include <string.h> #include "texturemap.h" #include "random.h" only in patch2: unchanged: --- aqsis-1.2.0.orig/shadercompiler/slparse/parser.yy +++ aqsis-1.2.0/shadercompiler/slparse/parser.yy @@ -21,6 +21,7 @@ #include <string> #include <vector> #include <cassert> +#include <string.h> #include "parsenode.h" #include "logging.h" only in patch2: unchanged: --- aqsis-1.2.0.orig/shadercompiler/slparse/parser.cpp +++ aqsis-1.2.0/shadercompiler/slparse/parser.cpp @@ -206,6 +206,7 @@ #include <string> #include <vector> #include <cassert> +#include <string.h> #include "parsenode.h" #include "logging.h" only in patch2: unchanged: --- aqsis-1.2.0.orig/shadercompiler/aqsltell/aqsltell.cpp +++ aqsis-1.2.0/shadercompiler/aqsltell/aqsltell.cpp @@ -47,6 +47,7 @@ #include <vector> #include <stdio.h> +#include <string.h> namespace Aqsis only in patch2: unchanged: --- aqsis-1.2.0.orig/shadercompiler/shaderexecenv/shadeops_text.cpp +++ aqsis-1.2.0/shadercompiler/shaderexecenv/shadeops_text.cpp @@ -29,6 +29,7 @@ #include <map> #include <vector> #include <string> +#include <string.h> #include <stdio.h> #include "shaderexecenv.h" only in patch2: unchanged: --- aqsis-1.2.0.orig/shadercompiler/shaderexecenv/shadeops_tmap.cpp +++ aqsis-1.2.0/shadercompiler/shaderexecenv/shadeops_tmap.cpp @@ -29,6 +29,7 @@ #include <map> #include <vector> #include <string> +#include <string.h> #include <stdio.h> #include "shaderexecenv.h" only in patch2: unchanged: --- aqsis-1.2.0.orig/shadercompiler/shaderexecenv/shadeops_inter.cpp +++ aqsis-1.2.0/shadercompiler/shaderexecenv/shadeops_inter.cpp @@ -29,6 +29,7 @@ #include <map> #include <vector> #include <string> +#include <string.h> #include <stdio.h> #if defined(REGEXP) only in patch2: unchanged: --- aqsis-1.2.0.orig/shadercompiler/shadervm/shadervm.cpp +++ aqsis-1.2.0/shadercompiler/shadervm/shadervm.cpp @@ -32,6 +32,7 @@ #include <sstream> #include <ctype.h> #include <stddef.h> +#include <string.h> #include "shadervm.h" #include "symbols.h" only in patch2: unchanged: --- aqsis-1.2.0.orig/shadercompiler/shadervm/dsoshadeops.cpp +++ aqsis-1.2.0/shadercompiler/shadervm/dsoshadeops.cpp @@ -19,6 +19,7 @@ */ #include <sys/stat.h> +#include <string.h> #include "aqsis.h" #include "sstring.h" only in patch2: unchanged: --- aqsis-1.2.0.orig/shadercompiler/aqsl/aqslcomp.cpp +++ aqsis-1.2.0/shadercompiler/aqsl/aqslcomp.cpp @@ -32,6 +32,7 @@ #include <fstream> #include <sstream> #include <stdio.h> +#include <string.h> #ifdef AQSIS_SYSTEM_WIN32 #include "io.h" only in patch2: unchanged: --- aqsis-1.2.0.orig/rib/miqser/miqser.cpp +++ aqsis-1.2.0/rib/miqser/miqser.cpp @@ -42,6 +42,7 @@ #include <string> #include <vector> #include <stdio.h> +#include <string.h> #include <time.h> #ifdef AQSIS_SYSTEM_WIN32 only in patch2: unchanged: --- aqsis-1.2.0.orig/rib/rib2/parser.yy +++ aqsis-1.2.0/rib/rib2/parser.yy @@ -26,6 +26,7 @@ #include <sstream> #include <map> #include <string> +#include <string.h> #include <vector> #include <cassert> only in patch2: unchanged: --- aqsis-1.2.0.orig/rib/rib2/parser.cpp +++ aqsis-1.2.0/rib/rib2/parser.cpp @@ -48,7 +48,7 @@ /* Using locations. */ #define YYLSP_NEEDED 0 - +#include <string.h> /* Tokens. */ #ifndef YYTOKENTYPE only in patch2: unchanged: --- aqsis-1.2.0.orig/rib/ri2rib/output.cpp +++ aqsis-1.2.0/rib/ri2rib/output.cpp @@ -32,6 +32,7 @@ #include "context.h" #include "stddef.h" +#include <string.h> USING_NAMESPACE( libri2rib ); only in patch2: unchanged: --- aqsis-1.2.0.orig/rib/ri2rib/context.cpp +++ aqsis-1.2.0/rib/ri2rib/context.cpp @@ -31,6 +31,8 @@ #include "binary.h" #include "error.h" +#include <string.h> + USING_NAMESPACE( libri2rib ) only in patch2: unchanged: --- aqsis-1.2.0.orig/rib/rib2ri/librib2ri.cpp +++ aqsis-1.2.0/rib/rib2ri/librib2ri.cpp @@ -2,6 +2,7 @@ using namespace librib; #include "ri.h" +#include <string.h> namespace librib2ri { only in patch2: unchanged: --- aqsis-1.2.0.orig/texturing/teqser/teqser.cpp +++ aqsis-1.2.0/texturing/teqser/teqser.cpp @@ -2,6 +2,7 @@ // #include <stdio.h> +#include <string.h> #ifdef AQSIS_SYSTEM_WIN32 only in patch2: unchanged: --- aqsis-1.2.0.orig/patches/01_gcc_4.3_fixes.patch +++ aqsis-1.2.0/patches/01_gcc_4.3_fixes.patch @@ -0,0 +1,112 @@ +Index: aqsis-1.2.0/argparse/argparse.cpp +=================================================================== +--- aqsis-1.2.0.orig/argparse/argparse.cpp 2008-05-12 09:11:58.000000000 +0100 ++++ aqsis-1.2.0/argparse/argparse.cpp 2008-05-12 09:20:04.000000000 +0100 +@@ -17,6 +17,7 @@ + */ + + #include "argparse.h" ++#include <cstdlib> + #include <map> + #include <list> + #include <functional> +Index: aqsis-1.2.0/renderer/aqsis/aqsis.cpp +=================================================================== +--- aqsis-1.2.0.orig/renderer/aqsis/aqsis.cpp 2008-05-12 09:11:58.000000000 +0100 ++++ aqsis-1.2.0/renderer/aqsis/aqsis.cpp 2008-05-12 09:20:04.000000000 +0100 +@@ -36,9 +36,11 @@ + #endif // AQSIS_SYSTEM_WIN32 + #include <fcntl.h> + ++#include <cstdlib> + #include <iostream> + #include <iomanip> + #include <fstream> ++#include <memory> + #include <sstream> + #include <string> + #include <vector> +Index: aqsis-1.2.0/rib/miqser/miqser.cpp +=================================================================== +--- aqsis-1.2.0.orig/rib/miqser/miqser.cpp 2008-05-12 09:11:59.000000000 +0100 ++++ aqsis-1.2.0/rib/miqser/miqser.cpp 2008-05-12 09:20:04.000000000 +0100 +@@ -35,10 +35,12 @@ + #endif // AQSIS_SYSTEM_WIN32 + #include <fcntl.h> + ++#include <cstdlib> + #include <iostream> + #include <iomanip> + #include <fstream> + #include <sstream> ++#include <memory> + #include <string> + #include <vector> + #include <stdio.h> +Index: aqsis-1.2.0/rib/rib2/bdec.cpp +=================================================================== +--- aqsis-1.2.0.orig/rib/rib2/bdec.cpp 2008-05-12 09:11:59.000000000 +0100 ++++ aqsis-1.2.0/rib/rib2/bdec.cpp 2008-05-12 09:20:04.000000000 +0100 +@@ -34,6 +34,7 @@ + + #include "logging.h" + ++#include <cstdlib> + #include <iostream> + #include <iomanip> + +Index: aqsis-1.2.0/shadercompiler/aqsl/aqslcomp.cpp +=================================================================== +--- aqsis-1.2.0.orig/shadercompiler/aqsl/aqslcomp.cpp 2008-05-12 09:11:59.000000000 +0100 ++++ aqsis-1.2.0/shadercompiler/aqsl/aqslcomp.cpp 2008-05-12 15:10:27.000000000 +0100 +@@ -28,10 +28,13 @@ + #include "logging.h" + #include "logging_streambufs.h" + ++#include <cstdlib> + #include <iostream> + #include <fstream> ++#include <memory> + #include <sstream> + #include <stdio.h> ++#include <string.h> + + #ifdef AQSIS_SYSTEM_WIN32 + #include "io.h" +Index: aqsis-1.2.0/shadercompiler/aqsltell/aqsltell.cpp +=================================================================== +--- aqsis-1.2.0.orig/shadercompiler/aqsltell/aqsltell.cpp 2008-05-12 09:11:58.000000000 +0100 ++++ aqsis-1.2.0/shadercompiler/aqsltell/aqsltell.cpp 2008-05-12 09:20:04.000000000 +0100 +@@ -40,6 +40,7 @@ + #include "slx.h" + #include "version.h" + ++#include <cstdlib> + #include <iostream> + #include <iomanip> + #include <fstream> +Index: aqsis-1.2.0/shadercompiler/codegenvm/vmoutput.cpp +=================================================================== +--- aqsis-1.2.0.orig/shadercompiler/codegenvm/vmoutput.cpp 2008-05-12 09:11:58.000000000 +0100 ++++ aqsis-1.2.0/shadercompiler/codegenvm/vmoutput.cpp 2008-05-12 09:20:04.000000000 +0100 +@@ -29,6 +29,7 @@ + #include <sstream> + #endif + #include <fstream> ++#include <cstdlib> + #include <deque> + #include <string> + #include <map> +Index: aqsis-1.2.0/texturing/teqser/teqser.cpp +=================================================================== +--- aqsis-1.2.0.orig/texturing/teqser/teqser.cpp 2008-05-12 09:12:00.000000000 +0100 ++++ aqsis-1.2.0/texturing/teqser/teqser.cpp 2008-05-12 09:20:04.000000000 +0100 +@@ -3,6 +3,8 @@ + + #include <stdio.h> + ++#include <cstdlib> ++#include <memory> + + #ifdef AQSIS_SYSTEM_WIN32 + #include <conio.h> only in patch2: unchanged: --- aqsis-1.2.0.orig/displays/display/display.cpp +++ aqsis-1.2.0/displays/display/display.cpp @@ -24,6 +24,7 @@ */ #include <aqsis.h> +#include <string.h> #include <iostream> #include <logging.h> only in patch2: unchanged: --- aqsis-1.2.0.orig/displays/d_xpm/xpm.cpp +++ aqsis-1.2.0/displays/d_xpm/xpm.cpp @@ -9,6 +9,7 @@ #include <iostream> +#include <string.h> #undef DSPY_INTERNAL #include "ndspy.h" #include "aspXpm.h" only in patch2: unchanged: --- aqsis-1.2.0.orig/displays/d_xpm/aspXpm.cpp +++ aqsis-1.2.0/displays/d_xpm/aspXpm.cpp @@ -1,5 +1,6 @@ #include "aspXpm.h" +#include <string.h> aspXpm::aspXpm( const char *filename, int width, int height, int bpp ) {