[yade] 02/04: Update/Remove patches.
Anton Gladky
gladk at moszumanska.debian.org
Fri Jan 20 17:00:38 UTC 2017
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository yade.
commit 09577db3dda74a9dffd4caba203ddca9f95d4475
Author: Anton Gladky <gladk at debian.org>
Date: Thu Jan 19 22:46:25 2017 +0100
Update/Remove patches.
---
debian/patches/01_remove_google_analytics.patch | 6 +-
debian/patches/05_reproducible-builds.patch | 192 ------------------------
debian/patches/06_fixCrash.patch | 26 ----
debian/patches/08_fix-FTBFS-bosst162.patch | 23 ---
debian/patches/10_ipython5_fix.patch | 24 ---
debian/patches/series | 5 -
6 files changed, 3 insertions(+), 273 deletions(-)
diff --git a/debian/patches/01_remove_google_analytics.patch b/debian/patches/01_remove_google_analytics.patch
index f9ee87b..dc6fd35 100644
--- a/debian/patches/01_remove_google_analytics.patch
+++ b/debian/patches/01_remove_google_analytics.patch
@@ -2,10 +2,10 @@ Description: remove google analytics script
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2014-01-14
-Index: trunk-2016.06a/doc/sphinx/templates/layout.html
+Index: yade/doc/sphinx/templates/layout.html
===================================================================
---- trunk-2016.06a.orig/doc/sphinx/templates/layout.html
-+++ trunk-2016.06a/doc/sphinx/templates/layout.html
+--- yade.orig/doc/sphinx/templates/layout.html
++++ yade/doc/sphinx/templates/layout.html
@@ -16,19 +16,6 @@
{% endblock %}
diff --git a/debian/patches/05_reproducible-builds.patch b/debian/patches/05_reproducible-builds.patch
deleted file mode 100644
index 54d54b1..0000000
--- a/debian/patches/05_reproducible-builds.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-Description: Fix some machine-specific items in documentation.
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2016-06-02
-
-Index: trunk-2016.06a/doc/sphinx/introduction.rst
-===================================================================
---- trunk-2016.06a.orig/doc/sphinx/introduction.rst
-+++ trunk-2016.06a/doc/sphinx/introduction.rst
-@@ -157,15 +157,11 @@ Normal simulations, however, are run con
-
- In [1]: O.pause()
-
-- In [1]: O.iter
-- 104587
--
- In [1]: O.run(100000,True)
-
-- In [1]: O.iter
-- 204587
--
- In [1]: O.stopAtIter=500000
-+
-+ In [1]: O.run()
-
- In [1]: O.wait()
-
-@@ -253,11 +249,9 @@ Entire simulation, i.e. both data and fu
-
- .. ipython::
-
-- Yade [1]: O.bodies # some data components
--
-- Yade [2]: len(O.bodies) # there are no bodies as of yet
-+ Yade [1]: len(O.bodies) # there are no bodies as of yet
-
-- Yade [3]: O.engines # functional components, empty at the moment
-+ Yade [2]: O.engines # functional components, empty at the moment
-
- Data components
- ^^^^^^^^^^^^^^^
-@@ -288,13 +282,11 @@ Explicitly assigning all 4 properties to
-
- .. ipython::
-
-- In [3]: s=utils.sphere(center=[0,0,0],radius=1)
--
-- In [5]: s.shape, s.state, s.mat, s.bound
-+ In [2]: s=utils.sphere(center=[0,0,0],radius=1)
-
-- In [6]: s.state.pos
-+ In [3]: s.state.pos
-
-- In [7]: s.shape.radius
-+ In [4]: s.shape.radius
-
-
- We see that a sphere with material of type :yref:`FrictMat` (default, unless you provide another :yref:`Material`) and bounding volume of type :yref:`Aabb` (axis-aligned bounding box) was created. Its position is at origin and its radius is 1.0. Finally, this object can be inserted into the simulation; and we can insert yet one sphere as well.
-@@ -360,21 +352,21 @@ Suppose now interactions have been alrea
-
- .. ipython::
-
-- In [1]: O.interactions[0,1]
-- <Interaction instance at 0x93f9528>
-+ In [1]: if (O.interactions[0,1]): print ("Interaction exists!")
-+ Interaction exists!
-
-- In [2]: O.interactions[1,0] # order of ids is not important
-+ In [2]: if (O.interactions[1,0]): print ("Interaction exists!") # order of ids is not important
-
- In [2]: i=O.interactions[0,1]
-
- In [3]: i.id1,i.id2
- (0, 1)
-
-- In [4]: i.geom
-- <ScGeom instance at 0x9403838>
-+ In [4]: if (i.geom): print ("Geom instance exists!")
-+ Geom instance exists!
-
-- In [5]: i.phys
-- <ElasticContactInteraction instance at 0x94038d0>
-+ In [5]: if (i.phys): print ("Phys instance exists!")
-+ Phys instance exists!
-
- In [6]: O.interactions[100,10111]
- ValueError: No such interaction
-Index: trunk-2016.06a/doc/sphinx/tutorial-geo.rst
-===================================================================
---- trunk-2016.06a.orig/doc/sphinx/tutorial-geo.rst
-+++ trunk-2016.06a/doc/sphinx/tutorial-geo.rst
-@@ -85,9 +85,9 @@ The following creates periodic cloud of
-
- Yade [1]: sp=pack.SpherePack()
-
-- Yade [1]: sp.makeCloud((1,1,1),(2,2,2),rMean=.2,periodic=True)
-+ Yade [1]: idParticlesCreated = sp.makeCloud((1,1,1),(2,2,2),rMean=.2,periodic=True)
-
-- Yade [1]: sp.toSimulation() # implicitly sets O.periodic=True, and O.cell.refSize to the packing period size
-+ Yade [1]: idParticlesAdded = sp.toSimulation() # implicitly sets O.periodic=True, and O.cell.refSize to the packing period size
-
- Yade [1]: O.engines+=[PeriTriaxController(goal=(-1e4,-1e4,-.1),stressMask=0b011,maxUnbalanced=.2,doneHook='functionToRunWhenFinished()')]
-
-Index: trunk-2016.06a/doc/sphinx/tutorial-hands-on.rst
-===================================================================
---- trunk-2016.06a.orig/doc/sphinx/tutorial-hands-on.rst
-+++ trunk-2016.06a/doc/sphinx/tutorial-hands-on.rst
-@@ -320,8 +320,6 @@ In order to avoid such tasks, shorthand
-
- Yade [1]: s=utils.sphere((0,0,0),radius=1) # create sphere particle centered at (0,0,0) with radius=1
-
-- Yade [1]: s.shape # s.shape describes the geometry of the particle
--
- Yade [1]: s.shape.radius # we already know the Sphere class
-
- Yade [1]: s.state.mass, s.state.inertia # inertia is computed from density and geometry
-@@ -336,7 +334,7 @@ A particle object is not yet part of the
-
- .. ipython::
-
-- Yade [1]: O.bodies.append(s) # adds particle s to the simulation; returns id of the particle(s) added
-+ Yade [1]: idS = O.bodies.append(s) # adds particle s to the simulation; returns id of the particle(s) added
-
-
- Packs
-@@ -350,12 +348,9 @@ There are functions to generate a specif
-
- Yade [1]: sp=pack.SpherePack() # create an empty cloud; SpherePack contains only geometrical information
-
-- Yade [1]: sp.makeCloud((1,1,1),(2,2,2),rMean=.2) # put spheres with defined radius inside box given by corners (1,1,1) and (2,2,2)
--
-- Yade [1]: for c,r in sp: print c,r # print center and radius of all particles (SpherePack is a sequence which can be iterated over)
-- ...:
-+ Yade [1]: idParticlesCreated = sp.makeCloud((1,1,1),(2,2,2),rMean=.2) # put spheres with defined radius inside box given by corners (1,1,1) and (2,2,2)
-
-- Yade [1]: sp.toSimulation() # create particles and add them to the simulation
-+ Yade [1]: idParticlesAdded = sp.toSimulation() # create particles and add them to the simulation
-
- Boundaries
- """"""""""
-@@ -430,10 +425,6 @@ Engines define processes undertaken by p
- ...: ]
- ...:
-
-- Yade [1]: O.engines
--
-- Yade [1]: O.engines[-1]==newton # is it the same object?
--
- Yade [1]: newton.damping
-
- Instead of typing everything into the command-line, one can describe simulation in a file (*script*) and then run yade with that file as an argument. We will therefore no longer show the command-line unless necessary; instead, only the script part will be shown. Like this::
-Index: trunk-2016.06a/doc/sphinx/user.rst
-===================================================================
---- trunk-2016.06a.orig/doc/sphinx/user.rst
-+++ trunk-2016.06a/doc/sphinx/user.rst
-@@ -45,10 +45,6 @@ If no :yref:`Material` is specified when
-
- Yade [2]: idConcrete=O.materials.append(FrictMat(young=30e9,poisson=.2,frictionAngle=.6,label="concrete"))
-
-- Yade [3]: O.materials[idConcrete]
--
-- # uses the last defined material
--
- Yade [3]: O.bodies.append(sphere(center=(0,0,0),radius=1))
-
- # material given by id
-@@ -520,9 +516,6 @@ It is possible to create an interaction
-
- Yade [1]: i=createInteraction(0,1)
-
-- # created by functors in InteractionLoop
-- Yade [2]: i.geom, i.phys
--
- This method will be rather slow if many interaction are to be created (the functor lookup will be repeated for each of them). In such case, ask on yade-dev at lists.launchpad.net to have the :yref:`createInteraction<yade.utils.createInteraction>` function accept list of pairs id's as well.
-
- Base engines
-@@ -826,15 +819,7 @@ Simulation tags
- * ``O.tags`` is *saved and loaded with simulation*;
- * ``O.tags`` has some values pre-initialized.
-
--After Yade startup, ``O.tags`` contains the following:
--
--.. ipython::
--
-- @suppress
-- Yade [1]: O.reset()
--
-- Yade [1]: dict(O.tags) # convert to real dictionary
--
-+After Yade startup, ``O.tags`` contains meta information about simulation:
-
- author
- Real name, username and machine as obtained from your system at simulation creation
diff --git a/debian/patches/06_fixCrash.patch b/debian/patches/06_fixCrash.patch
deleted file mode 100644
index 148dcf4..0000000
--- a/debian/patches/06_fixCrash.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 07940b52ac31597c07d9d98f2891311d7e6d8e0e Mon Sep 17 00:00:00 2001
-From: Anton Gladky <gladky.anton at gmail.com>
-Date: Wed, 24 Aug 2016 18:27:21 +0200
-Subject: [PATCH] Increase the size of force container.
-
-Prevents crashes, when the simulation is loaded
-with O.load, but force container is not large
-enough to keep all bodies.
----
- pkg/common/InsertionSortCollider.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/pkg/common/InsertionSortCollider.cpp b/pkg/common/InsertionSortCollider.cpp
-index 8914b96..4206391 100644
---- a/pkg/common/InsertionSortCollider.cpp
-+++ b/pkg/common/InsertionSortCollider.cpp
-@@ -221,6 +221,9 @@ void InsertionSortCollider::action(){
- }
- if(minima.size()!=(size_t)3*nBodies){ minima.resize(3*nBodies); maxima.resize(3*nBodies); }
- assert((size_t)BB[0].size==2*scene->bodies->size());
-+
-+ //Increase the size of force container.
-+ scene->forces.addMaxId(2*scene->bodies->size());
-
- // update periodicity
- assert(BB[0].axis==0); assert(BB[1].axis==1); assert(BB[2].axis==2);
diff --git a/debian/patches/08_fix-FTBFS-bosst162.patch b/debian/patches/08_fix-FTBFS-bosst162.patch
deleted file mode 100644
index 4365e33..0000000
--- a/debian/patches/08_fix-FTBFS-bosst162.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 7671fdc5fb19cd850ee577a5d43bf59b34824299 Mon Sep 17 00:00:00 2001
-From: Anton Gladky <gladk at debian.org>
-Date: Sat, 3 Dec 2016 12:18:37 +0100
-Subject: [PATCH] Add -fext-numeric-literals to fix FTBFS against boost_1.62
-
-Debian bug #845742: https://bugs.debian.org/845742
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1d748b3..26f3d0f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -73,7 +73,7 @@ ELSE()
- ENDIF()
- ENDIF()
-
--SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O2 --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -Wall -std=c++11 ")
-+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC -O2 --param=ssp-buffer-size=4 -Wformat -Wformat-security -Werror=format-security -Wall -std=c++11 -fext-numeric-literals")
-
- IF (DEBUG)
- SET(CMAKE_VERBOSE_MAKEFILE 1)
diff --git a/debian/patches/10_ipython5_fix.patch b/debian/patches/10_ipython5_fix.patch
deleted file mode 100644
index b232f31..0000000
--- a/debian/patches/10_ipython5_fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Fix ipython5 config module
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2016-12-10
-
---- yade-2016.06a.orig/core/main/main.py.in
-+++ yade-2016.06a/core/main/main.py.in
-@@ -228,9 +228,14 @@ def userSession(gui='none',qapp=None):
- from IPython.terminal.embed import InteractiveShellEmbed
- else:
- from IPython.frontend.terminal.embed import InteractiveShellEmbed
-- from IPython.config.loader import Config
-- cfg = Config()
-- prompt_config = cfg.PromptManager
-+ if yade.runtime.ipython_version>=500:
-+ from traitlets.config.loader import Config
-+ cfg = Config()
-+ prompt_config = cfg.TerminalInteractiveShell.prompts_class
-+ else:
-+ from IPython.config.loader import Config
-+ cfg = Config()
-+ prompt_config = cfg.PromptManager
- prompt_config.in_template = ipconfig['prompt_in1']
- prompt_config.in2_template = ipconfig['prompt_in2']
- prompt_config.out_template = ipconfig['prompt_out']
diff --git a/debian/patches/series b/debian/patches/series
index da006a7..b4e6505 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
01_remove_google_analytics.patch
-05_reproducible-builds.patch
-06_fixCrash.patch
-07_ipython5.patch
-08_fix-FTBFS-bosst162.patch
-10_ipython5_fix.patch
--
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