Author: domibel-guest Date: 2009-05-11 03:30:35 +0000 (Mon, 11 May 2009) New Revision: 3375
Removed: trunk/packages/sofa-framework/trunk/debian/PML/ trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch trunk/packages/sofa-framework/trunk/debian/patches/22_amd64_segfault.dpatch Modified: trunk/packages/sofa-framework/trunk/debian/changelog trunk/packages/sofa-framework/trunk/debian/compat trunk/packages/sofa-framework/trunk/debian/control trunk/packages/sofa-framework/trunk/debian/get-orig-source trunk/packages/sofa-framework/trunk/debian/patches/00list trunk/packages/sofa-framework/trunk/debian/patches/10changes.dpatch trunk/packages/sofa-framework/trunk/debian/rules Log: preparation for beta4 Modified: trunk/packages/sofa-framework/trunk/debian/changelog =================================================================== --- trunk/packages/sofa-framework/trunk/debian/changelog 2009-05-10 19:39:41 UTC (rev 3374) +++ trunk/packages/sofa-framework/trunk/debian/changelog 2009-05-11 03:30:35 UTC (rev 3375) @@ -1,3 +1,9 @@ +sofa-framework (1.0~beta4-1) UNRELEASED; urgency=low + + * new upstream version + + -- Dominique Belhachemi <[email protected]> Wed, 25 Mar 2009 19:11:06 +0000 + sofa-framework (1.0~beta3-5) unstable; urgency=low * set SOFA_QT4 explicitly Modified: trunk/packages/sofa-framework/trunk/debian/compat =================================================================== --- trunk/packages/sofa-framework/trunk/debian/compat 2009-05-10 19:39:41 UTC (rev 3374) +++ trunk/packages/sofa-framework/trunk/debian/compat 2009-05-11 03:30:35 UTC (rev 3375) @@ -1 +1 @@ -6 +7 Modified: trunk/packages/sofa-framework/trunk/debian/control =================================================================== --- trunk/packages/sofa-framework/trunk/debian/control 2009-05-10 19:39:41 UTC (rev 3374) +++ trunk/packages/sofa-framework/trunk/debian/control 2009-05-11 03:30:35 UTC (rev 3375) @@ -4,11 +4,12 @@ Maintainer: Debian-Med Packaging Team <[email protected]> DM-Upload-Allowed: yes Uploaders: Dominique Belhachemi <[email protected]> -Build-Depends: debhelper (>= 6.0.7~), dpatch, libxml2-dev, freeglut3-dev, libnewmat10-dev, +Build-Depends: debhelper (>= 7), dpatch, libxml2-dev, freeglut3-dev, libnewmat10-dev, libfltk1.1-dev, libglew-dev, libqt4-dev, libqt4-opengl-dev, libboost-dev, - libboost-graph-dev, libqwt5-qt4-dev, libpng-dev, libogre-dev + libboost-graph-dev, libqwt5-qt4-dev, libpng-dev, libogre-dev, libqglviewer-qt4-dev, + libboost-thread1.38-dev Build-Depends-Indep: doxygen, graphviz -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Homepage: http://www.sofa-framework.org/ Modified: trunk/packages/sofa-framework/trunk/debian/get-orig-source =================================================================== --- trunk/packages/sofa-framework/trunk/debian/get-orig-source 2009-05-10 19:39:41 UTC (rev 3374) +++ trunk/packages/sofa-framework/trunk/debian/get-orig-source 2009-05-11 03:30:35 UTC (rev 3375) @@ -1,38 +1,32 @@ #!/bin/sh -e -mkdir -p tmp-sofa-framework/downloads +OUTDIR=tmp-sofa-framework/downloads +mkdir -p ${OUTDIR} -wget http://gforge.inria.fr/frs/download.php/5654/sofa-framework-1.0-beta3.zip -wget http://gforge.inria.fr/frs/download.php/5598/sofa-modules-1.0-beta3.zip -wget http://gforge.inria.fr/frs/download.php/5596/sofa-applications-1.0-beta3.zip +wget -c http://gforge.inria.fr/frs/download.php/19534/sofa-framework-1.0-beta4.zip -P ${OUTDIR} +wget -c http://gforge.inria.fr/frs/download.php/19535/sofa-modules-1.0-beta4.zip -P ${OUTDIR} +wget -c http://gforge.inria.fr/frs/download.php/19536/sofa-applications-1.0-beta4.zip -P ${OUTDIR} -mv sofa-framework-1.0-beta3.zip tmp-sofa-framework/downloads -mv sofa-modules-1.0-beta3.zip tmp-sofa-framework/downloads -mv sofa-applications-1.0-beta3.zip tmp-sofa-framework/downloads +mkdir -p tmp-sofa-framework/repackaged/sofa-framework-1.0~beta4 +cd tmp-sofa-framework/repackaged/sofa-framework-1.0~beta4 -############################################################ +unzip ../../downloads/sofa-framework-1.0-beta4.zip +unzip ../../downloads/sofa-modules-1.0-beta4.zip +unzip ../../downloads/sofa-applications-1.0-beta4.zip -mkdir -p tmp-sofa-framework/repackaged/sofa-framework-1.0~beta3 -cd tmp-sofa-framework/repackaged/sofa-framework-1.0~beta3 - -unzip ../../downloads/sofa-framework-1.0-beta3.zip -unzip ../../downloads/sofa-modules-1.0-beta3.zip -unzip ../../downloads/sofa-applications-1.0-beta3.zip - -rm -rf extlibs/boost/ # libboost-dev -rm -rf extlibs/libQGLViewer/ # libqglviewer-dev -rm -rf extlibs/qwt/ # libqwt-dev -rm -rf extlibs/NewMAT/ # libnewmat10-dev +rm -rf extlibs/miniBoost # libboost-dev +rm -rf extlibs/libQGLViewer # libqglviewer-dev +rm -rf extlibs/qwt # libqwt-dev +rm -rf extlibs/newmat # libnewmat10-dev # the external libraries are still there: -# LML, miniFlowVR, PML +# csparse LML miniFlowVR PML tinyxml - cd .. -tar cvzf sofa-framework_1.0~beta3.orig.tar.gz sofa-framework-1.0~beta3 -mv sofa-framework-1.0~beta3 ../../ -mv sofa-framework_1.0~beta3.orig.tar.gz ../../ +tar cvzf sofa-framework_1.0~beta4.orig.tar.gz sofa-framework-1.0~beta4 +mv sofa-framework-1.0~beta4 ../../ +mv sofa-framework_1.0~beta4.orig.tar.gz ../../ cd ../../ rm -rf tmp-sofa-framework/ -rm -rf sofa-framework-1.0~beta3/ +rm -rf sofa-framework-1.0~beta4/ Modified: trunk/packages/sofa-framework/trunk/debian/patches/00list =================================================================== --- trunk/packages/sofa-framework/trunk/debian/patches/00list 2009-05-10 19:39:41 UTC (rev 3374) +++ trunk/packages/sofa-framework/trunk/debian/patches/00list 2009-05-11 03:30:35 UTC (rev 3375) @@ -1,6 +1,5 @@ -13_gcc4.4.dpatch -22_amd64_segfault.dpatch -25_newmat.dpatch +#25_newmat.dpatch #10changes.dpatch -44_ogre.dpatch -55_fix_mips_sqrt.dpatch +#44_ogre.dpatch +#55_fix_mips_sqrt.dpatch +07_all_patches.dpatch Modified: trunk/packages/sofa-framework/trunk/debian/patches/10changes.dpatch =================================================================== --- trunk/packages/sofa-framework/trunk/debian/patches/10changes.dpatch 2009-05-10 19:39:41 UTC (rev 3374) +++ trunk/packages/sofa-framework/trunk/debian/patches/10changes.dpatch 2009-05-11 03:30:35 UTC (rev 3375) @@ -16,27 +16,6 @@ SUBDIRS += framework SUBDIRS += modules SUBDIRS += applications -diff -urNad sofa-1.0.2~/applications/sofa/gui/qt/qt.pro.rej sofa-1.0.2/applications/sofa/gui/qt/qt.pro.rej ---- sofa-1.0.2~/applications/sofa/gui/qt/qt.pro.rej 1970-01-01 01:00:00.000000000 +0100 -+++ sofa-1.0.2/applications/sofa/gui/qt/qt.pro.rej 2008-02-16 23:19:45.000000000 +0100 -@@ -0,0 +1,17 @@ -+*************** -+*** 5,11 **** -+ include($$SOFA_DIR/sofa.cfg) -+ -+ TARGET = sofaguiqt$$LIBSUFFIX -+- CONFIG += $$CONFIGLIBRARIES qt uic3 -+ QT += opengl qt3support -+ LIBS += $$SOFA_FRAMEWORK_LIBS $$SOFA_MODULES_LIBS -+ LIBS += $$SOFA_EXT_LIBS -+--- 5,11 ---- -+ include($$SOFA_DIR/sofa.cfg) -+ -+ TARGET = sofaguiqt$$LIBSUFFIX -++ CONFIG += $$CONFIGLIBRARIES qt uic-qt3 -+ QT += opengl qt3support -+ LIBS += $$SOFA_FRAMEWORK_LIBS $$SOFA_MODULES_LIBS -+ LIBS += $$SOFA_EXT_LIBS diff -urNad sofa-1.0.2~/framework/sofa/defaulttype/NewMatSofaMatrix.h sofa-1.0.2/framework/sofa/defaulttype/NewMatSofaMatrix.h --- sofa-1.0.2~/framework/sofa/defaulttype/NewMatSofaMatrix.h 2008-02-16 23:18:50.000000000 +0100 +++ sofa-1.0.2/framework/sofa/defaulttype/NewMatSofaMatrix.h 2008-02-16 23:19:45.000000000 +0100 Deleted: trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch =================================================================== --- trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch 2009-05-10 19:39:41 UTC (rev 3374) +++ trunk/packages/sofa-framework/trunk/debian/patches/13_gcc4.4.dpatch 2009-05-11 03:30:35 UTC (rev 3375) @@ -1,63 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 13_gcc4.4.dpatch by <[email protected]> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: added #include headers required by GCC 4.4 (Closes: #505953) - -...@dpatch@ -diff -urNad sofa-framework-1.0~beta3~/framework/sofa/helper/Quater.inl sofa-framework-1.0~beta3/framework/sofa/helper/Quater.inl ---- sofa-framework-1.0~beta3~/framework/sofa/helper/Quater.inl 2008-08-12 08:53:41.000000000 +0000 -+++ sofa-framework-1.0~beta3/framework/sofa/helper/Quater.inl 2008-11-19 01:18:38.000000000 +0000 -@@ -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~beta3~/framework/sofa/helper/gl/Capture.cpp sofa-framework-1.0~beta3/framework/sofa/helper/gl/Capture.cpp ---- sofa-framework-1.0~beta3~/framework/sofa/helper/gl/Capture.cpp 2008-08-12 08:53:40.000000000 +0000 -+++ sofa-framework-1.0~beta3/framework/sofa/helper/gl/Capture.cpp 2008-11-19 01:17:55.000000000 +0000 -@@ -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~beta3~/framework/sofa/helper/io/ImageBMP.cpp sofa-framework-1.0~beta3/framework/sofa/helper/io/ImageBMP.cpp ---- sofa-framework-1.0~beta3~/framework/sofa/helper/io/ImageBMP.cpp 2008-08-12 08:53:40.000000000 +0000 -+++ sofa-framework-1.0~beta3/framework/sofa/helper/io/ImageBMP.cpp 2008-11-19 01:17:17.000000000 +0000 -@@ -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~beta3~/framework/sofa/helper/io/MeshTrian.cpp sofa-framework-1.0~beta3/framework/sofa/helper/io/MeshTrian.cpp ---- sofa-framework-1.0~beta3~/framework/sofa/helper/io/MeshTrian.cpp 2008-08-12 08:53:40.000000000 +0000 -+++ sofa-framework-1.0~beta3/framework/sofa/helper/io/MeshTrian.cpp 2008-11-19 01:18:18.000000000 +0000 -@@ -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> - -diff -urNad sofa-framework-1.0~beta3~/sofa.cfg sofa-framework-1.0~beta3/sofa.cfg ---- sofa-framework-1.0~beta3~/sofa.cfg 2008-08-12 08:56:12.000000000 +0000 -+++ sofa-framework-1.0~beta3/sofa.cfg 2008-11-19 01:19:19.000000000 +0000 -@@ -19,7 +19,7 @@ - - # Auto-detect Qt 4.x - # The QT variable was introduced in Qt 4 --!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 Deleted: trunk/packages/sofa-framework/trunk/debian/patches/22_amd64_segfault.dpatch =================================================================== --- trunk/packages/sofa-framework/trunk/debian/patches/22_amd64_segfault.dpatch 2009-05-10 19:39:41 UTC (rev 3374) +++ trunk/packages/sofa-framework/trunk/debian/patches/22_amd64_segfault.dpatch 2009-05-11 03:30:35 UTC (rev 3375) @@ -1,32 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 22_amd64_segfault.dpatch by <domi...@sid1500> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: fix: segfault on amd64 + qt4 - -...@dpatch@ -diff -urNad sofa-framework-1.0~beta3~/applications/sofa/gui/qt/RealGUI.cpp sofa-framework-1.0~beta3/applications/sofa/gui/qt/RealGUI.cpp ---- sofa-framework-1.0~beta3~/applications/sofa/gui/qt/RealGUI.cpp 2008-11-16 20:22:30.000000000 +0100 -+++ sofa-framework-1.0~beta3/applications/sofa/gui/qt/RealGUI.cpp 2008-11-16 20:30:28.000000000 +0100 -@@ -180,7 +180,7 @@ - class QSOFAApplication : public QApplication - { - public: -- QSOFAApplication(int argc, char ** argv) -+ QSOFAApplication(int &argc, char ** argv) - : QApplication(argc,argv) - { - } -@@ -206,10 +206,10 @@ - { - { - int argc=1; -- char* argv[1]; -+ char **argv = new char*[2]; - argv[0] = strdup ( SofaGUI::GetProgramName() ); -+ argv[1]=NULL; - application = new QSOFAApplication ( argc,argv ); -- free ( argv[0] ); - } - // create interface - gui = new RealGUI ( name, options ); Modified: trunk/packages/sofa-framework/trunk/debian/rules =================================================================== --- trunk/packages/sofa-framework/trunk/debian/rules 2009-05-10 19:39:41 UTC (rev 3374) +++ trunk/packages/sofa-framework/trunk/debian/rules 2009-05-11 03:30:35 UTC (rev 3375) @@ -35,7 +35,7 @@ # Create the documentation files mkdir -p $(CURDIR)/doc/doxygen doxygen -u Doxyfile - doxygen +# doxygen # remove zero byte files find $(CURDIR)/doc/doxygen/ -depth -empty | xargs rm -rf @@ -87,10 +87,9 @@ dh_install -psofa-data share usr/share/sofa dh_install -psofa-data examples usr/share/sofa - dh_install -psofa-data debian/PML usr/share/sofa/examples # Documentation - dh_install -psofa-doc doc/doxygen/html usr/share/doc/sofa-doc +# dh_install -psofa-doc doc/doxygen/html usr/share/doc/sofa-doc dh_installexamples _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit
