[med-svn] r9045 - trunk/packages/sofa-framework/trunk/debian/patches
Andreas Tille
tille at alioth.debian.org
Mon Dec 19 15:19:23 UTC 2011
Author: tille
Date: 2011-12-19 15:19:23 +0000 (Mon, 19 Dec 2011)
New Revision: 9045
Added:
trunk/packages/sofa-framework/trunk/debian/patches/10_gcc4.4.patch
trunk/packages/sofa-framework/trunk/debian/patches/10_missing_includes.patch
trunk/packages/sofa-framework/trunk/debian/patches/20_debian_config.patch
Removed:
trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.diff
trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff
Modified:
trunk/packages/sofa-framework/trunk/debian/patches/series
Log:
Adapt patches to new upstream version
Added: trunk/packages/sofa-framework/trunk/debian/patches/10_gcc4.4.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/10_gcc4.4.patch (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/10_gcc4.4.patch 2011-12-19 15:19:23 UTC (rev 9045)
@@ -0,0 +1,60 @@
+--- sofa-1.0-rc1.orig/framework/sofa/helper/LCPSolver.inl
++++ sofa-1.0-rc1/framework/sofa/helper/LCPSolver.inl
+@@ -26,6 +26,7 @@
+ #define SOFA_HELPER_LCPSOLVER_INL
+
+ #include <sofa/helper/LCPSolver.h>
++#include <cstdio>
+
+ #include <cstdio> // printf
+
+--- sofa-1.0-rc1.orig/framework/sofa/helper/Quater.inl
++++ sofa-1.0-rc1/framework/sofa/helper/Quater.inl
+@@ -26,6 +26,7 @@
+ #define SOFA_HELPER_QUATER_INL
+
+ #include "Quater.h"
++#include <cstdio>
+ #include <math.h>
+ #include <iostream>
+ #include <stdio.h>
+--- sofa-1.0-rc1.orig/framework/sofa/helper/gl/Capture.cpp
++++ sofa-1.0-rc1/framework/sofa/helper/gl/Capture.cpp
+@@ -28,6 +28,7 @@
+ #include <sofa/helper/io/ImagePNG.h>
+ #endif
+
++#include <cstdio>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
+--- sofa-1.0-rc1.orig/framework/sofa/helper/io/ImageBMP.cpp
++++ sofa-1.0-rc1/framework/sofa/helper/io/ImageBMP.cpp
+@@ -24,6 +24,7 @@
+ ******************************************************************************/
+ #include <sofa/helper/io/ImageBMP.h>
+ #include <sofa/helper/system/FileRepository.h>
++#include <cstdio>
+ #include <iostream>
+
+ #include <cstdio> // fopen and friends
+--- sofa-1.0-rc1.orig/framework/sofa/helper/io/ImageRAW.cpp
++++ sofa-1.0-rc1/framework/sofa/helper/io/ImageRAW.cpp
+@@ -25,6 +25,7 @@
+ #include <sofa/helper/io/ImageRAW.h>
+ #include <sofa/helper/system/FileRepository.h>
+ #include <iostream>
++#include <cstdio>
+
+ #include <cstdio> // fopen
+
+--- sofa-1.0-rc1.orig/framework/sofa/helper/io/MeshTrian.cpp
++++ sofa-1.0-rc1/framework/sofa/helper/io/MeshTrian.cpp
+@@ -25,6 +25,7 @@
+ #include <sofa/helper/io/MeshTrian.h>
+ #include <sofa/helper/system/FileRepository.h>
+ #include <stdlib.h>
++#include <cstdio>
+ #include <iostream>
+ #include <string>
+
Added: trunk/packages/sofa-framework/trunk/debian/patches/10_missing_includes.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/10_missing_includes.patch (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/10_missing_includes.patch 2011-12-19 15:19:23 UTC (rev 9045)
@@ -0,0 +1,24 @@
+--- sofa-1.0-rc1.orig/applications/sofa/gui/qt/GraphVisitor.cpp
++++ sofa-1.0-rc1/applications/sofa/gui/qt/GraphVisitor.cpp
+@@ -26,10 +26,7 @@
+
+ #include <sstream>
+
+-#include <tinyxml.cpp>
+-#include <tinyxmlerror.cpp>
+-#include <tinystr.cpp>
+-#include <tinyxmlparser.cpp>
++#include <tinyxml.h>
+
+ #include <algorithm>
+
+--- sofa-1.0-rc1.orig/applications/sofa/gui/qt/GraphVisitor.h
++++ sofa-1.0-rc1/applications/sofa/gui/qt/GraphVisitor.h
+@@ -44,7 +44,6 @@
+
+ //Tinyxml library
+ #include <tinyxml.h>
+-#include <tinystr.h>
+
+ #include <iostream>
+ #include <set>
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.diff 2011-12-19 14:51:04 UTC (rev 9044)
+++ trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.diff 2011-12-19 15:19:23 UTC (rev 9045)
@@ -1,73 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 13_gcc4.4.dpatch by <domibel at ve2056622895.ihrserver.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: added #include headers required by GCC 4.4 (Closes: #505953)
-
- at DPATCH@
-diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/LCPSolver.inl sofa-framework-1.0~beta4/framework/sofa/helper/LCPSolver.inl
---- sofa-framework-1.0~beta4~/framework/sofa/helper/LCPSolver.inl 2009-06-09 21:10:29.000000000 -0400
-+++ sofa-framework-1.0~beta4/framework/sofa/helper/LCPSolver.inl 2009-06-09 21:10:49.000000000 -0400
-@@ -28,6 +28,7 @@
- #define SOFA_HELPER_LCPSOLVER_INL
-
- #include <sofa/helper/LCPSolver.h>
-+#include <cstdio>
-
- namespace sofa
- {
-diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/Quater.inl sofa-framework-1.0~beta4/framework/sofa/helper/Quater.inl
---- sofa-framework-1.0~beta4~/framework/sofa/helper/Quater.inl 2009-06-09 21:10:29.000000000 -0400
-+++ sofa-framework-1.0~beta4/framework/sofa/helper/Quater.inl 2009-06-09 21:10:49.000000000 -0400
-@@ -28,6 +28,7 @@
- #define SOFA_HELPER_QUATER_INL
-
- #include "Quater.h"
-+#include <cstdio>
- #include <math.h>
- #include <iostream>
-
-diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/gl/Capture.cpp sofa-framework-1.0~beta4/framework/sofa/helper/gl/Capture.cpp
---- sofa-framework-1.0~beta4~/framework/sofa/helper/gl/Capture.cpp 2009-06-09 21:10:29.000000000 -0400
-+++ sofa-framework-1.0~beta4/framework/sofa/helper/gl/Capture.cpp 2009-06-09 21:10:49.000000000 -0400
-@@ -30,6 +30,7 @@
- #include <sofa/helper/io/ImagePNG.h>
- #endif
-
-+#include <cstdio>
- #include <sys/types.h>
- #include <sys/stat.h>
-
-diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/io/ImageBMP.cpp sofa-framework-1.0~beta4/framework/sofa/helper/io/ImageBMP.cpp
---- sofa-framework-1.0~beta4~/framework/sofa/helper/io/ImageBMP.cpp 2009-06-09 21:10:29.000000000 -0400
-+++ sofa-framework-1.0~beta4/framework/sofa/helper/io/ImageBMP.cpp 2009-06-09 21:10:49.000000000 -0400
-@@ -26,6 +26,7 @@
- ******************************************************************************/
- #include <sofa/helper/io/ImageBMP.h>
- #include <sofa/helper/system/FileRepository.h>
-+#include <cstdio>
- #include <iostream>
-
- namespace sofa
-diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/io/ImageRAW.cpp sofa-framework-1.0~beta4/framework/sofa/helper/io/ImageRAW.cpp
---- sofa-framework-1.0~beta4~/framework/sofa/helper/io/ImageRAW.cpp 2009-06-09 21:10:29.000000000 -0400
-+++ sofa-framework-1.0~beta4/framework/sofa/helper/io/ImageRAW.cpp 2009-06-09 21:10:49.000000000 -0400
-@@ -27,6 +27,7 @@
- #include <sofa/helper/io/ImageRAW.h>
- #include <sofa/helper/system/FileRepository.h>
- #include <iostream>
-+#include <cstdio>
-
- namespace sofa
- {
-diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/io/MeshTrian.cpp sofa-framework-1.0~beta4/framework/sofa/helper/io/MeshTrian.cpp
---- sofa-framework-1.0~beta4~/framework/sofa/helper/io/MeshTrian.cpp 2009-06-09 21:10:29.000000000 -0400
-+++ sofa-framework-1.0~beta4/framework/sofa/helper/io/MeshTrian.cpp 2009-06-09 21:10:49.000000000 -0400
-@@ -27,6 +27,7 @@
- #include <sofa/helper/io/MeshTrian.h>
- #include <sofa/helper/system/FileRepository.h>
- #include <stdlib.h>
-+#include <cstdio>
- #include <iostream>
- #include <string>
-
Added: trunk/packages/sofa-framework/trunk/debian/patches/20_debian_config.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/20_debian_config.patch (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/20_debian_config.patch 2011-12-19 15:19:23 UTC (rev 9045)
@@ -0,0 +1,57 @@
+--- sofa-1.0-rc1.orig/sofa-default.prf
++++ sofa-1.0-rc1/sofa-default.prf
+@@ -19,7 +19,8 @@
+ # Viewers
+ ########################################################################
+
+-!isEmpty(QT): DEFINES += SOFA_QT4
++#!isEmpty(QT): DEFINES += SOFA_QT4
++DEFINES += SOFA_QT4
+
+ # Uncomment if you want to compile Qt interface
+ DEFINES += SOFA_GUI_QTVIEWER
+@@ -94,7 +95,7 @@
+ # DEFINES += SOFA_HAVE_FLOWVR
+
+ # Uncomment if you want to use Boost lib for multithread computing
+-# DEFINES += SOFA_HAVE_BOOST
++DEFINES += SOFA_HAVE_BOOST
+ # On mac, we often need the suffix -mt
+ # BOOST_SUFFIX = -mt
+ # On Windows, the path where boost is install and the suffix of the dlls should be specified
+@@ -120,7 +121,7 @@
+
+ contains(DEFINES,SOFA_XML_PARSER_LIBXML){
+ # Uncomment if you want to use SofaPML to load PML and LML files
+-# DEFINES += SOFA_PML
++DEFINES += SOFA_PML
+ }
+
+ # Uncomment if you want to use METIS
+@@ -152,12 +153,15 @@
+ # QMAKE_LFLAGS *= -fopenmp
+ # QMAKE_CXXFLAGS_RELEASE *= -fopenmp
+
++# for binutils-gold
++SOFA_EXT_LIBS += -ldl
++
+ # Uncomment if you want to use fishpack support
+ # DEFINES += SOFA_HAVE_FISHPACK
+ # FISHPACK_FLAGS = intel
+
+ # If you want to use BLAS/LAPACK (required by TAUCS), uncomment the correct libraries and macros depending on your system
+-# DEFINES += SOFA_HAVE_BLAS
++DEFINES += SOFA_HAVE_BLAS
+ # BLAS_LIBS *= -lblas -llapack -lf2c
+ # BLAS_LIBS *= -llibgoto2 -llapack -llibf2c
+ # BLAS_DEFINES *= TAUCS_BLAS_UNDERSCORE
+@@ -304,6 +308,9 @@
+ # Uncomment if you want to compile the debug or release version
+ #CONFIG += debug
+ CONFIG += release
++QMAKE_CXXFLAGS_RELEASE += -O1
++QMAKE_CXXFLAGS += -W
++QMAKE_CFLAGS += -W
+
+ # Uncomment if you want debug symbols even in release build
+ # QMAKE_CXXFLAGS += -g
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff 2011-12-19 14:51:04 UTC (rev 9044)
+++ trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff 2011-12-19 15:19:23 UTC (rev 9045)
@@ -1,270 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 50_all_changes.dpatch by <domibel at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Link sofa to Debians newmat, boost, xml2 and qwt library.
-## DP: Use OGRE >= 1.6.0 if switched on.
-
- at DPATCH@
-Index: sofa-framework-1.0~beta4/Sofa.pro
-===================================================================
---- sofa-framework-1.0~beta4.orig/Sofa.pro 2009-03-20 18:41:25.000000000 -0400
-+++ sofa-framework-1.0~beta4/Sofa.pro 2010-03-16 20:02:03.000000000 -0400
-@@ -3,13 +3,13 @@
-
- include($${SOFA_DIR}/sofa.cfg)
-
--SUBDIRS += extlibs/newmat
-+#SUBDIRS += extlibs/newmat
-
-
--SUBDIRS += extlibs/qwt
-+#SUBDIRS += extlibs/qwt
-
- contains(DEFINES,SOFA_XML_PARSER_TINYXML){
-- SUBDIRS += extlibs/tinyxml
-+# SUBDIRS += extlibs/tinyxml
- }
-
- # FlowVR
-@@ -21,14 +21,15 @@
- #CSParse
-
- contains(DEFINES,SOFA_HAVE_CSPARSE){
-- SUBDIRS += extlibs/csparse
-+# use Debian's system library instead of the one in extlibs
-+# SUBDIRS += extlibs/csparse
- }
-
-
- #QGLViewer
-
- contains(DEFINES,SOFA_GUI_QGLVIEWER){
-- SUBDIRS += extlibs/libQGLViewer/QGLViewer
-+# SUBDIRS += extlibs/libQGLViewer/QGLViewer
- }
-
- # PML
-Index: sofa-framework-1.0~beta4/framework/sofa/helper/gl/DrawManager.cpp
-===================================================================
---- sofa-framework-1.0~beta4.orig/framework/sofa/helper/gl/DrawManager.cpp 2009-03-20 18:40:53.000000000 -0400
-+++ sofa-framework-1.0~beta4/framework/sofa/helper/gl/DrawManager.cpp 2010-03-16 20:02:03.000000000 -0400
-@@ -517,7 +517,7 @@
- node->scale(radius/50.0,radius/50.0,radius/50.0);
- node->translate(p[0],p[1],p[2]);
- node->attachObject(sph);
-- sph->setNormaliseNormals(true);
-+ //sph->setNormaliseNormals(true);
- break;
- #endif
- }
-Index: sofa-framework-1.0~beta4/sofa-default.cfg
-===================================================================
---- sofa-framework-1.0~beta4.orig/sofa-default.cfg 2009-03-20 18:41:25.000000000 -0400
-+++ sofa-framework-1.0~beta4/sofa-default.cfg 2010-03-16 20:02:03.000000000 -0400
-@@ -47,7 +47,7 @@
- # DEFINES += SOFA_HAVE_FLOWVR
-
- # Uncomment if you want to use Boost lib for multithread computing
--# DEFINES += SOFA_HAVE_BOOST
-+ DEFINES += SOFA_HAVE_BOOST
-
- # Uncomment if you want to compile CUDA GPU prototype (require NVIDIA CUDA SDK)
- # DEFINES += SOFA_GPU_CUDA
-@@ -61,10 +61,10 @@
- # DEFINES += SOFA_GPU_CUDA_DOUBLE
-
- # Uncomment if you want to use SofaPML to load PML and LML files
--# DEFINES += SOFA_PML
-+DEFINES += SOFA_PML
-
- # Uncomment if you want to use LAPACK for Matrix Solvers
--#DEFINES += SOFA_HAVE_LAPACK
-+# DEFINES += SOFA_HAVE_LAPACK
-
- # Uncomment if you want to use MKL for Matrix Solvers
- #DEFINES += SOFA_HAVE_MKL
-@@ -77,7 +77,7 @@
- # DEFINES += SOFA_HAVE_CHAI3D
-
- # Uncomment if you want to support moving frames when computing inertia forces in Mass
--# DEFINES += SOFA_SUPPORT_MOVING_FRAMES
-+ DEFINES += SOFA_SUPPORT_MOVING_FRAMES
-
- # Uncomment if you want to have the possibility to trave the visitor execution
- DEFINES += DUMP_VISITOR_INFO
-@@ -110,6 +110,9 @@
- # Choose if you want to compile the debug or release version
- #CONFIG = debug
- CONFIG = release
-+QMAKE_CXXFLAGS_RELEASE += -O1
-+QMAKE_CXXFLAGS += -W
-+QMAKE_CFLAGS += -W
-
- # Uncomment if you want debug symbols even in release build
- # QMAKE_CXXFLAGS += -g
-Index: sofa-framework-1.0~beta4/sofa.cfg
-===================================================================
---- sofa-framework-1.0~beta4.orig/sofa.cfg 2009-03-20 18:41:25.000000000 -0400
-+++ sofa-framework-1.0~beta4/sofa.cfg 2010-03-16 20:02:03.000000000 -0400
-@@ -19,7 +19,8 @@
-
- # Auto-detect Qt 4.x
- # The QT variable was introduced in Qt 4
--!isEmpty(QT): DEFINES += SOFA_QT4
-+#!isEmpty(QT): DEFINES += SOFA_QT4
-+DEFINES += SOFA_QT4
-
- !include( sofa-local.cfg ) {
- # Copy sofa-default.cfg to sofa-local.cfg and modify it to change local options
-@@ -197,12 +198,10 @@
- OBJECTS_DIR = OBJ/$$join(CONFIGDEBUG,,,)
-
- CONFIGLIBRARIES+= \
-- warn_on \
- stl \
- rtti \
- thread
-
--CONFIGPROJECT += warn_on
- CONFIGPROJECTGUI = $$CONFIGPROJECT
- CONFIGPROJECTCMD = $$CONFIGPROJECT
- CONFIGPROJECTCMD += console
-@@ -211,7 +210,11 @@
- $$SOFA_DIR/include \
- $$SOFA_DIR/framework \
- $$SOFA_DIR/modules \
-- $$SOFA_DIR/applications
-+ $$SOFA_DIR/applications \
-+ /usr/include/qt4 \
-+ /usr/include/qwt
-+
-+
-
- DEPENDPATH *= \
- $$SOFA_DIR/framework \
-@@ -241,7 +244,7 @@
- # BOOST
- ########################################################################
- contains(DEFINES,SOFA_HAVE_BOOST){
-- SOFA_EXT_LIBS *= -lboost_thread
-+ SOFA_EXT_LIBS *= -lboost_thread-mt
- }else{
- # use miniBoost headers included in extlibs
- INCLUDEPATH *= $$SOFA_DIR/extlibs/miniBoost
-@@ -251,9 +254,9 @@
- # CSPARSE
- ########################################################################
- contains(DEFINES,SOFA_HAVE_CSPARSE){
-- SOFA_EXT_LIBS *= -lcsparse$$LIBSUFFIX
-+ SOFA_EXT_LIBS *= -lcsparse
- # use csparse headers included in extlibs
-- INCLUDEPATH *= $$SOFA_DIR/extlibs/csparse
-+ # INCLUDEPATH *= $$SOFA_DIR/extlibs/csparse
- }
-
- ########################################################################
-@@ -267,7 +270,7 @@
- contains(DEFINES,SOFA_XML_PARSER_TINYXML){
- # DEFINES *= TIXML_USE_STL
- SOFA_EXT_LIBS += -ltinyxml$$LIBSUFFIX
-- INCLUDEPATH *= $$SOFA_DIR/extlibs/tinyxml
-+# INCLUDEPATH *= $$SOFA_DIR/extlibs/tinyxml
- }
-
- ########################################################################
-@@ -322,8 +325,8 @@
- # NewMAT
- ########################################################################
-
--INCLUDEPATH *= $$SOFA_DIR/extlibs/newmat
--SOFA_EXT_LIBS *= -lnewmat$$LIBSUFFIX
-+#INCLUDEPATH *= $$SOFA_DIR/extlibs/newmat
-+SOFA_EXT_LIBS *= -lnewmat
-
- ########################################################################
- # METIS
-@@ -377,8 +380,9 @@
- else {
- QT += opengl
- }
-- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
-- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
-+# INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
-+# SOFA_GUI_EXT_LIBS *= -lqwt
-+ SOFA_GUI_EXT_LIBS *= -lqwt-qt4
- }
-
- ########################################################################
-@@ -398,10 +402,10 @@
- else {
- QT += opengl
- }
-- unix:SOFA_GUI_EXT_LIBS *= -lQGLViewer$${LIBSUFFIX}
-+ unix:SOFA_GUI_EXT_LIBS *= -lqglviewer-qt4$${LIBSUFFIX}
- win32:SOFA_GUI_EXT_LIBS *= -lQGLViewer2$${LIBSUFFIX}
-- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt $$SOFA_DIR/extlibs/libQGLViewer
-- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
-+ INCLUDEPATH += /usr/include/qglviewer-qt4
-+ SOFA_GUI_EXT_LIBS *= -lqwt-qt4
- }
-
- ########################################################################
-@@ -428,8 +432,8 @@
- QMAKE_LIBDIR += $(OGRE_HOME)/lib
- LIBS += OgreMain.lib
- }
-- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
-- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
-+# INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
-+ SOFA_GUI_EXT_LIBS *= -lqwt-qt4
-
- unix {
- macx: QMAKE_CXXFLAGS += -Wno-unused
-@@ -601,6 +605,9 @@
-
- SOFA_GUI_LIBS *= -lsofagui$$LIBSUFFIX -lsofaguimain$$LIBSUFFIX
-
-+# for binutils-gold
-+SOFA_EXTRA_LIBS += -ldl
-+
- # When using staticlib, rebuild applications if a library has changed
- contains(CONFIGLIBRARIES,staticlib){
- contains(TEMPLATE,app){
-@@ -619,7 +626,7 @@
- }
- }
-
--SOFA_LIBS = $${SOFA_MODULES_LIBS} $${SOFA_MODULES_LIBS} $${SOFA_FRAMEWORK_LIBS} $${SOFA_FRAMEWORK_LIBS} $${SOFA_EXT_LIBS}
-+SOFA_LIBS = $${SOFA_MODULES_LIBS} $${SOFA_MODULES_LIBS} $${SOFA_FRAMEWORK_LIBS} $${SOFA_FRAMEWORK_LIBS} $${SOFA_EXT_LIBS} $${SOFA_EXTRA_LIBS}
-
- SOFA_GUI_LIBS += $${SOFA_GUI_EXT_LIBS}
-
-Index: sofa-framework-1.0~beta4/applications/sofa/gui/qt/GraphVisitor.cpp
-===================================================================
---- sofa-framework-1.0~beta4.orig/applications/sofa/gui/qt/GraphVisitor.cpp 2009-03-20 18:40:52.000000000 -0400
-+++ sofa-framework-1.0~beta4/applications/sofa/gui/qt/GraphVisitor.cpp 2010-03-16 20:02:03.000000000 -0400
-@@ -28,10 +28,7 @@
-
- #include <sstream>
-
--#include <tinyxml.cpp>
--#include <tinyxmlerror.cpp>
--#include <tinystr.cpp>
--#include <tinyxmlparser.cpp>
-+#include <tinyxml.h>
-
- #include <algorithm>
-
-Index: sofa-framework-1.0~beta4/applications/sofa/gui/qt/GraphVisitor.h
-===================================================================
---- sofa-framework-1.0~beta4.orig/applications/sofa/gui/qt/GraphVisitor.h 2010-03-16 20:02:24.000000000 -0400
-+++ sofa-framework-1.0~beta4/applications/sofa/gui/qt/GraphVisitor.h 2010-03-16 20:02:31.000000000 -0400
-@@ -43,7 +43,6 @@
-
- //Tinyxml library
- #include <tinyxml.h>
--#include <tinystr.h>
-
- #include <iostream>
- #include <set>
Modified: trunk/packages/sofa-framework/trunk/debian/patches/series
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/series 2011-12-19 14:51:04 UTC (rev 9044)
+++ trunk/packages/sofa-framework/trunk/debian/patches/series 2011-12-19 15:19:23 UTC (rev 9045)
@@ -1,5 +1,6 @@
-13_gcc4.4.diff
-50_all_changes.diff
+10_gcc4.4.patch
+10_missing_includes.patch
+20_debian_config.patch
55_fix_mips_sqrt.diff
78_atomicity.diff
fix_mutable_serr_sout.diff
More information about the debian-med-commit
mailing list