Author: domibel-guest
Date: 2008-08-31 15:59:03 +0000 (Sun, 31 Aug 2008)
New Revision: 2443
Added:
trunk/packages/sofa/trunk/debian/
trunk/packages/sofa/trunk/debian/README.Debian
trunk/packages/sofa/trunk/debian/changelog
trunk/packages/sofa/trunk/debian/compat
trunk/packages/sofa/trunk/debian/control
trunk/packages/sofa/trunk/debian/copyright
trunk/packages/sofa/trunk/debian/get-orig-source
trunk/packages/sofa/trunk/debian/patches/
trunk/packages/sofa/trunk/debian/patches/00list
trunk/packages/sofa/trunk/debian/patches/10changes.dpatch
trunk/packages/sofa/trunk/debian/patches/25_newmat.dpatch
trunk/packages/sofa/trunk/debian/patches/44_ogre.dpatch
trunk/packages/sofa/trunk/debian/rules
trunk/packages/sofa/trunk/debian/sofa
trunk/packages/sofa/trunk/debian/sofa-doc.dirs
trunk/packages/sofa/trunk/debian/sofa-doc.doc-base
trunk/packages/sofa/trunk/debian/sofa.desktop
trunk/packages/sofa/trunk/debian/sofa.doc-base
trunk/packages/sofa/trunk/debian/sofa.menu
trunk/packages/sofa/trunk/debian/sofa.xpm
Log:
[svn-inject] Applying Debian modifications to trunk
Property changes on: trunk/packages/sofa/trunk/debian
___________________________________________________________________
Name: mergeWithUpstream
+ 1
Added: trunk/packages/sofa/trunk/debian/README.Debian
===================================================================
--- trunk/packages/sofa/trunk/debian/README.Debian
(rev 0)
+++ trunk/packages/sofa/trunk/debian/README.Debian 2008-08-31 15:59:03 UTC
(rev 2443)
@@ -0,0 +1,26 @@
+sofa for Debian
+---------------
+
+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,
+
+
+ -- Dominique Belhachemi <[EMAIL PROTECTED]> Sat, 16 Feb 2008 10:26:03 +0100
Added: trunk/packages/sofa/trunk/debian/changelog
===================================================================
--- trunk/packages/sofa/trunk/debian/changelog (rev 0)
+++ trunk/packages/sofa/trunk/debian/changelog 2008-08-31 15:59:03 UTC (rev
2443)
@@ -0,0 +1,21 @@
+sofa (1.0.0~beta3-3) experimental; urgency=low
+
+ * debian/copyright: MKL removed
+
+ -- Dominique Belhachemi <[EMAIL PROTECTED]> Sat, 30 Aug 2008 13:41:33 +0100
+
+
+sofa (1.0.0~beta3-2) unstable; urgency=low
+
+ * 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
+
+ -- Dominique Belhachemi <[EMAIL PROTECTED]> Sun, 24 Aug 2008 12:21:33 +0100
+
+
+sofa (1.0.0~beta3-1) unstable; urgency=low
+
+ * Initial release (Closes: #455064)
+
+ -- Dominique Belhachemi <[EMAIL PROTECTED]> Wed, 13 Aug 2008 10:26:03 +0100
+
Added: trunk/packages/sofa/trunk/debian/compat
===================================================================
--- trunk/packages/sofa/trunk/debian/compat (rev 0)
+++ trunk/packages/sofa/trunk/debian/compat 2008-08-31 15:59:03 UTC (rev
2443)
@@ -0,0 +1 @@
+6
Added: trunk/packages/sofa/trunk/debian/control
===================================================================
--- trunk/packages/sofa/trunk/debian/control (rev 0)
+++ trunk/packages/sofa/trunk/debian/control 2008-08-31 15:59:03 UTC (rev
2443)
@@ -0,0 +1,89 @@
+Source: sofa
+Section: graphics
+Priority: optional
+Maintainer: Debian-Med Packaging Team <[EMAIL PROTECTED]>
+DM-Upload-Allowed: yes
+Uploaders: Dominique Belhachemi <[EMAIL PROTECTED]>
+Build-Depends: debhelper (>= 5), dpatch, libxml2-dev, freeglut3-dev,
libnewmat10-dev,
+ libfltk1.1-dev, doxygen, graphviz, libglew-dev, libqt4-dev, libqt4-opengl-dev
+ libboost-dev, libboost-graph-dev, libqwt5-qt4-dev
+Standards-Version: 3.8.0
+Homepage: http://www.sofa-framework.org/
+
+
+Package: sofa-apps
+Architecture: any
+Depends: libsofa1 (= ${binary:Version}), sofa-share
+Description: GUI for the Simulation Open Framework Architecture (SOFA)
+
+
+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
+Depends: libsofa1 (= ${binary:Version})
+Architecture: any
+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-share
+Section: graphics
+Architecture: any
+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 data for the SOFA applications.
+
+
+Package: sofa-doc
+Section: doc
+Architecture: any
+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/trunk/debian/copyright
===================================================================
--- trunk/packages/sofa/trunk/debian/copyright (rev 0)
+++ trunk/packages/sofa/trunk/debian/copyright 2008-08-31 15:59:03 UTC (rev
2443)
@@ -0,0 +1,44 @@
+Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat
+Debianized-By: Dominique Belhachemi <[EMAIL PROTECTED]>
+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
+ see `/usr/share/common-licenses/LGPL'
+
+Files: modules/*
+Copyright: (c) 2006-2008 MGH, INRIA, USTL, UJF, CNRS
+License: LGPL
+ 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 INRIA
+License: GPL, LGPL
+ see `/usr/share/common-licenses/GPL' and `/usr/share/common-licenses/LGPL'
+
+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 <[EMAIL PROTECTED]>
+License: GPL-2+
+ The Debian packaging is licensed under the GPL, see
`/usr/share/common-licenses/GPL'
Added: trunk/packages/sofa/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/sofa/trunk/debian/get-orig-source
(rev 0)
+++ trunk/packages/sofa/trunk/debian/get-orig-source 2008-08-31 15:59:03 UTC
(rev 2443)
@@ -0,0 +1,36 @@
+mkdir -p sofa-tmp/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 sofa-tmp/downloads
+mv sofa-modules-1.0-beta3.zip sofa-tmp/downloads
+mv sofa-applications-1.0-beta3.zip sofa-tmp/downloads
+
+
+############################################################
+
+mkdir -p sofa-tmp/repackaged/sofa-1.0.0~beta3
+cd sofa-tmp/repackaged/sofa-1.0.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_1.0.0~beta3.orig.tar.gz sofa-1.0.0~beta3
+mv sofa-1.0.0~beta3 ../../
+mv sofa_1.0.0~beta3.orig.tar.gz ../../
+cd ../../
+#rm -rf sofa-tmp/
+
Added: trunk/packages/sofa/trunk/debian/patches/00list
===================================================================
--- trunk/packages/sofa/trunk/debian/patches/00list
(rev 0)
+++ trunk/packages/sofa/trunk/debian/patches/00list 2008-08-31 15:59:03 UTC
(rev 2443)
@@ -0,0 +1,3 @@
+25_newmat.dpatch
+#10changes.dpatch
+#44_ogre.dpatch
Added: trunk/packages/sofa/trunk/debian/patches/10changes.dpatch
===================================================================
--- trunk/packages/sofa/trunk/debian/patches/10changes.dpatch
(rev 0)
+++ trunk/packages/sofa/trunk/debian/patches/10changes.dpatch 2008-08-31
15:59:03 UTC (rev 2443)
@@ -0,0 +1,175 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10changes.dpatch by <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: small changes
+
[EMAIL PROTECTED]@
+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/trunk/debian/patches/25_newmat.dpatch
===================================================================
--- trunk/packages/sofa/trunk/debian/patches/25_newmat.dpatch
(rev 0)
+++ trunk/packages/sofa/trunk/debian/patches/25_newmat.dpatch 2008-08-31
15:59:03 UTC (rev 2443)
@@ -0,0 +1,441 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 25_newmat.dpatch by <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Neccessary changes to use the libnewmat10-dev package
+
[EMAIL PROTECTED]@
+diff -urNad sofa-1.0.0~beta3~/Sofa.pro sofa-1.0.0~beta3/Sofa.pro
+--- sofa-1.0.0~beta3~/Sofa.pro 2008-08-22 09:38:52.000000000 +0200
++++ sofa-1.0.0~beta3/Sofa.pro 2008-08-22 11:33:23.000000000 +0200
+@@ -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
+diff -urNad
sofa-1.0.0~beta3~/modules/sofa/component/forcefield/BeamFEMForceField.h
sofa-1.0.0~beta3/modules/sofa/component/forcefield/BeamFEMForceField.h
+--- sofa-1.0.0~beta3~/modules/sofa/component/forcefield/BeamFEMForceField.h
2008-08-22 09:38:52.000000000 +0200
++++ sofa-1.0.0~beta3/modules/sofa/component/forcefield/BeamFEMForceField.h
2008-08-22 11:33:23.000000000 +0200
+@@ -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-1.0.0~beta3~/modules/sofa/component/forcefield/TriangularAnisotropicFEMForceField.h
sofa-1.0.0~beta3/modules/sofa/component/forcefield/TriangularAnisotropicFEMForceField.h
+---
sofa-1.0.0~beta3~/modules/sofa/component/forcefield/TriangularAnisotropicFEMForceField.h
2008-08-22 09:38:52.000000000 +0200
++++
sofa-1.0.0~beta3/modules/sofa/component/forcefield/TriangularAnisotropicFEMForceField.h
2008-08-22 11:33:23.000000000 +0200
+@@ -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-1.0.0~beta3~/modules/sofa/component/forcefield/TriangularFEMForceField.cpp
sofa-1.0.0~beta3/modules/sofa/component/forcefield/TriangularFEMForceField.cpp
+---
sofa-1.0.0~beta3~/modules/sofa/component/forcefield/TriangularFEMForceField.cpp
2008-08-22 09:38:52.000000000 +0200
++++
sofa-1.0.0~beta3/modules/sofa/component/forcefield/TriangularFEMForceField.cpp
2008-08-22 11:33:23.000000000 +0200
+@@ -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-1.0.0~beta3~/modules/sofa/component/forcefield/TriangularFEMForceField.h
sofa-1.0.0~beta3/modules/sofa/component/forcefield/TriangularFEMForceField.h
+---
sofa-1.0.0~beta3~/modules/sofa/component/forcefield/TriangularFEMForceField.h
2008-08-22 09:38:52.000000000 +0200
++++
sofa-1.0.0~beta3/modules/sofa/component/forcefield/TriangularFEMForceField.h
2008-08-22 11:33:23.000000000 +0200
+@@ -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-1.0.0~beta3~/modules/sofa/component/linearsolver/NewMatMatrix.h
sofa-1.0.0~beta3/modules/sofa/component/linearsolver/NewMatMatrix.h
+--- sofa-1.0.0~beta3~/modules/sofa/component/linearsolver/NewMatMatrix.h
2008-08-22 09:38:52.000000000 +0200
++++ sofa-1.0.0~beta3/modules/sofa/component/linearsolver/NewMatMatrix.h
2008-08-22 11:33:23.000000000 +0200
+@@ -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-1.0.0~beta3~/modules/sofa/component/linearsolver/NewMatVector.h
sofa-1.0.0~beta3/modules/sofa/component/linearsolver/NewMatVector.h
+--- sofa-1.0.0~beta3~/modules/sofa/component/linearsolver/NewMatVector.h
2008-08-22 09:38:52.000000000 +0200
++++ sofa-1.0.0~beta3/modules/sofa/component/linearsolver/NewMatVector.h
2008-08-22 11:33:23.000000000 +0200
+@@ -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-1.0.0~beta3~/sofa.cfg sofa-1.0.0~beta3/sofa.cfg
+--- sofa-1.0.0~beta3~/sofa.cfg 2008-08-22 09:38:52.000000000 +0200
++++ sofa-1.0.0~beta3/sofa.cfg 2008-08-22 11:33:59.000000000 +0200
+@@ -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}
+ }
+
+ ########################################################################
Property changes on: trunk/packages/sofa/trunk/debian/patches/25_newmat.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/sofa/trunk/debian/patches/44_ogre.dpatch
===================================================================
--- trunk/packages/sofa/trunk/debian/patches/44_ogre.dpatch
(rev 0)
+++ trunk/packages/sofa/trunk/debian/patches/44_ogre.dpatch 2008-08-31
15:59:03 UTC (rev 2443)
@@ -0,0 +1,40 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 44_ogre.dpatch by <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad sofa-1.0.0~/sofa-default.cfg sofa-1.0.0/sofa-default.cfg
+--- sofa-1.0.0~/sofa-default.cfg 2008-08-13 17:24:23.000000000 +0200
++++ sofa-1.0.0/sofa-default.cfg 2008-08-13 22:00:17.000000000 +0200
+@@ -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
+@@ -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-1.0.0~/sofa.cfg sofa-1.0.0/sofa.cfg
+--- sofa-1.0.0~/sofa.cfg 2008-08-13 17:24:23.000000000 +0200
++++ sofa-1.0.0/sofa.cfg 2008-08-13 22:00:58.000000000 +0200
+@@ -345,6 +345,8 @@
+ LIBS += OgreMain.lib
+ }
+ INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
++ INCLUDEPATH += /usr/include/OGRE/
++
+ SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
+ }
+
Added: trunk/packages/sofa/trunk/debian/rules
===================================================================
--- trunk/packages/sofa/trunk/debian/rules (rev 0)
+++ trunk/packages/sofa/trunk/debian/rules 2008-08-31 15:59:03 UTC (rev
2443)
@@ -0,0 +1,154 @@
+#!/usr/bin/make -f
+
+PACKAGE=sofa
+
+# DPatch
+DEB_SOURCE_PACKAGE:=$(PACKAGE)
+include /usr/share/dpatch/dpatch.make
+
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
+
+CFLAGS = -Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
+
+get-orig-source:
+ . debian/get-orig-source
+
+
+configure: configure-stamp
+configure-stamp: patch-stamp
+ dh_testdir
+ # Add here commands to configure the package.
+ qmake
+ touch configure-stamp
+
+
+build: build-stamp
+build-stamp: configure
+ dh_testdir
+
+ # install the source code of the example applications
+ dh_install -psofa-tutorials applications/tutorials usr/share/sofa
+
+ # Add here commands to compile the package.
+ $(MAKE)
+ mkdir -p $(CURDIR)/doc
+ doxygen -u Doxyfile
+# doxygen
+
+ touch $@
+
+clean: clean-patched unpatch
+
+clean-patched:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp configure-stamp
+
+ # Add here commands to clean up after the build process.
+# $(MAKE) clean
+
+ dh_clean
+
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_installdirs
+
+ # Add here commands to install the package into debian/tmp
+# $(MAKE) install
+# $(MAKE) INSTALL_DIR=$(CURDIR)/debian/tmp install
+
+# # Documentation
+# cp -rf $(CURDIR)/doc/doxygen/*
$(CURDIR)/debian/sofa-doc/usr/share/doc/sofa-doc/html/
+# cp -p -r $(CURDIR)/doc/doxygen/*
$(CURDIR)/debian/tmp/usr/share/doc/sofa-doc/
+
+ 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/share/doc/sofa-doc
+
+ 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/bin/sofa.bin
+ 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/bin/sofa.bin
usr/bin
+ 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_install -psofa-apps debian/sofa.desktop
usr/share/applications
+ dh_install -psofa-apps debian/sofa.xpm
usr/share/pixmaps
+
+ dh_install -psofa-share share
usr/share/sofa
+ dh_install -psofa-share examples
usr/share/sofa
+
+ # install the source code of the example applications
+# dh_install -psofa-tutorials applications/tutorials usr/share/sofa
+# this happens now before we build the applications (see build-stamp)
+
+
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_install
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+ dh_installmenu
+ dh_desktop
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
Property changes on: trunk/packages/sofa/trunk/debian/rules
___________________________________________________________________
Name: svn:executable
+ *
Added: trunk/packages/sofa/trunk/debian/sofa
===================================================================
--- trunk/packages/sofa/trunk/debian/sofa (rev 0)
+++ trunk/packages/sofa/trunk/debian/sofa 2008-08-31 15:59:03 UTC (rev
2443)
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# SOFA wrapper script
+#
+# Copyright (C) 2008 Dominique Belhachemi ([EMAIL PROTECTED])
+#
+# 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
+
+sofa.bin
+
+exit 0
Added: trunk/packages/sofa/trunk/debian/sofa-doc.dirs
===================================================================
--- trunk/packages/sofa/trunk/debian/sofa-doc.dirs
(rev 0)
+++ trunk/packages/sofa/trunk/debian/sofa-doc.dirs 2008-08-31 15:59:03 UTC
(rev 2443)
@@ -0,0 +1,2 @@
+usr/share/doc/sofa-doc/html
+
Added: trunk/packages/sofa/trunk/debian/sofa-doc.doc-base
===================================================================
--- trunk/packages/sofa/trunk/debian/sofa-doc.doc-base
(rev 0)
+++ trunk/packages/sofa/trunk/debian/sofa-doc.doc-base 2008-08-31 15:59:03 UTC
(rev 2443)
@@ -0,0 +1,9 @@
+Document: sofa-doc
+Title: SOFA class documentation
+Author: Various
+Abstract: SOFA
+Section: Apps/Programming
+
+Format: HTML
+Index: /usr/share/doc/sofa-doc/html/index.html
+Files: /usr/share/doc/sofa-doc/html/*.html
Added: trunk/packages/sofa/trunk/debian/sofa.desktop
===================================================================
--- trunk/packages/sofa/trunk/debian/sofa.desktop
(rev 0)
+++ trunk/packages/sofa/trunk/debian/sofa.desktop 2008-08-31 15:59:03 UTC
(rev 2443)
@@ -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/trunk/debian/sofa.doc-base
===================================================================
--- trunk/packages/sofa/trunk/debian/sofa.doc-base
(rev 0)
+++ trunk/packages/sofa/trunk/debian/sofa.doc-base 2008-08-31 15:59:03 UTC
(rev 2443)
@@ -0,0 +1,22 @@
+Document: sofa
+Title: Debian sofa Manual
+Author: <insert document author here>
+Abstract: This manual describes what sofa is
+ and how it can be used to
+ manage online manuals on Debian systems.
+Section: unknown
+
+Format: debiandoc-sgml
+Files: /usr/share/doc/sofa/sofa.sgml.gz
+
+Format: postscript
+Files: /usr/share/doc/sofa/sofa.ps.gz
+
+Format: text
+Files: /usr/share/doc/sofa/sofa.text.gz
+
+Format: HTML
+Index: /usr/share/doc/sofa/html/index.html
+Files: /usr/share/doc/sofa/html/*.html
+
+
Added: trunk/packages/sofa/trunk/debian/sofa.menu
===================================================================
--- trunk/packages/sofa/trunk/debian/sofa.menu (rev 0)
+++ trunk/packages/sofa/trunk/debian/sofa.menu 2008-08-31 15:59:03 UTC (rev
2443)
@@ -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/trunk/debian/sofa.xpm
===================================================================
--- trunk/packages/sofa/trunk/debian/sofa.xpm (rev 0)
+++ trunk/packages/sofa/trunk/debian/sofa.xpm 2008-08-31 15:59:03 UTC (rev
2443)
@@ -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 ` [EMAIL PROTECTED]&.*.@ . . . . =.-.;.@ . ",
+"+ >.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 . `. [EMAIL PROTECTED] ",
+". . . . . @ #+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+`+`+ @. . ",
+". . . . . . [EMAIL PROTECTED]@. . . . @ @@[EMAIL PROTECTED]@%@&@[EMAIL
PROTECTED]@[EMAIL PROTECTED] . . ;@>@,@'@)@[EMAIL PROTECTED] . ",
+". . . . . . . . . . . . . . @ [EMAIL PROTECTED]@[EMAIL PROTECTED]@A.. . . . .
/@(@_@:@. . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . "};
_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
