[med-svn] r4666 - in trunk/packages/sofa-framework/trunk/debian: . patches

Dominique Belhachemi domibel-guest at alioth.debian.org
Wed Mar 17 03:16:52 UTC 2010 

Author: domibel-guest
Date: 2010-03-17 03:16:51 +0000 (Wed, 17 Mar 2010)
New Revision: 4666

Modified:
   trunk/packages/sofa-framework/trunk/debian/Notes
   trunk/packages/sofa-framework/trunk/debian/changelog
   trunk/packages/sofa-framework/trunk/debian/control
   trunk/packages/sofa-framework/trunk/debian/libsofa1.lintian-overrides
   trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff
   trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.diff
   trunk/packages/sofa-framework/trunk/debian/rules
Log:
sofa-framework release 1.0~beta4-4

Modified: trunk/packages/sofa-framework/trunk/debian/Notes
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/Notes	2010-03-16 10:24:29 UTC (rev 4665)
+++ trunk/packages/sofa-framework/trunk/debian/Notes	2010-03-17 03:16:51 UTC (rev 4666)
@@ -53,3 +53,8 @@
    #include <tinystr.h>
 
 
+11)
+since libtinyxml-dev is in Debian we can remove ./extlibs/tinyxml
+debian/copyright has to be updated as well
+
+

