[yade] 01/03: Merge branch 'master' into jessie-backports
Anton Gladky
gladk at moszumanska.debian.org
Fri Mar 24 20:28:58 UTC 2017
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch jessie-backports
in repository yade.
commit ab7f808c682ebc814eeddc6f30c6bdceeaae3d2b
Merge: 777438f 253fbaf
Author: Anton Gladky <gladk at debian.org>
Date: Wed Mar 22 23:36:51 2017 +0100
Merge branch 'master' into jessie-backports
CMakeLists.txt | 40 +-
ChangeLog | 108 +
RELEASE | 2 +-
cMake/FindCLP.cmake | 42 +
core/Clump.cpp | 234 +-
core/Clump.hpp | 6 +-
core/PartialEngine.hpp | 4 +-
core/main/main.py.in | 11 +-
debian/changelog | 66 +
debian/compat | 2 +-
debian/control | 5 +-
debian/patches/01_remove_google_analytics.patch | 6 +-
debian/patches/05_reproducible-builds.patch | 192 --
debian/patches/06_fixCrash.patch | 26 -
debian/patches/07_ipython5.patch | 1323 +++++++++
debian/patches/08_fix_gui.patch | 21 +
debian/patches/series | 4 +-
debian/rules | 4 +-
debian/yade-doc.doc-base | 3 -
debian/yade-doc.docs | 1 -
doc/citing_yade.bib | 8 +-
doc/how-to-release.md | 12 +
doc/sphinx/book/confBook.py | 12 +-
doc/sphinx/book/confManual.py | 12 +-
doc/sphinx/book/confReference.py | 12 +-
doc/sphinx/book/confTheory.py | 12 +-
doc/sphinx/conf.py | 83 +-
doc/sphinx/installation.rst | 29 +-
doc/sphinx/ipython_directive500.py | 1184 ++++++++
doc/sphinx/tutorial/01-bouncing-sphere.py | 4 +-
doc/sphinx/tutorial/02-gravity-deposition.py | 4 +-
doc/sphinx/tutorial/03-oedometric-test.py | 4 +-
doc/sphinx/tutorial/04-periodic-simple-shear.py | 4 +-
doc/sphinx/tutorial/05-3d-postprocessing.py | 4 +-
doc/sphinx/user.rst | 26 +-
doc/yade-articles.bib | 97 +-
doc/yade-conferences.bib | 33 +
doc/yade-theses.bib | 8 +
examples/HydroForceEngine/buoyantParticles.py | 104 +
examples/HydroForceEngine/fluidizedBed.py | 172 ++
.../HydroForceEngine/sedimentTransportExample.py | 421 +++
examples/PotentialBlocks/cubePBscaled.py | 298 ++
.../CapillaryPhys-example.py | 0
examples/capillaryLaplaceYoung/README.txt | 35 +
examples/capillaryLaplaceYoung/capillaryBridge.py | 50 +
examples/capillaryLaplaceYoung/solveLaplace_uc.m | 105 +
examples/capillaryLaplaceYoung/solveLiqBridge.m | 279 ++
examples/capillaryLaplaceYoung/writesCapFile.m | 255 ++
examples/cylinders/cylinderconnection-roots.py | 6 +-
examples/polyhedra/splitter.py | 54 +
examples/test/pack-inConvexPolyhedron.py | 62 +
gui/qt5/__init__.py | 25 +-
lib/base/Math.hpp | 3 +-
lib/serialization/Serializable.cpp | 2 -
lib/triangulation/FlowBoundingSphere.hpp | 2 +-
lib/triangulation/FlowBoundingSphere.ipp | 43 +-
lib/triangulation/FlowBoundingSphereLinSolv.ipp | 11 +-
lib/triangulation/Network.hpp | 3 +-
lib/triangulation/Network.ipp | 68 +-
lib/triangulation/PeriodicFlow.hpp | 18 +-
lib/triangulation/RegularTriangulation.h | 18 +-
lib/triangulation/Tesselation.h | 2 +
lib/triangulation/Tesselation.ipp | 10 +
pkg/common/ForceEngine.cpp | 61 +-
pkg/common/ForceEngine.hpp | 2 +
pkg/common/Gl1_PotentialBlock.cpp | 1102 ++++++++
pkg/common/Gl1_PotentialBlock.hpp | 196 ++
pkg/common/InsertionSortCollider.cpp | 3 +
pkg/common/InteractionLoop.cpp | 17 +-
pkg/common/InteractionLoop.hpp | 8 +-
pkg/common/KinematicEngines.hpp | 6 +-
pkg/dem/BlockGen.cpp | 2882 ++++++++++++++++++++
pkg/dem/BlockGen.hpp | 260 ++
pkg/dem/BubbleMat.hpp | 2 +-
pkg/dem/CapillaryPhys.hpp | 2 +
pkg/dem/ConcretePM.cpp | 7 +-
pkg/dem/ConcretePM.hpp | 2 +-
pkg/dem/DelaunayInterpolation.hpp | 1 -
pkg/dem/Ig2_PB_PB_ScGeom.cpp | 2639 ++++++++++++++++++
pkg/dem/Ig2_PB_PB_ScGeom.hpp | 147 +
pkg/dem/KnKsPBLaw.cpp | 646 +++++
pkg/dem/KnKsPBLaw.hpp | 198 ++
pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.cpp | 111 +-
pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity.hpp | 9 +-
pkg/dem/Law2_ScGeom_CapillaryPhys_Capillarity1.cpp | 7 +-
pkg/dem/MortarMat.hpp | 2 +-
pkg/dem/PotentialBlock.cpp | 106 +
pkg/dem/PotentialBlock.hpp | 122 +
pkg/dem/PotentialBlock2AABB.cpp | 57 +
pkg/dem/PotentialBlock2AABB.hpp | 24 +
pkg/dem/RockBolt.cpp | 611 +++++
pkg/dem/RockBolt.hpp | 112 +
pkg/dem/RockLiningGlobal.cpp | 772 ++++++
pkg/dem/RockLiningGlobal.hpp | 167 ++
pkg/dem/STLImporter.hpp | 17 +-
pkg/dem/ScGeom.cpp | 15 +
pkg/dem/ScGeom.hpp | 2 +
pkg/dem/TriaxialStressController.hpp | 2 +-
pkg/dem/ViscoelasticPM.cpp | 7 +-
.../DeformableCohesiveElement.hpp | 2 +
pkg/pfv/FlowEngine.hpp.in | 20 +-
pkg/pfv/FlowEngine.ipp.in | 37 +-
pkg/pfv/TwoPhaseFlowEngine.cpp | 569 +++-
pkg/pfv/TwoPhaseFlowEngine.hpp | 148 +-
pkg/pfv/UnsaturatedEngine.cpp | 465 +---
py/3rd-party/pygts-0.3.1/pygts.c | 5 -
py/_polyhedra_utils.cpp | 21 +-
py/_utils.cpp | 6 +-
py/_utils.hpp | 2 -
py/pack/pack.py | 72 +
py/utils.py | 7 +-
py/wrapper/yadeWrapper.cpp | 49 +
scripts/HTML.py | 493 ----
scripts/default-test.py | 110 -
scripts/hackett-warn-replace.py | 205 --
scripts/hackett.py | 243 --
scripts/installOnUbuntu.sh | 24 -
scripts/make-release.sh | 13 -
scripts/regression-tests.py | 20 -
scripts/scanreplace.py | 19 -
scripts/yade-exec-wrapper | 22 -
scripts/ysl1.py | 79 -
122 files changed, 16338 insertions(+), 2311 deletions(-)
diff --cc debian/changelog
index 3ebc297,dc13566..6e9b998
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,69 +1,75 @@@
+ yade (2017.01a-7) unstable; urgency=medium
+
+ * [31387da] Add missing dependency on python-pyqt5.qtsvg in python-yade.
+
+ -- Anton Gladky <gladk at debian.org> Tue, 28 Feb 2017 22:03:24 +0100
+
+ yade (2017.01a-6) unstable; urgency=medium
+
+ * [2366d84] Add missing dependency on python-pyqt5.qtsvg.
+
+ -- Anton Gladky <gladk at debian.org> Tue, 28 Feb 2017 21:53:02 +0100
+
+ yade (2017.01a-5) unstable; urgency=medium
+
+ * [eb193dd] Revert patch applied by last upload.
+ * [11efabc] Stop generating of PDF file. (Closes: #856218)
+
+ -- Anton Gladky <gladk at debian.org> Mon, 27 Feb 2017 23:20:27 +0100
+
+ yade (2017.01a-4) unstable; urgency=medium
+
+ * [e248862] Fix FTBFS during documentation build. (Closes: #856218)
+
+ -- Anton Gladky <gladk at debian.org> Sun, 26 Feb 2017 20:21:22 +0100
+
+ yade (2017.01a-3) unstable; urgency=medium
+
+ * [14120f5] Initialize GUI in IPython 5. (Closes: #856175)
+
+ -- Anton Gladky <gladk at debian.org> Sun, 26 Feb 2017 00:47:26 +0100
+
+ yade (2017.01a-2) unstable; urgency=medium
+
+ * [1a804bb] Disable parallel build.
+
+ -- Anton Gladky <gladk at debian.org> Mon, 23 Jan 2017 17:36:15 +0100
+
+ yade (2017.01a-1) unstable; urgency=medium
+
+ * [4b5edc3] New upstream version 2017.01a
+ * [09577db] Update/Remove patches.
+ * [d763fbf] Set compat level to 10.
+
+ -- Anton Gladky <gladk at debian.org> Thu, 19 Jan 2017 22:48:54 +0100
+
+ yade (2016.06a-7) unstable; urgency=medium
+
+ * [a7a08a9] Fix ipython5 config module.
+
+ -- Anton Gladky <gladk at debian.org> Sat, 10 Dec 2016 21:18:05 +0100
+
+ yade (2016.06a-6) unstable; urgency=medium
+
+ * [4ab8a46] Fix FTBFS against booost_1.62. (Closes: #845742)
+ * [e3afe8b] Apply cme fix dpkg.
+
+ -- Anton Gladky <gladk at debian.org> Sat, 03 Dec 2016 12:24:48 +0100
+
+ yade (2016.06a-5) unstable; urgency=medium
+
+ [ Tobias Hansen ]
+ * Include ipython_directive.py from IPython 5.1.0 to fix build
+ with IPython 5. (Closes: #840527)
+
+ -- Anton Gladky <gladk at debian.org> Sat, 29 Oct 2016 23:25:13 +0200
+
+yade (2016.06a-4~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Anton Gladky <gladk at debian.org> Tue, 30 Aug 2016 23:13:16 +0200
+
yade (2016.06a-4) unstable; urgency=medium
* [c982cf0] Add python-pyqt5.qtwebkit to dependencies.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/yade.git
More information about the debian-science-commits
mailing list