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

domibel-guest at alioth.debian.org domibel-guest at alioth.debian.org
Fri Nov 14 01:17:20 UTC 2008 

Author: domibel-guest
Date: 2008-11-14 01:17:20 +0000 (Fri, 14 Nov 2008)
New Revision: 2676

Added:
   trunk/packages/sofa-framework/trunk/debian/patches/47_png.dpatch
Modified:
   trunk/packages/sofa-framework/trunk/debian/README.Debian
   trunk/packages/sofa-framework/trunk/debian/changelog
   trunk/packages/sofa-framework/trunk/debian/control
   trunk/packages/sofa-framework/trunk/debian/patches/00list
   trunk/packages/sofa-framework/trunk/debian/patches/44_ogre.dpatch
Log:
PNG, OGRE, Build-Depends-Indep


Modified: trunk/packages/sofa-framework/trunk/debian/README.Debian
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/README.Debian	2008-11-13 13:15:52 UTC (rev 2675)
+++ trunk/packages/sofa-framework/trunk/debian/README.Debian	2008-11-14 01:17:20 UTC (rev 2676)
@@ -7,7 +7,7 @@
 Project MESSAGE: | Mode: RELEASE
 Project MESSAGE: | Qt version: 4.x
 Project MESSAGE: | RDTSC timer: DISABLED
-Project MESSAGE: | PNG support: DISABLED
+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
@@ -15,7 +15,7 @@
 Project MESSAGE: | Qt GUI: ENABLED
 Project MESSAGE: | - Qt OpenGL viewer: ENABLED
 Project MESSAGE: | - Qt QGLViewer viewer: DISABLED
-Project MESSAGE: | - Qt OGRE 3D viewer: DISABLED
+Project MESSAGE: | - Qt OGRE 3D viewer: ENABLED
 Project MESSAGE: ======================================
 
 