Modified: trunk/packages/sofa-framework/trunk/debian/changelog
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/changelog	2010-03-16 10:24:29 UTC (rev 4665)
+++ trunk/packages/sofa-framework/trunk/debian/changelog	2010-03-17 03:16:51 UTC (rev 4666)
@@ -1,3 +1,12 @@
+sofa-framework (1.0~beta4-4) unstable; urgency=low
+
+  * use Debian's libtinyxml-dev (Closes: #573941)
+  * reduce optimization level to -O1 as a workaround for
+    linking failure (Thanks to Ilya Barygi) (Closes: #560104)
+  * fixed FTBFS for SuperH (Thanks to Nobuhiro Iwamatsu) (Closes: #567223)
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de>  Tue, 16 Mar 2010 17:42:22 -0400
+
 sofa-framework (1.0~beta4-3) unstable; urgency=low
 
   [Dominique Belhachemi]

Modified: trunk/packages/sofa-framework/trunk/debian/control
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/control	2010-03-16 10:24:29 UTC (rev 4665)
+++ trunk/packages/sofa-framework/trunk/debian/control	2010-03-17 03:16:51 UTC (rev 4666)
@@ -6,10 +6,10 @@
 Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
 Build-Depends: debhelper (>= 7), quilt, freeglut3-dev, libnewmat10-dev,
  libglew-dev, libqt4-dev, libqt4-opengl-dev, libboost-dev, libxml2-dev,
- libboost-graph-dev, libboost-thread-dev, libqwt5-qt4-dev, libpng-dev, pkg-config
+ libboost-graph-dev, libboost-thread-dev, libqwt5-qt4-dev, libpng-dev, pkg-config, libtinyxml-dev
 Build-Depends-Indep: doxygen, graphviz
 Build-Conflicts: qt3-dev-tools
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 Homepage: http://www.sofa-framework.org/
 Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/sofa-framework/trunk/?rev=0&sc=0
 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/sofa-framework/trunk/
@@ -17,7 +17,7 @@
 
 Package: sofa-apps
 Architecture: any
-Depends: ${shlibs:Depends}, libsofa1 (= ${binary:Version}), sofa-data
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsofa1 (= ${binary:Version}), sofa-data
 Description: GUI for the Simulation Open Framework Architecture (SOFA)
  SOFA is an Open Source framework primarily targeted at
  real-time simulation, with an emphasis on medical simulation.
@@ -31,7 +31,7 @@
 Package: libsofa1-dev
 Section: libdevel
 Architecture: any
-Depends: libsofa1 (= ${binary:Version})
+Depends: libsofa1 (= ${binary:Version}), ${misc:Depends}
 Suggests: sofa-tutorials, sofa-doc
 Description: Simulation Open Framework Architecture - development
  SOFA is an Open Source framework primarily targeted at
@@ -48,7 +48,7 @@
 Package: libsofa1
 Section: libs
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Simulation Open Framework Architecture - runtime
  SOFA is an Open Source framework primarily targeted at
  real-time simulation, with an emphasis on medical simulation.
@@ -62,6 +62,7 @@
 Package: sofa-tutorials
 Section: graphics
 Architecture: all
+Depends: ${misc:Depends}
 Description: Simulation Open Framework Architecture - tutorials
  SOFA is an Open Source framework primarily targeted at
  real-time simulation, with an emphasis on medical simulation.
@@ -75,6 +76,7 @@
 Package: sofa-data
 Section: graphics
 Architecture: all
+Depends: ${misc:Depends}
 Description: Simulation Open Framework Architecture - data
  SOFA is an Open Source framework primarily targeted at
  real-time simulation, with an emphasis on medical simulation.
@@ -88,6 +90,7 @@
 Package: sofa-doc
 Section: doc
 Architecture: all
+Depends: ${misc:Depends}
 Description: SOFA class reference documentation
  SOFA is an Open Source framework primarily targeted at
  real-time simulation, with an emphasis on medical simulation.

Modified: trunk/packages/sofa-framework/trunk/debian/libsofa1.lintian-overrides
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/libsofa1.lintian-overrides	2010-03-16 10:24:29 UTC (rev 4665)
+++ trunk/packages/sofa-framework/trunk/debian/libsofa1.lintian-overrides	2010-03-17 03:16:51 UTC (rev 4666)
@@ -1 +1 @@
-libsofa1: package-name-doesnt-match-sonames libload1 libminiFlowVR1 libphysicalmodel1 libsofacomponent1 libsofacomponentbase1 libsofacomponentbehaviormodel1 libsofacomponentcollision1 libsofacomponentconstraint1 libsofacomponentcontextobject1 libsofacomponentcontroller1 libsofacomponentengine1 libsofacomponentfem1 libsofacomponentforcefield1 libsofacomponentinteractionforcefield1 libsofacomponentlinearsolver1 libsofacomponentmapping1 libsofacomponentmass1 libsofacomponentmastersolver1 libsofacomponentmisc1 libsofacomponentodesolver1 libsofacomponentvisualmodel1 libsofacore1 libsofadefaulttype1 libsofagui1 libsofaguiglut1 libsofaguimain1 libsofaguiqt1 libsofahelper1 libsofamodeler1 libsofapml1 libsofasimulation1 libsofatree1 libtinyxml1
+libsofa1: package-name-doesnt-match-sonames libload1 libminiFlowVR1 libphysicalmodel1 libsofacomponent1 libsofacomponentbase1 libsofacomponentbehaviormodel1 libsofacomponentcollision1 libsofacomponentconstraint1 libsofacomponentcontextobject1 libsofacomponentcontroller1 libsofacomponentengine1 libsofacomponentfem1 libsofacomponentforcefield1 libsofacomponentinteractionforcefield1 libsofacomponentlinearsolver1 libsofacomponentmapping1 libsofacomponentmass1 libsofacomponentmastersolver1 libsofacomponentmisc1 libsofacomponentodesolver1 libsofacomponentvisualmodel1 libsofacore1 libsofadefaulttype1 libsofagui1 libsofaguiglut1 libsofaguimain1 libsofaguiqt1 libsofahelper1 libsofamodeler1 libsofapml1 libsofasimulation1 libsofatree1

Modified: trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff	2010-03-16 10:24:29 UTC (rev 4665)
+++ trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff	2010-03-17 03:16:51 UTC (rev 4666)
@@ -8,9 +8,9 @@
 @DPATCH@
 Index: sofa-framework-1.0~beta4/Sofa.pro
 ===================================================================
---- sofa-framework-1.0~beta4.orig/Sofa.pro	2009-12-06 14:20:24.000000000 -0500
-+++ sofa-framework-1.0~beta4/Sofa.pro	2009-12-06 14:20:34.000000000 -0500
-@@ -3,10 +3,10 @@
+--- 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) 
  
@@ -22,7 +22,11 @@
 +#SUBDIRS += extlibs/qwt
  
  contains(DEFINES,SOFA_XML_PARSER_TINYXML){
-   SUBDIRS += extlibs/tinyxml
+-  SUBDIRS += extlibs/tinyxml
++#  SUBDIRS += extlibs/tinyxml
+ }
+ 
+ # FlowVR
 @@ -21,14 +21,15 @@
  #CSParse
  
@@ -43,8 +47,8 @@
  # 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-12-06 14:20:24.000000000 -0500
-+++ sofa-framework-1.0~beta4/framework/sofa/helper/gl/DrawManager.cpp	2009-12-06 14:20:34.000000000 -0500
+--- 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]);
@@ -56,8 +60,8 @@
        }
 Index: sofa-framework-1.0~beta4/sofa-default.cfg
 ===================================================================
