[yade] 01/02: Merge.
Anton Gladky
gladk at moszumanska.debian.org
Thu Apr 10 20:06:23 UTC 2014
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch wheezy
in repository yade.
commit 8053f89238c8be57569cd055785064a4d97161cd
Merge: a42be1f d42bd69
Author: Anton Gladky <gladk at debian.org>
Date: Thu Apr 10 19:53:35 2014 +0200
Merge.
CMakeLists.txt | 40 ++++--
ChangeLog | 127 ++++++++++++++++---
README.rst | 5 +-
RELEASE | 2 +-
core/main/main.py.in | 10 +-
core/main/yade-batch.in | 7 ++
debian/changelog | 37 ++++++
debian/control | 10 +-
debian/copyright | 2 +-
debian/patches/01_fix_ipython_1.0.patch | 16 +++
debian/patches/02_remove_google_analytics.patch | 26 ++++
debian/patches/03_increase_steps_in_test.patch | 15 +++
debian/patches/04_fix_libqglviewer.patch | 37 ++++++
debian/patches/20_disable_release-mode.patch | 40 ------
debian/patches/series | 5 +-
debian/rules | 7 +-
debian/tests/control | 1 +
debian/tests/yadetest | 5 +
debian/upstream | 11 ++
doc/references.bib | 42 +++++--
doc/sphinx/formulation.rst | 14 ++-
doc/sphinx/installation.rst | 88 ++++++++++----
doc/sphinx/user.rst | 2 +-
doc/yade-articles.bib | 15 ++-
examples/baraban/BicyclePedalEngine.py | 62 ++++++++++
examples/clumps/addToClump-example.py | 4 +
.../{addToClump-example.py => save-load-clumps.py} | 24 ++--
examples/concrete/triax.py | 7 +-
examples/jointedCohesiveFrictionalPM/gravityBis.py | 11 +-
.../jointedCohesiveFrictionalPM/gravityLoading.py | 14 +--
examples/jointedCohesiveFrictionalPM/identifBis.py | 91 +++++++-------
.../identificationSpheresOnJoint.py | 120 +++++++++---------
.../jointedCohesiveFrictionalPM/testingJoint.py | 135 +++++++++++++++++++++
examples/packs/packs.py | 11 +-
examples/stl-gts/README | 7 ++
examples/stl-gts/cone.geo | 38 ++++++
examples/stl-gts/convert2stl.sh | 3 +
examples/stl-gts/gts-stl.py | 42 +++++++
examples/tetra/oneTetra.py | 2 +-
examples/triax-tutorial/script-session1.py | 1 +
gui/qt4/GLViewerMouse.cpp | 42 ++++---
gui/qt4/__init__.py | 11 +-
lib/triangulation/FlowBoundingSphere.ipp | 3 +-
lib/triangulation/FlowBoundingSphereLinSolv.ipp | 3 +-
lib/triangulation/PeriodicFlow.cpp | 1 -
lib/triangulation/def_types.h | 3 +
pkg/common/Grid.cpp | 61 ----------
pkg/common/Grid_GUI.cpp | 67 ++++++++++
pkg/common/KinematicEngines.cpp | 33 ++++-
pkg/common/KinematicEngines.hpp | 12 ++
pkg/dem/FlowEngine.cpp | 40 +++---
pkg/dem/FlowEngine.hpp | 13 +-
pkg/dem/Ip2_FrictMat_FrictMat_FrictPhys.cpp | 33 +++--
pkg/dem/JointedCohesiveFrictionalPM.cpp | 106 ++++++++++------
pkg/dem/JointedCohesiveFrictionalPM.hpp | 75 ++++++------
pkg/dem/Shop.hpp | 4 +-
pkg/dem/Shop_02.cpp | 13 ++
pkg/dem/TesselationWrapper.hpp | 4 +-
pkg/dem/VTKRecorder.cpp | 74 ++++++++---
pkg/dem/VTKRecorder.hpp | 3 +-
pkg/dem/ViscoelasticPM.cpp | 68 +++++++----
pkg/dem/ViscoelasticPM.hpp | 15 ++-
py/_extraDocs.py | 6 +-
py/_utils.cpp | 61 +++++-----
py/export.py | 47 ++++++-
py/pack/pack.py | 6 +-
py/utils.py | 2 +-
py/ymport.py | 40 ++++++
scripts/checks-and-tests/checks/DEM-PFV-check.py | 11 +-
scripts/checks-and-tests/checks/checkViscElEng.py | 59 +++++++++
scripts/checks-and-tests/checks/checkWeight.py | 2 +-
scripts/ppa/.dput.cf | 6 +
scripts/ppa/.mini-dinstall.conf | 21 ++++
scripts/ppa/buildppa.py | 120 ++++++++++++++++++
scripts/ppa/ppa.config | 31 +++++
75 files changed, 1697 insertions(+), 535 deletions(-)
diff --cc debian/changelog
index f0481f3,e65ed2e..f1eeef5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,40 +1,49 @@@
+ yade (1.07.0-4) unstable; urgency=medium
+
+ * [053bf6f] Remove some build-depends, which were added to VTK6.
+ * [a560cb6] Remove --parallel option. (Closes: #741827)
+ * [1d1f0d5] Build yade only on amd64 hurd-i386 i386
+ kfreebsd-amd64 kfreebsd-i386 powerpc s390x sparc ppc64 x32.
+ * [fa8ee56] Add autotest.
+
+ -- Anton Gladky <gladk at debian.org> Sun, 30 Mar 2014 19:05:22 +0200
+
+ yade (1.07.0-3) unstable; urgency=medium
+
+ * [c628d07] Update Depends for VTK6.
+ * [2d27ac8] Fix compilation against new libqglviewer.
+ * [3821427] Update date in debian/copyright.
+
+ -- Anton Gladky <gladk at debian.org> Sun, 16 Mar 2014 14:55:57 +0100
+
+ yade (1.07.0-2) unstable; urgency=medium
+
+ * [1de8256] Increase number of steps in checkWeight.py.
+
+ -- Anton Gladky <gladk at debian.org> Sun, 19 Jan 2014 19:59:34 +0100
+
+ yade (1.07.0-1) unstable; urgency=medium
+
+ * [d42c7de] Imported Upstream version 1.07.0
+ * [a421b10] Remove patch, applied by upstream.
+ * [d151f88] Set Standards-Version: 3.9.5. No changes.
+ * [a9616c6] Add upstream file.
+ * [c078bb4] Inject additional parameters for weak archs.
+ Thanks to Roland Stigge <stigge at antcom.de>. (Closes: #733152)
+ * [21a2430] Fix version definition for IPython>1.0.0.
+ * [8204093] Remove google-scripts from documentation.
+
+ -- Anton Gladky <gladk at debian.org> Mon, 13 Jan 2014 20:13:14 +0100
+
+yade (1.05.0-2~bpo70+1) wheezy-backports; urgency=low
+
+ * Rebuild for wheezy-backports.
+ * Remove python-gts, libmetis-dev, libopenblas-dev, libsuitesparse-dev
+ and python-minieigen from Build-Depends.
+ * Replace libqglviewer-dev by libqglviewer-qt4-dev.
+
+ -- Anton Gladky <gladk at debian.org> Tue, 03 Dec 2013 20:47:54 +0100
+
yade (1.05.0-2) unstable; urgency=low
* [cf3f8d9] Pass -ftrack-macro-expansion=0 only if gcc>=4.8. (Closes: #726009)
diff --cc debian/control
index ed1cdf6,bd8409f..3acab2f
--- a/debian/control
+++ b/debian/control
@@@ -20,8 -20,11 +20,10 @@@ Build-Depends
libgl1-mesa-dev,
libgts-dev,
libloki-dev,
- libmetis-dev [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc],
+ libqglviewer-qt4-dev,
+ libvtk5-dev,
+ libopenblas-dev [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc],
- libqglviewer-dev,
+ libsuitesparse-dev [amd64 i386 ia64 kfreebsd-amd64 kfreebsd-i386 powerpc],
- libvtk6-dev (>=6.0.0-6),
libxi-dev,
libxmu-dev,
pyqt4-dev-tools,
--
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