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

[Andreas Tille]

Author: tille
Date: 2011-12-24 14:54:18 +0000 (Sat, 24 Dec 2011)
New Revision: 9096

Modified:
   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/patches/30_newmat.patch
Log:
Try to make use of Debian packaged libraries (not fully tested)


Modified: trunk/packages/sofa-framework/trunk/debian/changelog
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/changelog	2011-12-24 08:49:27 UTC (rev 9095)
+++ trunk/packages/sofa-framework/trunk/debian/changelog	2011-12-24 14:54:18 UTC (rev 9096)
@@ -2,14 +2,18 @@
 
   * New upstream version
   * debian/watch: also seek for https URLs
-  * debian/get-orig-source: Fetch any new version not only one hard
-    coded version
+  * 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
+  * debian/control:
+    - Build-Depends: libeigen3-dev, libqglviewer-qt4-dev
 
  -- Andreas Tille <tille at debian.org>  Mon, 19 Dec 2011 15:05:24 +0100
 

Modified: trunk/packages/sofa-framework/trunk/debian/control
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/control	2011-12-24 08:49:27 UTC (rev 9095)
+++ trunk/packages/sofa-framework/trunk/debian/control	2011-12-24 14:54:18 UTC (rev 9096)
@@ -11,9 +11,11 @@
                libboost-graph-dev,
                libboost-thread-dev,
                libboost-system-dev,
+               libeigen3-dev,
                libglew-dev,
                libnewmat10-dev,
                libpng12-dev,
+               libqglviewer-qt4-dev,
                libqt4-dev,
                libqt4-opengl-dev,
                libqwt5-qt4-dev,

Modified: trunk/packages/sofa-framework/trunk/debian/get-orig-source
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/get-orig-source	2011-12-24 08:49:27 UTC (rev 9095)
+++ trunk/packages/sofa-framework/trunk/debian/get-orig-source	2011-12-24 14:54:18 UTC (rev 9096)
@@ -42,10 +42,12 @@
 find .. -mindepth 1 -maxdepth 1 -name "sofa-*.zip" -delete
 
 rm -rf extlibs/miniBoost       # libboost-dev
-rm -rf extlibs/libQGLViewer    # libqglviewer-dev
-rm -rf extlibs/qwt             # libqwt-dev
+rm -rf extlibs/libQGLViewer*   # libqglviewer-dev
+rm -rf extlibs/eigen*          # libeigen3-dev
+rm -rf extlibs/qwt*            # libqwt-dev
 rm -rf extlibs/newmat          # libnewmat10-dev
 rm -rf extlibs/csparse         # libsuitesparse-dev
+rm -rf extlibs/tinyxml         # libtinyxml-dev (>= 2.6)
 # the external libraries are still there:
 # LML  miniFlowVR  PML tinyxml
 

Modified: trunk/packages/sofa-framework/trunk/debian/patches/30_newmat.patch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/30_newmat.patch	2011-12-24 08:49:27 UTC (rev 9095)
+++ trunk/packages/sofa-framework/trunk/debian/patches/30_newmat.patch	2011-12-24 14:54:18 UTC (rev 9096)
@@ -1,21 +1,49 @@
---- sofa-framework-1.0~rc1.orig/sofa-dependencies.prf
-+++ sofa-framework-1.0~rc1/sofa-dependencies.prf
-@@ -16,12 +16,13 @@ declare(zlib,   zlib.prf)
+--- 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(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-framework-1.0~rc1/features/sofa/newmat.prf
++++ 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 @@
++LIBS *= -lqwt5-qt4
+--- /dev/null
++++ sofa-1.0-rc1/features/sofa/eigen.prf
+@@ -0,0 +1 @@
++INCLUDES *= /usr/include/eigen3
+--- /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