---- sofa-framework-1.0~beta4.orig/sofa-default.cfg	2009-12-06 14:20:24.000000000 -0500
-+++ sofa-framework-1.0~beta4/sofa-default.cfg	2009-12-06 14:20:34.000000000 -0500
+--- 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
  
@@ -89,10 +93,11 @@
  
  # Uncomment if you want to have the possibility to trave the visitor execution
  DEFINES += DUMP_VISITOR_INFO
-@@ -110,6 +110,8 @@
+@@ -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
  
@@ -100,8 +105,8 @@
    # QMAKE_CXXFLAGS += -g
 Index: sofa-framework-1.0~beta4/sofa.cfg
 ===================================================================
---- sofa-framework-1.0~beta4.orig/sofa.cfg	2009-12-06 14:20:24.000000000 -0500
-+++ sofa-framework-1.0~beta4/sofa.cfg	2009-12-06 14:22:48.000000000 -0500
+--- 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
@@ -159,6 +164,15 @@
  }
  
  ########################################################################
+@@ -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
  ########################################################################
@@ -226,3 +240,31 @@
  
  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/55_fix_mips_sqrt.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.diff	2010-03-16 10:24:29 UTC (rev 4665)
+++ trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.diff	2010-03-17 03:16:51 UTC (rev 4666)
@@ -2,7 +2,7 @@
 ## 55_fix_mips_sqrt.dpatch by  <domibel at sid1500>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: fixes a build error on MIPS and ARM (sqrt/sqrtl)
+## DP: fixes a build error on MIPS, ARM, and SuperH (sqrt/sqrtl)
 
 @DPATCH@
 Index: sofa-framework-1.0~beta4/framework/sofa/helper/rmath.h
@@ -15,7 +15,7 @@
  {
 -#if defined(__GNUC__)
 -    return sqrt(a);
-+#if defined(__arm__) || defined(__mips__)
++#if defined(__arm__) || defined(__mips__) || defined(__sh__)
 +    return sqrt((double)a);
  #else
      return (double)sqrtl((long double)a);
@@ -24,7 +24,7 @@
  
  inline long double rsqrt(const long double& a)
  {
-+#if defined(__arm__) || defined(__mips__)
++#if defined(__arm__) || defined(__mips__) || defined(__sh__)
 +    return (long double)sqrt((double)a);
 +#else
      return sqrtl(a);

Modified: trunk/packages/sofa-framework/trunk/debian/rules
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/rules	2010-03-16 10:24:29 UTC (rev 4665)
+++ trunk/packages/sofa-framework/trunk/debian/rules	2010-03-17 03:16:51 UTC (rev 4666)
@@ -60,6 +60,7 @@
 	dh_testroot
 	rm -f build-stamp configure-stamp docs-stamp
 	rm -rf bin lib tutorials doc OBJ
+	- rm -rf extlibs/tinyxml/
 	
 	# Add here commands to clean up after the build process.
 	#$(MAKE) clean

More information about the debian-med-commit mailing list