[ovito] 01/09: 0.9.5-2
Anton Gladky
gladk at moszumanska.debian.org
Sun Mar 2 21:48:16 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 1a0d40c0481953e100fc2c4ef288d2a2d8f4346e
Author: Anton Gladky <gladk at debian.org>
Date: Sun Mar 2 21:47:28 2014 +0100
0.9.5-2
---
debian/changelog | 55 +++++++++++++++
debian/compat | 1 +
debian/control | 43 +++++++++++
debian/copyright | 69 ++++++++++++++++++
debian/docs | 1 +
debian/ovito-doc.dirs | 1 +
debian/ovito-doc.doc-base | 10 +++
debian/ovito-doc.install | 1 +
debian/ovito-examples.dirs | 1 +
debian/ovito-examples.install | 1 +
debian/ovito-examples.lintian-overrides | 3 +
debian/ovito.1 | 71 +++++++++++++++++++
debian/ovito.dirs | 4 ++
debian/ovito.install | 7 ++
debian/ovito.lintian-overrides | 10 +++
debian/ovito.manpages | 2 +
debian/ovito.menu | 2 +
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/series | 5 ++
debian/rules | 36 ++++++++++
debian/source/format | 1 +
debian/watch | 2 +
27 files changed, 646 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..25c0204
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,55 @@
+ovito (0.9.5-2) unstable; urgency=low
+
+ * QA upload.
+ * Use libtachyon-dev instead of the embedded copy of this library shipped
+ with the package:
+ - debian/control: add libtachyon-dev as a build dependency.
+ - 50-use-libtachyon.patch: Use libtachyon-dev instead of embedded
+ tachyonlib.
+ - ovito.lintian-overrides: override lintian error because libTachyon.so
+ is a plugin.
+ * Update compatibility level to 9.
+
+ -- Mònica Ramírez Arceda <monica at debian.org> Mon, 28 May 2012 00:45:56 +0200
+
+ovito (0.9.5-1) unstable; urgency=low
+
+ * QA upload.
+ * New upstream release. (Closes: #672047)
+ * Set Maintainer field to Debian QA Group.
+ * Add python dependency.
+ * Bump to Standards-Version 3.9.3. No changes required.
+ * Remove debian/patches/boost1.48: fixed in upstream.
+ * Remove autogenerated patches: debian-changes-0.9.2-1~2 and
+ debian-changes-0.9.2-1~3. Organize these changes in four patches:
+ * 10-repository-revision.patch
+ * 20-desktop-entry-encoding.patch
+ * 30-fix-typos.patch
+ * 40-use-libmuparser.patch
+
+ -- Mònica Ramírez Arceda <monica at debian.org> Thu, 24 May 2012 23:44:09 +0200
+
+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 <showard at debian.org> Tue, 27 Mar 2012 21:31:13 -0400
+
+ovito (0.9.2-1.1) unstable; urgency=low
+
+ * Non-Maintainer Upload.
+
+ * patches/boost1.48: New. Work around moc limitation. Closes: #652795.
+
+ -- Steve M. Robbins <smr at debian.org> Sun, 22 Jan 2012 20:11:46 -0600
+
+ovito (0.9.2-1) unstable; urgency=low
+
+ * Initial release (Closes: #600812)
+
+ -- Pekko Metsä <pjmetsa at gmail.com> Sun, 31 Oct 2010 00:44:04 +0300
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..be113c8
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,43 @@
+Source: ovito
+Section: science
+Priority: extra
+Maintainer: Debian QA Group <packages at qa.debian.org>
+Build-Depends: debhelper (>= 9), 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), libtachyon-dev
+Standards-Version: 3.9.3
+Homepage: http://www.ovito.org/
+
+Package: ovito
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python
+Recommends: ovito-doc, ovito-examples
+Suggests: povray
+Description: visualization and analysis tool for atomistic simulation data
+ OVITO is a visualization and analysis software for atomistic
+ simulation data. Being a single integrated application it covers both
+ the analysis and the visualization of large-scale atomistic datasets
+ produced by molecular dynamics/statics and Monte-Carlo simulation
+ codes. Its name is an acronym for Open Visualization Tool,
+ emphasizing that the software has been designed with flexibility and
+ extensibility in mind.
+
+Package: ovito-doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: ovito, ovito-examples
+Section: doc
+Description: documentation for ovito
+ OVITO aka Open Visualization Tool is a scientific visualization and
+ analysis software for atomistic simulation data.
+ .
+ This package contains the User Manual for ovito.
+
+Package: ovito-examples
+Architecture: all
+Depends: ${misc:Depends}
+Recommends: ovito, ovito-doc
+Section: doc
+Description: tutorial examples for ovito
+ OVITO aka Open Visualization Tool is a scientific visualization and
+ analysis software for atomistic simulation data.
+ .
+ This package contains the tutorial examples for ovito.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..4f21a9a
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,69 @@
+This work was packaged for Debian by:
+
+ Pekko Metsä <pjmetsa at gmail.com> on Wed, 20 Oct 2010 09:35:45 +0300
+
+It was downloaded from:
+
+ https://ovito.svn.sourceforge.net/svnroot/ovito/tags/
+
+Upstream Author:
+
+ Alexander Stukowski
+
+Copyright:
+
+ Copyright (C) 2007-2010 Alexander Stukowski
+
+License:
+
+ 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
+ the Free Software Foundation, either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+On Debian systems, the complete text of the GNU General
+Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+The HTML documentation in package ovito-doc is licensed under the
+terms of GNU Free Documentation License, Version 1.2 or any later
+version published by Free Software Foundation. On Debian systems, the
+complete text of the license can be found in
+"/usr/share/common-licenses/GFDL-1.2".
+
+The Debian packaging is:
+
+ Copyright (C) 2010 Pekko Metsä <pjmetsa at gmail.com>
+
+and is licensed under the GPL version 2 or (at your opinion) any later
+version, see above.
+
+The source code contains an embedded muParser library, which is not
+used in the debianized package. Instead, the Debian ovito package
+links against the Debian libmuparser-dev package. The embedded
+muParser library is licensed under MIT license:
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..71dfd5b
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README.txt
diff --git a/debian/ovito-doc.dirs b/debian/ovito-doc.dirs
new file mode 100644
index 0000000..d25ce96
--- /dev/null
+++ b/debian/ovito-doc.dirs
@@ -0,0 +1 @@
+usr/share/doc/ovito-doc/html
diff --git a/debian/ovito-doc.doc-base b/debian/ovito-doc.doc-base
new file mode 100644
index 0000000..0e5cb19
--- /dev/null
+++ b/debian/ovito-doc.doc-base
@@ -0,0 +1,10 @@
+Document: ovito-doc
+Title: Ovito User Manual
+Author: Alexander Stukowski
+Abstract: This manual describes how to visualize and analyze
+ large-scale atomistic simulation datasets with ovito.
+Section: Science/Physics
+
+Format: HTML
+Index: /usr/share/doc/ovito-doc/html/index.html
+Files: /usr/share/doc/ovito-doc/html/*.html
diff --git a/debian/ovito-doc.install b/debian/ovito-doc.install
new file mode 100644
index 0000000..dfa7902
--- /dev/null
+++ b/debian/ovito-doc.install
@@ -0,0 +1 @@
+usr/share/ovito/doc/manual/html/* usr/share/doc/ovito-doc/html
diff --git a/debian/ovito-examples.dirs b/debian/ovito-examples.dirs
new file mode 100644
index 0000000..c9835cd
--- /dev/null
+++ b/debian/ovito-examples.dirs
@@ -0,0 +1 @@
+usr/share/ovito/examples
diff --git a/debian/ovito-examples.install b/debian/ovito-examples.install
new file mode 100644
index 0000000..c9835cd
--- /dev/null
+++ b/debian/ovito-examples.install
@@ -0,0 +1 @@
+usr/share/ovito/examples
diff --git a/debian/ovito-examples.lintian-overrides b/debian/ovito-examples.lintian-overrides
new file mode 100644
index 0000000..14817c3
--- /dev/null
+++ b/debian/ovito-examples.lintian-overrides
@@ -0,0 +1,3 @@
+# 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.1 b/debian/ovito.1
new file mode 100644
index 0000000..b2e0c10
--- /dev/null
+++ b/debian/ovito.1
@@ -0,0 +1,71 @@
+.\" 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 OVITO 1 "October 20, 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
+ovito \- (The Open Visualization Tool) is a scientific visualization
+and analysis software for atomistic simulation data.
+.SH SYNOPSIS
+.B ovito
+.RI [ options ]
+
+.SH DESCRIPTION
+This manual page documents briefly the command line options of
+.B ovito
+command.
+
+.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 OPTIONS
+All options start with two dashes (`-').
+A summary of options is included below.
+For a complete description, see the online documentation.
+.TP
+.B \-\-help
+Show help about options.
+.TP
+.B \-\-verbose
+Enable additional diagnostic console output.
+.TP
+.B \-\-nogui
+Run in console mode without graphical user interface.
+.TP
+.B \-\-script <file>
+Execute the given script file on startup.
+.TP
+.B \-\-nobanner
+Suppress the license banner shown in the console.
+.TP
+.B \-\-experimental
+Enable experimental program features.
+.SH SEE ALSO
+\fBovitos\fP(1)
+
+.br
+The Open Visualization Tool is documented fully by
+.IR "Ovito User Manual" ,
+available at /usr/share/doc/ovito-doc/html/index.html, if the package
+ovito-doc is installed. The most recent version of the manual is
+available at <http://ovito.org/manual/>.
+.SH AUTHOR
+ovito 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/ovito.dirs b/debian/ovito.dirs
new file mode 100644
index 0000000..41cae43
--- /dev/null
+++ b/debian/ovito.dirs
@@ -0,0 +1,4 @@
+usr/bin
+usr/lib
+usr/share/ovito
+usr/share/ovito/doc/manual/assistant
diff --git a/debian/ovito.install b/debian/ovito.install
new file mode 100644
index 0000000..ce44195
--- /dev/null
+++ b/debian/ovito.install
@@ -0,0 +1,7 @@
+usr/bin
+usr/lib
+usr/share/applications
+usr/share/ovito/ovito_icon.png usr/share/ovito
+#usr/share/ovito/scripts/atomviz
+usr/share/ovito/scripts
+usr/share/ovito/doc/manual/assistant/* usr/share/ovito/doc/manual/assistant
diff --git a/debian/ovito.lintian-overrides b/debian/ovito.lintian-overrides
new file mode 100644
index 0000000..a43e94b
--- /dev/null
+++ b/debian/ovito.lintian-overrides
@@ -0,0 +1,10 @@
+# Policy 10.2 says: Shared object files (often .so files) that are not public
+# libraries, that is, they are not meant to be linked to by third party
+# executables (binaries of other packages) [...]. Such files are exempt from
+# the rules that govern ordinary shared libraries, except that they must not
+# be installed executable and should be stripped. [...] A common example are
+# the so-called "plug-ins".
+#
+# libTachyon.so is a plug-in.
+#
+ovito: shlib-with-non-pic-code usr/lib/ovito/plugins/libTachyon.so
diff --git a/debian/ovito.manpages b/debian/ovito.manpages
new file mode 100644
index 0000000..c95ae2f
--- /dev/null
+++ b/debian/ovito.manpages
@@ -0,0 +1,2 @@
+debian/ovito.1
+debian/ovitos.1
diff --git a/debian/ovito.menu b/debian/ovito.menu
new file mode 100644
index 0000000..d029b46
--- /dev/null
+++ b/debian/ovito.menu
@@ -0,0 +1,2 @@
+?package(ovito):needs="X11" section="Applications/Science/Physics"\
+ title="ovito" command="/usr/bin/ovito"
diff --git a/debian/ovitos.1 b/debian/ovitos.1
new file mode 100644
index 0000000..0b3af1a
--- /dev/null
+++ b/debian/ovitos.1
@@ -0,0 +1,46 @@
+.\" 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
new file mode 100644
index 0000000..9bf9289
--- /dev/null
+++ b/debian/patches/10-repository-revision.patch
@@ -0,0 +1,23 @@
+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
new file mode 100644
index 0000000..b659535
--- /dev/null
+++ b/debian/patches/20-desktop-entry-encoding.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000..ad13429
--- /dev/null
+++ b/debian/patches/30-fix-typos.patch
@@ -0,0 +1,58 @@
+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
new file mode 100644
index 0000000..3ba3bb4
--- /dev/null
+++ b/debian/patches/40-use-libmuparser.patch
@@ -0,0 +1,82 @@
+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
new file mode 100644
index 0000000..01a9562
--- /dev/null
+++ b/debian/patches/50-use-libtachyon.patch
@@ -0,0 +1,98 @@
+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/series b/debian/patches/series
new file mode 100644
index 0000000..2372f56
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,5 @@
+10-repository-revision.patch
+20-desktop-entry-encoding.patch
+30-fix-typos.patch
+40-use-libmuparser.patch
+50-use-libtachyon.patch
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..76c7d1c
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,36 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+#
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+
+%:
+ dh $@
+
+override_dh_auto_configure:
+ dh_auto_configure -- -DCMAKE_BUILD_TYPE=Release \
+ -DOVITO_BUILD_DOCUMENTATION=TRUE -DOVITO_BUILD_PLUGIN_ATOMVIZ=TRUE \
+ -DOVITO_BUILD_PLUGIN_CRYSTALANALYSIS=TRUE \
+ -DOVITO_BUILD_PLUGIN_POVRAY=TRUE -DOVITO_BUILD_PLUGIN_RENDERMAN=TRUE \
+ -DOVITO_BUILD_PLUGIN_SCRIPTING=TRUE \
+ -DOVITO_BUILD_PLUGIN_STDOBJECTS=TRUE
+
+override_dh_auto_build:
+ dh_auto_build --parallel
+
+override_dh_install:
+ dh_install --list-missing
+ find ./debian/ovito -type d -empty -delete
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..b4b4059
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+https://ovito.svn.sourceforge.net/svnroot/ovito/tags release-(\d[\d.]+)/
--
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