[med-svn] r11143 - in trunk/packages/sofa-framework/trunk/debian: . patches
Andreas Tille
tille at alioth.debian.org
Thu May 31 16:18:33 UTC 2012
Author: tille
Date: 2012-05-31 16:18:32 +0000 (Thu, 31 May 2012)
New Revision: 11143
Added:
trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.diff
trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff
trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.diff
trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.diff
trunk/packages/sofa-framework/trunk/debian/patches/fix_mutable_serr_sout.diff
trunk/packages/sofa-framework/trunk/debian/patches/qwt5-qt4.patch
trunk/packages/sofa-framework/trunk/debian/patches/sofa-framework-gcc-4.7.diff
trunk/packages/sofa-framework/trunk/debian/patches/tinyxml26.diff
trunk/packages/sofa-framework/trunk/debian/sofa-apps.install
trunk/packages/sofa-framework/trunk/debian/sofa-data.install
trunk/packages/sofa-framework/trunk/debian/sofa-doc.install
trunk/packages/sofa-framework/trunk/debian/sofa-tutorials.install
Removed:
trunk/packages/sofa-framework/trunk/debian/patches/10_add_missing_include.patch
trunk/packages/sofa-framework/trunk/debian/patches/10_fix_mips_sqrt.patch
trunk/packages/sofa-framework/trunk/debian/patches/10_gcc4.4.patch
trunk/packages/sofa-framework/trunk/debian/patches/10_missing_includes.patch
trunk/packages/sofa-framework/trunk/debian/patches/20_debian_config.patch
trunk/packages/sofa-framework/trunk/debian/patches/20_ignore_missing_atomicity_h.patch
trunk/packages/sofa-framework/trunk/debian/patches/30_use_debian_packaged_libraries.patch
Modified:
trunk/packages/sofa-framework/trunk/debian/README.source
trunk/packages/sofa-framework/trunk/debian/changelog
trunk/packages/sofa-framework/trunk/debian/control
trunk/packages/sofa-framework/trunk/debian/get-orig-source
trunk/packages/sofa-framework/trunk/debian/libsofa1-dev.install
trunk/packages/sofa-framework/trunk/debian/libsofa1.install
trunk/packages/sofa-framework/trunk/debian/patches/series
trunk/packages/sofa-framework/trunk/debian/rules
Log:
Mass changes commit after (unapproved) NMU to bring the current package into a reasonable shape - needs updating to new upstrem version again; here is the complete changelog:
* debian/watch: also seek for https URLs
* debian/get-orig-source:
- Fetch any new version not only one hard coded version
- Make sure also versioned external library sources will
be removed
* debian/rules
- debian/*.{install,manpages} (make more use of dh_* helper files)
- Fixed clean target
- use short dh to simplify further packaging including hardening
* debian/control:
- Build-Depends: libeigen3-dev, libqglviewer-qt4-dev,
libsuitesparse-dev
- Build-Depends: s/libpng12-dev/libpng-dev/
Closes: #662508
- Standards-Version: 3.9.3 (no changes needed)
- Do not build sofa-doc by default (see README.source)
* debian/copyright: ensure DEP5 by fixing using
cme fix dpkg-copyright
* debian/patches/sofa-framework-gcc-4.7.diff: Fix gcc-4.7 build issue
Thanks to Matej Vela <vela at debian.org> for the patch
Closes: #673841
* debian/README.source:
- delete remark about quilt which is redundant these days
- add remark why sofa-doc is not builded any more and how
the package could be build for private use
* debhelper 9 (control+compat)
Modified: trunk/packages/sofa-framework/trunk/debian/README.source
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/README.source 2012-05-31 15:46:45 UTC (rev 11142)
+++ trunk/packages/sofa-framework/trunk/debian/README.source 2012-05-31 16:18:32 UTC (rev 11143)
@@ -1,2 +1,16 @@
-This package is using quilt. For more information please read
-/usr/share/doc/quilt/README.source
+Doxygen documentation for sofa
+------------------------------
+
+Formerly a package sofa-doc was created which contained exhaustive
+documentation created automatically by using doxygen. The process to
+generate the documentation lasts more than one hour on recent hardware
+and the results are close to 20.000 Files consuming nearly 1GB of disk
+space (0.75GB compressed in *.deb file). This seems to be a waste of
+resources and thus the package was dropped.
+
+If you intend to build the documentation locally from the Debian
+package source feel free to uncomment the sofa-doc package section
+in the debian/control file.
+
+ -- Andreas Tille <tille at debian.org> Tue, 29 May 2012 10:55:43 +0200
+
Modified: trunk/packages/sofa-framework/trunk/debian/changelog
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/changelog 2012-05-31 15:46:45 UTC (rev 11142)
+++ trunk/packages/sofa-framework/trunk/debian/changelog 2012-05-31 16:18:32 UTC (rev 11143)
@@ -1,29 +1,41 @@
-sofa-framework (1.0~rc1-1) UNRELEASED; urgency=low
+sofa-framework (1.0~beta4-7) unstable; urgency=low
- * New upstream version
* debian/watch: also seek for https URLs
* debian/get-orig-source:
- Fetch any new version not only one hard coded version
- Make sure also versioned external library sources will
be removed
- * debian/patches/*:
- - updated to latest upstream code
- - turned from dpatch syntax to quilt syntax
- - renamed: 10_* is for upstream, 20_* is Debian specific
* debian/rules
- debian/*.{install,manpages} (make more use of dh_* helper files)
- Fixed clean target
+ - use short dh to simplify further packaging including hardening
* debian/control:
- Build-Depends: libeigen3-dev, libqglviewer-qt4-dev,
libsuitesparse-dev
- Build-Depends: s/libpng12-dev/libpng-dev/
Closes: #662508
- Standards-Version: 3.9.3 (no changes needed)
+ - Do not build sofa-doc by default (see README.source)
* debian/copyright: ensure DEP5 by fixing using
cme fix dpkg-copyright
+ * debian/patches/sofa-framework-gcc-4.7.diff: Fix gcc-4.7 build issue
+ Thanks to Matej Vela <vela at debian.org> for the patch
+ Closes: #673841
+ * debian/README.source:
+ - delete remark about quilt which is redundant these days
+ - add remark why sofa-doc is not builded any more and how
+ the package could be build for private use
+ * debhelper 9 (control+compat)
- -- Andreas Tille <tille at debian.org> Wed, 07 Mar 2012 15:03:39 +0100
+ -- Andreas Tille <tille at debian.org> Thu, 31 May 2012 16:19:59 +0200
+sofa-framework (1.0~beta4-6.1) unstable; urgency=low
+
+ * Non maintainer upload.
+ * Fix build failure with GCC 4.7 (Matej Vela). Closes: #673841.
+
+ -- Matthias Klose <doko at debian.org> Tue, 29 May 2012 09:18:41 +0000
+
sofa-framework (1.0~beta4-6) unstable; urgency=low
[ Nelson A. de Oliveira ]
Modified: trunk/packages/sofa-framework/trunk/debian/control
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/control 2012-05-31 15:46:45 UTC (rev 11142)
+++ trunk/packages/sofa-framework/trunk/debian/control 2012-05-31 16:18:32 UTC (rev 11143)
@@ -4,7 +4,7 @@
Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
DM-Upload-Allowed: yes
Uploaders: Andreas Tille <tille at debian.org>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 9),
freeglut3-dev,
libboost-dev,
libboost-graph-dev,
@@ -49,7 +49,7 @@
Section: libdevel
Architecture: any
Depends: libsofa1 (= ${binary:Version}), ${misc:Depends}
-Suggests: sofa-doc, sofa-tutorials
+Suggests: sofa-tutorials
Description: Simulation Open Framework Architecture - development
SOFA is an Open Source framework primarily targeted at
real-time simulation, with an emphasis on medical simulation.
@@ -97,16 +97,16 @@
.
This package contains data for the SOFA applications.
-Package: sofa-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Description: SOFA class reference documentation
- SOFA is an Open Source framework primarily targeted at
- real-time simulation, with an emphasis on medical simulation.
- 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.
+#Package: sofa-doc
+#Section: doc
+#Architecture: all
+#Depends: ${misc:Depends}
+#Description: SOFA class reference documentation
+# SOFA is an Open Source framework primarily targeted at
+# real-time simulation, with an emphasis on medical simulation.
+# 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.
Modified: trunk/packages/sofa-framework/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/get-orig-source 2012-05-31 15:46:45 UTC (rev 11142)
+++ trunk/packages/sofa-framework/trunk/debian/get-orig-source 2012-05-31 16:18:32 UTC (rev 11143)
@@ -44,7 +44,7 @@
rm -rf extlibs/miniBoost # libboost-dev
rm -rf extlibs/libQGLViewer* # libqglviewer-dev
rm -rf extlibs/eigen* # libeigen3-dev
-rm -rf extlibs/qwt* # libqwt-dev
+# rm -rf extlibs/qwt* # libqwt5-qt4-dev
rm -rf extlibs/newmat # libnewmat10-dev
rm -rf extlibs/csparse # libsuitesparse-dev
rm -rf extlibs/tinyxml # libtinyxml-dev (>= 2.6)
Modified: trunk/packages/sofa-framework/trunk/debian/libsofa1-dev.install
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/libsofa1-dev.install 2012-05-31 15:46:45 UTC (rev 11142)
+++ trunk/packages/sofa-framework/trunk/debian/libsofa1-dev.install 2012-05-31 16:18:32 UTC (rev 11143)
@@ -1,2 +1,2 @@
-lib/lib*.a usr/lib
-lib/lib*.so usr/lib
+#lib/lib*.a usr/lib
+lib/*/lib*.so usr/lib
Modified: trunk/packages/sofa-framework/trunk/debian/libsofa1.install
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/libsofa1.install 2012-05-31 15:46:45 UTC (rev 11142)
+++ trunk/packages/sofa-framework/trunk/debian/libsofa1.install 2012-05-31 16:18:32 UTC (rev 11143)
@@ -1 +1 @@
-lib/lib*.so.[0-9]* usr/lib
+lib/*/lib*.so.[0-9]* usr/lib
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/10_add_missing_include.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/10_add_missing_include.patch 2012-05-31 15:46:45 UTC (rev 11142)
+++ trunk/packages/sofa-framework/trunk/debian/patches/10_add_missing_include.patch 2012-05-31 16:18:32 UTC (rev 11143)
@@ -1,31 +0,0 @@
-Author: Dominique Belhachemi <domibel at debian.org>
-Description: Add missing include statement
-
---- sofa-1.0-rc1.orig/framework/sofa/core/core.h
-+++ sofa-1.0-rc1/framework/sofa/core/core.h
-@@ -26,6 +26,7 @@
- #define SOFA_CORE_H
-
- #include <sofa/helper/system/config.h>
-+#include <cstddef>
-
- #ifdef SOFA_BUILD_CORE
- # define SOFA_CORE_API SOFA_EXPORT_DYNAMIC_LIBRARY
---- sofa-1.0-rc1.orig/applications/projects/Modeler/lib/TutorialSelector.cpp
-+++ sofa-1.0-rc1/applications/projects/Modeler/lib/TutorialSelector.cpp
-@@ -26,10 +26,11 @@
- #include "TutorialSelector.h"
- #include "iconnode.xpm"
-
--#include <tinyxml.cpp>
--#include <tinyxmlerror.cpp>
--#include <tinystr.cpp>
--#include <tinyxmlparser.cpp>
-+//#include <tinyxml.cpp>
-+//#include <tinyxmlerror.cpp>
-+//#include <tinystr.cpp>
-+//#include <tinyxmlparser.cpp>
-+#include <tinyxml.h>
-
- #include <iostream>
-
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/10_fix_mips_sqrt.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/10_fix_mips_sqrt.patch 2012-05-31 15:46:45 UTC (rev 11142)
+++ trunk/packages/sofa-framework/trunk/debian/patches/10_fix_mips_sqrt.patch 2012-05-31 16:18:32 UTC (rev 11143)
@@ -1,28 +0,0 @@
-Author: Dominique Belhachemi <domibel at debian.org>
-Description: fixes a build error on MIPS, ARM, and SuperH (sqrt/sqrtl)
-
---- sofa-1.0-rc1.orig/framework/sofa/helper/rmath.h
-+++ sofa-1.0-rc1/framework/sofa/helper/rmath.h
-@@ -130,8 +130,8 @@
-
- inline double rsqrt(const double& a)
- {
--#if defined(__GNUC__)
-- return sqrt(a);
-+#if defined(__arm__) || defined(__mips__) || defined(__sh__)
-+ return sqrt((double)a);
- #else
- return (double)sqrtl((long double)a);
- #endif
-@@ -139,7 +139,11 @@
-
- inline long double rsqrt(const long double& a)
- {
-+#if defined(__arm__) || defined(__mips__) || defined(__sh__)
-+ return (long double)sqrt((double)a);
-+#else
- return sqrtl(a);
-+#endif
- }
-
- template<class T>
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/10_gcc4.4.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/10_gcc4.4.patch 2012-05-31 15:46:45 UTC (rev 11142)
+++ trunk/packages/sofa-framework/trunk/debian/patches/10_gcc4.4.patch 2012-05-31 16:18:32 UTC (rev 11143)
@@ -1,64 +0,0 @@
-Author: Dominique Belhachemi <domibel at debian.org>
-Description: added #include headers required by GCC 4.4
-Bug-Closed: http://bugs.debian.org/505953
-
---- sofa-1.0-rc1.orig/framework/sofa/helper/LCPSolver.inl
-+++ sofa-1.0-rc1/framework/sofa/helper/LCPSolver.inl
-@@ -26,6 +26,7 @@
- #define SOFA_HELPER_LCPSOLVER_INL
-
- #include <sofa/helper/LCPSolver.h>
-+#include <cstdio>
-
- #include <cstdio> // printf
-
---- sofa-1.0-rc1.orig/framework/sofa/helper/Quater.inl
-+++ sofa-1.0-rc1/framework/sofa/helper/Quater.inl
-@@ -26,6 +26,7 @@
- #define SOFA_HELPER_QUATER_INL
-
- #include "Quater.h"
-+#include <cstdio>
- #include <math.h>
- #include <iostream>
- #include <stdio.h>
---- sofa-1.0-rc1.orig/framework/sofa/helper/gl/Capture.cpp
-+++ sofa-1.0-rc1/framework/sofa/helper/gl/Capture.cpp
-@@ -28,6 +28,7 @@
- #include <sofa/helper/io/ImagePNG.h>
- #endif
-
-+#include <cstdio>
- #include <sys/types.h>
- #include <sys/stat.h>
-
---- sofa-1.0-rc1.orig/framework/sofa/helper/io/ImageBMP.cpp
-+++ sofa-1.0-rc1/framework/sofa/helper/io/ImageBMP.cpp
-@@ -24,6 +24,7 @@
- ******************************************************************************/
- #include <sofa/helper/io/ImageBMP.h>
- #include <sofa/helper/system/FileRepository.h>
-+#include <cstdio>
- #include <iostream>
-
- #include <cstdio> // fopen and friends
---- sofa-1.0-rc1.orig/framework/sofa/helper/io/ImageRAW.cpp
-+++ sofa-1.0-rc1/framework/sofa/helper/io/ImageRAW.cpp
-@@ -25,6 +25,7 @@
- #include <sofa/helper/io/ImageRAW.h>
- #include <sofa/helper/system/FileRepository.h>
- #include <iostream>
-+#include <cstdio>
-
- #include <cstdio> // fopen
-
---- sofa-1.0-rc1.orig/framework/sofa/helper/io/MeshTrian.cpp
-+++ sofa-1.0-rc1/framework/sofa/helper/io/MeshTrian.cpp
-@@ -25,6 +25,7 @@
- #include <sofa/helper/io/MeshTrian.h>
- #include <sofa/helper/system/FileRepository.h>
- #include <stdlib.h>
-+#include <cstdio>
- #include <iostream>
- #include <string>
-
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/10_missing_includes.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/10_missing_includes.patch 2012-05-31 15:46:45 UTC (rev 11142)
+++ trunk/packages/sofa-framework/trunk/debian/patches/10_missing_includes.patch 2012-05-31 16:18:32 UTC (rev 11143)
@@ -1,39 +0,0 @@
-Author: Dominique Belhachemi <domibel at debian.org>,
- Andreas Tille <tille at debian.org>
-Description: Fix some tinyxml include statements
-
---- sofa-1.0-rc1.orig/applications/sofa/gui/qt/GraphVisitor.cpp
-+++ sofa-1.0-rc1/applications/sofa/gui/qt/GraphVisitor.cpp
-@@ -26,10 +26,7 @@
-
- #include <sstream>
-
--#include <tinyxml.cpp>
--#include <tinyxmlerror.cpp>
--#include <tinystr.cpp>
--#include <tinyxmlparser.cpp>
-+#include <tinyxml.h>
-
- #include <algorithm>
-
---- sofa-1.0-rc1.orig/applications/sofa/gui/qt/GraphVisitor.h
-+++ sofa-1.0-rc1/applications/sofa/gui/qt/GraphVisitor.h
-@@ -44,7 +44,6 @@
-
- //Tinyxml library
- #include <tinyxml.h>
--#include <tinystr.h>
-
- #include <iostream>
- #include <set>
---- sofa-1.0-rc1.orig/applications/projects/Modeler/lib/TutorialSelector.h
-+++ sofa-1.0-rc1/applications/projects/Modeler/lib/TutorialSelector.h
-@@ -42,7 +42,7 @@
-
- //Tinyxml library
- #include <tinyxml.h>
--#include <tinystr.h>
-+//#include <tinystr.h>
-
- #include <map>
-
Added: trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.diff (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.diff 2012-05-31 16:18:32 UTC (rev 11143)
@@ -0,0 +1,73 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_gcc4.4.dpatch by <domibel at ve2056622895.ihrserver.de>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: added #include headers required by GCC 4.4 (Closes: #505953)
+
+ at DPATCH@
+diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/LCPSolver.inl sofa-framework-1.0~beta4/framework/sofa/helper/LCPSolver.inl
+--- sofa-framework-1.0~beta4~/framework/sofa/helper/LCPSolver.inl 2009-06-09 21:10:29.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/helper/LCPSolver.inl 2009-06-09 21:10:49.000000000 -0400
+@@ -28,6 +28,7 @@
+ #define SOFA_HELPER_LCPSOLVER_INL
+
+ #include <sofa/helper/LCPSolver.h>
++#include <cstdio>
+
+ namespace sofa
+ {
+diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/Quater.inl sofa-framework-1.0~beta4/framework/sofa/helper/Quater.inl
+--- sofa-framework-1.0~beta4~/framework/sofa/helper/Quater.inl 2009-06-09 21:10:29.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/helper/Quater.inl 2009-06-09 21:10:49.000000000 -0400
+@@ -28,6 +28,7 @@
+ #define SOFA_HELPER_QUATER_INL
+
+ #include "Quater.h"
++#include <cstdio>
+ #include <math.h>
+ #include <iostream>
+
+diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/gl/Capture.cpp sofa-framework-1.0~beta4/framework/sofa/helper/gl/Capture.cpp
+--- sofa-framework-1.0~beta4~/framework/sofa/helper/gl/Capture.cpp 2009-06-09 21:10:29.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/helper/gl/Capture.cpp 2009-06-09 21:10:49.000000000 -0400
+@@ -30,6 +30,7 @@
+ #include <sofa/helper/io/ImagePNG.h>
+ #endif
+
++#include <cstdio>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+
+diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/io/ImageBMP.cpp sofa-framework-1.0~beta4/framework/sofa/helper/io/ImageBMP.cpp
+--- sofa-framework-1.0~beta4~/framework/sofa/helper/io/ImageBMP.cpp 2009-06-09 21:10:29.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/helper/io/ImageBMP.cpp 2009-06-09 21:10:49.000000000 -0400
+@@ -26,6 +26,7 @@
+ ******************************************************************************/
+ #include <sofa/helper/io/ImageBMP.h>
+ #include <sofa/helper/system/FileRepository.h>
++#include <cstdio>
+ #include <iostream>
+
+ namespace sofa
+diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/io/ImageRAW.cpp sofa-framework-1.0~beta4/framework/sofa/helper/io/ImageRAW.cpp
+--- sofa-framework-1.0~beta4~/framework/sofa/helper/io/ImageRAW.cpp 2009-06-09 21:10:29.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/helper/io/ImageRAW.cpp 2009-06-09 21:10:49.000000000 -0400
+@@ -27,6 +27,7 @@
+ #include <sofa/helper/io/ImageRAW.h>
+ #include <sofa/helper/system/FileRepository.h>
+ #include <iostream>
++#include <cstdio>
+
+ namespace sofa
+ {
+diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/io/MeshTrian.cpp sofa-framework-1.0~beta4/framework/sofa/helper/io/MeshTrian.cpp
+--- sofa-framework-1.0~beta4~/framework/sofa/helper/io/MeshTrian.cpp 2009-06-09 21:10:29.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/helper/io/MeshTrian.cpp 2009-06-09 21:10:49.000000000 -0400
+@@ -27,6 +27,7 @@
+ #include <sofa/helper/io/MeshTrian.h>
+ #include <sofa/helper/system/FileRepository.h>
+ #include <stdlib.h>
++#include <cstdio>
+ #include <iostream>
+ #include <string>
+
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/20_debian_config.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/20_debian_config.patch 2012-05-31 15:46:45 UTC (rev 11142)
+++ trunk/packages/sofa-framework/trunk/debian/patches/20_debian_config.patch 2012-05-31 16:18:32 UTC (rev 11143)
@@ -1,61 +0,0 @@
-Authors: Dominique Belhachemi <domibel at debian.org>,
- Andreas Tille <tille at debian.org>
-Description: Link sofa to Debians newmat, boost, xml2 and qwt library.
-
---- sofa-1.0-rc1.orig/sofa-default.prf
-+++ sofa-1.0-rc1/sofa-default.prf
-@@ -19,7 +19,8 @@
- # Viewers
- ########################################################################
-
--!isEmpty(QT): DEFINES += SOFA_QT4
-+#!isEmpty(QT): DEFINES += SOFA_QT4
-+DEFINES += SOFA_QT4
-
- # Uncomment if you want to compile Qt interface
- DEFINES += SOFA_GUI_QTVIEWER
-@@ -94,7 +95,7 @@
- # DEFINES += SOFA_HAVE_FLOWVR
-
- # Uncomment if you want to use Boost lib for multithread computing
--# DEFINES += SOFA_HAVE_BOOST
-+DEFINES += SOFA_HAVE_BOOST
- # On mac, we often need the suffix -mt
- # BOOST_SUFFIX = -mt
- # On Windows, the path where boost is install and the suffix of the dlls should be specified
-@@ -120,7 +121,7 @@
-
- contains(DEFINES,SOFA_XML_PARSER_LIBXML){
- # Uncomment if you want to use SofaPML to load PML and LML files
--# DEFINES += SOFA_PML
-+DEFINES += SOFA_PML
- }
-
- # Uncomment if you want to use METIS
-@@ -152,12 +153,15 @@
- # QMAKE_LFLAGS *= -fopenmp
- # QMAKE_CXXFLAGS_RELEASE *= -fopenmp
-
-+# for binutils-gold
-+SOFA_EXT_LIBS += -ldl
-+
- # Uncomment if you want to use fishpack support
- # DEFINES += SOFA_HAVE_FISHPACK
- # FISHPACK_FLAGS = intel
-
- # If you want to use BLAS/LAPACK (required by TAUCS), uncomment the correct libraries and macros depending on your system
--# DEFINES += SOFA_HAVE_BLAS
-+DEFINES += SOFA_HAVE_BLAS
- # BLAS_LIBS *= -lblas -llapack -lf2c
- # BLAS_LIBS *= -llibgoto2 -llapack -llibf2c
- # BLAS_DEFINES *= TAUCS_BLAS_UNDERSCORE
-@@ -304,6 +308,9 @@
- # Uncomment if you want to compile the debug or release version
- #CONFIG += debug
- CONFIG += release
-+QMAKE_CXXFLAGS_RELEASE += -O1
-+QMAKE_CXXFLAGS += -W
-+QMAKE_CFLAGS += -W
-
- # Uncomment if you want debug symbols even in release build
- # QMAKE_CXXFLAGS += -g
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/20_ignore_missing_atomicity_h.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/20_ignore_missing_atomicity_h.patch 2012-05-31 15:46:45 UTC (rev 11142)
+++ trunk/packages/sofa-framework/trunk/debian/patches/20_ignore_missing_atomicity_h.patch 2012-05-31 16:18:32 UTC (rev 11143)
@@ -1,19 +0,0 @@
-Authors: Dominique Belhachemi <domibel at debian.org>,
-Description: fix: error: bits/atomicity.h: No such file or directory
-
---- sofa-1.0-rc1.orig/framework/sofa/helper/system/atomic.h
-+++ sofa-1.0-rc1/framework/sofa/helper/system/atomic.h
-@@ -29,9 +29,10 @@
-
- #if defined(SOFA_USE_ASM_ATOMIC)
- #include <asm/atomic.h>
--#include <bits/atomicity.h> // for __exchange_and_add
--#elif defined(__GNUC__) && (defined(i386) || defined(__i386__) || defined(__x86_64__))
--// custom ASM code, no include
-+#endif
-+
-+#if defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 402 )
-+# include <ext/atomicity.h>
- #elif defined(__GNUC__)
- // Fall-back mode: stdc++ atomic operations (should be available on all gcc-supported platforms)
- #include <bits/atomicity.h>
Deleted: trunk/packages/sofa-framework/trunk/debian/patches/30_use_debian_packaged_libraries.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/30_use_debian_packaged_libraries.patch 2012-05-31 15:46:45 UTC (rev 11142)
+++ trunk/packages/sofa-framework/trunk/debian/patches/30_use_debian_packaged_libraries.patch 2012-05-31 16:18:32 UTC (rev 11143)
@@ -1,104 +0,0 @@
---- sofa-1.0-rc1.orig/sofa-dependencies.prf
-+++ sofa-1.0-rc1/sofa-dependencies.prf
-@@ -16,16 +16,21 @@
- declare(thrust, thrust.prf, cuda)
- declare(system-metis, system-metis.prf)
- declare(system-taucs, system-taucs.prf)
-+declare(newmat, newmat.prf)
-+declare(tinyxml, tinyxml.prf)
-+declare(eigen, eigen.prf)
-+declare(qwt, qwt.prf)
-+declare(QGLViewer, QGLViewer.prf)
-
- ######################################################################
- # Extlibs
- ######################################################################
-
--declare(newmat, extlibs/newmat)
--declare(tinyxml, extlibs/tinyxml)
--declare(eigen, extlibs/eigen-3.0.3/eigen.pro)
--declare(qwt, extlibs/qwt-5.2.0/src, qtgui)
--declare(QGLViewer, extlibs/libQGLViewer-2.3.3/QGLViewer, qtgui)
-+#declare(newmat, extlibs/newmat)
-+#declare(tinyxml, extlibs/tinyxml)
-+#declare(eigen, extlibs/eigen-3.0.3/eigen.pro)
-+#declare(qwt, extlibs/qwt-5.2.0/src, qtgui)
-+#declare(QGLViewer, extlibs/libQGLViewer-2.3.3/QGLViewer, qtgui)
- declare(miniFlowVR, extlibs/miniFlowVR, boost)
- declare(csparse, extlibs/csparse)
-
---- /dev/null
-+++ sofa-1.0-rc1/features/sofa/newmat.prf
-@@ -0,0 +1 @@
-+LIBS *= -lnewmat
---- /dev/null
-+++ sofa-1.0-rc1/features/sofa/qwt.prf
-@@ -0,0 +1,8 @@
-+INCLUDEPATH *= /usr/include/qwt-qt4
-+INCLUDEPATH *= /usr/include/qt4
-+INCLUDEPATH *= /usr/include/qt4/Qt
-+INCLUDEPATH *= /usr/include/qt4/QtGui
-+INCLUDEPATH *= /usr/include/qt4/QtCore
-+INCLUDEPATH *= /usr/include/qt4/Qt3Support
-+LIBS *= -lqwt-qt4
-+
---- /dev/null
-+++ sofa-1.0-rc1/features/sofa/eigen.prf
-@@ -0,0 +1,8 @@
-+INCLUDEPATH *= /usr/include/eigen3
-+MY_LIBS =
-+MY_LIBRARYPATH =
-+
-+!contains(CONFIGDEBUG, debug) {
-+ DEFINES *= EIGEN_NO_DEBUG
-+}
-+
---- /dev/null
-+++ sofa-1.0-rc1/features/sofa/tinyxml.prf
-@@ -0,0 +1 @@
-+LIBS *= -ltinyxml
---- /dev/null
-+++ sofa-1.0-rc1/features/sofa/QGLViewer.prf
-@@ -0,0 +1 @@
-+LIBS *= -lqglviewer-qt4
---- sofa-framework-1.0~rc1.orig/applications/projects/Modeler/exec/exec.pro
-+++ sofa-framework-1.0~rc1/applications/projects/Modeler/exec/exec.pro
-@@ -8,6 +8,12 @@
- INCLUDEPATH += $$BUILD_DIR/../lib/$$UI_DIR # HACK: some uic generated headers are generated in another .pro
- DEPENDPATH += $$BUILD_DIR/../lib/$$UI_DIR # HACK: some uic generated headers are generated in another .pro
-
-+contains (DEFINES, SOFA_QT4) {
-+ QT *= qt3support
-+ DEFINES *= QT3_SUPPORT
-+ LIBS *= -lQt3Support -lQtGui -lQtCore
-+}
-+
- macx : {
- CONFIG +=app_bundle
- RC_FILE = Modeler.icns
---- sofa-framework-1.0~rc1.orig/applications/projects/Modeler/lib/lib.pro
-+++ sofa-framework-1.0~rc1/applications/projects/Modeler/lib/lib.pro
-@@ -41,8 +41,9 @@
- QCategoryTreeLibrary.cpp \
- QComponentTreeLibrary.cpp
-
-- CONFIG += qt uic uic3
-- QT += qt3support xml
-+ CONFIG *= qt uic uic3
-+ QT *= qt3support xml
-+ DEFINES *= QT3_SUPPORT
- FORMS3 += Modeler.ui
- FORMS3 += DialogAddPreset.ui
- FORMS3 += ../../../sofa/gui/qt/PluginManager.ui
---- sofa-framework-1.0~rc1.orig/applications/sofa/gui/qt/qt.pro
-+++ sofa-framework-1.0~rc1/applications/sofa/gui/qt/qt.pro
-@@ -11,7 +11,8 @@
-
- contains(DEFINES, SOFA_QT4) {
- CONFIG += qt uic uic3
-- QT += opengl qt3support xml
-+ QT *= opengl qt3support xml
-+ DEFINES *= QT3_SUPPORT
-
- FORMS3 += GUI.ui
- FORMS3 += BaseGenGraphForm.ui
Added: trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff 2012-05-31 16:18:32 UTC (rev 11143)
@@ -0,0 +1,270 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 50_all_changes.dpatch by <domibel at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Link sofa to Debians newmat, boost, xml2 and qwt library.
+## DP: Use OGRE >= 1.6.0 if switched on.
+
+ at DPATCH@
+Index: sofa-framework-1.0~beta4/Sofa.pro
+===================================================================
+--- sofa-framework-1.0~beta4.orig/Sofa.pro 2009-03-20 18:41:25.000000000 -0400
++++ sofa-framework-1.0~beta4/Sofa.pro 2010-03-16 20:02:03.000000000 -0400
+@@ -3,13 +3,13 @@
+
+ include($${SOFA_DIR}/sofa.cfg)
+
+-SUBDIRS += extlibs/newmat
++#SUBDIRS += extlibs/newmat
+
+
+-SUBDIRS += extlibs/qwt
++#SUBDIRS += extlibs/qwt
+
+ contains(DEFINES,SOFA_XML_PARSER_TINYXML){
+- SUBDIRS += extlibs/tinyxml
++# SUBDIRS += extlibs/tinyxml
+ }
+
+ # FlowVR
+@@ -21,14 +21,15 @@
+ #CSParse
+
+ contains(DEFINES,SOFA_HAVE_CSPARSE){
+- SUBDIRS += extlibs/csparse
++# use Debian's system library instead of the one in extlibs
++# SUBDIRS += extlibs/csparse
+ }
+
+
+ #QGLViewer
+
+ contains(DEFINES,SOFA_GUI_QGLVIEWER){
+- SUBDIRS += extlibs/libQGLViewer/QGLViewer
++# SUBDIRS += extlibs/libQGLViewer/QGLViewer
+ }
+
+ # PML
+Index: sofa-framework-1.0~beta4/framework/sofa/helper/gl/DrawManager.cpp
+===================================================================
+--- sofa-framework-1.0~beta4.orig/framework/sofa/helper/gl/DrawManager.cpp 2009-03-20 18:40:53.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/helper/gl/DrawManager.cpp 2010-03-16 20:02:03.000000000 -0400
+@@ -517,7 +517,7 @@
+ node->scale(radius/50.0,radius/50.0,radius/50.0);
+ node->translate(p[0],p[1],p[2]);
+ node->attachObject(sph);
+- sph->setNormaliseNormals(true);
++ //sph->setNormaliseNormals(true);
+ break;
+ #endif
+ }
+Index: sofa-framework-1.0~beta4/sofa-default.cfg
+===================================================================
+--- sofa-framework-1.0~beta4.orig/sofa-default.cfg 2009-03-20 18:41:25.000000000 -0400
++++ sofa-framework-1.0~beta4/sofa-default.cfg 2010-03-16 20:02:03.000000000 -0400
+@@ -47,7 +47,7 @@
+ # DEFINES += SOFA_HAVE_FLOWVR
+
+ # Uncomment if you want to use Boost lib for multithread computing
+-# DEFINES += SOFA_HAVE_BOOST
++ DEFINES += SOFA_HAVE_BOOST
+
+ # Uncomment if you want to compile CUDA GPU prototype (require NVIDIA CUDA SDK)
+ # DEFINES += SOFA_GPU_CUDA
+@@ -61,10 +61,10 @@
+ # DEFINES += SOFA_GPU_CUDA_DOUBLE
+
+ # Uncomment if you want to use SofaPML to load PML and LML files
+-# DEFINES += SOFA_PML
++DEFINES += SOFA_PML
+
+ # Uncomment if you want to use LAPACK for Matrix Solvers
+-#DEFINES += SOFA_HAVE_LAPACK
++# DEFINES += SOFA_HAVE_LAPACK
+
+ # Uncomment if you want to use MKL for Matrix Solvers
+ #DEFINES += SOFA_HAVE_MKL
+@@ -77,7 +77,7 @@
+ # DEFINES += SOFA_HAVE_CHAI3D
+
+ # Uncomment if you want to support moving frames when computing inertia forces in Mass
+-# DEFINES += SOFA_SUPPORT_MOVING_FRAMES
++ DEFINES += SOFA_SUPPORT_MOVING_FRAMES
+
+ # Uncomment if you want to have the possibility to trave the visitor execution
+ DEFINES += DUMP_VISITOR_INFO
+@@ -110,6 +110,9 @@
+ # Choose if you want to compile the debug or release version
+ #CONFIG = debug
+ CONFIG = release
++QMAKE_CXXFLAGS_RELEASE += -O1
++QMAKE_CXXFLAGS += -W
++QMAKE_CFLAGS += -W
+
+ # Uncomment if you want debug symbols even in release build
+ # QMAKE_CXXFLAGS += -g
+Index: sofa-framework-1.0~beta4/sofa.cfg
+===================================================================
+--- sofa-framework-1.0~beta4.orig/sofa.cfg 2009-03-20 18:41:25.000000000 -0400
++++ sofa-framework-1.0~beta4/sofa.cfg 2010-03-16 20:02:03.000000000 -0400
+@@ -19,7 +19,8 @@
+
+ # Auto-detect Qt 4.x
+ # The QT variable was introduced in Qt 4
+-!isEmpty(QT): DEFINES += SOFA_QT4
++#!isEmpty(QT): DEFINES += SOFA_QT4
++DEFINES += SOFA_QT4
+
+ !include( sofa-local.cfg ) {
+ # Copy sofa-default.cfg to sofa-local.cfg and modify it to change local options
+@@ -197,12 +198,10 @@
+ OBJECTS_DIR = OBJ/$$join(CONFIGDEBUG,,,)
+
+ CONFIGLIBRARIES+= \
+- warn_on \
+ stl \
+ rtti \
+ thread
+
+-CONFIGPROJECT += warn_on
+ CONFIGPROJECTGUI = $$CONFIGPROJECT
+ CONFIGPROJECTCMD = $$CONFIGPROJECT
+ CONFIGPROJECTCMD += console
+@@ -211,7 +210,11 @@
+ $$SOFA_DIR/include \
+ $$SOFA_DIR/framework \
+ $$SOFA_DIR/modules \
+- $$SOFA_DIR/applications
++ $$SOFA_DIR/applications \
++ /usr/include/qt4 \
++ /usr/include/qwt
++
++
+
+ DEPENDPATH *= \
+ $$SOFA_DIR/framework \
+@@ -241,7 +244,7 @@
+ # BOOST
+ ########################################################################
+ contains(DEFINES,SOFA_HAVE_BOOST){
+- SOFA_EXT_LIBS *= -lboost_thread
++ SOFA_EXT_LIBS *= -lboost_thread-mt
+ }else{
+ # use miniBoost headers included in extlibs
+ INCLUDEPATH *= $$SOFA_DIR/extlibs/miniBoost
+@@ -251,9 +254,9 @@
+ # CSPARSE
+ ########################################################################
+ contains(DEFINES,SOFA_HAVE_CSPARSE){
+- SOFA_EXT_LIBS *= -lcsparse$$LIBSUFFIX
++ SOFA_EXT_LIBS *= -lcsparse
+ # use csparse headers included in extlibs
+- INCLUDEPATH *= $$SOFA_DIR/extlibs/csparse
++ # INCLUDEPATH *= $$SOFA_DIR/extlibs/csparse
+ }
+
+ ########################################################################
+@@ -267,7 +270,7 @@
+ contains(DEFINES,SOFA_XML_PARSER_TINYXML){
+ # DEFINES *= TIXML_USE_STL
+ SOFA_EXT_LIBS += -ltinyxml$$LIBSUFFIX
+- INCLUDEPATH *= $$SOFA_DIR/extlibs/tinyxml
++# INCLUDEPATH *= $$SOFA_DIR/extlibs/tinyxml
+ }
+
+ ########################################################################
+@@ -322,8 +325,8 @@
+ # NewMAT
+ ########################################################################
+
+-INCLUDEPATH *= $$SOFA_DIR/extlibs/newmat
+-SOFA_EXT_LIBS *= -lnewmat$$LIBSUFFIX
++#INCLUDEPATH *= $$SOFA_DIR/extlibs/newmat
++SOFA_EXT_LIBS *= -lnewmat
+
+ ########################################################################
+ # METIS
+@@ -377,8 +380,9 @@
+ else {
+ QT += opengl
+ }
+- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
+- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
++# INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
++# SOFA_GUI_EXT_LIBS *= -lqwt
++ SOFA_GUI_EXT_LIBS *= -lqwt-qt4
+ }
+
+ ########################################################################
+@@ -398,10 +402,10 @@
+ else {
+ QT += opengl
+ }
+- unix:SOFA_GUI_EXT_LIBS *= -lQGLViewer$${LIBSUFFIX}
++ unix:SOFA_GUI_EXT_LIBS *= -lqglviewer-qt4$${LIBSUFFIX}
+ win32:SOFA_GUI_EXT_LIBS *= -lQGLViewer2$${LIBSUFFIX}
+- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt $$SOFA_DIR/extlibs/libQGLViewer
+- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
++ INCLUDEPATH += /usr/include/qglviewer-qt4
++ SOFA_GUI_EXT_LIBS *= -lqwt-qt4
+ }
+
+ ########################################################################
+@@ -428,8 +432,8 @@
+ QMAKE_LIBDIR += $(OGRE_HOME)/lib
+ LIBS += OgreMain.lib
+ }
+- INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
+- SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
++# INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
++ SOFA_GUI_EXT_LIBS *= -lqwt-qt4
+
+ unix {
+ macx: QMAKE_CXXFLAGS += -Wno-unused
+@@ -601,6 +605,9 @@
+
+ SOFA_GUI_LIBS *= -lsofagui$$LIBSUFFIX -lsofaguimain$$LIBSUFFIX
+
++# for binutils-gold
++SOFA_EXTRA_LIBS += -ldl
++
+ # When using staticlib, rebuild applications if a library has changed
+ contains(CONFIGLIBRARIES,staticlib){
+ contains(TEMPLATE,app){
+@@ -619,7 +626,7 @@
+ }
+ }
+
+-SOFA_LIBS = $${SOFA_MODULES_LIBS} $${SOFA_MODULES_LIBS} $${SOFA_FRAMEWORK_LIBS} $${SOFA_FRAMEWORK_LIBS} $${SOFA_EXT_LIBS}
++SOFA_LIBS = $${SOFA_MODULES_LIBS} $${SOFA_MODULES_LIBS} $${SOFA_FRAMEWORK_LIBS} $${SOFA_FRAMEWORK_LIBS} $${SOFA_EXT_LIBS} $${SOFA_EXTRA_LIBS}
+
+ SOFA_GUI_LIBS += $${SOFA_GUI_EXT_LIBS}
+
+Index: sofa-framework-1.0~beta4/applications/sofa/gui/qt/GraphVisitor.cpp
+===================================================================
+--- sofa-framework-1.0~beta4.orig/applications/sofa/gui/qt/GraphVisitor.cpp 2009-03-20 18:40:52.000000000 -0400
++++ sofa-framework-1.0~beta4/applications/sofa/gui/qt/GraphVisitor.cpp 2010-03-16 20:02:03.000000000 -0400
+@@ -28,10 +28,7 @@
+
+ #include <sstream>
+
+-#include <tinyxml.cpp>
+-#include <tinyxmlerror.cpp>
+-#include <tinystr.cpp>
+-#include <tinyxmlparser.cpp>
++#include <tinyxml.h>
+
+ #include <algorithm>
+
+Index: sofa-framework-1.0~beta4/applications/sofa/gui/qt/GraphVisitor.h
+===================================================================
+--- sofa-framework-1.0~beta4.orig/applications/sofa/gui/qt/GraphVisitor.h 2010-03-16 20:02:24.000000000 -0400
++++ sofa-framework-1.0~beta4/applications/sofa/gui/qt/GraphVisitor.h 2010-03-16 20:02:31.000000000 -0400
+@@ -43,7 +43,6 @@
+
+ //Tinyxml library
+ #include <tinyxml.h>
+-#include <tinystr.h>
+
+ #include <iostream>
+ #include <set>
Added: trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.diff (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/55_fix_mips_sqrt.diff 2012-05-31 16:18:32 UTC (rev 11143)
@@ -0,0 +1,34 @@
+#! /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, ARM, and SuperH (sqrt/sqrtl)
+
+ at DPATCH@
+Index: sofa-framework-1.0~beta4/framework/sofa/helper/rmath.h
+===================================================================
+--- sofa-framework-1.0~beta4.orig/framework/sofa/helper/rmath.h 2009-12-06 14:23:24.000000000 -0500
++++ sofa-framework-1.0~beta4/framework/sofa/helper/rmath.h 2009-12-06 14:23:29.000000000 -0500
+@@ -132,8 +132,8 @@
+
+ inline double rsqrt(const double& a)
+ {
+-#if defined(__GNUC__)
+- return sqrt(a);
++#if defined(__arm__) || defined(__mips__) || defined(__sh__)
++ 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__) || defined(__sh__)
++ return (long double)sqrt((double)a);
++#else
+ return sqrtl(a);
++#endif
+ }
+
+ template<class T>
Added: trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.diff (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.diff 2012-05-31 16:18:32 UTC (rev 11143)
@@ -0,0 +1,23 @@
+## 78_atomicity.dpatch by <domibel at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix: error: bits/atomicity.h: No such file or directory
+
+Index: sofa-framework-1.0~beta4/framework/sofa/helper/system/atomic.h
+===================================================================
+--- sofa-framework-1.0~beta4.orig/framework/sofa/helper/system/atomic.h 2009-12-06 14:20:15.000000000 -0500
++++ sofa-framework-1.0~beta4/framework/sofa/helper/system/atomic.h 2009-12-06 14:20:36.000000000 -0500
+@@ -31,9 +31,10 @@
+
+ #if defined(SOFA_USE_ASM_ATOMIC)
+ #include <asm/atomic.h>
+-#include <bits/atomicity.h> // for __exchange_and_add
+-#elif defined(__GNUC__) && (defined(i386) || defined(__i386__) || defined(__x86_64__))
+-// custom ASM code, no include
++#endif
++
++#if defined( __GNUC__ ) && ( __GNUC__ * 100 + __GNUC_MINOR__ >= 402 )
++# include <ext/atomicity.h>
+ #elif defined(__GNUC__)
+ // Fall-back mode: stdc++ atomic operations (should be available on all gcc-supported platforms)
+ #include <bits/atomicity.h>
Added: trunk/packages/sofa-framework/trunk/debian/patches/fix_mutable_serr_sout.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/fix_mutable_serr_sout.diff (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/fix_mutable_serr_sout.diff 2012-05-31 16:18:32 UTC (rev 11143)
@@ -0,0 +1,32 @@
+## 78_atomicity.dpatch by <domibel at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: fix #625059 , error: reference 'serr' cannot be declared 'mutable' [-fpermissive]
+
+Index: sofa-framework-1.0~beta4/framework/sofa/core/objectmodel/Base.h
+===================================================================
+--- sofa-framework-1.0~beta4.orig/framework/sofa/core/objectmodel/Base.h 2011-05-07 16:18:02.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/core/objectmodel/Base.h 2011-05-07 16:18:06.000000000 -0400
+@@ -279,8 +279,8 @@
+ std::multimap< std::string, BaseData* > getAliases() { return m_aliasData; }
+
+ mutable sofa::helper::system::SofaOStream sendl;
+- mutable std::ostringstream &serr;
+- mutable std::ostringstream &sout;
++ std::ostringstream &serr;
++ std::ostringstream &sout;
+
+
+ protected:
+Index: sofa-framework-1.0~beta4/framework/sofa/core/core.h
+===================================================================
+--- sofa-framework-1.0~beta4.orig/framework/sofa/core/core.h 2011-05-07 16:21:56.000000000 -0400
++++ sofa-framework-1.0~beta4/framework/sofa/core/core.h 2011-05-07 16:22:12.000000000 -0400
+@@ -28,6 +28,7 @@
+ #define SOFA_CORE_H
+
+ #include <sofa/helper/system/config.h>
++#include <cstddef>
+
+ #ifdef SOFA_BUILD_CORE
+ # define SOFA_CORE_API SOFA_EXPORT_DYNAMIC_LIBRARY
Added: trunk/packages/sofa-framework/trunk/debian/patches/qwt5-qt4.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/qwt5-qt4.patch (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/qwt5-qt4.patch 2012-05-31 16:18:32 UTC (rev 11143)
@@ -0,0 +1,28 @@
+Author: Andreas Tille <tille at debian.org>
+Last-Changed: Tue, 13 Dec 2011 12:55:52 +0100
+Description: Sofa does not build properly with
+ libqwt-dev so adjusting include directory and fixing some header
+ file is needed
+
+--- sofa-framework-1.0~beta4.orig/applications/sofa/gui/qt/GraphDataWidget.h
++++ sofa-framework-1.0~beta4/applications/sofa/gui/qt/GraphDataWidget.h
+@@ -33,6 +33,8 @@
+ #include <qwt_plot.h>
+ #include <qwt_legend.h>
+ #include <qwt_scale_engine.h>
++#include <qwt_data.h>
++#include <qwt_double_rect.h>
+
+ namespace sofa
+ {
+--- sofa-framework-1.0~beta4.orig/sofa.cfg
++++ sofa-framework-1.0~beta4/sofa.cfg
+@@ -212,7 +212,7 @@
+ $$SOFA_DIR/modules \
+ $$SOFA_DIR/applications \
+ /usr/include/qt4 \
+- /usr/include/qwt
++ /usr/include/qwt-qt4
+
+
+
Modified: trunk/packages/sofa-framework/trunk/debian/patches/series
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/series 2012-05-31 15:46:45 UTC (rev 11142)
+++ trunk/packages/sofa-framework/trunk/debian/patches/series 2012-05-31 16:18:32 UTC (rev 11143)
@@ -1,7 +1,8 @@
-10_gcc4.4.patch
-10_missing_includes.patch
-20_debian_config.patch
-10_fix_mips_sqrt.patch
-20_ignore_missing_atomicity_h.patch
-10_add_missing_include.patch
-30_use_debian_packaged_libraries.patch
+13_gcc4.4.diff
+50_all_changes.diff
+55_fix_mips_sqrt.diff
+78_atomicity.diff
+fix_mutable_serr_sout.diff
+tinyxml26.diff
+qwt5-qt4.patch
+sofa-framework-gcc-4.7.diff
Added: trunk/packages/sofa-framework/trunk/debian/patches/sofa-framework-gcc-4.7.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/sofa-framework-gcc-4.7.diff (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/sofa-framework-gcc-4.7.diff 2012-05-31 16:18:32 UTC (rev 11143)
@@ -0,0 +1,260 @@
+Description: Fix build issue when using gcc-4.7
+Author: Matej Vela <vela at debian.org>
+Date: Sat, 26 May 2012 23:09:58 +0100
+Bug-Debian: http://bugs.debian.org/673841
+
+--- sofa-framework-1.0~beta4~/framework/sofa/core/componentmodel/behavior/MechanicalMapping.inl
++++ sofa-framework-1.0~beta4/framework/sofa/core/componentmodel/behavior/MechanicalMapping.inl
+@@ -88,14 +88,14 @@
+ void MechanicalMapping<In,Out>::propagateX()
+ {
+ if (this->fromModel!=NULL && this->toModel->getX()!=NULL && this->fromModel->getX()!=NULL)
+- apply(*this->toModel->getX(), *this->fromModel->getX());
++ this->apply(*this->toModel->getX(), *this->fromModel->getX());
+ }
+
+ template <class In, class Out>
+ void MechanicalMapping<In,Out>::propagateV()
+ {
+ if (this->fromModel!=NULL && this->toModel->getV()!=NULL && this->fromModel->getV()!=NULL)
+- applyJ(*this->toModel->getV(), *this->fromModel->getV());
++ this->applyJ(*this->toModel->getV(), *this->fromModel->getV());
+ }
+
+ template <class In, class Out>
+@@ -110,14 +110,14 @@
+ void MechanicalMapping<In,Out>::propagateDx()
+ {
+ if (this->fromModel!=NULL && this->toModel->getDx()!=NULL && this->fromModel->getDx()!=NULL)
+- applyJ(*this->toModel->getDx(), *this->fromModel->getDx());
++ this->applyJ(*this->toModel->getDx(), *this->fromModel->getDx());
+ }
+
+ template <class In, class Out>
+ void MechanicalMapping<In,Out>::propagateXfree()
+ {
+ if (this->fromModel!=NULL && this->toModel->getXfree()!=NULL && this->fromModel->getXfree()!=NULL)
+- apply(*this->toModel->getXfree(), *this->fromModel->getXfree());
++ this->apply(*this->toModel->getXfree(), *this->fromModel->getXfree());
+ }
+
+
+--- sofa-framework-1.0~beta4~/modules/sofa/component/constraint/DistanceConstraint.inl
++++ sofa-framework-1.0~beta4/modules/sofa/component/constraint/DistanceConstraint.inl
+@@ -147,9 +147,9 @@
+ V2.insert(idx2,V12);c2.push_back(V2);
+ }
+
+- core::componentmodel::behavior::BaseLMConstraint::constraintGroup *constraintAcc = addGroupConstraint(this->ACC);
+- core::componentmodel::behavior::BaseLMConstraint::constraintGroup *constraintVel = addGroupConstraint(this->VEL);
+- core::componentmodel::behavior::BaseLMConstraint::constraintGroup *constraintPos = addGroupConstraint(this->POS);
++ core::componentmodel::behavior::BaseLMConstraint::constraintGroup *constraintAcc = this->addGroupConstraint(this->ACC);
++ core::componentmodel::behavior::BaseLMConstraint::constraintGroup *constraintVel = this->addGroupConstraint(this->VEL);
++ core::componentmodel::behavior::BaseLMConstraint::constraintGroup *constraintPos = this->addGroupConstraint(this->POS);
+
+ //BaseLMConstraint interface
+ constraintAcc->addConstraint(idxInVecConst[0], idxInVecConst[1],
+--- sofa-framework-1.0~beta4~/modules/sofa/component/constraint/UnilateralInteractionConstraint.inl
++++ sofa-framework-1.0~beta4/modules/sofa/component/constraint/UnilateralInteractionConstraint.inl
+@@ -71,7 +71,7 @@
+ c.contactId = id;
+
+
+- if (rabs(delta - deltaFree) > 0.001 * delta)
++ if (helper::rabs(delta - deltaFree) > 0.001 * delta)
+ {
+ dt = delta / (delta - deltaFree);
+ if (dt > 0.0 && dt < 1.0 ){
+--- sofa-framework-1.0~beta4~/modules/sofa/component/container/MappedObject.inl
++++ sofa-framework-1.0~beta4/modules/sofa/component/container/MappedObject.inl
+@@ -36,8 +36,8 @@
+
+ template <class DataTypes>
+ MappedObject<DataTypes>::MappedObject()
+-: f_X( initData(&f_X, "position", "position vector") )
+-, f_V( initData(&f_V, "velocity", "velocity vector") )
++: f_X( this->initData(&f_X, "position", "position vector") )
++, f_V( this->initData(&f_V, "velocity", "velocity vector") )
+ {
+ }
+
+--- sofa-framework-1.0~beta4~/modules/sofa/component/forcefield/BoxStiffSpringForceField.inl
++++ sofa-framework-1.0~beta4/modules/sofa/component/forcefield/BoxStiffSpringForceField.inl
+@@ -48,8 +48,8 @@
+ template <class DataTypes>
+ BoxStiffSpringForceField<DataTypes>::BoxStiffSpringForceField(MechanicalState* object1, MechanicalState* object2, double ks, double kd)
+ : StiffSpringForceField<DataTypes>(object1, object2, ks, kd),
+- box_object1( initData( &box_object1, Vec6(0,0,0,1,1,1), "box_object1", "Box for the object1 where springs will be attached") ),
+- box_object2( initData( &box_object2, Vec6(0,0,0,1,1,1), "box_object2", "Box for the object2 where springs will be attached") )
++ box_object1( this->initData( &box_object1, Vec6(0,0,0,1,1,1), "box_object1", "Box for the object1 where springs will be attached") ),
++ box_object2( this->initData( &box_object2, Vec6(0,0,0,1,1,1), "box_object2", "Box for the object2 where springs will be attached") )
+
+ {
+ }
+@@ -57,8 +57,8 @@
+ template <class DataTypes>
+ BoxStiffSpringForceField<DataTypes>::BoxStiffSpringForceField(double ks, double kd)
+ : StiffSpringForceField<DataTypes>(ks, kd),
+- box_object1( initData( &box_object1, Vec6(0,0,0,1,1,1), "box_object1", "Box for the object1 where springs will be attached") ),
+- box_object2( initData( &box_object2, Vec6(0,0,0,1,1,1), "box_object2", "Box for the object2 where springs will be attached") )
++ box_object1( this->initData( &box_object1, Vec6(0,0,0,1,1,1), "box_object1", "Box for the object1 where springs will be attached") ),
++ box_object2( this->initData( &box_object2, Vec6(0,0,0,1,1,1), "box_object2", "Box for the object2 where springs will be attached") )
+ {
+ }
+
+--- sofa-framework-1.0~beta4~/modules/sofa/component/forcefield/HexahedronFEMForceFieldAndMass.inl
++++ sofa-framework-1.0~beta4/modules/sofa/component/forcefield/HexahedronFEMForceFieldAndMass.inl
+@@ -48,8 +48,8 @@
+ HexahedronFEMForceFieldAndMass<DataTypes>::HexahedronFEMForceFieldAndMass()
+ : MassT()
+ , HexahedronFEMForceFieldT()
+- ,_elementMasses(initData(&_elementMasses,"massMatrices", "Mass matrices per element (M_i)"))
+- , _density(initData(&_density,(Real)1.0,"density","density == volumetric mass in english (kg.m-3)"))
++ ,_elementMasses(this->initData(&_elementMasses,"massMatrices", "Mass matrices per element (M_i)"))
++ , _density(this->initData(&_density,(Real)1.0,"density","density == volumetric mass in english (kg.m-3)"))
+ {
+ _lumpedMass = this->initData(&_lumpedMass,false,"lumpedMass","Does it use lumped masses?");
+ }
+--- sofa-framework-1.0~beta4~/modules/sofa/component/forcefield/RegularGridSpringForceField.h
++++ sofa-framework-1.0~beta4/modules/sofa/component/forcefield/RegularGridSpringForceField.h
+@@ -63,32 +63,32 @@
+ public:
+ RegularGridSpringForceField(core::componentmodel::behavior::MechanicalState<DataTypes>* object1, core::componentmodel::behavior::MechanicalState<DataTypes>* object2)
+ : StiffSpringForceField<DataTypes>(object1, object2),
+- linesStiffness (initData(&linesStiffness,Real(100),"linesStiffness","Lines Stiffness"))
+- , linesDamping (initData(&linesDamping ,Real(5),"linesDamping" ,"Lines Damping"))
+- , quadsStiffness(initData(&quadsStiffness,Real(100),"quadsStiffness","Quads Stiffness"))
+- , quadsDamping (initData(&quadsDamping ,Real(5),"quadsDamping" ,"Quads Damping"))
+- , cubesStiffness(initData(&cubesStiffness,Real(100),"cubesStiffness","Cubes Stiffness"))
+- , cubesDamping (initData(&cubesDamping ,Real(5),"cubesDamping" ,"Cubes Damping"))
++ linesStiffness (this->initData(&linesStiffness,Real(100),"linesStiffness","Lines Stiffness"))
++ , linesDamping (this->initData(&linesDamping ,Real(5),"linesDamping" ,"Lines Damping"))
++ , quadsStiffness(this->initData(&quadsStiffness,Real(100),"quadsStiffness","Quads Stiffness"))
++ , quadsDamping (this->initData(&quadsDamping ,Real(5),"quadsDamping" ,"Quads Damping"))
++ , cubesStiffness(this->initData(&cubesStiffness,Real(100),"cubesStiffness","Cubes Stiffness"))
++ , cubesDamping (this->initData(&cubesDamping ,Real(5),"cubesDamping" ,"Cubes Damping"))
+ , topology(NULL)
+ {
+- addAlias(&linesStiffness, "stiffness");addAlias(&linesDamping, "damping");
+- addAlias(&quadsStiffness, "stiffness");addAlias(&quadsDamping, "damping");
+- addAlias(&cubesStiffness, "stiffness");addAlias(&cubesDamping, "damping");
++ this->addAlias(&linesStiffness, "stiffness");this->addAlias(&linesDamping, "damping");
++ this->addAlias(&quadsStiffness, "stiffness");this->addAlias(&quadsDamping, "damping");
++ this->addAlias(&cubesStiffness, "stiffness");this->addAlias(&cubesDamping, "damping");
+ }
+
+ RegularGridSpringForceField()
+ :
+- linesStiffness (initData(&linesStiffness,Real(100),"linesStiffness","Lines Stiffness"))
+- , linesDamping (initData(&linesDamping ,Real(5),"linesDamping" ,"Lines Damping"))
+- , quadsStiffness(initData(&quadsStiffness,Real(100),"quadsStiffness","Quads Stiffness"))
+- , quadsDamping (initData(&quadsDamping ,Real(5),"quadsDamping" ,"Quads Damping"))
+- , cubesStiffness(initData(&cubesStiffness,Real(100),"cubesStiffness","Cubes Stiffness"))
+- , cubesDamping (initData(&cubesDamping ,Real(5),"cubesDamping" ,"Cubes Damping"))
++ linesStiffness (this->initData(&linesStiffness,Real(100),"linesStiffness","Lines Stiffness"))
++ , linesDamping (this->initData(&linesDamping ,Real(5),"linesDamping" ,"Lines Damping"))
++ , quadsStiffness(this->initData(&quadsStiffness,Real(100),"quadsStiffness","Quads Stiffness"))
++ , quadsDamping (this->initData(&quadsDamping ,Real(5),"quadsDamping" ,"Quads Damping"))
++ , cubesStiffness(this->initData(&cubesStiffness,Real(100),"cubesStiffness","Cubes Stiffness"))
++ , cubesDamping (this->initData(&cubesDamping ,Real(5),"cubesDamping" ,"Cubes Damping"))
+ , topology(NULL)
+ {
+- addAlias(&linesStiffness, "stiffness");addAlias(&linesDamping, "damping");
+- addAlias(&quadsStiffness, "stiffness");addAlias(&quadsDamping, "damping");
+- addAlias(&cubesStiffness, "stiffness");addAlias(&cubesDamping, "damping");
++ this->addAlias(&linesStiffness, "stiffness");this->addAlias(&linesDamping, "damping");
++ this->addAlias(&quadsStiffness, "stiffness");this->addAlias(&quadsDamping, "damping");
++ this->addAlias(&cubesStiffness, "stiffness");this->addAlias(&cubesDamping, "damping");
+ }
+
+ Real getStiffness() const { return linesStiffness.getValue(); }
+--- sofa-framework-1.0~beta4~/modules/sofa/component/mass/MatrixMass.h
++++ sofa-framework-1.0~beta4/modules/sofa/component/mass/MatrixMass.h
+@@ -78,11 +78,11 @@
+
+
+ MatrixMass()
+- : f_mass( initData(&f_mass, "massMatrices", "values of the particles masses") )
+- , _defaultValue( initData(&_defaultValue, (Real)1.0,"defaultValue", "real default value") )
++ : f_mass( this->initData(&f_mass, "massMatrices", "values of the particles masses") )
++ , _defaultValue( this->initData(&_defaultValue, (Real)1.0,"defaultValue", "real default value") )
+ ,_usingDefaultDiagonalMatrices(false)
+ {
+- _lumped = initData( &this->_lumped, false, "lumped", "");
++ _lumped = this->initData( &this->_lumped, false, "lumped", "");
+ };
+
+ ~MatrixMass();
+--- sofa-framework-1.0~beta4~/modules/sofa/component/topology/DynamicSparseGridGeometryAlgorithms.inl
++++ sofa-framework-1.0~beta4/modules/sofa/component/topology/DynamicSparseGridGeometryAlgorithms.inl
+@@ -96,7 +96,7 @@
+ it = regular2topo.find( regularGridIndex);
+ if( it != regular2topo.end())
+ {
+- const Real d = computeElementRestDistanceMeasure(it->second, pos);
++ const Real d = this->computeElementRestDistanceMeasure(it->second, pos);
+ // std::cout << "Distance : " << d << "\n";
+ if(d<distance)
+ {
+@@ -116,9 +116,9 @@
+ return HexahedronSetGeometryAlgorithms<DataTypes>::findNearestElementInRestPos( pos, baryC, distance);
+ }
+
+- distance = computeElementRestDistanceMeasure( index, pos);
++ distance = this->computeElementRestDistanceMeasure( index, pos);
+
+- baryC = computeHexahedronRestBarycentricCoeficients(index, pos);
++ baryC = this->computeHexahedronRestBarycentricCoeficients(index, pos);
+
+ return index;
+ }
+--- sofa-framework-1.0~beta4~/modules/sofa/component/topology/EdgeSubsetData.inl
++++ sofa-framework-1.0~beta4/modules/sofa/component/topology/EdgeSubsetData.inl
+@@ -137,7 +137,7 @@
+
+ // test that there are no item with the key = s+i
+ assert(this->find(s+i)==this->end());
+- insert(std::pair<unsigned int,T>(s+i,t));
++ this->insert(std::pair<unsigned int,T>(s+i,t));
+ }
+ lastEdgeIndex+=nbEdges;
+ }
+@@ -160,10 +160,10 @@
+ {
+ /// change the key of the item associated with key lastEdgeIndex
+ T tmp=(*itend).second;
+- erase(itend);
+- insert(std::pair<unsigned int,T>(index[i],tmp));
++ this->erase(itend);
++ this->insert(std::pair<unsigned int,T>(index[i],tmp));
+ }
+- erase(it);
++ this->erase(it);
+ }
+ --lastEdgeIndex;
+ }
+--- sofa-framework-1.0~beta4~/modules/sofa/component/topology/TriangleSubsetData.inl
++++ sofa-framework-1.0~beta4/modules/sofa/component/topology/TriangleSubsetData.inl
+@@ -115,7 +115,7 @@
+
+ // test that there are no item with the key = s+i
+ assert(this->find(s+i)==this->end());
+- insert(std::pair<unsigned int,T>(s+i,t));
++ this->insert(std::pair<unsigned int,T>(s+i,t));
+ }
+ lastTriangleIndex+=nbTriangles;
+ }
+@@ -138,10 +138,10 @@
+ {
+ /// change the key of the item associated with key lastTriangleIndex
+ T tmp=(*itend).second;
+- erase(itend);
+- insert(std::pair<unsigned int,T>(index[i],tmp));
++ this->erase(itend);
++ this->insert(std::pair<unsigned int,T>(index[i],tmp));
+ }
+- erase(it);
++ this->erase(it);
+ }
+ --lastTriangleIndex;
+ }
Added: trunk/packages/sofa-framework/trunk/debian/patches/tinyxml26.diff
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/tinyxml26.diff (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/tinyxml26.diff 2012-05-31 16:18:32 UTC (rev 11143)
@@ -0,0 +1,48 @@
+--- a/applications/sofa/gui/qt/GraphVisitor.cpp
++++ b/applications/sofa/gui/qt/GraphVisitor.cpp
+@@ -207,10 +207,10 @@
+ Q3ListViewItem *graphNode=NULL;
+ switch (typeOfNode)
+ {
+- case TiXmlNode::DOCUMENT:
++ case TiXmlNode::TINYXML_DOCUMENT:
+ break;
+
+- case TiXmlNode::ELEMENT:
++ case TiXmlNode::TINYXML_ELEMENT:
+ if (nameOfNode == "Time")
+ {
+ openTime( node, parent);
+@@ -222,17 +222,17 @@
+ }
+ break;
+
+- case TiXmlNode::COMMENT:
++ case TiXmlNode::TINYXML_COMMENT:
+ graphNode = addComment(parent, elementAbove, nameOfNode);
+ break;
+
+- case TiXmlNode::UNKNOWN:
++ case TiXmlNode::TINYXML_UNKNOWN:
+ break;
+
+- case TiXmlNode::TEXT:
++ case TiXmlNode::TINYXML_TEXT:
+ break;
+
+- case TiXmlNode::DECLARATION:
++ case TiXmlNode::TINYXML_DECLARATION:
+ break;
+ default:
+ break;
+--- a/modules/sofa/simulation/tree/xml/XML.cpp
++++ b/modules/sofa/simulation/tree/xml/XML.cpp
+@@ -84,7 +84,7 @@
+ BaseElement* createNode(TiXmlNode* root, const char *basefilename, bool isRoot = false)
+ {
+ //if (!xmlStrcmp(root->name,(const xmlChar*)"text")) return NULL;
+- if (root->Type() != TiXmlNode::ELEMENT) return NULL;
++ if (root->Type() != TiXmlNode::TINYXML_ELEMENT) return NULL;
+ TiXmlElement* element = root->ToElement();
+ if (!element || !element->Value() || !element->Value()[0]) return NULL;
+
Modified: trunk/packages/sofa-framework/trunk/debian/rules
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/rules 2012-05-31 15:46:45 UTC (rev 11142)
+++ trunk/packages/sofa-framework/trunk/debian/rules 2012-05-31 16:18:32 UTC (rev 11143)
@@ -1,64 +1,42 @@
#!/usr/bin/make -f
+# Uncomment this to turn on verbose mode.
+# export DH_VERBOSE=1
-PACKAGE=sofa-framework
+PACKAGE := $(shell dpkg-parsechangelog | sed -n 's/^Source: //p')
DEB_SOURCE_PACKAGE:=$(PACKAGE)
-# quilt
-include /usr/share/quilt/quilt.make
+devpkg := libsofa1-dev
+apppkg := sofa-apps
+docpkg := sofa-doc
-# Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+%:
+ dh $@
-
get-orig-source:
. debian/get-orig-source
-configure: configure-stamp
-configure-stamp: $(QUILT_STAMPFN)
- dh_testdir
- # Add here commands to configure the package.
+override_dh_auto_configure:
qmake
(cd applications/projects/runSofa; qmake -o Makefile runSofa.pro)
# create a folder without object files
cp -a $(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
-
+override_dh_auto_build:
+ dh_auto_build
+ # Create the documentation files if debian/control does include the package definition
+ if grep -q "^Package: sofa-doc$$" debian/control ; then \
+ mkdir -p $(CURDIR)/doc/doxygen ; \
+ doxygen -u Doxyfile ; \
+ doxygen ; \
+ fi
# 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
-
- $(MAKE)
-
- touch $@
-
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp configure-stamp docs-stamp
+override_dh_clean:
rm -rf bin lib tutorials doc OBJ
# - rm -rf extlibs/tinyxml/
-
+
dh_clean
# some packages might remain after clean
@@ -86,113 +64,32 @@
applications/projects/Modeler/lib/Modeler.h \
applications/sofa/gui/qt/UI \
applications/projects/Modeler/lib/UI
+ rm -f Sofa.tag doxygen.log
-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
+override_dh_install:
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" -exec chmod 755 \{\} \;
-
find examples -type f -exec chmod 644 \{\} \;
find examples -name "*.sh" -exec chmod 755 \{\} \;
- dh_install -psofa-data share usr/share/sofa
- dh_install -psofa-data examples usr/share/sofa
-
- # Documentation
-# dh_install -psofa-doc doc/doxygen/html usr/share/doc/sofa-doc
- dh_install -psofa-doc debian/index.html usr/share/doc/sofa-doc/html
-
-
- 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
-
-# $(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 -af $(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 -af $(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 -af $(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
-
-
- # use dh_install directly
-### cp -a $(CURDIR)/lib/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/sofa usr/bin
-
-
-# called by binary-indep and binary-arch
-binary-common:
- dh_testdir
- dh_testroot
dh_install
- dh_installchangelogs
- dh_installdocs
- dh_installmenu
- dh_lintian
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_makeshlibs
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ # try only if doxygen was called above
+ if [ -d doc/doxygen/html ] ; then mv doc/doxygen/html/* $(CURDIR)/debian/$(docpkg)/usr/share/doc/sofa-doc/html ; fi
-# Build architecture independant packages using the common target.
-binary-indep: build-indep install-indep
- $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
+ # install some files directly into development package
+ mkdir -p $(CURDIR)/debian/$(devpkg)/usr/include
+ for dir in framework modules applications ; do \
+ for header in `find $$dir -name "*.h" -o -name "*.inl"` ; do \
+ target=`echo $$header | sed "s?^$${dir}/??"`; \
+ mkdir -p `dirname debian/$(devpkg)/usr/include/$$target`; \
+ cp -a $$header debian/$(devpkg)/usr/include/$$target ; \
+ done ; \
+ done
-# 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
+ # rename runSofa
+ mkdir -p $(CURDIR)/debian/$(apppkg)/usr/lib/sofa-framework
+ mv $(CURDIR)/bin/runSofa $(CURDIR)/debian/$(apppkg)/usr/lib/sofa-framework/sofa
Added: trunk/packages/sofa-framework/trunk/debian/sofa-apps.install
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/sofa-apps.install (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/sofa-apps.install 2012-05-31 16:18:32 UTC (rev 11143)
@@ -0,0 +1,3 @@
+debian/sofa.desktop usr/share/applications
+debian/sofa.xpm usr/share/pixmaps
+debian/sofa usr/bin
Added: trunk/packages/sofa-framework/trunk/debian/sofa-data.install
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/sofa-data.install (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/sofa-data.install 2012-05-31 16:18:32 UTC (rev 11143)
@@ -0,0 +1,2 @@
+share usr/share/sofa
+examples usr/share/sofa
Added: trunk/packages/sofa-framework/trunk/debian/sofa-doc.install
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/sofa-doc.install (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/sofa-doc.install 2012-05-31 16:18:32 UTC (rev 11143)
@@ -0,0 +1 @@
+debian/index.html usr/share/doc/sofa-doc/html
Added: trunk/packages/sofa-framework/trunk/debian/sofa-tutorials.install
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/sofa-tutorials.install (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/sofa-tutorials.install 2012-05-31 16:18:32 UTC (rev 11143)
@@ -0,0 +1 @@
+tutorials usr/share/sofa
More information about the debian-med-commit
mailing list