Modified: trunk/packages/sofa-framework/trunk/debian/changelog
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/changelog	2008-11-13 13:15:52 UTC (rev 2675)
+++ trunk/packages/sofa-framework/trunk/debian/changelog	2008-11-14 01:17:20 UTC (rev 2676)
@@ -1,3 +1,11 @@
+sofa-framework (1.0~beta3-4) unstable; urgency=low
+
+  * PNG support enabled
+  * Qt OGRE 3D viewer enabled
+  * debian/control: doxygen & graphviz moved to Build-Depends-Indep
+
+ -- Dominique Belhachemi <domibel at cs.tu-berlin.de>  Wed, 12 Nov 2008 20:36:57 +0100
+
 sofa-framework (1.0~beta3-3) unstable; urgency=low
 
   * fixed build-indep issue (Closes: #503555)

Modified: trunk/packages/sofa-framework/trunk/debian/control
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/control	2008-11-13 13:15:52 UTC (rev 2675)
+++ trunk/packages/sofa-framework/trunk/debian/control	2008-11-14 01:17:20 UTC (rev 2676)
@@ -5,8 +5,9 @@
 DM-Upload-Allowed: yes
 Uploaders: Dominique Belhachemi <domibel at cs.tu-berlin.de>
 Build-Depends: debhelper (>= 6), dpatch, libxml2-dev, freeglut3-dev, libnewmat10-dev,
- libfltk1.1-dev, doxygen, graphviz, libglew-dev, libqt4-dev, libqt4-opengl-dev
- libboost-dev, libboost-graph-dev, libqwt5-qt4-dev
+ libfltk1.1-dev, libglew-dev, libqt4-dev, libqt4-opengl-dev, libboost-dev,
+ libboost-graph-dev, libqwt5-qt4-dev, libpng-dev, libogre-dev
+Build-Depends-Indep: doxygen, graphviz
 Standards-Version: 3.8.0
 Homepage: http://www.sofa-framework.org/
 

Modified: trunk/packages/sofa-framework/trunk/debian/patches/00list
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/00list	2008-11-13 13:15:52 UTC (rev 2675)
+++ trunk/packages/sofa-framework/trunk/debian/patches/00list	2008-11-14 01:17:20 UTC (rev 2676)
@@ -1,5 +1,6 @@
 22_amd64_segfault.dpatch
 25_newmat.dpatch
 #10changes.dpatch
-#44_ogre.dpatch
+44_ogre.dpatch
+47_png.dpatch
 55_fix_mips_sqrt.dpatch

Modified: trunk/packages/sofa-framework/trunk/debian/patches/44_ogre.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/44_ogre.dpatch	2008-11-13 13:15:52 UTC (rev 2675)
+++ trunk/packages/sofa-framework/trunk/debian/patches/44_ogre.dpatch	2008-11-14 01:17:20 UTC (rev 2676)
@@ -1,19 +1,33 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## 44_ogre.dpatch by  <domibel at sid1500>
+## 44_ogre.dpatch by  <domibel at ve2056622895.ihrserver.de>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
 ## DP: No description.
 
 @DPATCH@
-diff -urNad sofa-1.0.0~/sofa-default.cfg sofa-1.0.0/sofa-default.cfg
---- sofa-1.0.0~/sofa-default.cfg	2008-08-13 17:24:23.000000000 +0200
-+++ sofa-1.0.0/sofa-default.cfg	2008-08-13 22:00:17.000000000 +0200
+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
+@@ -323,8 +323,8 @@
+ 
+ 
+ 
+-	    Display* display = qt_xdisplay(); //XOpenDisplay(NULL);
+- 	    int screen = qt_xscreen(); //DefaultScreen(display);
++	    Display* display = XOpenDisplay(NULL);
++ 	    int screen = DefaultScreen(display);
+ 
+ // 	    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
 @@ -20,7 +20,7 @@
    DEFINES += SOFA_GUI_QTVIEWER
  
  # Uncomment if you want to compile QTOgreViewer interface
 -# DEFINES += SOFA_GUI_QTOGREVIEWER
-+ DEFINES += SOFA_GUI_QTOGREVIEWER
++  DEFINES += SOFA_GUI_QTOGREVIEWER
  
  # Uncomment if you want to compile QGLViewer interface
  # DEFINES += SOFA_GUI_QGLVIEWER
@@ -26,15 +40,16 @@
  
  # Uncomment if you want to support moving frames when computing inertia forces in Mass
  # DEFINES += SOFA_SUPPORT_MOVING_FRAMES
-diff -urNad sofa-1.0.0~/sofa.cfg sofa-1.0.0/sofa.cfg
---- sofa-1.0.0~/sofa.cfg	2008-08-13 17:24:23.000000000 +0200
-+++ sofa-1.0.0/sofa.cfg	2008-08-13 22:00:58.000000000 +0200
-@@ -345,6 +345,8 @@
+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 @@
  		LIBS += OgreMain.lib  
  	}
  	INCLUDEPATH += $$SOFA_DIR/extlibs/qwt
 +	INCLUDEPATH += /usr/include/OGRE/
-+
- 	SOFA_GUI_EXT_LIBS *= -lqwt$${LIBSUFFIX}
+ 	SOFA_GUI_EXT_LIBS *= -lqwt-qt4$${LIBSUFFIX}
++	SOFA_GUI_EXT_LIBS *= -lOgreMain$${LIBSUFFIX}
  }
  
+ ########################################################################

Added: trunk/packages/sofa-framework/trunk/debian/patches/47_png.dpatch
===================================================================
--- trunk/packages/sofa-framework/trunk/debian/patches/47_png.dpatch	                        (rev 0)
+++ trunk/packages/sofa-framework/trunk/debian/patches/47_png.dpatch	2008-11-14 01:17:20 UTC (rev 2676)
@@ -0,0 +1,19 @@
+#! /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


Property changes on: trunk/packages/sofa-framework/trunk/debian/patches/47_png.dpatch
___________________________________________________________________
Name: svn:executable
   + *

More information about the debian-med-commit mailing list