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

Dominique Belhachemi domibel-guest at alioth.debian.org
Thu Jun 11 00:46:41 UTC 2009 

Author: domibel-guest
Date: 2009-06-11 00:46:40 +0000 (Thu, 11 Jun 2009)
New Revision: 3481

Modified:
   trunk/packages/sofa-framework/trunk/debian/changelog
   trunk/packages/sofa-framework/trunk/debian/control
   trunk/packages/sofa-framework/trunk/debian/libsofa1.lintian-overrides
   trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.dpatch
Log:
csparse support disabled


Modified: trunk/packages/sofa-framework/trunk/debian/changelog
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/changelog	2009-06-10 22:06:46 UTC (rev 3480)
+++ trunk/packages/sofa-framework/trunk/debian/changelog	2009-06-11 00:46:40 UTC (rev 3481)
@@ -4,7 +4,8 @@
   * Qt OGRE 3D viewer disabled (Closes: #527706)
   * MIPS/ARM patch, AMD64 patch and Newmat patch removed because they
     have been applied by upstream (Thanks to Everton Hermann)
-  * depends on libsuitesparse-dev now (Closes: #532693)
+  * csparse support disabled because it conflicts with the
+    newer version in libsuitesparse-dev (Closes: #532693)
 
  -- Dominique Belhachemi <domibel at cs.tu-berlin.de>  Sun, 07 Jun 2009 14:35:15 -0400
 

Modified: trunk/packages/sofa-framework/trunk/debian/control
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/control	2009-06-10 22:06:46 UTC (rev 3480)
+++ trunk/packages/sofa-framework/trunk/debian/control	2009-06-11 00:46:40 UTC (rev 3481)
@@ -6,8 +6,7 @@
 Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
 Build-Depends: debhelper (>= 7), dpatch, freeglut3-dev, libnewmat10-dev,
  libglew-dev, libqt4-dev, libqt4-opengl-dev, libboost-dev, libxml2-dev,
- libboost-graph-dev, libboost-thread-dev, libqwt5-qt4-dev, libpng-dev, pkg-config,
- libsuitesparse-dev
+ libboost-graph-dev, libboost-thread-dev, libqwt5-qt4-dev, libpng-dev, pkg-config
 Build-Depends-Indep: doxygen, graphviz
 Standards-Version: 3.8.1
 Homepage: http://www.sofa-framework.org/

Modified: trunk/packages/sofa-framework/trunk/debian/libsofa1.lintian-overrides
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/libsofa1.lintian-overrides	2009-06-10 22:06:46 UTC (rev 3480)
+++ trunk/packages/sofa-framework/trunk/debian/libsofa1.lintian-overrides	2009-06-11 00:46:40 UTC (rev 3481)
@@ -1 +1 @@
-libsofa1: package-name-doesnt-match-sonames libcsparse1 libload1 libminiFlowVR1 libphysicalmodel1 libsofacomponent1 libsofacomponentbase1 libsofacomponentbehaviormodel1 libsofacomponentcollision1 libsofacomponentconstraint1 libsofacomponentcontextobject1 libsofacomponentcontroller1 libsofacomponentengine1 libsofacomponentfem1 libsofacomponentforcefield1 libsofacomponentinteractionforcefield1 libsofacomponentlinearsolver1 libsofacomponentmapping1 libsofacomponentmass1 libsofacomponentmastersolver1 libsofacomponentmisc1 libsofacomponentodesolver1 libsofacomponentvisualmodel1 libsofacore1 libsofadefaulttype1 libsofagui1 libsofaguiglut1 libsofaguimain1 libsofaguiqt1 libsofahelper1 libsofamodeler1 libsofapml1 libsofasimulation1 libsofatree1 libtinyxml1
+libsofa1: package-name-doesnt-match-sonames libload1 libminiFlowVR1 libphysicalmodel1 libsofacomponent1 libsofacomponentbase1 libsofacomponentbehaviormodel1 libsofacomponentcollision1 libsofacomponentconstraint1 libsofacomponentcontextobject1 libsofacomponentcontroller1 libsofacomponentengine1 libsofacomponentfem1 libsofacomponentforcefield1 libsofacomponentinteractionforcefield1 libsofacomponentlinearsolver1 libsofacomponentmapping1 libsofacomponentmass1 libsofacomponentmastersolver1 libsofacomponentmisc1 libsofacomponentodesolver1 libsofacomponentvisualmodel1 libsofacore1 libsofadefaulttype1 libsofagui1 libsofaguiglut1 libsofaguimain1 libsofaguiqt1 libsofahelper1 libsofamodeler1 libsofapml1 libsofasimulation1 libsofatree1 libtinyxml1

Modified: trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.dpatch	2009-06-10 22:06:46 UTC (rev 3480)
+++ trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.dpatch	2009-06-11 00:46:40 UTC (rev 3481)
@@ -7,8 +7,8 @@
 
 @DPATCH@
 diff -urNad sofa-framework-1.0~beta4~/Sofa.pro sofa-framework-1.0~beta4/Sofa.pro
---- sofa-framework-1.0~beta4~/Sofa.pro	2009-06-10 17:48:18.000000000 -0400
-+++ sofa-framework-1.0~beta4/Sofa.pro	2009-06-10 17:49:21.000000000 -0400
+--- sofa-framework-1.0~beta4~/Sofa.pro	2009-03-20 18:41:25.000000000 -0400
++++ sofa-framework-1.0~beta4/Sofa.pro	2009-06-10 19:06:32.000000000 -0400
 @@ -3,10 +3,10 @@
  
  include($${SOFA_DIR}/sofa.cfg) 
@@ -41,8 +41,8 @@
  
  # PML
 diff -urNad sofa-framework-1.0~beta4~/framework/sofa/helper/gl/DrawManager.cpp sofa-framework-1.0~beta4/framework/sofa/helper/gl/DrawManager.cpp
---- sofa-framework-1.0~beta4~/framework/sofa/helper/gl/DrawManager.cpp	2009-06-10 17:48:18.000000000 -0400
-+++ sofa-framework-1.0~beta4/framework/sofa/helper/gl/DrawManager.cpp	2009-06-10 17:48:32.000000000 -0400
+--- sofa-framework-1.0~beta4~/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	2009-06-10 19:06:32.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]);
@@ -53,8 +53,8 @@
  #endif
        }
 diff -urNad sofa-framework-1.0~beta4~/sofa-default.cfg sofa-framework-1.0~beta4/sofa-default.cfg
