[liggghts] 03/05: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Mon Jun 22 18:21:35 UTC 2015
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository liggghts.
commit b81a33d609ed2ffa7a27f8b3cbe0a36400b3b8c6
Author: Anton Gladky <gladk at debian.org>
Date: Mon Jun 22 18:11:21 2015 +0200
Refresh patches.
---
debian/patches/01_add_cmake_files.patch | 15 +++++++--------
debian/patches/05_vtk6_support.patch | 10 +++++-----
2 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/debian/patches/01_add_cmake_files.patch b/debian/patches/01_add_cmake_files.patch
index 0cc5504..e7d157b 100644
--- a/debian/patches/01_add_cmake_files.patch
+++ b/debian/patches/01_add_cmake_files.patch
@@ -1,12 +1,12 @@
Description: adds cmake files. Will hopefully be accepted by upstream.
Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2015-03-17
+Last-Update: 2015-06-22
-Index: liggghts-3.1.0/CMakeLists.txt
+Index: LIGGGHTS-PUBLIC-3.2.0/CMakeLists.txt
===================================================================
--- /dev/null
-+++ liggghts-3.1.0/CMakeLists.txt
-@@ -0,0 +1,88 @@
++++ LIGGGHTS-PUBLIC-3.2.0/CMakeLists.txt
+@@ -0,0 +1,87 @@
+# ENABLE_PACKAGE: enable PACKAGE-modules (OFF by default)
+# ENABLE_PACKAGEUSER: enable PACKAGEUSER-modules (OFF by default)
+# SUFFIX: add sufix to binary-name (NONE by default)
@@ -27,7 +27,6 @@ Index: liggghts-3.1.0/CMakeLists.txt
+INCLUDE_DIRECTORIES (${Boost_INCLUDE_DIRS})
+#=======================================
+
-+INCLUDE(FindVTK)
+INCLUDE(GNUInstallDirs)
+INCLUDE(FindPythonLibs)
+FIND_PACKAGE(VTK COMPONENTS vtkChartsCore vtkViewsContext2D vtkCommonCore vtkIOImage vtkIOXML vtkRenderingOpenGL vtkIOLegacy)
@@ -95,10 +94,10 @@ Index: liggghts-3.1.0/CMakeLists.txt
+INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/src)
+
+ADD_SUBDIRECTORY("${CMAKE_SOURCE_DIR}/src")
-Index: liggghts-3.1.0/src/CMakeLists.txt
+Index: LIGGGHTS-PUBLIC-3.2.0/src/CMakeLists.txt
===================================================================
---- liggghts-3.1.0.orig/src/CMakeLists.txt
-+++ liggghts-3.1.0/src/CMakeLists.txt
+--- LIGGGHTS-PUBLIC-3.2.0.orig/src/CMakeLists.txt
++++ LIGGGHTS-PUBLIC-3.2.0/src/CMakeLists.txt
@@ -1,80 +1,57 @@
-# ENABLE_PACKAGE: enable PACKAGE-modules (OFF by default)
-# ENABLE_PACKAGEUSER: enable PACKAGEUSER-modules (OFF by default)
diff --git a/debian/patches/05_vtk6_support.patch b/debian/patches/05_vtk6_support.patch
index 615c6bb..0595d6f 100644
--- a/debian/patches/05_vtk6_support.patch
+++ b/debian/patches/05_vtk6_support.patch
@@ -1,12 +1,12 @@
Description: Fixes compilation against VTK6
Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2015-03-17
+Last-Update: 2015-06-22
-Index: LIGGGHTS-PUBLIC-3.0.7/src/dump_atom_vtk.cpp
+Index: LIGGGHTS-PUBLIC-3.2.0/src/dump_atom_vtk.cpp
===================================================================
---- LIGGGHTS-PUBLIC-3.0.7.orig/src/dump_atom_vtk.cpp
-+++ LIGGGHTS-PUBLIC-3.0.7/src/dump_atom_vtk.cpp
-@@ -313,11 +313,11 @@ void DumpATOMVTK::vtkExportData::writeSE
+--- LIGGGHTS-PUBLIC-3.2.0.orig/src/dump_atom_vtk.cpp
++++ LIGGGHTS-PUBLIC-3.2.0/src/dump_atom_vtk.cpp
+@@ -320,11 +320,11 @@ void DumpATOMVTK::vtkExportData::writeSE
vtkSmartPointer<vtkXMLUnstructuredGridWriter> writer = vtkSmartPointer<vtkXMLUnstructuredGridWriter>::New();
writer->SetDataModeToAscii();
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/liggghts.git
More information about the debian-science-commits
mailing list