[med-svn] r2681 - in trunk/packages/sofa-framework/trunk/debian: . patches
domibel-guest at alioth.debian.org
domibel-guest at alioth.debian.org
Fri Nov 14 15:20:53 UTC 2008
Author: domibel-guest
Date: 2008-11-14 15:20:53 +0000 (Fri, 14 Nov 2008)
New Revision: 2681
Removed:
trunk/packages/sofa-framework/trunk/debian/patches/47_png.dpatch
Modified:
trunk/packages/sofa-framework/trunk/debian/Notes
trunk/packages/sofa-framework/trunk/debian/README.Debian
trunk/packages/sofa-framework/trunk/debian/changelog
trunk/packages/sofa-framework/trunk/debian/patches/00list
trunk/packages/sofa-framework/trunk/debian/patches/25_newmat.dpatch
trunk/packages/sofa-framework/trunk/debian/patches/44_ogre.dpatch
trunk/packages/sofa-framework/trunk/debian/rules
Log:
PML enabled
Modified: trunk/packages/sofa-framework/trunk/debian/Notes
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/Notes 2008-11-14 11:50:22 UTC (rev 2680)
+++ trunk/packages/sofa-framework/trunk/debian/Notes 2008-11-14 15:20:53 UTC (rev 2681)
@@ -29,3 +29,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
+
Modified: trunk/packages/sofa-framework/trunk/debian/README.Debian
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/README.Debian 2008-11-14 11:50:22 UTC (rev 2680)
+++ trunk/packages/sofa-framework/trunk/debian/README.Debian 2008-11-14 15:20:53 UTC (rev 2681)
@@ -10,7 +10,7 @@
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: DISABLED
+Project MESSAGE: | PML/LML support: ENABLED
Project MESSAGE: | GLUT GUI: ENABLED
Project MESSAGE: | Qt GUI: ENABLED
Project MESSAGE: | - Qt OpenGL viewer: ENABLED
Modified: trunk/packages/sofa-framework/trunk/debian/changelog
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/changelog 2008-11-14 11:50:22 UTC (rev 2680)
+++ trunk/packages/sofa-framework/trunk/debian/changelog 2008-11-14 15:20:53 UTC (rev 2681)
@@ -1,5 +1,6 @@
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
Modified: trunk/packages/sofa-framework/trunk/debian/patches/00list
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/00list 2008-11-14 11:50:22 UTC (rev 2680)
+++ trunk/packages/sofa-framework/trunk/debian/patches/00list 2008-11-14 15:20:53 UTC (rev 2681)
@@ -2,5 +2,4 @@
25_newmat.dpatch
#10changes.dpatch
44_ogre.dpatch
-47_png.dpatch
55_fix_mips_sqrt.dpatch
Modified: trunk/packages/sofa-framework/trunk/debian/patches/25_newmat.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/25_newmat.dpatch 2008-11-14 11:50:22 UTC (rev 2680)
+++ trunk/packages/sofa-framework/trunk/debian/patches/25_newmat.dpatch 2008-11-14 15:20:53 UTC (rev 2681)
@@ -5,9 +5,9 @@
## DP: Neccessary changes to use the libnewmat10-dev package
@DPATCH@
-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
+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)
@@ -21,9 +21,22 @@
# 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
+@@ -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>
@@ -33,9 +46,9 @@
-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
+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>
@@ -47,9 +60,9 @@
-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
+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] */ ;
@@ -76,9 +89,9 @@
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
+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>
@@ -90,9 +103,9 @@
-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
+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;
@@ -280,9 +293,9 @@
}
-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
+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
@@ -386,9 +399,9 @@
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
+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 \
Modified: trunk/packages/sofa-framework/trunk/debian/patches/44_ogre.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/44_ogre.dpatch 2008-11-14 11:50:22 UTC (rev 2680)
+++ trunk/packages/sofa-framework/trunk/debian/patches/44_ogre.dpatch 2008-11-14 15:20:53 UTC (rev 2681)
@@ -6,8 +6,8 @@
@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-08-13 15:24:37.000000000 +0000
-+++ sofa-framework-1.0~beta3/applications/sofa/gui/qt/viewer/qtogre/QtOgreViewer.cpp 2008-11-13 23:20:17.000000000 +0000
+--- sofa-framework-1.0~beta3~/applications/sofa/gui/qt/viewer/qtogre/QtOgreViewer.cpp 2008-11-14 14:30:26.000000000 +0000
++++ sofa-framework-1.0~beta3/applications/sofa/gui/qt/viewer/qtogre/QtOgreViewer.cpp 2008-11-14 14:30:33.000000000 +0000
@@ -323,8 +323,8 @@
@@ -20,8 +20,8 @@
// 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-08-12 08:56:12.000000000 +0000
-+++ sofa-framework-1.0~beta3/sofa-default.cfg 2008-11-13 23:20:17.000000000 +0000
+--- sofa-framework-1.0~beta3~/sofa-default.cfg 2008-11-14 14:30:26.000000000 +0000
++++ sofa-framework-1.0~beta3/sofa-default.cfg 2008-11-14 14:30:43.000000000 +0000
@@ -20,7 +20,7 @@
DEFINES += SOFA_GUI_QTVIEWER
@@ -31,6 +31,24 @@
# 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
@@ -41,15 +59,19 @@
# 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-13 23:20:17.000000000 +0000
-+++ sofa-framework-1.0~beta3/sofa.cfg 2008-11-13 23:22:31.000000000 +0000
-@@ -350,7 +350,9 @@
+--- sofa-framework-1.0~beta3~/sofa.cfg 2008-11-14 14:30:31.000000000 +0000
++++ sofa-framework-1.0~beta3/sofa.cfg 2008-11-14 14:30:33.000000000 +0000
+@@ -349,8 +349,11 @@
+
LIBS += OgreMain.lib
}
- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
+- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
+- SOFA_GUI_EXT_LIBS *= -lqwt-qt4$${LIBSUFFIX}
+ INCLUDEPATH += /usr/include/OGRE/
- SOFA_GUI_EXT_LIBS *= -lqwt-qt4$${LIBSUFFIX}
-+ SOFA_GUI_EXT_LIBS *= -lOgreMain$${LIBSUFFIX}
++
++ # $$LIBSUFFIX for the debug target not needed because we are using Debian libraries
++ SOFA_GUI_EXT_LIBS *= -lqwt-qt4
++ SOFA_GUI_EXT_LIBS *= -lOgreMain
}
########################################################################
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/47_png.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/47_png.dpatch 2008-11-14 11:50:22 UTC (rev 2680)
+++ trunk/packages/sofa-framework/trunk/debian/patches/47_png.dpatch 2008-11-14 15:20:53 UTC (rev 2681)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 47_png.dpatch by <domibel at ve2056622895.ihrserver.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-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-13 22:46:21.000000000 +0000
-+++ sofa-framework-1.0~beta3/sofa-default.cfg 2008-11-13 22:46:39.000000000 +0000
-@@ -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
Modified: trunk/packages/sofa-framework/trunk/debian/rules
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/rules 2008-11-14 11:50:22 UTC (rev 2680)
+++ trunk/packages/sofa-framework/trunk/debian/rules 2008-11-14 15:20:53 UTC (rev 2681)
@@ -73,9 +73,6 @@
mkdir -p $(CURDIR)/debian/tmp/usr/share/doc/sofa-doc
- dh_install -psofa-apps debian/sofa.desktop usr/share/applications
- dh_install -psofa-apps debian/sofa.xpm usr/share/pixmaps
-
# because of a lintian warning
find tutorials -name "*.kdevelop" | xargs chmod 644
@@ -102,6 +99,9 @@
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
More information about the debian-med-commit
mailing list