[med-svn] r3475 - in trunk/packages/sofa-framework/tags: . 1.0~beta3-5 1.0~beta3-5/debian 1.0~beta3-5/debian/PML 1.0~beta3-5/debian/patches 1.0~beta4-1
Dominique Belhachemi
domibel-guest at alioth.debian.org
Tue Jun 9 23:25:37 UTC 2009
Author: domibel-guest
Date: 2009-06-09 23:25:37 +0000 (Tue, 09 Jun 2009)
New Revision: 3475
Added:
trunk/packages/sofa-framework/tags/1.0~beta3-5/
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/Notes
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/default.scn
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/example.lml
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/example.pml
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/mtccs.lml
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/mtccs.pml
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/README.Debian
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/changelog
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/compat
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/control
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/copyright
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/get-orig-source
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/libsofa1.lintian-overrides
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/00list
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/10changes.dpatch
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/13_gcc4.4.dpatch
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/22_amd64_segfault.dpatch
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/25_newmat.dpatch
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/44_ogre.dpatch
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/55_fix_mips_sqrt.dpatch
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/rules
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa-doc.doc-base
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa.1
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa.desktop
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa.menu
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa.xpm
trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/watch
trunk/packages/sofa-framework/tags/1.0~beta4-1/
trunk/packages/sofa-framework/tags/1.0~beta4-1/debian/
Log:
tagging sofa-framework 1.0~beta3-5 and 1.0~beta4-1
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/Notes
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/Notes (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/Notes 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,37 @@
+1)
+grep -r "1.0 beta 1" .
+./modules/sofa/component/forcefield/TriangularAnisotropicFEMForceField.cpp:* SOFA, Simulation Open-Framework Architecture,
+version 1.0 beta 1 *
+./modules/sofa/component/forcefield/TriangularAnisotropicFEMForceField.h:* SOFA, Simulation Open-Framework Architecture,
+version 1.0 beta 1 *
+
+
+2)
+please provide a
+copyright file for extlibs/miniFlowVR/
+
+3)
+please provide a
+make install
+
+4)
+Sometimes it is better to link against:
+libqt3-mt-dev, qt3-dev-tools,
+libqglviewer-dev, libqwt-dev,
+
+5)
+ * debian/copyright: MKL removed
+
+
+
+6)
+
+ * Example files can be find in /usr/share/sofa
+ * Use a shell script to set the environment variable SOFA_DATA_PATH and to start the sofa gui
+
+7)
+ * $$LIBSUFFIX for the debug target not needed because we are using Debian libraries
+
+8)
+ update "man page", update "sofa -h" because
+ "sofa myscene.scn" works, but it is not documented
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/default.scn
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/default.scn (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/default.scn 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,2 @@
+<Node name="root" dt="0.1" showBehaviorModels="1" showCollisionModels="0" showMappings="0" showForceFields="1">
+</Node>
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/example.lml
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/example.lml (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/example.lml 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- physical model load file -->
+<loads xmlns='http://www-timc.imag.fr/load'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+<load xsi:type="Translation">
+ <appliedTo>0-3,26-27,30-31</appliedTo>
+ <valueEvent date="0.0" value="1.0"/>
+ <direction x="NULL" y="NULL" z="NULL"/>
+ <unit>mm</unit>
+</load>
+
+</loads>
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/example.pml
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/example.pml (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/example.pml 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,300 @@
+<!-- physical model is a generic representation for 3D physical model (FEM, spring mass network, phymulob...) -->
+
+<!-- This an example of a pml designed for Sofa -->
+
+<physicalModel name="bodyChain" nrOfAtoms="32"
+ nrOfExclusiveComponents="6"
+ nrOfInformativeComponents="0"
+ nrOfCells="25"
+>
+<!-- list of atoms: -->
+<atoms>
+<structuralComponent name="element list" >
+<nrOfStructures value="32"/>
+<atom>
+<atomProperties index="0" x="0" y="0" z="0" />
+</atom>
+<atom>
+<atomProperties index="1" x="0" y="0" z="1" />
+</atom>
+<atom>
+<atomProperties index="2" x="0" y="1" z="1" />
+</atom>
+<atom>
+<atomProperties index="3" x="0" y="1" z="0" />
+</atom>
+<atom>
+<atomProperties index="4" x="1" y="0" z="0" />
+</atom>
+<atom>
+<atomProperties index="5" x="1" y="0" z="1" />
+</atom>
+<atom>
+<atomProperties index="6" x="1" y="1" z="1" />
+</atom>
+<atom>
+<atomProperties index="7" x="1" y="1" z="0" />
+</atom>
+<atom>
+<atomProperties index="8" x="2" y="0" z="0" />
+</atom>
+<atom>
+<atomProperties index="9" x="2" y="0" z="1" />
+</atom>
+<atom>
+<atomProperties index="10" x="2" y="1" z="1" />
+</atom>
+<atom>
+<atomProperties index="11" x="2" y="1" z="0" />
+</atom>
+<atom>
+<atomProperties index="12" x="3" y="0" z="0" />
+</atom>
+<atom>
+<atomProperties index="13" x="3" y="0" z="1" />
+</atom>
+<atom>
+<atomProperties index="14" x="3" y="1" z="1" />
+</atom>
+<atom>
+<atomProperties index="15" x="3" y="1" z="0" />
+</atom>
+<atom>
+<atomProperties index="16" x="4" y="0" z="0" />
+</atom>
+<atom>
+<atomProperties index="17" x="4" y="0" z="1" />
+</atom>
+<atom>
+<atomProperties index="18" x="4" y="1" z="1" />
+</atom>
+<atom>
+<atomProperties index="19" x="4" y="1" z="0" />
+</atom>
+<atom>
+<atomProperties index="20" x="5" y="0" z="0" />
+</atom>
+<atom>
+<atomProperties index="21" x="5" y="0" z="1" />
+</atom>
+<atom>
+<atomProperties index="22" x="5" y="1" z="1" />
+</atom>
+<atom>
+<atomProperties index="23" x="5" y="1" z="0" />
+</atom>
+<atom>
+<atomProperties index="24" x="4" y="-1" z="0" />
+</atom>
+<atom>
+<atomProperties index="25" x="4" y="-1" z="1" />
+</atom>
+<atom>
+<atomProperties index="26" x="4" y="-2" z="1" />
+</atom>
+<atom>
+<atomProperties index="27" x="4" y="-2" z="0" />
+</atom>
+<atom>
+<atomProperties index="28" x="5" y="-1" z="0" />
+</atom>
+<atom>
+<atomProperties index="29" x="5" y="-1" z="1" />
+</atom>
+<atom>
+<atomProperties index="30" x="5" y="-2" z="1" />
+</atom>
+<atom>
+<atomProperties index="31" x="5" y="-2" z="0" />
+</atom>
+</structuralComponent>
+</atoms>
+
+<!-- list of exclusive components : -->
+<exclusiveComponents>
+<multiComponent name="Exclusive Components " >
+<multiComponent name="Bodies">
+
+<structuralComponent name="CubeFEM" bodyType="FEM" mass="0.1" young="2000" poisson="0.49" deformation="LARGE" collision="true" mode="WIREFRAME_AND_SURFACE">
+<color r="0.5" g="0.5" b="0.8" a="1" />
+ <cell>
+ <cellProperties type="HEXAHEDRON"/>
+ <atomRef index="0"/>
+ <atomRef index="1"/>
+ <atomRef index="2"/>
+ <atomRef index="3"/>
+ <atomRef index="4"/>
+ <atomRef index="5"/>
+ <atomRef index="6"/>
+ <atomRef index="7"/>
+ </cell>
+</structuralComponent>
+<structuralComponent name="CubeSprings" bodyType="stiffSpring" mass="0.2" stiffness="800" damping="2" collision="true" mode="WIREFRAME_AND_SURFACE">
+<color r="0.5" g="0.8" b="0.5" a="1" />
+ <cell>
+ <cellProperties type="HEXAHEDRON"/>
+ <atomRef index="8"/>
+ <atomRef index="9"/>
+ <atomRef index="10"/>
+ <atomRef index="11"/>
+ <atomRef index="12"/>
+ <atomRef index="13"/>
+ <atomRef index="14"/>
+ <atomRef index="15"/>
+ </cell>
+</structuralComponent>
+<structuralComponent name="CubeFEM2" bodyType="FEM" mass="0.2" young="1000" poisson="0.49" deformation="LARGE" collision="true" mode="WIREFRAME_AND_SURFACE">
+<color r="0.5" g="0.5" b="0.8" a="1" />
+ <cell>
+ <cellProperties type="HEXAHEDRON"/>
+ <atomRef index="16"/>
+ <atomRef index="17"/>
+ <atomRef index="18"/>
+ <atomRef index="19"/>
+ <atomRef index="20"/>
+ <atomRef index="21"/>
+ <atomRef index="22"/>
+ <atomRef index="23"/>
+ </cell>
+</structuralComponent>
+<structuralComponent name="CubeRigid" bodyType="rigid" mass="1" collision="true" mode="WIREFRAME_AND_SURFACE">
+<color r="0.8" g="0.5" b="0.5" a="1" />
+ <cell>
+ <cellProperties type="QUAD"/>
+ <atomRef index="24"/>
+ <atomRef index="25"/>
+ <atomRef index="26"/>
+ <atomRef index="27"/>
+ </cell>
+ <cell>
+ <cellProperties type="QUAD"/>
+ <atomRef index="30"/>
+ <atomRef index="31"/>
+ <atomRef index="27"/>
+ <atomRef index="26"/>
+ </cell>
+ <cell>
+ <cellProperties type="QUAD"/>
+ <atomRef index="31"/>
+ <atomRef index="30"/>
+ <atomRef index="29"/>
+ <atomRef index="28"/>
+ </cell>
+ <cell>
+ <cellProperties type="QUAD"/>
+ <atomRef index="25"/>
+ <atomRef index="24"/>
+ <atomRef index="28"/>
+ <atomRef index="29"/>
+ </cell>
+ <cell>
+ <cellProperties type="QUAD"/>
+ <atomRef index="24"/>
+ <atomRef index="27"/>
+ <atomRef index="31"/>
+ <atomRef index="28"/>
+ </cell>
+ <cell>
+ <cellProperties type="QUAD"/>
+ <atomRef index="29"/>
+ <atomRef index="30"/>
+ <atomRef index="26"/>
+ <atomRef index="25"/>
+ </cell>
+</structuralComponent>
+<structuralComponent name="Interaction1" bodyType="interaction" stiffness="200" body1="CubeFEM" body2="CubeSprings" mode="WIREFRAME_AND_SURFACE">
+<color r="0.5" g="0.5" b="0.5" a="1" />
+ <cell>
+ <cellProperties type="LINE"/>
+ <atomRef index="4"/>
+ <atomRef index="8"/>
+ </cell>
+ <cell>
+ <cellProperties type="LINE"/>
+ <atomRef index="5"/>
+ <atomRef index="9"/>
+ </cell>
+ <cell>
+ <cellProperties type="LINE"/>
+ <atomRef index="6"/>
+ <atomRef index="10"/>
+ </cell>
+ <cell>
+ <cellProperties type="LINE"/>
+ <atomRef index="7"/>
+ <atomRef index="11"/>
+ </cell>
+ <cell>
+ <cellProperties type="LINE"/>
+ <atomRef index="4"/>
+ <atomRef index="10"/>
+ </cell>
+ <cell>
+ <cellProperties type="LINE"/>
+ <atomRef index="5"/>
+ <atomRef index="11"/>
+ </cell>
+ <cell>
+ <cellProperties type="LINE"/>
+ <atomRef index="6"/>
+ <atomRef index="8"/>
+ </cell>
+ <cell>
+ <cellProperties type="LINE"/>
+ <atomRef index="7"/>
+ <atomRef index="9"/>
+ </cell>
+</structuralComponent>
+<structuralComponent name="Interaction2" bodyType="interaction" stiffness="200" body1="CubeSprings" body2="CubeFEM2" mode="WIREFRAME_AND_SURFACE">
+<color r="0.5" g="0.5" b="0.5" a="1" />
+ <cell>
+ <cellProperties type="LINE"/>
+ <atomRef index="12"/>
+ <atomRef index="16"/>
+ </cell>
+ <cell>
+ <cellProperties type="LINE"/>
+ <atomRef index="13"/>
+ <atomRef index="17"/>
+ </cell>
+ <cell>
+ <cellProperties type="LINE"/>
+ <atomRef index="14"/>
+ <atomRef index="18"/>
+ </cell>
+ <cell>
+ <cellProperties type="LINE"/>
+ <atomRef index="15"/>
+ <atomRef index="19"/>
+ </cell>
+ <cell>
+ <cellProperties type="LINE"/>
+ <atomRef index="12"/>
+ <atomRef index="18"/>
+ </cell>
+ <cell>
+ <cellProperties type="LINE"/>
+ <atomRef index="13"/>
+ <atomRef index="19"/>
+ </cell>
+ <cell>
+ <cellProperties type="LINE"/>
+ <atomRef index="14"/>
+ <atomRef index="16"/>
+ </cell>
+ <cell>
+ <cellProperties type="LINE"/>
+ <atomRef index="15"/>
+ <atomRef index="17"/>
+ </cell>
+</structuralComponent>
+
+
+</multiComponent>
+</multiComponent>
+</exclusiveComponents>
+<!-- list of informative components : -->
+<informativeComponents>
+</informativeComponents>
+</physicalModel>
+
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/mtccs.lml
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/mtccs.lml (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/mtccs.lml 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- physical model load file -->
+
+<!-- This an example of a lml file to create scenarii (designed to use with mtccs.pml)-->
+<!-- It uses forces and translations to deforme and displace objects -->
+
+<loads xmlns='http://www-timc.imag.fr/load'
+ xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+
+<!-- plan y min = 4-7,54,65,74,76,106 -->
+<!-- plan y max = 0-3,10,21,30,32,101 -->
+<!-- plan x min = 0,3,4,7,30,40,73,74,105 -->
+<!-- plan x max = 1,2,5,6,21,51,62,65,103 -->
+
+<load xsi:type="Force">
+ <appliedTo>0</appliedTo>
+ <valueEvent date="0" value="0"/>
+ <valueEvent date="10" value="168.683"/>
+ <valueEvent date="23" value="168.683"/>
+ <valueEvent date="23.01" value="0"/>
+ <direction x="-0.382684" y="0" z="0.923879"/>
+ <unit>mm</unit>
+</load>
+
+<load xsi:type="Force">
+ <appliedTo>1</appliedTo>
+ <valueEvent date="0" value="0"/>
+ <valueEvent date="10" value="168.683"/>
+ <valueEvent date="23" value="168.683"/>
+ <valueEvent date="23.01" value="0"/>
+ <direction x="-0.923879" y="0" z="-0.382684"/>
+ <unit>mm</unit>
+</load>
+
+<load xsi:type="Force">
+ <appliedTo>2</appliedTo>
+ <valueEvent date="0" value="0"/>
+ <valueEvent date="10" value="168.683"/>
+ <valueEvent date="23" value="168.683"/>
+ <valueEvent date="23.01" value="0"/>
+ <direction x="0.382684" y="0" z="-0.923879"/>
+ <unit>mm</unit>
+</load>
+
+<load xsi:type="Force">
+ <appliedTo>3</appliedTo>
+ <valueEvent date="0" value="0"/>
+ <valueEvent date="10" value="168.683"/>
+ <valueEvent date="23" value="168.683"/>
+ <valueEvent date="23.01" value="0"/>
+ <direction x="0.923879" y="0" z="0.382684"/>
+ <unit>mm</unit>
+</load>
+
+<load xsi:type="Force">
+ <appliedTo>10</appliedTo>
+ <valueEvent date="0" value="0"/>
+ <valueEvent date="10" value="168.683"/>
+ <valueEvent date="23" value="168.683"/>
+ <valueEvent date="23.01" value="0"/>
+ <direction x="-0.923879" y="0" z="0.382685"/>
+ <unit>mm</unit>
+</load>
+
+<load xsi:type="Force">
+ <appliedTo>21</appliedTo>
+ <valueEvent date="0" value="0"/>
+ <valueEvent date="10" value="168.683"/>
+ <valueEvent date="23" value="168.683"/>
+ <valueEvent date="23.01" value="0"/>
+ <direction x="-0.382685" y="0" z="-0.923879"/>
+ <unit>mm</unit>
+</load>
+
+<load xsi:type="Force">
+ <appliedTo>30</appliedTo>
+ <valueEvent date="0" value="0"/>
+ <valueEvent date="10" value="168.683"/>
+ <valueEvent date="23" value="168.683"/>
+ <valueEvent date="23.01" value="0"/>
+ <direction x="0.382685" y="0" z="0.923879"/>
+ <unit>mm</unit>
+</load>
+
+<load xsi:type="Force">
+ <appliedTo>32</appliedTo>
+ <valueEvent date="0" value="0"/>
+ <valueEvent date="10" value="168.683"/>
+ <valueEvent date="23" value="168.683"/>
+ <valueEvent date="23.01" value="0"/>
+ <direction x="0.923879" y="0" z="-0.382685"/>
+ <unit>mm</unit>
+</load>
+
+<load xsi:type="Translation">
+ <appliedTo>4-7,54,65,74,76,106</appliedTo>
+ <valueEvent date="0" value="1"/>
+ <valueEvent date="26" value="1"/>
+ <valueEvent date="26.01" value="0"/>
+ <direction x="NULL" y="NULL" z="NULL"/>
+ <unit>mm</unit>
+</load>
+
+<load xsi:type="Translation">
+ <appliedTo>200-207</appliedTo>
+ <valueEvent date="0" value="0"/>
+ <valueEvent date="23" value="10"/>
+ <direction x="0" y="-1" z="0"/>
+ <unit>mm</unit>
+</load>
+
+
+<load xsi:type="Translation">
+ <appliedTo>200-207</appliedTo>
+ <valueEvent date="0" value="0"/>
+ <valueEvent date="23.01" value="0"/>
+ <valueEvent date="23.02" value="1"/>
+ <direction x="NULL" y="NULL" z="NULL"/>
+ <unit>mm</unit>
+</load>
+
+</loads>
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/mtccs.pml
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/mtccs.pml (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/PML/mtccs.pml 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,237 @@
+<!-- physical model is a generic representation for 3D physical model (FEM, spring mass network, phymulob...) -->
+
+<!-- This an example of a pml designed for Sofa
+ It Create 2 FEM cubes (see bodies components) -->
+
+<physicalModel name="cube convex hull" nrOfAtoms="27"
+ nrOfExclusiveComponents="3"
+ nrOfInformativeComponents="0"
+ nrOfCells="52"
+>
+<!-- list of atoms: -->
+<atoms>
+<structuralComponent name="element list" >
+<nrOfStructures value="35"/>
+<atom>
+<atomProperties index="0" x="-5" y="5" z="-5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="1" x="5" y="5" z="-5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="2" x="5" y="5" z="5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="3" x="-5" y="5" z="5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="4" x="-5" y="-5" z="-5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="5" x="5" y="-5" z="-5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="6" x="5" y="-5" z="5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="7" x="-5" y="-5" z="5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="10" x="0" y="5" z="-5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="21" x="5" y="5" z="0" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="30" x="-5" y="5" z="0" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="32" x="0" y="5" z="5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="40" x="-5" y="0" z="-5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="51" x="5" y="0" z="-5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="54" x="0" y="-5" z="-5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="62" x="5" y="0" z="5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="65" x="5" y="-5" z="0" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="73" x="-5" y="0" z="5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="74" x="-5" y="-5" z="0" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="76" x="0" y="-5" z="5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="100" x="0" y="0" z="0" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="101" x="0" y="5" z="0" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="102" x="0" y="0" z="-5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="103" x="5" y="0" z="0" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="104" x="0" y="0" z="5" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="105" x="-5" y="0" z="0" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="106" x="0" y="-5" z="0" mass="29.6296" />
+</atom>
+<atom>
+<atomProperties index="200" x="-10" y="-10" z="-10"/>
+</atom>
+<atom>
+<atomProperties index="201" x="10" y="-10" z="-10"/>
+</atom>
+<atom>
+<atomProperties index="202" x="10" y="-10" z="10"/>
+</atom>
+<atom>
+<atomProperties index="203" x="-10" y="-10" z="10"/>
+</atom>
+<atom>
+<atomProperties index="204" x="-10" y="-12" z="-10"/>
+</atom>
+<atom>
+<atomProperties index="205" x="10" y="-12" z="-10"/>
+</atom>
+<atom>
+<atomProperties index="206" x="10" y="-12" z="10"/>
+</atom>
+<atom>
+<atomProperties index="207" x="-10" y="-12" z="10"/>
+</atom>
+</structuralComponent>
+</atoms>
+<!-- list of exclusive components : -->
+<exclusiveComponents>
+<multiComponent name="Exclusive Components " >
+<multiComponent name="Bodies">
+<structuralComponent name="Cube" bodyType="FEM" mass="0.1" young="100" poisson="0.49" deformation="LARGE" collision="true" mode="WIREFRAME_AND_SURFACE">
+<color r="0.5" g="0.5" b="0.8" a="1" />
+ <cell>
+ <cellProperties type="HEXAHEDRON"/>
+ <atomRef index="104"/>
+ <atomRef index="73"/>
+ <atomRef index="3"/>
+ <atomRef index="32"/>
+ <atomRef index="100"/>
+ <atomRef index="105"/>
+ <atomRef index="30"/>
+ <atomRef index="101"/>
+ </cell>
+ <cell>
+ <cellProperties type="HEXAHEDRON"/>
+ <atomRef index="100"/>
+ <atomRef index="105"/>
+ <atomRef index="30"/>
+ <atomRef index="101"/>
+ <atomRef index="102"/>
+ <atomRef index="40"/>
+ <atomRef index="0"/>
+ <atomRef index="10"/>
+ </cell>
+ <cell>
+ <cellProperties type="HEXAHEDRON"/>
+ <atomRef index="62"/>
+ <atomRef index="104"/>
+ <atomRef index="32"/>
+ <atomRef index="2"/>
+ <atomRef index="103"/>
+ <atomRef index="100"/>
+ <atomRef index="101"/>
+ <atomRef index="21"/>
+ </cell>
+ <cell>
+ <cellProperties type="HEXAHEDRON"/>
+ <atomRef index="103"/>
+ <atomRef index="100"/>
+ <atomRef index="101"/>
+ <atomRef index="21"/>
+ <atomRef index="51"/>
+ <atomRef index="102"/>
+ <atomRef index="10"/>
+ <atomRef index="1"/>
+ </cell>
+ <cell>
+ <cellProperties type="HEXAHEDRON"/>
+ <atomRef index="76"/>
+ <atomRef index="7"/>
+ <atomRef index="73"/>
+ <atomRef index="104"/>
+ <atomRef index="106"/>
+ <atomRef index="74"/>
+ <atomRef index="105"/>
+ <atomRef index="100"/>
+ </cell>
+ <cell>
+ <cellProperties type="HEXAHEDRON"/>
+ <atomRef index="106"/>
+ <atomRef index="74"/>
+ <atomRef index="105"/>
+ <atomRef index="100"/>
+ <atomRef index="54"/>
+ <atomRef index="4"/>
+ <atomRef index="40"/>
+ <atomRef index="102"/>
+ </cell>
+ <cell>
+ <cellProperties type="HEXAHEDRON"/>
+ <atomRef index="6"/>
+ <atomRef index="76"/>
+ <atomRef index="104"/>
+ <atomRef index="62"/>
+ <atomRef index="65"/>
+ <atomRef index="106"/>
+ <atomRef index="100"/>
+ <atomRef index="103"/>
+ </cell>
+ <cell>
+ <cellProperties type="HEXAHEDRON"/>
+ <atomRef index="65"/>
+ <atomRef index="106"/>
+ <atomRef index="100"/>
+ <atomRef index="103"/>
+ <atomRef index="5"/>
+ <atomRef index="54"/>
+ <atomRef index="102"/>
+ <atomRef index="51"/>
+ </cell>
+</structuralComponent>
+<structuralComponent name="CubeFloor" bodyType="FEM" mass="0" collision="true" mode="WIREFRAME_AND_SURFACE">
+<color r="0.5" g="0.5" b="0.5" a="1" />
+ <cell>
+ <cellProperties type="HEXAHEDRON"/>
+ <atomRef index="200"/>
+ <atomRef index="201"/>
+ <atomRef index="202"/>
+ <atomRef index="203"/>
+ <atomRef index="204"/>
+ <atomRef index="205"/>
+ <atomRef index="206"/>
+ <atomRef index="207"/>
+ </cell>
+</structuralComponent>
+</multiComponent>
+</multiComponent>
+</exclusiveComponents>
+<!-- list of informative components : -->
+<informativeComponents>
+</informativeComponents>
+</physicalModel>
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/README.Debian
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/README.Debian (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/README.Debian 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,22 @@
+sofa-framework for Debian
+-------------------------
+
+
+Project MESSAGE: ====== SOFA Build Configuration ======
+Project MESSAGE: | Platform: Linux/Unix
+Project MESSAGE: | Mode: RELEASE
+Project MESSAGE: | Qt version: 4.x
+Project MESSAGE: | RDTSC timer: DISABLED
+Project MESSAGE: | PNG support: ENABLED
+Project MESSAGE: | OpenGL Extensions support using GLEW: ENABLED
+Project MESSAGE: | GPU support using CUDA: DISABLED
+Project MESSAGE: | PML/LML support: ENABLED
+Project MESSAGE: | GLUT GUI: ENABLED
+Project MESSAGE: | Qt GUI: ENABLED
+Project MESSAGE: | - Qt OpenGL viewer: ENABLED
+Project MESSAGE: | - Qt QGLViewer viewer: DISABLED
+Project MESSAGE: | - Qt OGRE 3D viewer: ENABLED
+Project MESSAGE: ======================================
+
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Sat, 16 Feb 2008 10:26:03 +0100
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/changelog
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/changelog (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/changelog 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,40 @@
+sofa-framework (1.0~beta3-5) unstable; urgency=low
+
+ * set SOFA_QT4 explicitly
+ * added #include headers required by GCC 4.4 (Closes: #505953)
+ * added missing PML files
+ * fixed sofa wrapper
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Sat, 15 Nov 2008 19:45:47 +0100
+
+sofa-framework (1.0~beta3-4) unstable; urgency=low
+
+ * PML/LML support enabled
+ * PNG support enabled
+ * Qt OGRE 3D viewer enabled
+ * debian/control: doxygen & graphviz moved to Build-Depends-Indep
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Wed, 12 Nov 2008 20:36:57 +0100
+
+sofa-framework (1.0~beta3-3) unstable; urgency=low
+
+ * fixed build-indep issue (Closes: #503555)
+ * fixed MIPS and ARM build error (sqrt/sqrtl)
+ * fixed installation for man page (Closes: #504927)
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Sat, 08 Nov 2008 01:50:23 +0100
+
+sofa-framework (1.0~beta3-2) unstable; urgency=low
+
+ * fixed segfault on amd64
+ * build arch all packages only in the binary-indep target (Closes: #503555)
+ * fixed MIPS and ARM build error (sqrt/sqrtl)
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Thu, 30 Oct 2008 19:23:49 +0100
+
+sofa-framework (1.0~beta3-1) unstable; urgency=low
+
+ * Initial release (Closes: #455064)
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de> Wed, 13 Aug 2008 10:26:03 +0100
+
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/compat
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/compat (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/compat 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1 @@
+6
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/control
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/control (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/control 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,96 @@
+Source: sofa-framework
+Section: graphics
+Priority: optional
+Maintainer: Debian-Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
+DM-Upload-Allowed: yes
+Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
+Build-Depends: debhelper (>= 6.0.7~), dpatch, libxml2-dev, freeglut3-dev, libnewmat10-dev,
+ libfltk1.1-dev, libglew-dev, libqt4-dev, libqt4-opengl-dev, libboost-dev,
+ libboost-graph-dev, libqwt5-qt4-dev, libpng-dev, libogre-dev
+Build-Depends-Indep: doxygen, graphviz
+Standards-Version: 3.8.0
+Homepage: http://www.sofa-framework.org/
+
+
+Package: sofa-apps
+Architecture: any
+Depends: ${shlibs: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.
+ It is mostly intended for the research community to help
+ develop newer algorithms, but can also be used as an efficient
+ prototyping tool.
+ .
+ This package contains the SOFA main application.
+
+
+Package: libsofa1-dev
+Section: libdevel
+Architecture: any
+Depends: libsofa1 (= ${binary:Version})
+Suggests: sofa-tutorials, sofa-doc
+Description: Simulation Open Framework Architecture - development
+ SOFA is an Open Source framework primarily targeted at
+ real-time simulation, with an emphasis on medical simulation.
+ It is mostly intended for the research community to help
+ develop newer algorithms, but can also be used as an efficient
+ prototyping tool.
+ .
+ This package contains the development files needed to build your own
+ SOFA applications.
+
+
+
+Package: libsofa1
+Section: libs
+Architecture: any
+Depends: ${shlibs: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.
+ It is mostly intended for the research community to help
+ develop newer algorithms, but can also be used as an efficient
+ prototyping tool.
+ .
+ This package contains the libraries needed to run SOFA applications.
+
+
+Package: sofa-tutorials
+Section: graphics
+Architecture: all
+Description: Simulation Open Framework Architecture - tutorials
+ SOFA is an Open Source framework primarily targeted at
+ real-time simulation, with an emphasis on medical simulation.
+ It is mostly intended for the research community to help
+ develop newer algorithms, but can also be used as an efficient
+ prototyping tool.
+ .
+ This package contains tutorials from the SOFA source.
+
+
+Package: sofa-data
+Section: graphics
+Architecture: all
+Description: Simulation Open Framework Architecture - data
+ SOFA is an Open Source framework primarily targeted at
+ real-time simulation, with an emphasis on medical simulation.
+ It is mostly intended for the research community to help
+ develop newer algorithms, but can also be used as an efficient
+ prototyping tool.
+ .
+ This package contains data for the SOFA applications.
+
+
+Package: sofa-doc
+Section: doc
+Architecture: all
+Description: SOFA class reference documentation
+ SOFA is an Open Source framework primarily targeted at
+ real-time simulation, with an emphasis on medical simulation.
+ It is mostly intended for the research community to help
+ develop newer algorithms, but can also be used as an efficient
+ prototyping tool.
+ .
+ This package contains exhaustive HTML documentation for the all the
+ documented C++ classes.
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/copyright
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/copyright (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/copyright 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,49 @@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Debianized-By: Dominique Belhachemi <domibel at cs.tu-berlin.de>
+Debianized-Date: Tue, 24 Jun 2008 20:51:56 +0200
+Original-Source: http://www.sofa-framework.org/
+
+Files: framework/*
+Copyright: (c) 2006-2008 MGH, INRIA, USTL, UJF, CNRS
+License: LGPL-2.1+
+ see `/usr/share/common-licenses/LGPL'
+
+Files: modules/*
+Copyright: (c) 2006-2008 MGH, INRIA, USTL, UJF, CNRS
+License: LGPL-2.1+
+ see `/usr/share/common-licenses/LGPL'
+
+Files: applications/*
+Copyright: (c) 2006-2008 MGH, INRIA, USTL, UJF, CNRS
+License: GPL-2+
+ see `/usr/share/common-licenses/GPL'
+
+Files: extlibs/LML/*
+Copyright: (c)
+License: GPL-2+
+ see `/usr/share/common-licenses/GPL'
+
+Files: extlibs/miniFlowVR/*
+Copyright: (c) 2005 Laboratoire Informatique et Distribution (UMR5132), INRIA Project MOVI.
+License: LGPL
+ see `/usr/share/common-licenses/LGPL'
+
+Files: extlibs/miniFlowVR/src/librender/*
+Copyright: (c) 2005 Laboratoire Informatique et Distribution (UMR5132), INRIA Project MOVI.
+License: GPL
+ see `/usr/share/common-licenses/GPL'
+
+Files: extlibs/PML/*
+Copyright: (c)
+License: GPL-2+
+ see `/usr/share/common-licenses/GPL'
+
+Files: *
+Copyright: (c) 2006-2008 MGH, INRIA, USTL, UJF, CNRS
+License: LGPL
+ see `/usr/share/common-licenses/LGPL'
+
+Files: debian/*
+Copyright: 2008, Dominique Belhachemi <domibel at cs.tu-berlin.de>
+License: GPL-2+
+ The Debian packaging is licensed under the GPL, see `/usr/share/common-licenses/GPL'
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/get-orig-source
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/get-orig-source (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/get-orig-source 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,38 @@
+#!/bin/sh -e
+
+mkdir -p tmp-sofa-framework/downloads
+
+wget http://gforge.inria.fr/frs/download.php/5654/sofa-framework-1.0-beta3.zip
+wget http://gforge.inria.fr/frs/download.php/5598/sofa-modules-1.0-beta3.zip
+wget http://gforge.inria.fr/frs/download.php/5596/sofa-applications-1.0-beta3.zip
+
+mv sofa-framework-1.0-beta3.zip tmp-sofa-framework/downloads
+mv sofa-modules-1.0-beta3.zip tmp-sofa-framework/downloads
+mv sofa-applications-1.0-beta3.zip tmp-sofa-framework/downloads
+
+
+############################################################
+
+mkdir -p tmp-sofa-framework/repackaged/sofa-framework-1.0~beta3
+cd tmp-sofa-framework/repackaged/sofa-framework-1.0~beta3
+
+unzip ../../downloads/sofa-framework-1.0-beta3.zip
+unzip ../../downloads/sofa-modules-1.0-beta3.zip
+unzip ../../downloads/sofa-applications-1.0-beta3.zip
+
+rm -rf extlibs/boost/ # libboost-dev
+rm -rf extlibs/libQGLViewer/ # libqglviewer-dev
+rm -rf extlibs/qwt/ # libqwt-dev
+rm -rf extlibs/NewMAT/ # libnewmat10-dev
+# the external libraries are still there:
+# LML, miniFlowVR, PML
+
+
+cd ..
+
+tar cvzf sofa-framework_1.0~beta3.orig.tar.gz sofa-framework-1.0~beta3
+mv sofa-framework-1.0~beta3 ../../
+mv sofa-framework_1.0~beta3.orig.tar.gz ../../
+cd ../../
+rm -rf tmp-sofa-framework/
+rm -rf sofa-framework-1.0~beta3/
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/libsofa1.lintian-overrides
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/libsofa1.lintian-overrides (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/libsofa1.lintian-overrides 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1 @@
+libsofa1: package-name-doesnt-match-sonames libload1 libminiFlowVR1 libphysicalmodel1 libsofacomponent1 libsofacore1 libsofadefaulttype1 libsofagui1 libsofaguiglut1 libsofaguimain1 libsofaguiqt1 libsofahelper1 libsofamodeler1 libsofapml1 libsofasimulation1 libsofatree1
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/00list
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/00list (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/00list 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,6 @@
+13_gcc4.4.dpatch
+22_amd64_segfault.dpatch
+25_newmat.dpatch
+#10changes.dpatch
+44_ogre.dpatch
+55_fix_mips_sqrt.dpatch
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/10changes.dpatch
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/10changes.dpatch (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/10changes.dpatch 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,175 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10changes.dpatch by <domibel at sid1500>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: small changes
+
+ at DPATCH@
+diff -urNad sofa-1.0.2~/Sofa.pro sofa-1.0.2/Sofa.pro
+--- sofa-1.0.2~/Sofa.pro 2008-02-16 23:18:50.000000000 +0100
++++ sofa-1.0.2/Sofa.pro 2008-02-16 23:19:45.000000000 +0100
+@@ -3,7 +3,6 @@
+
+ include($$SOFA_DIR/sofa.cfg)
+
+-SUBDIRS += extlibs/NewMAT
+ SUBDIRS += framework
+ SUBDIRS += modules
+ SUBDIRS += applications
+diff -urNad sofa-1.0.2~/applications/sofa/gui/qt/qt.pro.rej sofa-1.0.2/applications/sofa/gui/qt/qt.pro.rej
+--- sofa-1.0.2~/applications/sofa/gui/qt/qt.pro.rej 1970-01-01 01:00:00.000000000 +0100
++++ sofa-1.0.2/applications/sofa/gui/qt/qt.pro.rej 2008-02-16 23:19:45.000000000 +0100
+@@ -0,0 +1,17 @@
++***************
++*** 5,11 ****
++ include($$SOFA_DIR/sofa.cfg)
++
++ TARGET = sofaguiqt$$LIBSUFFIX
++- CONFIG += $$CONFIGLIBRARIES qt uic3
++ QT += opengl qt3support
++ LIBS += $$SOFA_FRAMEWORK_LIBS $$SOFA_MODULES_LIBS
++ LIBS += $$SOFA_EXT_LIBS
++--- 5,11 ----
++ include($$SOFA_DIR/sofa.cfg)
++
++ TARGET = sofaguiqt$$LIBSUFFIX
+++ CONFIG += $$CONFIGLIBRARIES qt uic-qt3
++ QT += opengl qt3support
++ LIBS += $$SOFA_FRAMEWORK_LIBS $$SOFA_MODULES_LIBS
++ LIBS += $$SOFA_EXT_LIBS
+diff -urNad sofa-1.0.2~/framework/sofa/defaulttype/NewMatSofaMatrix.h sofa-1.0.2/framework/sofa/defaulttype/NewMatSofaMatrix.h
+--- sofa-1.0.2~/framework/sofa/defaulttype/NewMatSofaMatrix.h 2008-02-16 23:18:50.000000000 +0100
++++ sofa-1.0.2/framework/sofa/defaulttype/NewMatSofaMatrix.h 2008-02-16 23:19:45.000000000 +0100
+@@ -28,7 +28,7 @@
+ #include <sofa/defaulttype/SofaBaseMatrix.h>
+ #include "NewMatSofaVector.h"
+
+-#include "NewMAT/newmat.h"
++#include <newmat/newmat.h>
+ #include <iostream>
+
+ namespace sofa
+@@ -43,7 +43,7 @@
+
+ NewMatSofaMatrix()
+ {
+- impl = new NewMAT::Matrix;
++ impl = new NEWMAT::Matrix;
+ resVect = new NewMatSofaVector;
+ opVect = new NewMatSofaVector;
+ }
+@@ -111,7 +111,7 @@
+ };
+
+ private:
+- NewMAT::Matrix *impl;
++ NEWMAT::Matrix *impl;
+ };
+
+
+diff -urNad sofa-1.0.2~/framework/sofa/defaulttype/NewMatSofaVector.h sofa-1.0.2/framework/sofa/defaulttype/NewMatSofaVector.h
+--- sofa-1.0.2~/framework/sofa/defaulttype/NewMatSofaVector.h 2008-02-16 23:18:50.000000000 +0100
++++ sofa-1.0.2/framework/sofa/defaulttype/NewMatSofaVector.h 2008-02-16 23:19:45.000000000 +0100
+@@ -27,7 +27,7 @@
+
+ #include <sofa/defaulttype/SofaBaseMatrix.h>
+
+-#include "NewMAT/newmat.h"
++#include <newmat/newmat.h>
+
+ namespace sofa
+ {
+@@ -43,7 +43,7 @@
+
+ NewMatSofaVector()
+ {
+- impl = new NewMAT::ColumnVector();
++ impl = new NEWMAT::ColumnVector();
+ }
+
+ virtual ~NewMatSofaVector()
+@@ -68,7 +68,7 @@
+ };
+
+ private:
+- NewMAT::ColumnVector *impl;
++ NEWMAT::ColumnVector *impl;
+ };
+
+ } // namespace defaulttype
+diff -urNad sofa-1.0.2~/framework/sofa/helper/gl/GLshader.cpp sofa-1.0.2/framework/sofa/helper/gl/GLshader.cpp
+--- sofa-1.0.2~/framework/sofa/helper/gl/GLshader.cpp 2008-02-16 23:18:50.000000000 +0100
++++ sofa-1.0.2/framework/sofa/helper/gl/GLshader.cpp 2008-02-16 23:19:45.000000000 +0100
+@@ -88,7 +88,7 @@
+ #elif defined(__sgi) || defined(__sun)
+ return dlGetProcAddress(name);
+ #else /* __linux */
+- return (*glXGetProcAddressARB)((const GLubyte*)name);
++ return (*glXGetProcAddress)((const GLubyte*)name);
+ #endif
+ }
+
+diff -urNad sofa-1.0.2~/sofa-local.cfg sofa-1.0.2/sofa-local.cfg
+--- sofa-1.0.2~/sofa-local.cfg 1970-01-01 01:00:00.000000000 +0100
++++ sofa-1.0.2/sofa-local.cfg 2008-02-16 23:20:26.000000000 +0100
+@@ -0,0 +1,39 @@
++##################################
++# SOFA COMPILATION CONFIGURATION #
++##################################
++# Copy to sofa-local.cfg and modify it to change local options
++
++# Uncomment if you want to compile Qt interface
++DEFINES += SOFA_GUI_QT
++
++# Uncomment if you want to compile FLTK interface
++# DEFINES += SOFA_GUI_FLTK
++
++# Uncomment if you want to use RTDSC processor cycle-counter for timing
++# Note: this is the fastest and most precise method but have issues on
++# multi-CPUs or with varying CPU frequencies
++# DEFINES += SOFA_RDTSC
++
++# Uncomment if you want to use libPNG to read/write PNG images
++DEFINES += SOFA_HAVE_PNG
++
++# Uncomment if you want to compile CUDA GPU prototype (require NVIDIA CUDA SDK)
++# DEFINES += SOFA_GPU_CUDA
++
++win32{
++# CONFIG = debug_and_release
++}
++else{
++ # Choose if you want to compile the debug or release version
++ # CONFIG = debug
++ CONFIG = release
++
++ # Uncomment if you want debug symbols even in release build
++ # QMAKE_CXXFLAGS += -g
++
++ # Change to use different version of the compiler
++ QMAKE_CC = gcc
++ QMAKE_CXX = g++
++ QMAKE_LINK = g++
++ QMAKE_LINK_SHLIB = g++
++}
+diff -urNad sofa-1.0.2~/sofa.cfg sofa-1.0.2/sofa.cfg
+--- sofa-1.0.2~/sofa.cfg 2008-02-16 23:18:50.000000000 +0100
++++ sofa-1.0.2/sofa.cfg 2008-02-16 23:19:45.000000000 +0100
+@@ -121,7 +121,7 @@
+
+ INCLUDEPATH *= \
+ $$SOFA_DIR/include \
+- $$SOFA_DIR/extlibs \
++ /usr/include/libxml2 \
+ $$SOFA_DIR/framework \
+ $$SOFA_DIR/modules \
+ $$SOFA_DIR/applications
+@@ -135,7 +135,7 @@
+
+ # List of libs to link with
+
+-SOFA_EXT_LIBS *= -lNewMAT$$LIBSUFFIX
++SOFA_EXT_LIBS *= -lnewmat$$LIBSUFFIX
+ win32 {
+ SOFA_EXT_LIBS *= -llibxml2 -lGLaux -lglut32 -lcomctl32 -lopengl32 -lglu32 -lAdvAPI32 -lUser32 -lShell32 -lGdi32 -lWSock32 -lWS2_32 -lOle32
+ }
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/13_gcc4.4.dpatch
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/13_gcc4.4.dpatch (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/13_gcc4.4.dpatch 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,63 @@
+#! /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~beta3~/framework/sofa/helper/Quater.inl sofa-framework-1.0~beta3/framework/sofa/helper/Quater.inl
+--- sofa-framework-1.0~beta3~/framework/sofa/helper/Quater.inl 2008-08-12 08:53:41.000000000 +0000
++++ sofa-framework-1.0~beta3/framework/sofa/helper/Quater.inl 2008-11-19 01:18:38.000000000 +0000
+@@ -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~beta3~/framework/sofa/helper/gl/Capture.cpp sofa-framework-1.0~beta3/framework/sofa/helper/gl/Capture.cpp
+--- sofa-framework-1.0~beta3~/framework/sofa/helper/gl/Capture.cpp 2008-08-12 08:53:40.000000000 +0000
++++ sofa-framework-1.0~beta3/framework/sofa/helper/gl/Capture.cpp 2008-11-19 01:17:55.000000000 +0000
+@@ -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~beta3~/framework/sofa/helper/io/ImageBMP.cpp sofa-framework-1.0~beta3/framework/sofa/helper/io/ImageBMP.cpp
+--- sofa-framework-1.0~beta3~/framework/sofa/helper/io/ImageBMP.cpp 2008-08-12 08:53:40.000000000 +0000
++++ sofa-framework-1.0~beta3/framework/sofa/helper/io/ImageBMP.cpp 2008-11-19 01:17:17.000000000 +0000
+@@ -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~beta3~/framework/sofa/helper/io/MeshTrian.cpp sofa-framework-1.0~beta3/framework/sofa/helper/io/MeshTrian.cpp
+--- sofa-framework-1.0~beta3~/framework/sofa/helper/io/MeshTrian.cpp 2008-08-12 08:53:40.000000000 +0000
++++ sofa-framework-1.0~beta3/framework/sofa/helper/io/MeshTrian.cpp 2008-11-19 01:18:18.000000000 +0000
+@@ -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>
+
+diff -urNad sofa-framework-1.0~beta3~/sofa.cfg sofa-framework-1.0~beta3/sofa.cfg
+--- sofa-framework-1.0~beta3~/sofa.cfg 2008-08-12 08:56:12.000000000 +0000
++++ sofa-framework-1.0~beta3/sofa.cfg 2008-11-19 01:19:19.000000000 +0000
+@@ -19,7 +19,7 @@
+
+ # Auto-detect Qt 4.x
+ # The QT variable was introduced in Qt 4
+-!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
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/22_amd64_segfault.dpatch
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/22_amd64_segfault.dpatch (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/22_amd64_segfault.dpatch 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,32 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 22_amd64_segfault.dpatch by <domibel at sid1500>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix: segfault on amd64 + qt4
+
+ at DPATCH@
+diff -urNad sofa-framework-1.0~beta3~/applications/sofa/gui/qt/RealGUI.cpp sofa-framework-1.0~beta3/applications/sofa/gui/qt/RealGUI.cpp
+--- sofa-framework-1.0~beta3~/applications/sofa/gui/qt/RealGUI.cpp 2008-11-16 20:22:30.000000000 +0100
++++ sofa-framework-1.0~beta3/applications/sofa/gui/qt/RealGUI.cpp 2008-11-16 20:30:28.000000000 +0100
+@@ -180,7 +180,7 @@
+ class QSOFAApplication : public QApplication
+ {
+ public:
+- QSOFAApplication(int argc, char ** argv)
++ QSOFAApplication(int &argc, char ** argv)
+ : QApplication(argc,argv)
+ {
+ }
+@@ -206,10 +206,10 @@
+ {
+ {
+ int argc=1;
+- char* argv[1];
++ char **argv = new char*[2];
+ argv[0] = strdup ( SofaGUI::GetProgramName() );
++ argv[1]=NULL;
+ application = new QSOFAApplication ( argc,argv );
+- free ( argv[0] );
+ }
+ // create interface
+ gui = new RealGUI ( name, options );
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/25_newmat.dpatch
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/25_newmat.dpatch (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/25_newmat.dpatch 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,454 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 25_newmat.dpatch by <domibel at sid1500>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Neccessary changes to use the libnewmat10-dev package
+
+ at DPATCH@
+diff -urNad sofa-framework-1.0~beta3~/Sofa.pro sofa-framework-1.0~beta3/Sofa.pro
+--- sofa-framework-1.0~beta3~/Sofa.pro 2008-11-14 13:12:24.000000000 +0000
++++ sofa-framework-1.0~beta3/Sofa.pro 2008-11-14 13:12:28.000000000 +0000
+@@ -3,10 +3,10 @@
+
+ include($${SOFA_DIR}/sofa.cfg)
+
+-SUBDIRS += extlibs/NewMAT
++#SUBDIRS += extlibs/NewMAT
+
+
+-SUBDIRS += extlibs/qwt
++#SUBDIRS += extlibs/qwt
+
+ # FlowVR
+ SUBDIRS += extlibs/miniFlowVR
+@@ -16,9 +16,9 @@
+
+ #QGLViewer
+
+-contains(DEFINES,SOFA_GUI_QGLVIEWER){
+- SUBDIRS += extlibs/libQGLViewer/QGLViewer
+-}
++#contains(DEFINES,SOFA_GUI_QGLVIEWER){
++# SUBDIRS += extlibs/libQGLViewer/QGLViewer
++#}
+
+ # PML
+ SUBDIRS += extlibs/PML
+diff -urNad sofa-framework-1.0~beta3~/modules/sofa/component/forcefield/BeamFEMForceField.h sofa-framework-1.0~beta3/modules/sofa/component/forcefield/BeamFEMForceField.h
+--- sofa-framework-1.0~beta3~/modules/sofa/component/forcefield/BeamFEMForceField.h 2008-11-14 13:12:24.000000000 +0000
++++ sofa-framework-1.0~beta3/modules/sofa/component/forcefield/BeamFEMForceField.h 2008-11-14 13:12:28.000000000 +0000
+@@ -35,7 +35,7 @@
+ #include <sofa/component/PoissonContainer.h>
+ #include <sofa/component/LengthContainer.h>
+ #include <sofa/component/RadiusContainer.h>
+-#include "NewMAT/newmat.h"
++#include <newmat/newmat.h>
+
+
+
+diff -urNad sofa-framework-1.0~beta3~/modules/sofa/component/forcefield/TriangularAnisotropicFEMForceField.h sofa-framework-1.0~beta3/modules/sofa/component/forcefield/TriangularAnisotropicFEMForceField.h
+--- sofa-framework-1.0~beta3~/modules/sofa/component/forcefield/TriangularAnisotropicFEMForceField.h 2008-11-14 13:12:24.000000000 +0000
++++ sofa-framework-1.0~beta3/modules/sofa/component/forcefield/TriangularAnisotropicFEMForceField.h 2008-11-14 13:12:28.000000000 +0000
+@@ -37,8 +37,8 @@
+ #include <sofa/component/topology/TriangleData.h>
+ #include <sofa/component/topology/EdgeData.h>
+ #include <sofa/component/topology/PointData.h>
+-#include <NewMAT/newmat.h>
+-#include <NewMAT/newmatap.h>
++#include <newmat/newmat.h>
++#include <newmat/newmatap.h>
+
+
+
+diff -urNad sofa-framework-1.0~beta3~/modules/sofa/component/forcefield/TriangularFEMForceField.cpp sofa-framework-1.0~beta3/modules/sofa/component/forcefield/TriangularFEMForceField.cpp
+--- sofa-framework-1.0~beta3~/modules/sofa/component/forcefield/TriangularFEMForceField.cpp 2008-11-14 13:12:24.000000000 +0000
++++ sofa-framework-1.0~beta3/modules/sofa/component/forcefield/TriangularFEMForceField.cpp 2008-11-14 13:12:28.000000000 +0000
+@@ -498,13 +498,13 @@
+ JtD[2] = Jt[2][0] * Depl[0] + Jt[2][1] * Depl[1] + Jt[2][2] * Depl[2] +
+ Jt[2][3] * Depl[3] + Jt[2][4] * Depl[4] /* + Jt[2][5] * Depl[5] */ ;
+
+- NewMAT::SymmetricMatrix e(2);
++ NEWMAT::SymmetricMatrix e(2);
+ e = 0.0;
+
+- NewMAT::DiagonalMatrix D(2);
++ NEWMAT::DiagonalMatrix D(2);
+ D = 0.0;
+
+- NewMAT::Matrix V(2,2);
++ NEWMAT::Matrix V(2,2);
+ V = 0.0;
+
+ e(1,1) = JtD[0];
+@@ -512,7 +512,7 @@
+ e(2,1) = JtD[2];
+ e(2,2) = JtD[1];
+
+- NewMAT::Jacobi(e, D, V);
++ NEWMAT::Jacobi(e, D, V);
+
+ v[0] = (Real)V(1,1);
+ v[1] = (Real)V(2,1);
+diff -urNad sofa-framework-1.0~beta3~/modules/sofa/component/forcefield/TriangularFEMForceField.h sofa-framework-1.0~beta3/modules/sofa/component/forcefield/TriangularFEMForceField.h
+--- sofa-framework-1.0~beta3~/modules/sofa/component/forcefield/TriangularFEMForceField.h 2008-11-14 13:12:24.000000000 +0000
++++ sofa-framework-1.0~beta3/modules/sofa/component/forcefield/TriangularFEMForceField.h 2008-11-14 13:12:28.000000000 +0000
+@@ -36,8 +36,8 @@
+ #include <sofa/component/topology/TriangleData.h>
+ #include <sofa/component/topology/EdgeData.h>
+ #include <sofa/component/topology/PointData.h>
+-#include <NewMAT/newmat.h>
+-#include <NewMAT/newmatap.h>
++#include <newmat/newmat.h>
++#include <newmat/newmatap.h>
+
+
+
+diff -urNad sofa-framework-1.0~beta3~/modules/sofa/component/linearsolver/NewMatMatrix.h sofa-framework-1.0~beta3/modules/sofa/component/linearsolver/NewMatMatrix.h
+--- sofa-framework-1.0~beta3~/modules/sofa/component/linearsolver/NewMatMatrix.h 2008-11-14 13:12:24.000000000 +0000
++++ sofa-framework-1.0~beta3/modules/sofa/component/linearsolver/NewMatMatrix.h 2008-11-14 13:12:28.000000000 +0000
+@@ -47,9 +47,9 @@
+ public:
+ typedef Mat M;
+ //typedef NewMAT::Matrix SubMatrixType;
+- typedef TNewMatMatrix<NewMAT::Matrix> SubMatrixType;
+- typedef TNewMatMatrix<NewMAT::Matrix> InvMatrixType;
+- typedef NewMAT::LinearEquationSolver LUSolver;
++ typedef TNewMatMatrix<NEWMAT::Matrix> SubMatrixType;
++ typedef TNewMatMatrix<NEWMAT::Matrix> InvMatrixType;
++ typedef NEWMAT::LinearEquationSolver LUSolver;
+ explicit TNewMatMatrix(int defaultBandWidth = 11)
+ : bandWidth(defaultBandWidth)
+ {
+@@ -177,7 +177,7 @@
+ M::Column(1+i) = 0.0;
+ }
+
+- NewMAT::GetSubMatrix sub(int i, int j, int nrow, int ncol)
++ NEWMAT::GetSubMatrix sub(int i, int j, int nrow, int ncol)
+ {
+ return M::SubMatrix(i+1,i+nrow,j+1,j+ncol);
+ }
+@@ -258,33 +258,33 @@
+ int bandWidth;
+ };
+
+-typedef TNewMatMatrix<NewMAT::Matrix> NewMatMatrix;
+-typedef TNewMatMatrix<NewMAT::SymmetricMatrix> NewMatSymmetricMatrix;
+-typedef TNewMatMatrix<NewMAT::BandMatrix> NewMatBandMatrix;
+-typedef TNewMatMatrix<NewMAT::SymmetricBandMatrix> NewMatSymmetricBandMatrix;
++typedef TNewMatMatrix<NEWMAT::Matrix> NewMatMatrix;
++typedef TNewMatMatrix<NEWMAT::SymmetricMatrix> NewMatSymmetricMatrix;
++typedef TNewMatMatrix<NEWMAT::BandMatrix> NewMatBandMatrix;
++typedef TNewMatMatrix<NEWMAT::SymmetricBandMatrix> NewMatSymmetricBandMatrix;
+
+ template<>
+-inline const char* TNewMatMatrix<NewMAT::Matrix>::Name() { return "NewMat"; }
++inline const char* TNewMatMatrix<NEWMAT::Matrix>::Name() { return "NewMat"; }
+
+ template<>
+-inline const char* TNewMatMatrix<NewMAT::SymmetricMatrix>::Name() { return "NewMatSymmetric"; }
++inline const char* TNewMatMatrix<NEWMAT::SymmetricMatrix>::Name() { return "NewMatSymmetric"; }
+
+ template<>
+-inline const char* TNewMatMatrix<NewMAT::BandMatrix>::Name() { return "NewMatBand"; }
++inline const char* TNewMatMatrix<NEWMAT::BandMatrix>::Name() { return "NewMatBand"; }
+
+ template<>
+-inline const char* TNewMatMatrix<NewMAT::SymmetricBandMatrix>::Name() { return "NewMatSymmetricBand"; }
++inline const char* TNewMatMatrix<NEWMAT::SymmetricBandMatrix>::Name() { return "NewMatSymmetricBand"; }
+
+ template<>
+-inline void TNewMatMatrix<NewMAT::SymmetricMatrix>::resize(int nbRow, int nbCol)
++inline void TNewMatMatrix<NEWMAT::SymmetricMatrix>::resize(int nbRow, int nbCol)
+ {
+ if (nbCol != nbRow)
+- std::cerr << "ERROR: NewMAT::SymmetricMatrix must be square, size "<<nbRow<<"x"<<nbCol<<" not supported."<<std::endl;
++ std::cerr << "ERROR: NEWMAT::SymmetricMatrix must be square, size "<<nbRow<<"x"<<nbCol<<" not supported."<<std::endl;
+ M::ReSize(nbRow);
+ }
+
+ template<>
+-inline void TNewMatMatrix<NewMAT::BandMatrix>::resize(int nbRow, int nbCol)
++inline void TNewMatMatrix<NEWMAT::BandMatrix>::resize(int nbRow, int nbCol)
+ {
+ if (nbCol != nbRow)
+ std::cerr << "ERROR: NewMAT::BandMatrix must be square, size "<<nbRow<<"x"<<nbCol<<" not supported."<<std::endl;
+@@ -292,15 +292,15 @@
+ }
+
+ template<>
+-inline void TNewMatMatrix<NewMAT::SymmetricBandMatrix>::resize(int nbRow, int nbCol)
++inline void TNewMatMatrix<NEWMAT::SymmetricBandMatrix>::resize(int nbRow, int nbCol)
+ {
+ if (nbCol != nbRow)
+- std::cerr << "ERROR: NewMAT::SymmetricBandMatrix must be square, size "<<nbRow<<"x"<<nbCol<<" not supported."<<std::endl;
++ std::cerr << "ERROR: NEWMAT::SymmetricBandMatrix must be square, size "<<nbRow<<"x"<<nbCol<<" not supported."<<std::endl;
+ M::ReSize(nbRow, bandWidth);
+ }
+
+ template<>
+-inline void TNewMatMatrix<NewMAT::SymmetricMatrix>::set(int i, int j, double v)
++inline void TNewMatMatrix<NEWMAT::SymmetricMatrix>::set(int i, int j, double v)
+ {
+ #ifdef NEWMAT_VERBOSE
+ std::cout << /* this->Name() << */"("<<rowSize()<<","<<colSize()<<"): element("<<i<<","<<j<<") = "<<v<<std::endl;
+@@ -317,7 +317,7 @@
+ }
+
+ template<>
+-inline void TNewMatMatrix<NewMAT::SymmetricMatrix>::add(int i, int j, double v)
++inline void TNewMatMatrix<NEWMAT::SymmetricMatrix>::add(int i, int j, double v)
+ {
+ #ifdef NEWMAT_VERBOSE
+ std::cout << /* this->Name() << */"("<<rowSize()<<","<<colSize()<<"): element("<<i<<","<<j<<") += "<<v<<std::endl;
+@@ -334,7 +334,7 @@
+ }
+
+ template<>
+-inline SReal TNewMatMatrix<NewMAT::BandMatrix>::element(int i, int j) const
++inline SReal TNewMatMatrix<NEWMAT::BandMatrix>::element(int i, int j) const
+ {
+ #ifdef NEWMAT_CHECK
+ if ((unsigned)i >= (unsigned)rowSize() || (unsigned)j >= (unsigned)colSize())
+@@ -351,7 +351,7 @@
+
+
+ template<>
+- inline void TNewMatMatrix<NewMAT::BandMatrix>::set(int i, int j, double v)
++ inline void TNewMatMatrix<NEWMAT::BandMatrix>::set(int i, int j, double v)
+ {
+ #ifdef NEWMAT_VERBOSE
+ std::cout << /* this->Name() << */"("<<rowSize()<<","<<colSize()<<"): element("<<i<<","<<j<<") = "<<v<<std::endl;
+@@ -372,7 +372,7 @@
+ }
+
+ template<>
+- inline void TNewMatMatrix<NewMAT::BandMatrix>::add(int i, int j, double v)
++ inline void TNewMatMatrix<NEWMAT::BandMatrix>::add(int i, int j, double v)
+ {
+ #ifdef NEWMAT_VERBOSE
+ std::cout << /* this->Name() << */"("<<rowSize()<<","<<colSize()<<"): element("<<i<<","<<j<<") += "<<v<<std::endl;
+@@ -393,7 +393,7 @@
+ }
+
+ template<>
+- inline SReal TNewMatMatrix<NewMAT::SymmetricBandMatrix>::element(int i, int j) const
++ inline SReal TNewMatMatrix<NEWMAT::SymmetricBandMatrix>::element(int i, int j) const
+ {
+ #ifdef NEWMAT_CHECK
+ if ((unsigned)i >= (unsigned)rowSize() || (unsigned)j >= (unsigned)colSize())
+@@ -409,7 +409,7 @@
+ }
+
+ template<>
+- inline void TNewMatMatrix<NewMAT::SymmetricBandMatrix>::set(int i, int j, double v)
++ inline void TNewMatMatrix<NEWMAT::SymmetricBandMatrix>::set(int i, int j, double v)
+ {
+ #ifdef NEWMAT_VERBOSE
+ std::cout << /* this->Name() << */"("<<rowSize()<<","<<colSize()<<"): element("<<i<<","<<j<<") = "<<v<<std::endl;
+@@ -431,7 +431,7 @@
+ }
+
+ template<>
+- inline void TNewMatMatrix<NewMAT::SymmetricBandMatrix>::add(int i, int j, double v)
++ inline void TNewMatMatrix<NEWMAT::SymmetricBandMatrix>::add(int i, int j, double v)
+ {
+ #ifdef NEWMAT_VERBOSE
+ std::cout << /* this->Name() << */"("<<rowSize()<<","<<colSize()<<"): element("<<i<<","<<j<<") += "<<v<<std::endl;
+@@ -460,7 +460,7 @@
+ {
+
+ template<>
+-class MatrixLinearSolverInternalData< component::linearsolver::TNewMatMatrix<NewMAT::SymmetricBandMatrix> , component::linearsolver::NewMatVector >
++class MatrixLinearSolverInternalData< component::linearsolver::TNewMatMatrix<NEWMAT::SymmetricBandMatrix> , component::linearsolver::NewMatVector >
+ {
+ public:
+ Data<int> bandWidth;
+@@ -470,13 +470,13 @@
+ };
+
+ template<>
+-inline component::linearsolver::TNewMatMatrix<NewMAT::SymmetricBandMatrix>* MatrixLinearSolver< component::linearsolver::TNewMatMatrix<NewMAT::SymmetricBandMatrix> , component::linearsolver::NewMatVector >::createMatrix()
++inline component::linearsolver::TNewMatMatrix<NEWMAT::SymmetricBandMatrix>* MatrixLinearSolver< component::linearsolver::TNewMatMatrix<NEWMAT::SymmetricBandMatrix> , component::linearsolver::NewMatVector >::createMatrix()
+ {
+- return new component::linearsolver::TNewMatMatrix<NewMAT::SymmetricBandMatrix>(this->data->bandWidth.getValue());
++ return new component::linearsolver::TNewMatMatrix<NEWMAT::SymmetricBandMatrix>(this->data->bandWidth.getValue());
+ }
+
+ template<>
+-class MatrixLinearSolverInternalData< component::linearsolver::TNewMatMatrix<NewMAT::BandMatrix> , component::linearsolver::NewMatVector >
++class MatrixLinearSolverInternalData< component::linearsolver::TNewMatMatrix<NEWMAT::BandMatrix> , component::linearsolver::NewMatVector >
+ {
+ public:
+ Data<int> bandWidth;
+@@ -486,9 +486,9 @@
+ };
+
+ template<>
+-inline component::linearsolver::TNewMatMatrix<NewMAT::BandMatrix>* MatrixLinearSolver< component::linearsolver::TNewMatMatrix<NewMAT::BandMatrix> , component::linearsolver::NewMatVector >::createMatrix()
++inline component::linearsolver::TNewMatMatrix<NEWMAT::BandMatrix>* MatrixLinearSolver< component::linearsolver::TNewMatMatrix<NEWMAT::BandMatrix> , component::linearsolver::NewMatVector >::createMatrix()
+ {
+- return new component::linearsolver::TNewMatMatrix<NewMAT::BandMatrix>(this->data->bandWidth.getValue());
++ return new component::linearsolver::TNewMatMatrix<NEWMAT::BandMatrix>(this->data->bandWidth.getValue());
+ }
+
+
+diff -urNad sofa-framework-1.0~beta3~/modules/sofa/component/linearsolver/NewMatVector.h sofa-framework-1.0~beta3/modules/sofa/component/linearsolver/NewMatVector.h
+--- sofa-framework-1.0~beta3~/modules/sofa/component/linearsolver/NewMatVector.h 2008-11-14 13:12:24.000000000 +0000
++++ sofa-framework-1.0~beta3/modules/sofa/component/linearsolver/NewMatVector.h 2008-11-14 13:12:28.000000000 +0000
+@@ -25,9 +25,9 @@
+ #ifndef SOFA_COMPONENT_LINEARSOLVER_NEWMATVECTOR_H
+ #define SOFA_COMPONENT_LINEARSOLVER_NEWMATVECTOR_H
+
+-#include "NewMAT/newmat.h"
++#include <newmat/newmat.h>
+ #define WANT_STREAM
+-#include "NewMAT/newmatio.h"
++#include <newmat/newmatio.h>
+ #include <sofa/defaulttype/BaseVector.h>
+
+ namespace sofa
+@@ -39,11 +39,11 @@
+ namespace linearsolver
+ {
+
+-class NewMatVector : public NewMAT::ColumnVector, public defaulttype::BaseVector
++class NewMatVector : public NEWMAT::ColumnVector, public defaulttype::BaseVector
+ {
+ public:
+
+- typedef NewMAT::ColumnVector SubVector;
++ typedef NEWMAT::ColumnVector SubVector;
+
+ NewMatVector()
+ {
+@@ -61,27 +61,27 @@
+
+ virtual SReal element(int i) const
+ {
+- return NewMAT::ColumnVector::element(i);
++ return NEWMAT::ColumnVector::element(i);
+ }
+
+ void set(int i, SReal v)
+ {
+- NewMAT::ColumnVector::element(i) = v;
++ NEWMAT::ColumnVector::element(i) = v;
+ }
+
+ void add(int i, SReal v)
+ {
+- NewMAT::ColumnVector::element(i) += v;
++ NEWMAT::ColumnVector::element(i) += v;
+ }
+
+ SReal& operator[](int i)
+ {
+- return NewMAT::ColumnVector::element(i);
++ return NEWMAT::ColumnVector::element(i);
+ }
+
+ SReal operator[](int i) const
+ {
+- return NewMAT::ColumnVector::element(i);
++ return NEWMAT::ColumnVector::element(i);
+ }
+
+ int size() const
+@@ -89,21 +89,21 @@
+ return Nrows();
+ }
+
+- NewMAT::GetSubMatrix sub(int i, int n)
++ NEWMAT::GetSubMatrix sub(int i, int n)
+ {
+- return NewMAT::ColumnVector::SubMatrix(i+1,i+n,1,1);
++ return NEWMAT::ColumnVector::SubMatrix(i+1,i+n,1,1);
+ }
+
+ template<class T>
+ void getsub(int i, int n, T& v)
+ {
+- v = NewMAT::ColumnVector::SubMatrix(i+1,i+n,1,1);
++ v = NEWMAT::ColumnVector::SubMatrix(i+1,i+n,1,1);
+ }
+
+ template<class T>
+ void setsub(int i, int n, const T& v)
+ {
+- NewMAT::ColumnVector::SubMatrix(i+1,i+n,1,1) = v;
++ NEWMAT::ColumnVector::SubMatrix(i+1,i+n,1,1) = v;
+ }
+
+ /// v = 0
+@@ -131,7 +131,7 @@
+ /// \return v.a
+ double dot(const NewMatVector& a) const
+ {
+- return NewMAT::DotProduct(*this,a);
++ return NEWMAT::DotProduct(*this,a);
+ }
+
+ /// \return sqrt(v.v)
+@@ -143,7 +143,7 @@
+ //void operator=(double f) { NewMAT::ColumnVector::operator=(f); }
+
+ template<class T>
+- void operator=(const T& m) { NewMAT::ColumnVector::operator=(m); }
++ void operator=(const T& m) { NEWMAT::ColumnVector::operator=(m); }
+
+ friend std::ostream& operator << (std::ostream& out, const NewMatVector& v )
+ {
+diff -urNad sofa-framework-1.0~beta3~/sofa.cfg sofa-framework-1.0~beta3/sofa.cfg
+--- sofa-framework-1.0~beta3~/sofa.cfg 2008-11-14 13:12:24.000000000 +0000
++++ sofa-framework-1.0~beta3/sofa.cfg 2008-11-14 13:12:48.000000000 +0000
+@@ -205,7 +205,12 @@
+ $$SOFA_DIR/extlibs \
+ $$SOFA_DIR/framework \
+ $$SOFA_DIR/modules \
+- $$SOFA_DIR/applications
++ $$SOFA_DIR/applications \
++ /usr/include/qwt \
++ /usr/include/qt4 \
++ /usr/include/qwt-qt4
++
++
+
+ DEPENDPATH *= \
+ $$SOFA_DIR/framework \
+@@ -220,7 +225,7 @@
+
+ # List of libs to link with
+
+-SOFA_EXT_LIBS *= -lNewMAT$$LIBSUFFIX
++SOFA_EXT_LIBS *= -lnewmat$$LIBSUFFIX
+
+
+ win32 {
+@@ -293,7 +298,7 @@
+ QT += opengl
+ }
+ INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
+- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
++ SOFA_GUI_EXT_LIBS *= -lqwt-qt4$${LIBSUFFIX}
+ }
+
+ ########################################################################
+@@ -316,7 +321,7 @@
+ unix:SOFA_GUI_EXT_LIBS *= -lQGLViewer$${LIBSUFFIX}
+ win32:SOFA_GUI_EXT_LIBS *= -lQGLViewer2$${LIBSUFFIX}
+ INCLUDEPATH += $$SOFA_DIR/extlibs/qwt $$SOFA_DIR/extlibs/libQGLViewer
+- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
++ SOFA_GUI_EXT_LIBS *= -lqwt-qt4$${LIBSUFFIX}
+ }
+
+ ########################################################################
+@@ -345,7 +350,7 @@
+ LIBS += OgreMain.lib
+ }
+ INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
+- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
++ SOFA_GUI_EXT_LIBS *= -lqwt-qt4$${LIBSUFFIX}
+ }
+
+ ########################################################################
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/44_ogre.dpatch
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/44_ogre.dpatch (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/44_ogre.dpatch 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,85 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 44_ogre.dpatch by <domibel at ve2056622895.ihrserver.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: enable OGRE, PNG, PML, LML
+
+ at DPATCH@
+diff -urNad sofa-framework-1.0~beta3~/applications/sofa/gui/qt/viewer/qtogre/QtOgreViewer.cpp sofa-framework-1.0~beta3/applications/sofa/gui/qt/viewer/qtogre/QtOgreViewer.cpp
+--- sofa-framework-1.0~beta3~/applications/sofa/gui/qt/viewer/qtogre/QtOgreViewer.cpp 2008-11-16 20:22:30.000000000 +0100
++++ sofa-framework-1.0~beta3/applications/sofa/gui/qt/viewer/qtogre/QtOgreViewer.cpp 2008-11-16 20:28:15.000000000 +0100
+@@ -237,6 +237,7 @@
+ #endif
+ mRoot = new Ogre::Root(pluginsPath, ogrePath, ogreLog);
+ Ogre::LogManager::getSingleton().setLogDetail(Ogre::LL_LOW);
++ Ogre::ResourceGroupManager::getSingleton().addResourceLocation("/","FileSystem","General");
+ Ogre::ResourceGroupManager::getSingleton().addResourceLocation(sofa::helper::system::DataRepository.getFirstPath() +"/textures","FileSystem","General");
+ Ogre::ResourceGroupManager::getSingleton().addResourceLocation(sofa::helper::system::DataRepository.getFirstPath() +"/materials","FileSystem","General");
+ Ogre::ResourceGroupManager::getSingleton().addResourceLocation(sofa::helper::system::DataRepository.getFirstPath() +"/shaders","FileSystem","General");
+@@ -323,8 +324,8 @@
+
+
+
+- Display* display = qt_xdisplay(); //XOpenDisplay(NULL);
+- int screen = qt_xscreen(); //DefaultScreen(display);
++ Display* display = XOpenDisplay(NULL);
++ int screen = DefaultScreen(display);
+
+ // params["parentWindowHandle"] =
+ // Ogre::StringConverter::toString ((unsigned long)display) +
+diff -urNad sofa-framework-1.0~beta3~/sofa-default.cfg sofa-framework-1.0~beta3/sofa-default.cfg
+--- sofa-framework-1.0~beta3~/sofa-default.cfg 2008-11-16 20:22:30.000000000 +0100
++++ sofa-framework-1.0~beta3/sofa-default.cfg 2008-11-16 20:27:48.000000000 +0100
+@@ -20,7 +20,7 @@
+ DEFINES += SOFA_GUI_QTVIEWER
+
+ # Uncomment if you want to compile QTOgreViewer interface
+-# DEFINES += SOFA_GUI_QTOGREVIEWER
++ DEFINES += SOFA_GUI_QTOGREVIEWER
+
+ # Uncomment if you want to compile QGLViewer interface
+ # DEFINES += SOFA_GUI_QGLVIEWER
+@@ -38,7 +38,7 @@
+ # DEFINES += SOFA_RDTSC
+
+ # Uncomment if you want to use libPNG to read/write PNG images
+-# DEFINES += SOFA_HAVE_PNG
++ DEFINES += SOFA_HAVE_PNG
+
+ # Uncomment if you want to use GLEW to handle OpenGL extensions
+ DEFINES += SOFA_HAVE_GLEW
+@@ -52,7 +52,7 @@
+ #CUDA_FLAGS += --ptxas-options=-v -arch sm_10
+
+ # 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 MKL for Matrix Solvers
+ #DEFINES += SOFA_HAVE_MKL
+@@ -62,7 +62,7 @@
+ #DEFINES += SOFA_HAVE_SENSABLE
+
+ # Uncomment if you want to use Sensable Phantom with CHAI3D
+-# DEFINES += SOFA_HAVE_CHAI3D
++# DEFINES += SOFA_HAVE_CHAI3D
+
+ # Uncomment if you want to support moving frames when computing inertia forces in Mass
+ # DEFINES += SOFA_SUPPORT_MOVING_FRAMES
+diff -urNad sofa-framework-1.0~beta3~/sofa.cfg sofa-framework-1.0~beta3/sofa.cfg
+--- sofa-framework-1.0~beta3~/sofa.cfg 2008-11-16 20:27:47.000000000 +0100
++++ sofa-framework-1.0~beta3/sofa.cfg 2008-11-16 20:27:48.000000000 +0100
+@@ -349,8 +349,11 @@
+
+ LIBS += OgreMain.lib
+ }
+- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
+- SOFA_GUI_EXT_LIBS *= -lqwt-qt4$${LIBSUFFIX}
++ INCLUDEPATH += /usr/include/OGRE/
++
++ # $$LIBSUFFIX for the debug target not needed because we are using Debian libraries
++ SOFA_GUI_EXT_LIBS *= -lqwt-qt4
++ SOFA_GUI_EXT_LIBS *= -lOgreMain
+ }
+
+ ########################################################################
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/55_fix_mips_sqrt.dpatch
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/55_fix_mips_sqrt.dpatch (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/patches/55_fix_mips_sqrt.dpatch 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,33 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 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)
+
+ at DPATCH@
+diff -urNad sofa-framework-1.0~beta3~/framework/sofa/helper/rmath.h sofa-framework-1.0~beta3/framework/sofa/helper/rmath.h
+--- sofa-framework-1.0~beta3~/framework/sofa/helper/rmath.h 2008-08-12 08:53:41.000000000 +0000
++++ sofa-framework-1.0~beta3/framework/sofa/helper/rmath.h 2008-11-07 23:31:04.000000000 +0000
+@@ -132,8 +132,8 @@
+
+ inline double rsqrt(const double& a)
+ {
+-#if defined(__GNUC__)
+- return sqrt(a);
++#if defined(__arm__) || defined(__mips__)
++ return sqrt((double)a);
+ #else
+ return (double)sqrtl((long double)a);
+ #endif
+@@ -141,7 +141,11 @@
+
+ inline long double rsqrt(const long double& a)
+ {
++#if defined(__arm__) || defined(__mips__)
++ return (long double)sqrt((double)a);
++#else
+ return sqrtl(a);
++#endif
+ }
+
+ template<class T>
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/rules
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/rules (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/rules 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,188 @@
+#!/usr/bin/make -f
+
+PACKAGE=sofa-framework
+DEB_SOURCE_PACKAGE:=$(PACKAGE)
+
+# DPatch
+include /usr/share/dpatch/dpatch.make
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+
+get-orig-source:
+ . debian/get-orig-source
+
+
+configure: configure-stamp
+configure-stamp: patch-stamp
+ dh_testdir
+ # Add here commands to configure the package.
+ qmake
+
+ # create a folder without object files
+ cp -r $(CURDIR)/applications/tutorials $(CURDIR)/tutorials
+
+ touch $@
+
+
+build: build-arch
+
+build-indep: build-indep-stamp
+build-indep-stamp: configure
+ dh_testdir
+
+ # Create the documentation files
+ mkdir -p $(CURDIR)/doc/doxygen
+ doxygen -u Doxyfile
+ doxygen
+
+ # remove zero byte files
+ find $(CURDIR)/doc/doxygen/ -depth -empty | xargs rm -rf
+
+ touch $@
+
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure
+ dh_testdir
+
+ # Add here commands to compile the package.
+ $(MAKE)
+
+ touch $@
+
+
+clean: clean-patched unpatch
+
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp docs-stamp
+
+ # Add here commands to clean up after the build process.
+# $(MAKE) clean
+
+ dh_clean
+
+
+install: install-indep install-arch
+
+install-indep: build-indep
+ dh_testdir
+
+ mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/sofa-doc
+
+ # because of a lintian warning
+ find tutorials -name "*.kdevelop" | xargs chmod 644
+
+ # install the source code of the example applications
+ dh_install -psofa-tutorials tutorials usr/share/sofa
+
+ find share -type f -exec chmod 644 \{\} \;
+ find share -name "*.sh" | xargs chmod 755
+
+ find examples -type f -exec chmod 644 \{\} \;
+ find examples -name "*.sh" | xargs chmod 755
+
+ dh_install -psofa-data share usr/share/sofa
+ dh_install -psofa-data examples usr/share/sofa
+ dh_install -psofa-data debian/PML usr/share/sofa/examples
+
+ # Documentation
+ dh_install -psofa-doc doc/doxygen/html usr/share/doc/sofa-doc
+
+ dh_installexamples
+
+
+install-arch: build-arch
+ dh_testdir
+ dh_testroot
+ dh_installdirs
+
+ dh_install -psofa-apps debian/sofa.desktop usr/share/applications
+ dh_install -psofa-apps debian/sofa.xpm usr/share/pixmaps
+
+ # Add here commands to install the package into debian/tmp
+# $(MAKE) install
+# $(MAKE) INSTALL_DIR=$(CURDIR)/debian/tmp install
+
+
+ mkdir -p $(CURDIR)/debian/tmp/usr/bin
+ mkdir -p $(CURDIR)/debian/tmp/usr/lib
+ mkdir -p $(CURDIR)/debian/tmp/usr/include
+ mkdir -p $(CURDIR)/debian/tmp/usr/lib/sofa-framework
+
+ find framework -name "*.h" | xargs -i cp --parents {} $(CURDIR)/debian/tmp/usr/include/
+ find framework -name "*.inl" | xargs -i cp --parents {} $(CURDIR)/debian/tmp/usr/include/
+ cp -rf $(CURDIR)/debian/tmp/usr/include/framework/* $(CURDIR)/debian/tmp/usr/include/
+ rm -rf $(CURDIR)/debian/tmp/usr/include/framework
+
+ find modules -name "*.h" | xargs -i cp --parents {} $(CURDIR)/debian/tmp/usr/include/
+ find modules -name "*.inl" | xargs -i cp --parents {} $(CURDIR)/debian/tmp/usr/include/
+ cp -rf $(CURDIR)/debian/tmp/usr/include/modules/* $(CURDIR)/debian/tmp/usr/include/
+ rm -rf $(CURDIR)/debian/tmp/usr/include/modules
+
+ find applications -name "*.h" | xargs -i cp --parents {} $(CURDIR)/debian/tmp/usr/include/
+ find applications -name "*.inl" | xargs -i cp --parents {} $(CURDIR)/debian/tmp/usr/include/
+ cp -rf $(CURDIR)/debian/tmp/usr/include/applications/* $(CURDIR)/debian/tmp/usr/include/
+ rm -rf $(CURDIR)/debian/tmp/usr/include/applications
+
+ mv $(CURDIR)/bin/runSofa $(CURDIR)/debian/tmp/usr/lib/sofa-framework/sofa
+### mv $(CURDIR)/bin/oneParticule $(CURDIR)/debian/tmp/usr/bin/sofa_particule
+### mv $(CURDIR)/bin/oneTetrahedron $(CURDIR)/debian/tmp/usr/bin/sofa_tetrahedron
+### mv $(CURDIR)/bin/chainHybrid $(CURDIR)/debian/tmp/usr/bin/sofa_chain_hybrid
+### mv $(CURDIR)/bin/mixedPendulum $(CURDIR)/debian/tmp/usr/bin/sofa_mixed_pendulum
+
+
+ cp -r $(CURDIR)/lib/linux/lib* $(CURDIR)/debian/tmp/usr/lib/
+
+
+ dh_install -plibsofa1 debian/tmp/usr/lib/lib*.so.* usr/lib
+
+ dh_install -plibsofa1-dev debian/tmp/usr/lib/lib*.so usr/lib
+ dh_install -plibsofa1-dev debian/tmp/usr/include/* usr/include
+
+ dh_install -psofa-apps debian/tmp/usr/lib/sofa-framework/sofa usr/lib/sofa-framework
+### dh_install -psofa-apps debian/tmp/usr/bin/sofa_particule usr/bin
+### dh_install -psofa-apps debian/tmp/usr/bin/sofa_tetrahedron usr/bin
+### dh_install -psofa-apps debian/tmp/usr/bin/sofa_chain_hybrid usr/bin
+### dh_install -psofa-apps debian/tmp/usr/bin/sofa_mixed_pendulum usr/bin
+ dh_install -psofa-apps debian/sofa usr/bin
+
+ dh_installman -psofa-apps debian/sofa.1
+
+# called by binary-indep and binary-arch
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_install
+ dh_installchangelogs
+ dh_installdocs
+ dh_installmenu
+ dh_lintian
+ dh_desktop
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+
+# Build architecture independant packages using the common target.
+binary-indep: build-indep install-indep
+ $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+ $(MAKE) -f debian/rules DH_OPTIONS=-s binary-common
+
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch configure
Property changes on: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# SOFA wrapper script
+#
+# Copyright (C) 2008 Dominique Belhachemi (domibel at cs.tu-berlin.de)
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+export SOFA_DATA_PATH=/usr/share/sofa/share:/usr/share/sofa/examples
+
+/usr/lib/sofa-framework/sofa $*
+
+exit 0
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa-doc.doc-base
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa-doc.doc-base (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa-doc.doc-base 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,14 @@
+Document: sofa-doc
+Title: SOFA class documentation
+Author: Various
+Abstract: 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.
+ It is mostly intended for the research community to help
+ develop newer algorithms, but can also be used as an efficient
+ prototyping tool.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/sofa-doc/html/index.html
+Files: /usr/share/doc/sofa-doc/html/*.html
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa.1
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa.1 (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa.1 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,31 @@
+.TH "sofa" "1" "August 2008" "" ""
+.SH "NAME"
+sofa \- SOFA GUI
+.SH "SYNOPSIS"
+sofa [OPTIONS]
+.SH "DESCRIPTION"
+SOFA is an Open Source framework primarily targeted at real\-time simulation, with an emphasis on medical simulation. It is mostly intended for the research community to help develop newer algorithms, but can also be used as an efficient prototyping tool. Based on an advanced software architecture, it allows to:
+
+ * create complex and evolving simulations by combining new algorithms with algorithms already included in SOFA
+ * modify most parameters of the simulation – deformable behavior, surface representation, solver, constraints, collision algorithm, etc. – by simply editing an XML file
+ * build complex models from simpler ones using a scene\-graph description
+ * efficiently simulate the dynamics of interacting objects using abstract equation solvers
+ * reuse and easily compare a variety of available methods
+.SH "OPTIONS"
+.IP "\-h \-\-help"
+this help
+.IP "\-s \-\-start"
+start the animation loop (default: 0 )
+.IP "\-p \-\-factory"
+In addition to the baz segments, also parse the
+blurfl headers.
+.IP "\-g \-\-gui"
+choose the UI (batch|qt|glut) (default: qt )
+.IP "\-l \-\-load"
+load given plugins (default: )
+.SH "AUTHORS"
+SOFA is currently developed by 3 INRIA teams: Alcove, Evasion and Asclepios but the project also benefited from the help of the CIMIT Sim Group, ETH Zurich and CSIRO.
+.SH "SEE ALSO"
+The full documentation for
+.B sofa
+is available at <\fBhttp://www.sofa\-framework.org\fR>
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa.desktop
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa.desktop (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa.desktop 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,9 @@
+[Desktop Entry]
+GenericName=SOFA
+Name=SOFA
+Comment=Open Source Framework for Medical Simulation
+Exec=sofa
+Icon=sofa
+Terminal=false
+Type=Application
+Categories=Graphics;
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa.menu
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa.menu (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa.menu 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,2 @@
+?package(sofa):needs="X11|text|vc|wm" section="Applications/Science/Medicine"\
+ title="SOFA" command="/usr/bin/sofa" icon="/usr/share/pixmaps/sofa.xpm"
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa.xpm
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa.xpm (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/sofa.xpm 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,336 @@
+/* XPM */
+static char * soffaaaa_xpm[] = {
+"32 32 301 2",
+" c None",
+". c #383846",
+"+ c #363746",
+"@ c #373846",
+"# c #7E5A48",
+"$ c #CD6A36",
+"% c #BF6436",
+"& c #5A4444",
+"* c #744D40",
+"= c #F3722C",
+"- c #F2712C",
+"; c #F2702B",
+"> c #E76F2F",
+", c #433C46",
+"' c #BC6236",
+") c #7B4E3F",
+"! c #4C4246",
+"~ c #965A3C",
+"{ c #98593B",
+"] c #4F4044",
+"^ c #393947",
+"/ c #3A3A47",
+"( c #BE6336",
+"_ c #F3742E",
+": c #7C5544",
+"< c #504245",
+"[ c #E77130",
+"} c #F2712B",
+"| c #EA702E",
+"1 c #524244",
+"2 c #7A4F40",
+"3 c #E87130",
+"4 c #ED7631",
+"5 c #95583C",
+"6 c #7E5040",
+"7 c #F3712B",
+"8 c #E8702F",
+"9 c #453D46",
+"0 c #A95D39",
+"a c #A55B39",
+"b c #493F46",
+"c c #EF712D",
+"d c #F2702C",
+"e c #F57730",
+"f c #6C4E44",
+"g c #8D553D",
+"h c #E46E2E",
+"i c #C96A35",
+"j c #5E4844",
+"k c #C26535",
+"l c #B76136",
+"m c #6F4B41",
+"n c #9F5839",
+"o c #A65B39",
+"p c #433D47",
+"q c #9B583B",
+"r c #F57D36",
+"s c #88523D",
+"t c #564445",
+"u c #8F553C",
+"v c #A95D3A",
+"w c #413C46",
+"x c #554345",
+"y c #EF722D",
+"z c #F4722B",
+"A c #F4742E",
+"B c #B7693D",
+"C c #3A3946",
+"D c #3E3B46",
+"E c #514245",
+"F c #AD5F39",
+"G c #EA712F",
+"H c #463D46",
+"I c #AB5E3A",
+"J c #393846",
+"K c #BE6D3E",
+"L c #4F4246",
+"M c #594645",
+"N c #524647",
+"O c #F6752C",
+"P c #D07239",
+"Q c #443D46",
+"R c #6E4C42",
+"S c #815340",
+"T c #9D5B3D",
+"U c #6B4A42",
+"V c #363646",
+"W c #956544",
+"X c #785949",
+"Y c #BB6337",
+"Z c #A05A39",
+"` c #BD6438",
+" . c #584645",
+".. c #A9633B",
+"+. c #E07D3A",
+"@. c #F67B2F",
+"#. c #DD7333",
+"$. c #A5633B",
+"%. c #504445",
+"&. c #634D45",
+"*. c #AA7148",
+"=. c #554B46",
+"-. c #7F6242",
+";. c #5D4844",
+">. c #CE6934",
+",. c #F1702B",
+"'. c #C76534",
+"). c #975D3D",
+"!. c #FE7B2C",
+"~. c #FA752C",
+"{. c #F8732C",
+"]. c #F7732C",
+"^. c #F8722C",
+"/. c #FB762C",
+"(. c #F6792E",
+"_. c #D47A3C",
+":. c #3D3A47",
+"<. c #855A40",
+"[. c #F88D31",
+"}. c #F8782D",
+"|. c #F7782C",
+"1. c #9B5C3C",
+"2. c #9C593B",
+"3. c #D67038",
+"4. c #AE6740",
+"5. c #644D47",
+"6. c #6A4D43",
+"7. c #F8782E",
+"8. c #F3702B",
+"9. c #F16E2A",
+"0. c #F06D2A",
+"a. c #F16D2B",
+"b. c #F26E2B",
+"c. c #F8732B",
+"d. c #FC792D",
+"e. c #7E5440",
+"f. c #403B46",
+"g. c #F0732E",
+"h. c #F4722C",
+"i. c #F4712C",
+"j. c #F4732C",
+"k. c #3F3B46",
+"l. c #B96439",
+"m. c #F17430",
+"n. c #CF6B36",
+"o. c #493F45",
+"p. c #433E47",
+"q. c #8D5B42",
+"r. c #BA7042",
+"s. c #895841",
+"t. c #DE7334",
+"u. c #F26F2B",
+"v. c #F06C2A",
+"w. c #F16D2A",
+"x. c #F16E2B",
+"y. c #F7722B",
+"z. c #F3772F",
+"A. c #373746",
+"B. c #5D4644",
+"C. c #F6722B",
+"D. c #F3712C",
+"E. c #F4722D",
+"F. c #6C4A42",
+"G. c #3B3A47",
+"H. c #694E46",
+"I. c #C26D3A",
+"J. c #F5732C",
+"K. c #F8742C",
+"L. c #AD623A",
+"M. c #945C3F",
+"N. c #BD7242",
+"O. c #B26C41",
+"P. c #E9702F",
+"Q. c #FC974A",
+"R. c #FEB76C",
+"S. c #F37630",
+"T. c #473E46",
+"U. c #91573D",
+"V. c #F06D2B",
+"W. c #EF6C2A",
+"X. c #F06B2A",
+"Y. c #E87635",
+"Z. c #5F4C47",
+"`. c #715043",
+" + c #EE7D36",
+".+ c #FEB76E",
+"++ c #F8C588",
+"@+ c #815743",
+"#+ c #373847",
+"$+ c #EF6A2A",
+"%+ c #ED9050",
+"&+ c #423F48",
+"*+ c #64544C",
+"=+ c #454148",
+"-+ c #A2613C",
+";+ c #F07F34",
+">+ c #D57F3C",
+",+ c #594944",
+"'+ c #8D5940",
+")+ c #EC8744",
+"!+ c #6A4B42",
+"~+ c #FD7A2E",
+"{+ c #FA762D",
+"]+ c #FC772D",
+"^+ c #E37733",
+"/+ c #986140",
+"(+ c #C4743F",
+"_+ c #FA7D34",
+":+ c #F3712D",
+"<+ c #D17940",
+"[+ c #353746",
+"}+ c #6A5243",
+"|+ c #B2703B",
+"1+ c #A67342",
+"2+ c #4F4645",
+"3+ c #865641",
+"4+ c #F67730",
+"5+ c #F5742E",
+"6+ c #F6742C",
+"7+ c #F9762C",
+"8+ c #6A5048",
+"9+ c #363846",
+"0+ c #D8753A",
+"a+ c #F87A33",
+"b+ c #FA7D36",
+"c+ c #F87B34",
+"d+ c #F87C35",
+"e+ c #F87A34",
+"f+ c #F77B35",
+"g+ c #F87E37",
+"h+ c #FA853B",
+"i+ c #FD9345",
+"j+ c #D1894A",
+"k+ c #B77240",
+"l+ c #94623E",
+"m+ c #FD8730",
+"n+ c #FF8630",
+"o+ c #FFB25D",
+"p+ c #EEC27D",
+"q+ c #4B4245",
+"r+ c #584646",
+"s+ c #FD883C",
+"t+ c #F6752E",
+"u+ c #FA7E34",
+"v+ c #F67B32",
+"w+ c #6A5248",
+"x+ c #F67F35",
+"y+ c #EF6825",
+"z+ c #EE6623",
+"A+ c #F87832",
+"B+ c #FC833A",
+"C+ c #F16A26",
+"D+ c #FB8339",
+"E+ c #FA8338",
+"F+ c #EB8F48",
+"G+ c #433E48",
+"H+ c #413E48",
+"I+ c #D57A39",
+"J+ c #FF832F",
+"K+ c #FE8332",
+"L+ c #975C3C",
+"M+ c #865D47",
+"N+ c #F48E43",
+"O+ c #F99043",
+"P+ c #885E47",
+"Q+ c #88634A",
+"R+ c #FA8238",
+"S+ c #F26E28",
+"T+ c #FA7F36",
+"U+ c #FC8D40",
+"V+ c #F6994B",
+"W+ c #67534A",
+"X+ c #BA7140",
+"Y+ c #FC8B3C",
+"Z+ c #FFA550",
+"`+ c #FFA953",
+" @ c #9F6E4A",
+".@ c #3D3C48",
+"+@ c #403E49",
+"@@ c #685349",
+"#@ c #D88A4B",
+"$@ c #FF9B4A",
+"%@ c #FF9A4A",
+"&@ c #FF9C4A",
+"*@ c #FF9F4C",
+"=@ c #CD8B4E",
+"-@ c #594C49",
+";@ c #65574A",
+">@ c #FAAE51",
+",@ c #FFC466",
+"'@ c #FFAC57",
+")@ c #F9A856",
+"!@ c #584A49",
+"~@ c #554848",
+"{@ c #775B49",
+"]@ c #775D4A",
+"^@ c #524748",
+"/@ c #66614F",
+"(@ c #B99056",
+"_@ c #B88754",
+":@ c #61514A",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . + @ . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . @ # $ % & . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . * = - ; > , . . . . . . . . . . . . ",
+". . . . . . . . . . . . . @ ' - ; ; ; ) . . . ! ~ { ] . . . . . ",
+". . . . . . . . . ^ / . . @ ( ; ; ; _ : . . < [ } } | 1 . . . . ",
+". . . . . . . . 2 3 4 5 @ . 6 7 ; ; 8 9 . . 0 } ; ; } a . . . . ",
+". . . . . . . b c d ; e f . . g h i j . . @ k } ; ; ; l . . . . ",
+". . . . . . . m - ; ; ; n . . . o p . . . . q } ; - r s . . . . ",
+". . . . . . . t = d ; ; u . . . v w . . . . x y z A B C . . . . ",
+". . D E . . . @ F 7 ; G H . . . I D . . . J K L M N @ . . . . . ",
+". & [ O P Q . . . R S T U . . V I / . . . W X . . . . . . . . . ",
+"@ Y d d ; Z . . . . . C ` ...+. at .#.$.%.&.*.@ . . . . =.-.;.@ . ",
+"+ >.d ,.,.'.+ . . . . . ).!.~.{.].^./.(._.:.. . . . <.[.}.|.1.@ ",
+". 2.- d ; 3.4.5.@ . . 6.7.8.9.0.0.a.b.c.d.e.. . . f.g.h.i.7 j.] ",
+". k.l.m.n.o.p.q.r.s.p t.u.a.0.v.v.w.a.x.y.z.o.. A.B.C.D.h.E.h.F.",
+". . @ G.@ . . . . H.I.J.x.0.v.v.v.v.v.w.b.K.L.M.N.O.P.h.Q.R.S.T.",
+". . . . . . . . . . U.u.V.0.W.X.X.v.v.w.b.8.Y.Z.J . `. +.+++ at +. ",
+". . . . . @ #+A.. . 1.u.x.v.W.$+$+X.v.v.x.b.%+@ . . . &+*+=+. . ",
+". . . . . -+;+>+,+. '+u.x.v.W.v.X.X.v.0.w.b.)+@ . . . . . . . . ",
+". . . . !+~+{+]+^+/+(+_+:+0.v.v.v.v.v.w.w.u.<+[+@ }+|+1+2+. . . ",
+". . . . 3+4+5+6+7+8+9+0+a+b+c+d+e+f+f+g+h+i+j+k+l+m+n+o+p+q+. . ",
+". . . . r+s+t+u+v+Q . w+x+y+z+E.A+B+C+D+E+F+G+H+I+n+J+J+K+L+. . ",
+". . . . @ M+N+O+P+. . @ Q+i+R+4+S+T+v+U+V+W+. . X+Y+Z+`+`+ @. . ",
+". . . . . . . at +@. . . . @ @@#@$@%@&@*@=@- at . . . ;@>@,@'@)@!@. . ",
+". . . . . . . . . . . . . . @ ~@{@]@^@A.. . . . . /@(@_@:@. . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "};
Added: trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/watch
===================================================================
--- trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/watch (rev 0)
+++ trunk/packages/sofa-framework/tags/1.0~beta3-5/debian/watch 2009-06-09 23:25:37 UTC (rev 3475)
@@ -0,0 +1,4 @@
+version=3
+opts="dversionmangle=s/~/-/" \
+http://www.sofa-framework.org/download \
+http://gforge.inria.fr/frs/download.php/.*/sofa-framework-(.*)\.zip
More information about the debian-med-commit
mailing list