tags 651331 + patch tags 651331 + pending severity 651331 serious thanks Dear maintainer,
I've prepared an NMU for ovito (versioned as 0.9.2-1.2) and uploaded it to DELAYED/10. Please feel free to tell me if I should delay it longer. Regards. diff -Nru ovito-0.9.2/debian/changelog ovito-0.9.2/debian/changelog --- ovito-0.9.2/debian/changelog 2012-01-22 21:11:46.000000000 -0500 +++ ovito-0.9.2/debian/changelog 2012-03-27 21:31:48.000000000 -0400 @@ -1,3 +1,14 @@ +ovito (0.9.2-1.2) unstable; urgency=low + + * Non-Maintainer Upload. + * Fix FTBFS (Closes: #651331) + - debian-changes-0.9.2-1~2: updated patch to include to muParser.h + - debian-changes-0.9.2-1~3: new patch to use muparser built in + atan2 function + - debian/control: BD on libmuparser-dev (>= 2.1.0) + + -- Scott Howard <show...@debian.org> Tue, 27 Mar 2012 21:31:13 -0400 + ovito (0.9.2-1.1) unstable; urgency=low * Non-Maintainer Upload. diff -Nru ovito-0.9.2/debian/control ovito-0.9.2/debian/control --- ovito-0.9.2/debian/control 2010-10-29 09:40:15.000000000 -0400 +++ ovito-0.9.2/debian/control 2012-03-27 21:30:42.000000000 -0400 @@ -2,7 +2,7 @@ Section: science Priority: extra Maintainer: Pekko Metsä <pjme...@gmail.com> -Build-Depends: debhelper (>= 7.0.50), cmake, libboost-dev, libboost-iostreams-dev, libboost-python-dev, libqt4-opengl-dev, qt4-dev-tools, libgsl0-dev, xsltproc, docbook-xml, docbook-xsl, docbook-xsl-doc-html, libqscintilla2-dev, python-dev, libmuparser-dev +Build-Depends: debhelper (>= 7.0.50), cmake, libboost-dev, libboost-iostreams-dev, libboost-python-dev, libqt4-opengl-dev, qt4-dev-tools, libgsl0-dev, xsltproc, docbook-xml, docbook-xsl, docbook-xsl-doc-html, libqscintilla2-dev, python-dev, libmuparser-dev (>= 2.1.0) Standards-Version: 3.9.1 Homepage: http://www.ovito.org/ diff -Nru ovito-0.9.2/debian/patches/debian-changes-0.9.2-1~2 ovito-0.9.2/debian/patches/debian-changes-0.9.2-1~2 --- ovito-0.9.2/debian/patches/debian-changes-0.9.2-1~2 2010-10-30 07:55:07.000000000 -0400 +++ ovito-0.9.2/debian/patches/debian-changes-0.9.2-1~2 2012-03-26 19:02:10.000000000 -0400 @@ -27,9 +27,11 @@ Reviewed-By: <name and email of someone who approved the patch> Last-Update: <YYYY-MM-DD> ---- ovito-0.9.2.orig/CMakeLists.txt -+++ ovito-0.9.2/CMakeLists.txt -@@ -50,15 +50,7 @@ INCLUDE_DIRECTORIES(${OVITO_INCLUDE_PATH +Index: ovito-0.9.2/CMakeLists.txt +=================================================================== +--- ovito-0.9.2.orig/CMakeLists.txt 2012-03-26 18:48:40.832167566 -0400 ++++ ovito-0.9.2/CMakeLists.txt 2012-03-26 18:48:45.000000000 -0400 +@@ -50,15 +50,7 @@ # Place all compiled libraries into OVITO's library directory. SET(LIBRARY_OUTPUT_PATH "${OVITO_LIBRARY_DIRECTORY}") @@ -46,22 +48,26 @@ # Use pre-compiled headers OPTION(OVITO_USE_PRECOMPILED_HEADERS "Enable the generation of precompiled headers to speed up compilation." "ON") ---- ovito-0.9.2.orig/src/mainexec/resources/ovito.desktop -+++ ovito-0.9.2/src/mainexec/resources/ovito.desktop +Index: ovito-0.9.2/src/mainexec/resources/ovito.desktop +=================================================================== +--- ovito-0.9.2.orig/src/mainexec/resources/ovito.desktop 2012-03-26 18:48:40.708167563 -0400 ++++ ovito-0.9.2/src/mainexec/resources/ovito.desktop 2012-03-26 18:48:45.000000000 -0400 @@ -1,5 +1,4 @@ [Desktop Entry] -Encoding=UTF-8 Name=OVITO Comment=Scientific visualization and analysis software for atomistic simulation data. Exec=/usr/bin/ovito -@@ -7,4 +6,3 @@ Icon=/usr/share/ovito/ovito_icon.png +@@ -7,4 +6,3 @@ Terminal=false Type=Application Categories=Graphics;Science; - ---- ovito-0.9.2.orig/src/core/actions/stdactions/FileActions.cpp -+++ ovito-0.9.2/src/core/actions/stdactions/FileActions.cpp -@@ -151,7 +151,7 @@ void FileActionsHandler::OnHelpShowOnlin +Index: ovito-0.9.2/src/core/actions/stdactions/FileActions.cpp +=================================================================== +--- ovito-0.9.2.orig/src/core/actions/stdactions/FileActions.cpp 2012-03-26 18:48:40.628167561 -0400 ++++ ovito-0.9.2/src/core/actions/stdactions/FileActions.cpp 2012-03-26 18:48:45.000000000 -0400 +@@ -151,7 +151,7 @@ try { // Use the web brwoser to show the online help instead. if(!QDesktopServices::openUrl(QUrl("http://www.ovito.org/manual/";))) @@ -70,9 +76,11 @@ } catch(const Exception& ex2) { ex2.showError(); ---- ovito-0.9.2.orig/src/core/gui/mainwnd/MainFrame.cpp -+++ ovito-0.9.2/src/core/gui/mainwnd/MainFrame.cpp -@@ -278,7 +278,7 @@ QProcess* MainFrame::showQtAssistant(con +Index: ovito-0.9.2/src/core/gui/mainwnd/MainFrame.cpp +=================================================================== +--- ovito-0.9.2.orig/src/core/gui/mainwnd/MainFrame.cpp 2012-03-26 18:48:40.656167561 -0400 ++++ ovito-0.9.2/src/core/gui/mainwnd/MainFrame.cpp 2012-03-26 18:48:45.000000000 -0400 +@@ -278,7 +278,7 @@ try { // Use the web brwoser to show the online help instead. if(!QDesktopServices::openUrl(QUrl("http://www.ovito.org/manual/";))) @@ -81,7 +89,7 @@ } catch(const Exception& ex) { ex.showError(); -@@ -306,7 +306,7 @@ QProcess* MainFrame::showQtAssistant(con +@@ -306,7 +306,7 @@ try { // Use the web browser to display the online help instead. if(!QDesktopServices::openUrl(QUrl("http://www.ovito.org/manual/";))) @@ -90,9 +98,11 @@ } catch(const Exception& ex) { ex.showError(); ---- ovito-0.9.2.orig/src/core/viewport/OpenGLInterface.cpp -+++ ovito-0.9.2/src/core/viewport/OpenGLInterface.cpp -@@ -40,7 +40,7 @@ const char* openglErrorString(GLenum err +Index: ovito-0.9.2/src/core/viewport/OpenGLInterface.cpp +=================================================================== +--- ovito-0.9.2.orig/src/core/viewport/OpenGLInterface.cpp 2012-03-26 18:48:40.680167562 -0400 ++++ ovito-0.9.2/src/core/viewport/OpenGLInterface.cpp 2012-03-26 18:48:45.000000000 -0400 +@@ -40,7 +40,7 @@ case GL_STACK_UNDERFLOW: return "GL_STACK_UNDERFLOW - This command would cause a stack underflow."; case GL_OUT_OF_MEMORY: return "GL_OUT_OF_MEMORY - There is not enough memory left to execute the command."; case GL_TABLE_TOO_LARGE: return "GL_TABLE_TOO_LARGE - The specified table exceeds the implementation's maximum supported table size."; @@ -101,9 +111,11 @@ } } ---- ovito-0.9.2.orig/src/atomviz/CMakeLists.txt -+++ ovito-0.9.2/src/atomviz/CMakeLists.txt -@@ -181,19 +181,6 @@ SET(AtomViz_SRCS +Index: ovito-0.9.2/src/atomviz/CMakeLists.txt +=================================================================== +--- ovito-0.9.2.orig/src/atomviz/CMakeLists.txt 2012-03-26 18:48:40.756167564 -0400 ++++ ovito-0.9.2/src/atomviz/CMakeLists.txt 2012-03-26 19:00:39.228184640 -0400 +@@ -181,19 +181,6 @@ benchmark/AtomVizBenchmarkUtility.cpp ) @@ -123,7 +135,7 @@ # Add optional source file needed for POV-Ray export of atoms. IF(OVITO_BUILD_PLUGIN_POVRAY) SET(AtomViz_SRCS ${AtomViz_SRCS} writer/Atoms2POVRay.cpp) -@@ -219,7 +206,6 @@ ADD_LIBRARY(AtomViz +@@ -219,7 +206,6 @@ PrecompiledHeader.cpp ${AtomViz_SRCS} ${AtomViz_MOC_SRCS} @@ -131,7 +143,7 @@ ) IF(OVITO_USE_PRECOMPILED_HEADERS AND CMAKE_COMPILER_IS_GNUCXX) -@@ -227,7 +213,7 @@ IF(OVITO_USE_PRECOMPILED_HEADERS AND CMA +@@ -227,7 +213,7 @@ ENDIF(OVITO_USE_PRECOMPILED_HEADERS AND CMAKE_COMPILER_IS_GNUCXX) # Link required libraries @@ -140,9 +152,11 @@ # Link the target against the Qt libraries. TARGET_LINK_LIBRARIES(AtomViz ${QT_LIBRARIES}) ---- ovito-0.9.2.orig/src/atomviz/parser/dxa/DXAFileParser.cpp -+++ ovito-0.9.2/src/atomviz/parser/dxa/DXAFileParser.cpp -@@ -261,7 +261,7 @@ EvaluationStatus DXAFileParser::loadTime +Index: ovito-0.9.2/src/atomviz/parser/dxa/DXAFileParser.cpp +=================================================================== +--- ovito-0.9.2.orig/src/atomviz/parser/dxa/DXAFileParser.cpp 2012-03-26 18:48:40.736167564 -0400 ++++ ovito-0.9.2/src/atomviz/parser/dxa/DXAFileParser.cpp 2012-03-26 18:48:45.000000000 -0400 +@@ -261,7 +261,7 @@ color = bccType->color(); break; default: @@ -151,25 +165,29 @@ } for(int n = 0; n < numNeighbors; n++) stream.read(&tag, sizeof(tag)); ---- ovito-0.9.2.orig/src/atomviz/modifier/datachannels/CreateExpressionChannelModifier.cpp -+++ ovito-0.9.2/src/atomviz/modifier/datachannels/CreateExpressionChannelModifier.cpp +Index: ovito-0.9.2/src/atomviz/modifier/datachannels/CreateExpressionChannelModifier.cpp +=================================================================== +--- ovito-0.9.2.orig/src/atomviz/modifier/datachannels/CreateExpressionChannelModifier.cpp 2012-03-26 18:48:40.780167565 -0400 ++++ ovito-0.9.2/src/atomviz/modifier/datachannels/CreateExpressionChannelModifier.cpp 2012-03-26 19:02:04.428186665 -0400 @@ -21,7 +21,7 @@ #include <core/Core.h> #include <core/undo/UndoManager.h> -#include <atomviz/utils/muparser/muParser.h> -+#include <muParser/muParser.h> ++#include <muParser.h> #include "CreateExpressionChannelModifier.h" ---- ovito-0.9.2.orig/src/atomviz/modifier/selection/SelectExpressionModifier.cpp -+++ ovito-0.9.2/src/atomviz/modifier/selection/SelectExpressionModifier.cpp +Index: ovito-0.9.2/src/atomviz/modifier/selection/SelectExpressionModifier.cpp +=================================================================== +--- ovito-0.9.2.orig/src/atomviz/modifier/selection/SelectExpressionModifier.cpp 2012-03-26 18:48:40.812167565 -0400 ++++ ovito-0.9.2/src/atomviz/modifier/selection/SelectExpressionModifier.cpp 2012-03-26 18:48:45.000000000 -0400 @@ -24,7 +24,7 @@ #include <core/scene/ObjectNode.h> #include <core/gui/properties/StringPropertyUI.h> #include <core/gui/properties/BooleanPropertyUI.h> -#include <atomviz/utils/muparser/muParser.h> -+#include <muParser/muParser.h> ++#include <muParser.h> #include "SelectExpressionModifier.h" diff -Nru ovito-0.9.2/debian/patches/debian-changes-0.9.2-1~3 ovito-0.9.2/debian/patches/debian-changes-0.9.2-1~3 --- ovito-0.9.2/debian/patches/debian-changes-0.9.2-1~3 1969-12-31 19:00:00.000000000 -0500 +++ ovito-0.9.2/debian/patches/debian-changes-0.9.2-1~3 2012-03-27 21:22:14.000000000 -0400 @@ -0,0 +1,26 @@ +Description: Use muparser's atan2 function to fix FTBFS +Author: Scott Howard <show...@debian.org> +Bug-Debian: http://bugs.debian.org/651331 + +--- ovito-0.9.2.orig/src/atomviz/modifier/datachannels/CreateExpressionChannelModifier.cpp ++++ ovito-0.9.2/src/atomviz/modifier/datachannels/CreateExpressionChannelModifier.cpp +@@ -140,7 +140,7 @@ public: + parsers[i].DefineNameChars("0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ."); + + // Add the atan2() function. +- parsers[i].DefineFun("atan2", atan2, false); ++ //parsers[i].DefineFun("atan2", atan2, false); INCLUDED IN MUPARSER 2.1.0 + + // Let the muParser process the math expression. + parsers[i].SetExpr(expr.toStdString()); +--- ovito-0.9.2.orig/src/atomviz/modifier/selection/SelectExpressionModifier.cpp ++++ ovito-0.9.2/src/atomviz/modifier/selection/SelectExpressionModifier.cpp +@@ -92,7 +92,7 @@ public: + parser.DefineNameChars("0123456789_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ."); + + // Add the atan2() function. +- parser.DefineFun("atan2", atan2, false); ++ //parser.DefineFun("atan2", atan2, false); INCLUDED IN MUPARSER 2.1.0 + + // Let the muParser process the math expression. + parser.SetExpr(expression.toStdString()); diff -Nru ovito-0.9.2/debian/patches/series ovito-0.9.2/debian/patches/series --- ovito-0.9.2/debian/patches/series 2012-01-22 16:05:23.000000000 -0500 +++ ovito-0.9.2/debian/patches/series 2012-03-27 21:23:30.000000000 -0400 @@ -1,2 +1,3 @@ debian-changes-0.9.2-1~2 boost1.48 +debian-changes-0.9.2-1~3 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