---- sofa-framework-1.0~beta4~/sofa-default.cfg	2009-06-10 17:48:18.000000000 -0400
-+++ sofa-framework-1.0~beta4/sofa-default.cfg	2009-06-10 17:48:32.000000000 -0400
+--- sofa-framework-1.0~beta4~/sofa-default.cfg	2009-03-20 18:41:25.000000000 -0400
++++ sofa-framework-1.0~beta4/sofa-default.cfg	2009-06-10 19:14:33.000000000 -0400
 @@ -47,7 +47,7 @@
  # DEFINES += SOFA_HAVE_FLOWVR
  
@@ -86,15 +86,6 @@
  
  # Uncomment if you want to have the possibility to trave the visitor execution
  DEFINES += DUMP_VISITOR_INFO
-@@ -86,7 +86,7 @@
- # DEFINES += SOFA_XML_PARSER_LIBXML
- 
- # Uncomment if you want to use csparse
--# DEFINES += SOFA_HAVE_CSPARSE
-+ DEFINES += SOFA_HAVE_CSPARSE
- 
- 
- # Uncomment if you want to use METIS
 @@ -110,6 +110,8 @@
    # Choose if you want to compile the debug or release version
  #CONFIG = debug
@@ -105,8 +96,8 @@
    # Uncomment if you want debug symbols even in release build
    # QMAKE_CXXFLAGS += -g
 diff -urNad sofa-framework-1.0~beta4~/sofa.cfg sofa-framework-1.0~beta4/sofa.cfg
---- sofa-framework-1.0~beta4~/sofa.cfg	2009-06-10 17:48:18.000000000 -0400
-+++ sofa-framework-1.0~beta4/sofa.cfg	2009-06-10 17:48:32.000000000 -0400
+--- sofa-framework-1.0~beta4~/sofa.cfg	2009-03-20 18:41:25.000000000 -0400
++++ sofa-framework-1.0~beta4/sofa.cfg	2009-06-10 19:06:32.000000000 -0400
 @@ -19,7 +19,8 @@
  
  # Auto-detect Qt 4.x

More information about the debian-med-commit mailing list