Author: naoliv Date: 2011-08-17 14:24:27 +0000 (Wed, 17 Aug 2011) New Revision: 7466
Added: trunk/packages/sofa-framework/trunk/debian/patches/fix_mutable_serr_sout.diff trunk/packages/sofa-framework/trunk/debian/patches/tinyxml26.diff trunk/packages/sofa-framework/trunk/debian/source/ trunk/packages/sofa-framework/trunk/debian/source/format Modified: trunk/packages/sofa-framework/trunk/debian/README.Debian 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/copyright trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.diff trunk/packages/sofa-framework/trunk/debian/patches/series trunk/packages/sofa-framework/trunk/debian/rules trunk/packages/sofa-framework/trunk/debian/sofa trunk/packages/sofa-framework/trunk/debian/sofa.desktop Log: Update repository to latest source available in Debian Modified: trunk/packages/sofa-framework/trunk/debian/README.Debian =================================================================== --- trunk/packages/sofa-framework/trunk/debian/README.Debian 2011-08-17 07:33:25 UTC (rev 7465) +++ trunk/packages/sofa-framework/trunk/debian/README.Debian 2011-08-17 14:24:27 UTC (rev 7466) @@ -42,4 +42,4 @@ - -- Dominique Belhachemi <[email protected]> Sat, 16 Feb 2008 10:26:03 +0100 + -- Dominique Belhachemi <[email protected]> Sat, 16 Feb 2008 10:26:03 +0100 Modified: trunk/packages/sofa-framework/trunk/debian/changelog =================================================================== --- trunk/packages/sofa-framework/trunk/debian/changelog 2011-08-17 07:33:25 UTC (rev 7465) +++ trunk/packages/sofa-framework/trunk/debian/changelog 2011-08-17 14:24:27 UTC (rev 7466) @@ -1,10 +1,25 @@ -sofa-framework (1.0~beta4-5) UNRELEASED; urgency=low +sofa-framework (1.0~beta4-5.1) unstable; urgency=high - * Changed debian/sofa-framework.desktop's category to - ‘Biology;Science;Education’ (Closes: #594671, LP: 605497) + * Non-maintainer upload. + * Fix build failure due to new TinyXML 2.6 (Closes: #628114). + Thanks to Felix Geyer for the patch. + * Bump build-dep on libtinyxml-dev to 2.6. - -- Charles Plessy <[email protected]> Sun, 29 Aug 2010 23:50:19 +0900 + -- Mehdi Dogguy <[email protected]> Sun, 29 May 2011 18:02:12 +0200 +sofa-framework (1.0~beta4-5) unstable; urgency=low + + * Switch to dpkg-source 3.0 (quilt) format + * debian/rules: drop the quilt patch/unpatch logic + * patches/fix_mutable_serr_sout.diff: remove mutable keyword (Closes: #625059) + * bump Standards-Version: 3.9.1 (no changes) + * set debian/compat to 8 + * debian/control: removed duplicated "section" fields + * Changed debian/sofa.desktop's category to Education;Science + * (Closes: #594671, LP: #605497) + + -- Dominique Belhachemi <[email protected]> Sat, 07 May 2011 20:21:51 -0400 + sofa-framework (1.0~beta4-4) unstable; urgency=low * use Debian's libtinyxml-dev (Closes: #573941) @@ -87,4 +102,3 @@ * Initial release (Closes: #455064) -- Dominique Belhachemi <[email protected]> Wed, 13 Aug 2008 10:26:03 +0100 - Modified: trunk/packages/sofa-framework/trunk/debian/compat =================================================================== --- trunk/packages/sofa-framework/trunk/debian/compat 2011-08-17 07:33:25 UTC (rev 7465) +++ trunk/packages/sofa-framework/trunk/debian/compat 2011-08-17 14:24:27 UTC (rev 7466) @@ -1 +1 @@ -7 +8 Modified: trunk/packages/sofa-framework/trunk/debian/control =================================================================== --- trunk/packages/sofa-framework/trunk/debian/control 2011-08-17 07:33:25 UTC (rev 7465) +++ trunk/packages/sofa-framework/trunk/debian/control 2011-08-17 14:24:27 UTC (rev 7466) @@ -3,13 +3,13 @@ Priority: optional Maintainer: Debian Med Packaging Team <[email protected]> DM-Upload-Allowed: yes -Uploaders: Dominique Belhachemi <[email protected]> -Build-Depends: debhelper (>= 7), quilt, freeglut3-dev, libnewmat10-dev, +Uploaders: Dominique Belhachemi <[email protected]> +Build-Depends: debhelper (>= 8), quilt, 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, libtinyxml-dev + libboost-graph-dev, libboost-thread-dev, libqwt5-qt4-dev, libpng-dev, pkg-config, libtinyxml-dev (>= 2.6) Build-Depends-Indep: doxygen, graphviz Build-Conflicts: qt3-dev-tools -Standards-Version: 3.8.4 +Standards-Version: 3.9.1 Homepage: http://www.sofa-framework.org/ Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/sofa-framework/trunk/?rev=0&sc=0 Vcs-Svn: svn://svn.debian.org/svn/debian-med/trunk/packages/sofa-framework/trunk/ @@ -60,7 +60,6 @@ Package: sofa-tutorials -Section: graphics Architecture: all Depends: ${misc:Depends} Description: Simulation Open Framework Architecture - tutorials @@ -74,7 +73,6 @@ Package: sofa-data -Section: graphics Architecture: all Depends: ${misc:Depends} Description: Simulation Open Framework Architecture - data Modified: trunk/packages/sofa-framework/trunk/debian/copyright =================================================================== --- trunk/packages/sofa-framework/trunk/debian/copyright 2011-08-17 07:33:25 UTC (rev 7465) +++ trunk/packages/sofa-framework/trunk/debian/copyright 2011-08-17 14:24:27 UTC (rev 7466) @@ -1,5 +1,5 @@ Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat -Debianized-By: Dominique Belhachemi <[email protected]> +Debianized-By: Dominique Belhachemi <[email protected]> Debianized-Date: Tue, 24 Jun 2008 20:51:56 +0200 Original-Source: http://www.sofa-framework.org/ @@ -71,6 +71,6 @@ see `/usr/share/common-licenses/LGPL' Files: debian/* -Copyright: 2008, Dominique Belhachemi <[email protected]> +Copyright: 2008, Dominique Belhachemi <[email protected]> License: GPL-2+ The Debian packaging is licensed under the GPL, see `/usr/share/common-licenses/GPL-2' Modified: trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff =================================================================== --- trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff 2011-08-17 07:33:25 UTC (rev 7465) +++ trunk/packages/sofa-framework/trunk/debian/patches/50_all_changes.diff 2011-08-17 14:24:27 UTC (rev 7466) @@ -1,5 +1,5 @@ #! /bin/sh /usr/share/dpatch/dpatch-run -## 50_all_changes.dpatch by <[email protected]> +## 50_all_changes.dpatch by <[email protected]> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: Link sofa to Debians newmat, boost, xml2 and qwt library. Modified: trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.diff =================================================================== --- trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.diff 2011-08-17 07:33:25 UTC (rev 7465) +++ trunk/packages/sofa-framework/trunk/debian/patches/78_atomicity.diff 2011-08-17 14:24:27 UTC (rev 7466) @@ -1,10 +1,8 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 78_atomicity.dpatch by <domibel@t500lenny> +## 78_atomicity.dpatch by <[email protected]> ## ## All lines beginning with `## DP:' are a description of the patch. ## DP: fix: error: bits/atomicity.h: No such file or directory -@DPATCH@ 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 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 2011-08-17 14:24:27 UTC (rev 7466) @@ -0,0 +1,32 @@ +## 78_atomicity.dpatch by <[email protected]> +## +## 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 Modified: trunk/packages/sofa-framework/trunk/debian/patches/series =================================================================== --- trunk/packages/sofa-framework/trunk/debian/patches/series 2011-08-17 07:33:25 UTC (rev 7465) +++ trunk/packages/sofa-framework/trunk/debian/patches/series 2011-08-17 14:24:27 UTC (rev 7466) @@ -2,3 +2,5 @@ 50_all_changes.diff 55_fix_mips_sqrt.diff 78_atomicity.diff +fix_mutable_serr_sout.diff +tinyxml26.diff 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 2011-08-17 14:24:27 UTC (rev 7466) @@ -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 2011-08-17 07:33:25 UTC (rev 7465) +++ trunk/packages/sofa-framework/trunk/debian/rules 2011-08-17 14:24:27 UTC (rev 7466) @@ -53,9 +53,7 @@ touch $@ -clean: clean-patched unpatch - -clean-patched: +clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp docs-stamp Modified: trunk/packages/sofa-framework/trunk/debian/sofa =================================================================== --- trunk/packages/sofa-framework/trunk/debian/sofa 2011-08-17 07:33:25 UTC (rev 7465) +++ trunk/packages/sofa-framework/trunk/debian/sofa 2011-08-17 14:24:27 UTC (rev 7466) @@ -2,7 +2,7 @@ # # SOFA wrapper script # -# Copyright (C) 2008 Dominique Belhachemi ([email protected]) +# Copyright (C) 2008 Dominique Belhachemi ([email protected]) # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by Modified: trunk/packages/sofa-framework/trunk/debian/sofa.desktop =================================================================== --- trunk/packages/sofa-framework/trunk/debian/sofa.desktop 2011-08-17 07:33:25 UTC (rev 7465) +++ trunk/packages/sofa-framework/trunk/debian/sofa.desktop 2011-08-17 14:24:27 UTC (rev 7466) @@ -6,4 +6,4 @@ Icon=sofa Terminal=false Type=Application -Categories=Biology;Science;Education; +Categories=Education;Science; Added: trunk/packages/sofa-framework/trunk/debian/source/format =================================================================== --- trunk/packages/sofa-framework/trunk/debian/source/format (rev 0) +++ trunk/packages/sofa-framework/trunk/debian/source/format 2011-08-17 14:24:27 UTC (rev 7466) @@ -0,0 +1 @@ +3.0 (quilt) _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
