[ovito] 03/06: Remove patches.
Anton Gladky
gladk at moszumanska.debian.org
Sun Mar 16 15:35:46 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository ovito.
commit d7e65d75966d78488b90fd8994bc56fb4fa6830d
Author: Anton Gladky <gladk at debian.org>
Date: Sun Mar 16 15:23:57 2014 +0100
Remove patches.
---
debian/ovito-doc.dirs | 1 -
debian/ovito-examples.install | 1 -
debian/ovito-examples.lintian-overrides | 3 -
debian/ovito.install | 7 +-
debian/ovito.menu | 10 ++-
debian/ovitos.1 | 46 ------------
debian/patches/10-repository-revision.patch | 23 ------
debian/patches/20-desktop-entry-encoding.patch | 13 ----
debian/patches/30-fix-typos.patch | 58 ---------------
debian/patches/40-use-libmuparser.patch | 82 ---------------------
debian/patches/50-use-libtachyon.patch | 98 --------------------------
debian/patches/rcc_config_fix.diff | 90 -----------------------
debian/patches/series | 7 +-
debian/rules | 1 -
14 files changed, 11 insertions(+), 429 deletions(-)
diff --git a/debian/ovito-doc.dirs b/debian/ovito-doc.dirs
deleted file mode 100644
index d25ce96..0000000
--- a/debian/ovito-doc.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/doc/ovito-doc/html
diff --git a/debian/ovito-examples.install b/debian/ovito-examples.install
deleted file mode 100644
index c9835cd..0000000
--- a/debian/ovito-examples.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/ovito/examples
diff --git a/debian/ovito-examples.lintian-overrides b/debian/ovito-examples.lintian-overrides
deleted file mode 100644
index 14817c3..0000000
--- a/debian/ovito-examples.lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# In the example directory there is an example of an ovito script, but
-# lintian does not recognise 'ovitos' as an interpreter.
-ovito-examples: unusual-interpreter */share/ovito/examples/scripts/atomviz/CommonNeighborAnalysis.py*
diff --git a/debian/ovito.install b/debian/ovito.install
index 0c5ff00..349d9a5 100644
--- a/debian/ovito.install
+++ b/debian/ovito.install
@@ -1,7 +1,4 @@
-#usr/share/ovito/scripts/atomviz
usr/bin
usr/lib
-usr/share/applications
-usr/share/ovito/doc/manual/assistant/* usr/share/ovito/doc/manual/assistant
-usr/share/ovito/ovito_icon.png usr/share/ovito
-usr/share/ovito/scripts
+debian/ovito.desktop usr/share/applications
+debian/*.xpm /usr/share/pixmaps
diff --git a/debian/ovito.menu b/debian/ovito.menu
index d029b46..cedf1a2 100644
--- a/debian/ovito.menu
+++ b/debian/ovito.menu
@@ -1,2 +1,8 @@
-?package(ovito):needs="X11" section="Applications/Science/Physics"\
- title="ovito" command="/usr/bin/ovito"
+?package(ovito): \
+ needs="X11" \
+ command="/usr/bin/ovito" \
+ section="Applications/Science/Physics" \
+ title="ovito" \
+ icon="/usr/share/pixmaps/ovito_32x32.xpm" \
+ icon16x16="/usr/share/pixmaps/ovito_16x16.xpm" \
+ icon32x32="/usr/share/pixmaps/ovito_32x32.xpm"
diff --git a/debian/ovitos.1 b/debian/ovitos.1
deleted file mode 100644
index 0b3af1a..0000000
--- a/debian/ovitos.1
+++ /dev/null
@@ -1,46 +0,0 @@
-.\" Hey, EMACS: -*- nroff -*-
-.\" First parameter, NAME, should be all caps
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
-.\" other parameters are allowed: see man(7), man(1)
-.TH OVITOS 1 "October 22, 2010"
-.\" Please adjust this date whenever revising the manpage.
-.\"
-.\" Some roff macros, for reference:
-.\" .nh disable hyphenation
-.\" .hy enable hyphenation
-.\" .ad l left justify
-.\" .ad b justify to both left and right margins
-.\" .nf disable filling
-.\" .fi enable filling
-.\" .br insert line break
-.\" .sp <n> insert n+1 empty lines
-.\" for manpage-specific macros, see man(7)
-.SH NAME
-ovitos \- Python script which launches OVITO (The Open Visualization
-Tool) in scripting mode and turns off the graphical user-interface.
-.SH SYNOPSIS
-.B ovitos
-.RI MyScript.py
-[param1] [param2]
-
-.SH DESCRIPTION
-\fBovitos\fP passes the command line options to \fBovito\fP, so the
-options for both commands are the same.
-
-
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-.\" respectively.
-
-.SH SEE ALSO
-\fBovito\fP(1)
-
-.br
-
-.SH AUTHOR
-The Open Visualization Tool was written by Alexander Stukowski.
-.PP
-This manual page was written by Pekko Mets\[:a]
-<pjmetsa at gmail.com>, for the Debian project (and may be used by
-others).
diff --git a/debian/patches/10-repository-revision.patch b/debian/patches/10-repository-revision.patch
deleted file mode 100644
index 9bf9289..0000000
--- a/debian/patches/10-repository-revision.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix repository revision.
-Author: Pekko Metsä <pjmetsa at gmail.com>
-Reviewed-by: Mònica Ramírez Arceda <monica at debian.org>
-Last-Update: 2012-05-26
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -50,15 +50,7 @@
- # Place all compiled libraries into OVITO's library directory.
- SET(LIBRARY_OUTPUT_PATH "${OVITO_LIBRARY_DIRECTORY}")
-
--# Get the current revision number from the Subversion repository.
--FIND_PACKAGE(Subversion)
--IF(Subversion_FOUND)
-- Subversion_WC_INFO(${PROJECT_SOURCE_DIR} OVITO_PROJ)
-- # The current revision number is made accessible from the source code through the OVITO_PROJ_REPOSITORY_REVISION macro.
-- ADD_DEFINITIONS("-DOVITO_PROJ_REPOSITORY_REVISION=${OVITO_PROJ_WC_REVISION}")
--ELSE(Subversion_FOUND)
-- ADD_DEFINITIONS("-DOVITO_PROJ_REPOSITORY_REVISION=0")
--ENDIF(Subversion_FOUND)
-+ADD_DEFINITIONS("-DOVITO_PROJ_REPOSITORY_REVISION=339")
-
- # Support for pre-compiled headers.
- OPTION(OVITO_USE_PRECOMPILED_HEADERS "Enable the generation of precompiled headers to speed up compilation." "ON")
diff --git a/debian/patches/20-desktop-entry-encoding.patch b/debian/patches/20-desktop-entry-encoding.patch
deleted file mode 100644
index b659535..0000000
--- a/debian/patches/20-desktop-entry-encoding.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Remove desktop entry encoding.
-Author: Pekko Metsä <pjmetsa at gmail.com>
-Reviewed-by: Mònica Ramírez Arceda <monica at debian.org>
-Last-Update: 2012-05-26
-
---- a/src/mainexec/resources/ovito.desktop
-+++ b/src/mainexec/resources/ovito.desktop
-@@ -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
diff --git a/debian/patches/30-fix-typos.patch b/debian/patches/30-fix-typos.patch
deleted file mode 100644
index ad13429..0000000
--- a/debian/patches/30-fix-typos.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-Description: Fix upstream typos.
-Author: Pekko Metsä <pjmetsa at gmail.com>
-Reviewed-by: Mònica Ramírez Arceda <monica at debian.org>
-Last-Update: 2012-05-26
-
---- a/src/core/actions/stdactions/FileActions.cpp
-+++ b/src/core/actions/stdactions/FileActions.cpp
-@@ -152,7 +152,7 @@
- try {
- // Use the web browser to show the online help instead.
- if(!QDesktopServices::openUrl(QUrl("http://www.ovito.org/manual/")))
-- throw Exception(tr("Could not lauch the web browser to display the online manual. The URL is http://ovito.org/manual/"));
-+ throw Exception(tr("Could not launch the web browser to display the online manual. The URL is http://ovito.org/manual/"));
- }
- catch(const Exception& ex2) {
- ex2.showError();
---- a/src/core/gui/mainwnd/MainFrame.cpp
-+++ b/src/core/gui/mainwnd/MainFrame.cpp
-@@ -290,7 +290,7 @@
- try {
- // Use the web brwoser to show the online help instead.
- if(!QDesktopServices::openUrl(QUrl("http://www.ovito.org/manual/")))
-- throw Exception(tr("Could not lauch the web browser to display the online manual. The URL is http://ovito.org/manual/"));
-+ throw Exception(tr("Could not launch the web browser to display the online manual. The URL is http://ovito.org/manual/"));
- }
- catch(const Exception& ex) {
- ex.showError();
-@@ -318,7 +318,7 @@
- try {
- // Use the web browser to display the online help instead.
- if(!QDesktopServices::openUrl(QUrl("http://www.ovito.org/manual/")))
-- throw Exception(tr("Could not lauch the web browser to display the online manual. The URL is http://ovito.org/manual/"));
-+ throw Exception(tr("Could not launch the web browser to display the online manual. The URL is http://ovito.org/manual/"));
- }
- catch(const Exception& ex) {
- ex.showError();
---- a/src/core/viewport/OpenGLInterface.cpp
-+++ b/src/core/viewport/OpenGLInterface.cpp
-@@ -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.";
-- default: return "Unkown OpenGL error code.";
-+ default: return "Unknown OpenGL error code.";
- }
- }
-
---- a/src/atomviz/atoms/AtomVizSettingsPage.cpp
-+++ b/src/atomviz/atoms/AtomVizSettingsPage.cpp
-@@ -61,7 +61,7 @@
- layout2->addLayout(layout2a);
-
- QLabel* label2 = new QLabel(tr("<html><p>Controls the atom rendering method used for high-quality display of atoms. High-quality mode is activated during "
-- "still image generation or when it is explicitely enabled by the user in the atoms object rollout.</p></html>"));
-+ "still image generation or when it is explicitly enabled by the user in the atoms object rollout.</p></html>"));
- label2->setWordWrap(true);
- layout2->addWidget(label2);
-
diff --git a/debian/patches/40-use-libmuparser.patch b/debian/patches/40-use-libmuparser.patch
deleted file mode 100644
index 3ba3bb4..0000000
--- a/debian/patches/40-use-libmuparser.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Description: Use libmuparser-dev.
-Author: Scott Howard <showard at debian.org>
-Reviewed-by: Mònica Ramírez Arceda <monica at debian.org>
-Bug-Debian: http://bugs.debian.org/651331
-Last-Update: 2012-05-26
-
---- a/src/atomviz/CMakeLists.txt
-+++ b/src/atomviz/CMakeLists.txt
-@@ -173,19 +173,6 @@
- benchmark/AtomVizBenchmarkUtility.cpp
- )
-
--# The source files of the muParser library.
--SET(AtomViz_muParser_SRCS
-- utils/muparser/muParser.cpp
-- utils/muparser/muParserBytecode.cpp
-- utils/muparser/muParserTest.cpp
-- utils/muparser/muParserDLL.cpp
-- utils/muparser/muParserInt.cpp
-- utils/muparser/muParserTokenReader.cpp
-- utils/muparser/muParserError.cpp
-- utils/muparser/muParserCallback.cpp
-- utils/muparser/muParserBase.cpp
--)
--
- # Add optional source file needed for POV-Ray export of atoms.
- IF(OVITO_BUILD_PLUGIN_POVRAY)
- LIST(APPEND AtomViz_SRCS writer/Atoms2POVRay.cpp)
-@@ -208,7 +195,7 @@
-
- # Generate plugin module.
- OVITO_PLUGIN(AtomViz
-- SOURCES PrecompiledHeader.cpp ${AtomViz_SRCS} ${AtomViz_MOC_SRCS} ${AtomViz_muParser_SRCS}
-+ SOURCES PrecompiledHeader.cpp ${AtomViz_SRCS} ${AtomViz_MOC_SRCS}
- LIB_DEPENDENCIES Mesh
- OPTIONAL_PLUGIN_DEPENDENCIES Scripting POVRay Tachyon
- RESOURCE atomviz.rcc resources/atomviz.qrc
-@@ -221,3 +208,4 @@
- INSTALL(DIRECTORY "${OVITO_SHARE_DIRECTORY}/scripts/atomviz" DESTINATION "${OVITO_RELATIVE_SHARE_DIRECTORY}/scripts" PATTERN ".svn" EXCLUDE)
- ENDIF(OVITO_BUILD_PLUGIN_SCRIPTING)
-
-+TARGET_LINK_LIBRARIES(AtomViz Base Core Mesh muparser)
---- a/src/atomviz/modifier/datachannels/CreateExpressionChannelModifier.cpp
-+++ b/src/atomviz/modifier/datachannels/CreateExpressionChannelModifier.cpp
-@@ -22,7 +22,7 @@
- #include <core/Core.h>
- #include <core/undo/UndoManager.h>
- #include <core/scene/objects/ModifiedObject.h>
--#include <atomviz/utils/muparser/muParser.h>
-+#include <muParser.h>
-
- #include "CreateExpressionChannelModifier.h"
-
-@@ -141,7 +141,7 @@
- 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());
---- a/src/atomviz/modifier/selection/SelectExpressionModifier.cpp
-+++ b/src/atomviz/modifier/selection/SelectExpressionModifier.cpp
-@@ -25,7 +25,7 @@
- #include <core/scene/objects/ModifiedObject.h>
- #include <core/gui/properties/StringPropertyUI.h>
- #include <core/gui/properties/BooleanPropertyUI.h>
--#include <atomviz/utils/muparser/muParser.h>
-+#include <muParser.h>
-
- #include "SelectExpressionModifier.h"
-
-@@ -93,7 +93,7 @@
- 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 --git a/debian/patches/50-use-libtachyon.patch b/debian/patches/50-use-libtachyon.patch
deleted file mode 100644
index 01a9562..0000000
--- a/debian/patches/50-use-libtachyon.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Description: Use libtachyon-dev instead of embedded tachyonlib.
-Author: Mònica Ramírez Arceda <monica at debian.org>
-Last-Update: 2012-05-28
---- a/src/tachyon/CMakeLists.txt
-+++ b/src/tachyon/CMakeLists.txt
-@@ -32,55 +32,12 @@
- renderer/TachyonRendererEditor.cpp
- )
-
--# The Tachyon library source files.
--SET(TachyonLib_SRCS
-- tachyonlib/api.c
-- tachyonlib/apigeom.c
-- tachyonlib/apitrigeom.c
-- tachyonlib/box.c
-- tachyonlib/camera.c
-- tachyonlib/coordsys.c
-- tachyonlib/cylinder.c
-- tachyonlib/extvol.c
-- tachyonlib/global.c
-- tachyonlib/grid.c
-- tachyonlib/hash.c
-- tachyonlib/imap.c
-- tachyonlib/imageio.c
-- tachyonlib/intersect.c
-- tachyonlib/light.c
-- tachyonlib/parallel.c
-- tachyonlib/plane.c
-- tachyonlib/quadric.c
-- tachyonlib/render.c
-- tachyonlib/ring.c
-- tachyonlib/shade.c
-- tachyonlib/sphere.c
-- tachyonlib/texture.c
-- tachyonlib/threads.c
-- tachyonlib/tgafile.c
-- tachyonlib/sgirgb.c
-- tachyonlib/ppm.c
-- tachyonlib/trace.c
-- tachyonlib/triangle.c
-- tachyonlib/ui.c
-- tachyonlib/util.c
-- tachyonlib/vector.c
-- tachyonlib/vol.c
-- tachyonlib/pngfile.c
-- tachyonlib/jpeg.c
-- tachyonlib/psd.c
-- tachyonlib/winbmp.c
--)
--
- # Compile Tachyon source files into static library, which will be linked into the Ovito plugin.
--ADD_LIBRARY(tachyonlib STATIC ${TachyonLib_SRCS})
- ADD_DEFINITIONS(-DTACHYON_NO_DEPRECATED -DTHR -D_REENTRANT)
- IF(APPLE)
- ADD_DEFINITIONS(-DBsd)
- ELSEIF(UNIX)
- ADD_DEFINITIONS(-DLinux)
-- SET_TARGET_PROPERTIES(tachyonlib PROPERTIES COMPILE_FLAGS -fPIC)
- ELSEIF(WIN32)
- ADD_DEFINITIONS(-DWIN32)
- ENDIF()
-@@ -91,11 +48,13 @@
- # Generate plugin module.
- OVITO_PLUGIN(Tachyon
- SOURCES PrecompiledHeader.cpp ${Tachyon_SRCS} ${Tachyon_MOC_SRCS}
-- LIB_DEPENDENCIES Mesh tachyonlib
-+ LIB_DEPENDENCIES Mesh
- )
-
- # Link to multi-threading library.
- IF(APPLE)
- TARGET_LINK_LIBRARIES(Tachyon pthread)
-+ELSEIF(UNIX)
-+ TARGET_LINK_LIBRARIES(Tachyon tachyon)
- ENDIF()
-
---- a/src/tachyon/renderer/TachyonExportInterface.h
-+++ b/src/tachyon/renderer/TachyonExportInterface.h
-@@ -27,7 +27,7 @@
- #include <core/viewport/Viewport.h>
- #include "../TachyonPlugin.h"
-
--#include "../tachyonlib/tachyon.h"
-+#include <tachyon/tachyon.h>
-
- namespace Core {
-
---- a/src/tachyon/renderer/TachyonRenderer.h
-+++ b/src/tachyon/renderer/TachyonRenderer.h
-@@ -28,7 +28,7 @@
- #include "../TachyonPlugin.h"
- #include "TachyonExportInterface.h"
-
--#include "../tachyonlib/tachyon.h"
-+#include <tachyon/tachyon.h>
-
- namespace TachyonPlugin {
-
diff --git a/debian/patches/rcc_config_fix.diff b/debian/patches/rcc_config_fix.diff
deleted file mode 100644
index 595c197..0000000
--- a/debian/patches/rcc_config_fix.diff
+++ /dev/null
@@ -1,90 +0,0 @@
-Description: Fix cmake/CompileQtResource.cmake to work with current Qt
-Cherrypick of upstream git version cmake/CompileQtResource.cmake to fix
-FTBFS with current Qt4
-Author: Scott Kitterman <scott at kitterman.com>
-
-Origin: upstream
-Bug-Debian: http://bugs.debian.org/730890
-Forwarded: not-needed
-Last-Update: 2014-02-19
-
-Index: ovito-0.9.5/cmake/CompileQtResource.cmake
-===================================================================
---- ovito-0.9.5.orig/cmake/CompileQtResource.cmake 2014-02-19 09:03:35.000000000 -0500
-+++ ovito-0.9.5/cmake/CompileQtResource.cmake 2014-02-19 09:03:35.000000000 -0500
-@@ -1,28 +1,25 @@
-
- # Compiles a .qrc file to a .rcc file using the Qt Resource Compiler
-
--# The following macro is part of CMake 2.6 and later. If we have an earlier version then we need to define it here.
--IF(NOT ${CMAKE_MAJOR_VERSION} GREATER 2 AND NOT ${CMAKE_MINOR_VERSION} GREATER 4)
-- MACRO (QT4_EXTRACT_OPTIONS _qt4_files _qt4_options)
-- SET(${_qt4_files})
-- SET(${_qt4_options})
-- SET(_QT4_DOING_OPTIONS FALSE)
-- FOREACH(_currentArg ${ARGN})
-- IF ("${_currentArg}" STREQUAL "OPTIONS")
-- SET(_QT4_DOING_OPTIONS TRUE)
-- ELSE ("${_currentArg}" STREQUAL "OPTIONS")
-- IF(_QT4_DOING_OPTIONS)
-- LIST(APPEND ${_qt4_options} "${_currentArg}")
-- ELSE(_QT4_DOING_OPTIONS)
-- LIST(APPEND ${_qt4_files} "${_currentArg}")
-- ENDIF(_QT4_DOING_OPTIONS)
-- ENDIF ("${_currentArg}" STREQUAL "OPTIONS")
-- ENDFOREACH(_currentArg)
-- ENDMACRO (QT4_EXTRACT_OPTIONS)
--ENDIF(NOT ${CMAKE_MAJOR_VERSION} GREATER 2 AND NOT ${CMAKE_MINOR_VERSION} GREATER 4)
-+MACRO (QT_EXTRACT_OPTIONS _qt_files _qt_options)
-+ SET(${_qt_files})
-+ SET(${_qt_options})
-+ SET(_QT_DOING_OPTIONS FALSE)
-+ FOREACH(_currentArg ${ARGN})
-+ IF ("${_currentArg}" STREQUAL "OPTIONS")
-+ SET(_QT_DOING_OPTIONS TRUE)
-+ ELSE ("${_currentArg}" STREQUAL "OPTIONS")
-+ IF(_QT_DOING_OPTIONS)
-+ LIST(APPEND ${_qt_options} "${_currentArg}")
-+ ELSE(_QT_DOING_OPTIONS)
-+ LIST(APPEND ${_qt_files} "${_currentArg}")
-+ ENDIF(_QT_DOING_OPTIONS)
-+ ENDIF ("${_currentArg}" STREQUAL "OPTIONS")
-+ ENDFOREACH(_currentArg)
-+ENDMACRO(QT_EXTRACT_OPTIONS)
-
--MACRO (QT4_COMPILE_RESOURCES target outfile)
-- QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
-+MACRO (QT_COMPILE_RESOURCES target outfile)
-+ QT_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN})
-
- SET(_RC_DEPENDS ${rcc_files})
- FOREACH (it ${rcc_files})
-@@ -53,5 +50,5 @@
- ADD_CUSTOM_TARGET("${target}_Resources" DEPENDS ${outfile})
- ADD_DEPENDENCIES(${target} "${target}_Resources")
-
--ENDMACRO (QT4_COMPILE_RESOURCES)
-+ENDMACRO(QT_COMPILE_RESOURCES)
-
-Index: ovito-0.9.5/cmake/Plugins.cmake
-===================================================================
---- ovito-0.9.5.orig/cmake/Plugins.cmake 2011-11-17 18:56:43.000000000 -0500
-+++ ovito-0.9.5/cmake/Plugins.cmake 2014-02-19 09:18:54.153890626 -0500
-@@ -126,7 +126,7 @@
-
- # Build optional resource file for this plugin which is not linked into the shared library.
- IF(resource_output)
-- QT4_COMPILE_RESOURCES(${target_name} "${OVITO_PLUGINS_DIRECTORY}/${resource_output}" ${resource_input})
-+ QT_COMPILE_RESOURCES(${target_name} "${OVITO_PLUGINS_DIRECTORY}/${resource_output}" ${resource_input})
- # The resource file will be part of the installation package.
- INSTALL(FILES "${OVITO_PLUGINS_DIRECTORY}/${resource_output}" DESTINATION "${OVITO_RELATIVE_PLUGINS_DIRECTORY}")
- ENDIF()
-@@ -141,7 +141,7 @@
-
- # Build optional resource file for this plugin which is not linked into the shared library.
- IF(resource_output)
-- QT4_COMPILE_RESOURCES(${target_name} "${OVITO_PLUGINS_DIRECTORY}/${resource_output}" ${resource_input})
-+ QT_COMPILE_RESOURCES(${target_name} "${OVITO_PLUGINS_DIRECTORY}/${resource_output}" ${resource_input})
- ENDIF()
-
- ENDIF(NOT IS_THIRD_PARTY_PLUGIN)
diff --git a/debian/patches/series b/debian/patches/series
index ed55850..f3e96f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
-10-repository-revision.patch
-20-desktop-entry-encoding.patch
-30-fix-typos.patch
-40-use-libmuparser.patch
-50-use-libtachyon.patch
-rcc_config_fix.diff
+10_add_c+11.patch
diff --git a/debian/rules b/debian/rules
index 67446c5..ec08157 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,4 @@
#!/usr/bin/make -f
-export DH_OPTIONS
%:
dh $@ --parallel
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ovito.git
More information about the debian-science-commits
mailing list