[Yade-dev] [Branch ~yade-dev/yade/trunk] Rev 2570: 1. Fix requestErase of erased interaction (thanks to Anton for reporting)

2010-11-25 Thread noreply

revno: 2570
fixes bug(s): https://launchpad.net/bugs/681018
committer: Václav Šmilauer e...@doxos.eu
branch nick: yade
timestamp: Thu 2010-11-25 09:56:11 +0100
message:
  1. Fix requestErase of erased interaction (thanks to Anton for reporting)
modified:
  core/InteractionContainer.cpp


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to 
https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription
=== modified file 'core/InteractionContainer.cpp'
--- core/InteractionContainer.cpp	2010-11-24 19:54:29 +
+++ core/InteractionContainer.cpp	2010-11-25 08:56:11 +
@@ -84,7 +84,8 @@
 
 
 void InteractionContainer::requestErase(Body::id_t id1, Body::id_t id2, bool force){
-	find(id1,id2)-reset(); IdsForce v={id1,id2,force};
+	const shared_ptrInteraction I=find(id1,id2); if(!I) return;
+	I-reset(); IdsForce v={id1,id2,force};
 	#ifdef YADE_OPENMP
 		threadsPendingErase[omp_get_thread_num()].push_back(v);
 	#else

___
Mailing list: https://launchpad.net/~yade-dev
Post to : yade-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~yade-dev
More help   : https://help.launchpad.net/ListHelp


[Yade-dev] [Bug 681018] Re: Crash in last revision

2010-11-25 Thread Václav Šmilauer
Now should be definitley fixed in r2570 (I tried yuor script). Let us
keep this bug open, so that I remember I should add a simple test to the
regression suite. Cheers, v.

-- 
Crash in last revision
https://bugs.launchpad.net/bugs/681018
You received this bug notification because you are a member of Yade
developers, which is subscribed to Yade.

Status in Yet Another Dynamic Engine: In Progress

Bug description:
The simulation starts and after couple seconds of simulation it crashes.

The problem is in O.bodies.erase(i.id)

Test script and backtrace are attached.



___
Mailing list: https://launchpad.net/~yade-dev
Post to : yade-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~yade-dev
More help   : https://help.launchpad.net/ListHelp


[Yade-dev] [Bug 681018] Re: Crash in last revision

2010-11-25 Thread Launchpad Bug Tracker
** Branch linked: lp:yade

-- 
Crash in last revision
https://bugs.launchpad.net/bugs/681018
You received this bug notification because you are a member of Yade
developers, which is subscribed to Yade.

Status in Yet Another Dynamic Engine: In Progress

Bug description:
The simulation starts and after couple seconds of simulation it crashes.

The problem is in O.bodies.erase(i.id)

Test script and backtrace are attached.



___
Mailing list: https://launchpad.net/~yade-dev
Post to : yade-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~yade-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Yade-dev] [Branch ~yade-dev/yade/trunk] Rev 2570: 1. Fix requestErase of erased interaction (thanks to Anton for reporting)

2010-11-25 Thread Anton Gladky
Thanks, Vaclav!

Should last commits be imported to 0.60?

Anton



On Thu, Nov 25, 2010 at 9:57 AM, nore...@launchpad.net wrote:

 
 revno: 2570
 fixes bug(s): https://launchpad.net/bugs/681018
 committer: Václav Šmilauer e...@doxos.eu
 branch nick: yade
 timestamp: Thu 2010-11-25 09:56:11 +0100
 message:
  1. Fix requestErase of erased interaction (thanks to Anton for reporting)
 modified:
  core/InteractionContainer.cpp


 --
 lp:yade
 https://code.launchpad.net/~yade-dev/yade/trunkhttps://code.launchpad.net/%7Eyade-dev/yade/trunk

 Your team Yade developers is subscribed to branch lp:yade.
 To unsubscribe from this branch go to
 https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscriptionhttps://code.launchpad.net/%7Eyade-dev/yade/trunk/+edit-subscription

 === modified file 'core/InteractionContainer.cpp'
 --- core/InteractionContainer.cpp   2010-11-24 19:54:29 +
 +++ core/InteractionContainer.cpp   2010-11-25 08:56:11 +
 @@ -84,7 +84,8 @@


  void InteractionContainer::requestErase(Body::id_t id1, Body::id_t id2,
 bool force){
 -   find(id1,id2)-reset(); IdsForce v={id1,id2,force};
 +   const shared_ptrInteraction I=find(id1,id2); if(!I) return;
 +   I-reset(); IdsForce v={id1,id2,force};
#ifdef YADE_OPENMP
threadsPendingErase[omp_get_thread_num()].push_back(v);
#else


 ___
 Mailing list: 
 https://launchpad.net/~yade-devhttps://launchpad.net/%7Eyade-dev
 Post to : yade-dev@lists.launchpad.net
 Unsubscribe : 
 https://launchpad.net/~yade-devhttps://launchpad.net/%7Eyade-dev
 More help   : https://help.launchpad.net/ListHelp


___
Mailing list: https://launchpad.net/~yade-dev
Post to : yade-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~yade-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Yade-dev] [Branch ~yade-dev/yade/trunk] Rev 2570: 1. Fix requestErase of erased interaction (thanks to Anton for reporting)

2010-11-25 Thread Václav Šmilauer

Should last commits be imported to 0.60?

No, 0.60 is not affected, that was bugs I introduced recently.

BTW go for the final 0.60 packages, if you have a while. It would be 
nice to try with gcc (to have openmp), but if it is too much hassle, 
just do it just with clang.


Cheers, Vaclav


___
Mailing list: https://launchpad.net/~yade-dev
Post to : yade-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~yade-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Yade-dev] 0.60 rc1 package error

2010-11-25 Thread Václav Šmilauer

sudo sudo add-apt-repository ppa:yade-pkg/stable; sudo apt-get install
yade-0.60
dpkg: error processing 
/var/cache/apt/archives/yade-0.60_rc1~maverick1_amd64.deb (--unpack):
 trying to overwrite '/usr/share/pixmaps/yade16x16.xpm', which is also 
in package yade-bzr2490 bzr2490-maverick1


Oops. Can you fix that? You will have to append version (0.60) to the 
icons as well (and change it in the menu file), otherwise the packages 
will conflict. Or perhpas just don't put the menu stuff at all, it dos 
not work anyway.


Thanks, v.


___
Mailing list: https://launchpad.net/~yade-dev
Post to : yade-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~yade-dev
More help   : https://help.launchpad.net/ListHelp


Re: [Yade-dev] [Bug 681018] Re: Crash in last revision

2010-11-25 Thread Klaus Thoeni
Hi Guys!

I just had a try with the new version, and finally, it works fine for me as
well.

Thanks

Klaus

On Thu, Nov 25, 2010 at 10:15 AM, Anton Gladky
681...@bugs.launchpad.netwrote:

 Thanks a lot, Vaclav! All is Ok now.

 Anton

 --
 Crash in last revision
 https://bugs.launchpad.net/bugs/681018
 You received this bug notification because you are a member of Yade
 developers, which is subscribed to Yade.

 Status in Yet Another Dynamic Engine: In Progress

 Bug description:
 The simulation starts and after couple seconds of simulation it crashes.

 The problem is in O.bodies.erase(i.id)

 Test script and backtrace are attached.



 ___
 Mailing list: 
 https://launchpad.net/~yade-devhttps://launchpad.net/%7Eyade-dev
 Post to : yade-dev@lists.launchpad.net
 Unsubscribe : 
 https://launchpad.net/~yade-devhttps://launchpad.net/%7Eyade-dev
 More help   : https://help.launchpad.net/ListHelp


-- 
Crash in last revision
https://bugs.launchpad.net/bugs/681018
You received this bug notification because you are a member of Yade
developers, which is subscribed to Yade.

Status in Yet Another Dynamic Engine: In Progress

Bug description:
The simulation starts and after couple seconds of simulation it crashes.

The problem is in O.bodies.erase(i.id)

Test script and backtrace are attached.



___
Mailing list: https://launchpad.net/~yade-dev
Post to : yade-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~yade-dev
More help   : https://help.launchpad.net/ListHelp


[Yade-dev] [Bug 681307] Re: regular-sphere-pack examples crashes at debug-version

2010-11-25 Thread Anton Gladky

** Attachment added: backtrace.tgz
   
https://bugs.launchpad.net/bugs/681307/+attachment/1744512/+files/backtrace.tgz

-- 
regular-sphere-pack examples crashes at debug-version
https://bugs.launchpad.net/bugs/681307
You received this bug notification because you are a member of Yade
developers, which is subscribed to Yade.

Status in Yet Another Dynamic Engine: New

Bug description:
regular-sphere-pack works fine at optimized build and crashes at debug-build.

Backtrace is attached.



___
Mailing list: https://launchpad.net/~yade-dev
Post to : yade-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~yade-dev
More help   : https://help.launchpad.net/ListHelp


[Yade-dev] [Bug 681307] Re: regular-sphere-pack examples crashes at debug-version

2010-11-25 Thread Václav Šmilauer
*** This bug is a duplicate of bug 669095 ***
https://bugs.launchpad.net/bugs/669095

** This bug has been marked a duplicate of bug 669095
   error: Body's boundary metting its opposite boundary
 * You can subscribe to bug 669095 by following this link: 
https://bugs.launchpad.net/yade/+bug/669095/+subscribe

-- 
regular-sphere-pack examples crashes at debug-version
https://bugs.launchpad.net/bugs/681307
You received this bug notification because you are a member of Yade
developers, which is subscribed to Yade.

Status in Yet Another Dynamic Engine: New

Bug description:
regular-sphere-pack works fine at optimized build and crashes at debug-build.

Backtrace is attached.



___
Mailing list: https://launchpad.net/~yade-dev
Post to : yade-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~yade-dev
More help   : https://help.launchpad.net/ListHelp


[Yade-dev] [Branch ~yade-dev/yade/trunk] Rev 2571: - FlowEngine : rewrite updateVolume so that cell volumes are not computed twice.

2010-11-25 Thread noreply

revno: 2571
committer: Bruno Chareyre bruno.chare...@hmg.inpg.fr
branch nick: yade
timestamp: Thu 2010-11-25 13:16:32 +0100
message:
  - FlowEngine : rewrite updateVolume so that cell volumes are not computed 
twice.
  - Remove irrelevant remark in SCPE
  - Some missing 6D here and ther in decorations (could affect only 
devirtualized build) 
modified:
  pkg/common/Cylinder.cpp
  pkg/common/Cylinder.hpp
  pkg/dem/FlowEngine.cpp
  pkg/dem/Ig2_Sphere_Sphere_ScGeom.cpp
  pkg/dem/SampleCapillaryPressureEngine.hpp


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to 
https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription
=== modified file 'pkg/common/Cylinder.cpp'
--- pkg/common/Cylinder.cpp	2010-11-12 18:44:15 +
+++ pkg/common/Cylinder.cpp	2010-11-25 12:16:32 +
@@ -9,10 +9,11 @@
 ChainedCylinder::~ChainedCylinder(){}
 ChainedState::~ChainedState(){}
 CylScGeom::~CylScGeom(){}
-
-
-YADE_PLUGIN(
-	(Cylinder)(ChainedCylinder)(ChainedState)(CylScGeom)(Ig2_Sphere_ChainedCylinder_CylScGeom)(Ig2_ChainedCylinder_ChainedCylinder_ScGeom6D)
+// Ig2_Sphere_ChainedCylinder_CylScGeom::~Ig2_Sphere_ChainedCylinder_CylScGeom() {}
+// Ig2_ChainedCylinder_ChainedCylinder_ScGeom6D::~Ig2_ChainedCylinder_ChainedCylinder_ScGeom6D() {}
+
+
+YADE_PLUGIN((Cylinder)(ChainedCylinder)(ChainedState)(CylScGeom)(Ig2_Sphere_ChainedCylinder_CylScGeom)(Ig2_ChainedCylinder_ChainedCylinder_ScGeom6D)
 	#ifdef YADE_OPENGL
 		(Gl1_Cylinder)(Gl1_ChainedCylinder)
 	#endif
@@ -64,7 +65,7 @@
 	Real dist = direction.dot(branch);
 // 	if ((dist-interactionDetectionFactor*cylinder-radius)  !c-isReal()) return (false);//position _before_ start of cylinder
 	if ((dist-interactionDetectionFactor*cylinder-radius)  isNew) return (false);//position _before_ start of cylinder
-		
+
 	//Check sphere-cylinder distance
 	Vector3r projectedP = cylinderSt-pos+shift2 + direction*dist;
 	branch = projectedP-sphereSt-pos;
@@ -74,7 +75,7 @@
 	shared_ptrCylScGeom scm;
 	if(!isNew) scm=YADE_PTR_CASTCylScGeom(c-geom);
 	else { scm=shared_ptrCylScGeom(new CylScGeom()); c-geom=scm; }
-	
+
 	scm-radius1=sphere-radius;
 	scm-radius2=cylinder-radius;
 	scm-id3=cylinderSt-chains[cylinderSt-chainNumber][cylinderSt-rank+1];
@@ -160,9 +161,9 @@
 	const ChainedState bchain2 = revert? *pChain1 : *pChain2;
 	if (bchain2.rank-bchain1.rank != 1) {/*cerrMutual contacts in same chain between not adjacent elements, not handled*/ return false;}
 	if (pChain2-chainNumber!=pChain1-chainNumber) {cerrPROBLEM0124endl; return false;}
-	
+
 	ChainedCylinder *bs1=static_castChainedCylinder*(revert? cm2.get():cm1.get());
-	
+
 	shared_ptrScGeom6D scm;
 	bool isNew = !c-geom;
 	if(!isNew) scm=YADE_PTR_CASTScGeom6D(c-geom);
@@ -176,8 +177,8 @@
 	scm-contactPoint=bchain2.pos;
 	//bs1-segment used for fast BBs and projections + display
 	bs1-segment= bchain2.pos-bchain1.pos;
-#ifdef YADE_OPENGL 
-	//bs1-length and s1-chainedOrientation used for display only, 
+#ifdef YADE_OPENGL
+	//bs1-length and s1-chainedOrientation used for display only,
 	bs1-length=length;
 	bs1-chainedOrientation.setFromTwoVectors(Vector3r::UnitZ(),bchain1.ori.conjugate()*segt);
 #endif
@@ -301,10 +302,10 @@
 //gluDeleteQuadric(quadObj);
 //glPopMatrix();
 // //GLERROR;
-// 	
+//
 // // 	glEndList();}
 // // 	glCallList(glCylinderList);
-// 
+//
 // }
 
 //!##	BOUNDS FUNCTOR   #

=== modified file 'pkg/common/Cylinder.hpp'
--- pkg/common/Cylinder.hpp	2010-11-12 18:44:15 +
+++ pkg/common/Cylinder.hpp	2010-11-25 12:16:32 +
@@ -1,9 +1,9 @@
 #pragma once
+#includeyade/pkg/common/Dispatching.hpp
 #includeyade/core/Shape.hpp
 #includeyade/core/State.hpp
 #includeyade/core/Body.hpp
 #includeyade/pkg/dem/ScGeom.hpp
-#includeyade/pkg/common/Dispatching.hpp
 #includeyade/pkg/common/Sphere.hpp
 #includeyade/core/Scene.hpp
 #ifdef YADE_OPENGL
@@ -13,28 +13,31 @@
 
 class Cylinder: public Sphere{
 	public:
-		Cylinder(Real _radius, Real _length): length(_length) { /*segment=Vector3r(0,0,1)*_length;*/ radius=_radius; createIndex(); }
+// 		Cylinder(Real _radius, Real _length): length(_length) { /*segment=Vector3r(0,0,1)*_length;*/ radius=_radius; createIndex(); }
 		virtual ~Cylinder ();
 	YADE_CLASS_BASE_DOC_ATTRS_CTOR(Cylinder,Sphere,Geometry of a cylinder, as Minkowski sum of line and sphere.,
 // 		((Real,radius,NaN,,Radius [m]))
 		((Real,length,NaN,,Length [m]))
 		((Vector3r,segment,Vector3r::Zero(),,Length vector)),
 		createIndex();
+
 		/*ctor*/
+		segment=Vector3r(0,0,1)*length;
 	);
 	REGISTER_CLASS_INDEX(Cylinder,Sphere);
 };
+REGISTER_SERIALIZABLE(Cylinder);
 
 class ChainedCylinder: public Cylinder{
 	public:
-		ChainedCylinder(Real _radius, Real _length): Cylinder(_radius,_length){}
+// 		ChainedCylinder(Real _radius, Real _length);/*: Cylinder(_radius,_length){}*/
 		virtual 

Re: [Yade-dev] can't launch yade

2010-11-25 Thread Václav Šmilauer
/Starting program: /usr/bin/python /home/giulia/YADE/bin/yade-bzr2567 
--debug -x/

[Thread debugging using libthread_db enabled]
Usage: yade-bzr2567 [options] [ simulation.xml[.bz2] | script.py 
[script options]]


yade-bzr2567: error: no such option: -/
/
Oops, that was a typo on my part, it should have been just -x (without 
the slash), sorry.



/Program received signal SIGFPE, Arithmetic exception.
0x7fffe6d4602f in OpenMPAccumulatordouble::OpenMPAccumulator() ()
   from /home/giulia/YADE/lib/yade-bzr2567/plugins/libplugins.so
(gdb) thread apply bt full
/
but I don't have anything after that.. I'm completely lost
Excellent! Had you run with --debug, you would get backtrace, but this 
is good enough already! I think I fixed it in the latest revision 
(2573). Do bzr up and re-compile, it should work. In the unexpected 
case that it does not, run again in the debugger and inside (gdb) run 
yade with --debug (with or without -x, that does not make much difference).


Explanation: since there is only one int division in OpenMPAccumulator 
constructor (by the constant CLS, cache line size, hardware-defined 
property of the CPU), it is apparently CLS that is not assigned 
correctly by sysconf(_SC_LEVEL1_DCACHE_LINESIZE) for your processor: it 
should be something like 32, 64, 128 but in your case it gives zero -- I 
guess that your processor model is too new for the system lib to know it 
(ubuntu 9.10 you said, right?). I added a check for zero value there, in 
which case 64 will be used as fallback.


Cheers, Vaclav

___
Mailing list: https://launchpad.net/~yade-dev
Post to : yade-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~yade-dev
More help   : https://help.launchpad.net/ListHelp


[Yade-dev] New Material and new contact law

2010-11-25 Thread Klaus Thoeni
Hi Guys!

I have to implement a simple contact law which considers normal tensile force 
only but elasto-plastic behaviour (steel wire). Once the connection breaks 
there is no more interaction. Any idea if there is already something similar 
in the code? 

Any suggestion how to start? I was thinking to create a new material 
ElPlastMat. Makes it sense or not?

I am still not really familiar with the code. So I appreciate any kind of 
help.

Thanks

Klaus

___
Mailing list: https://launchpad.net/~yade-dev
Post to : yade-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~yade-dev
More help   : https://help.launchpad.net/ListHelp


[Yade-dev] [Branch ~yade-dev/yade/trunk] Rev 2574: 1. Changes from 0.60 (debian packaging).

2010-11-25 Thread noreply

revno: 2574
committer: Anton Gladky gladky.an...@gmail.com
branch nick: trunk
timestamp: Fri 2010-11-26 08:42:42 +0100
message:
  1. Changes from 0.60 (debian packaging).
removed:
  debian/yade-dbg.menu-template
added:
  debian/yade.desktop-template
modified:
  debian/rules
  debian/yade.menu-template
  debian/yade.postinst-template
  scripts/debian-prep


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to 
https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription
=== modified file 'debian/rules'
--- debian/rules	2010-10-16 18:31:17 +
+++ debian/rules	2010-11-26 07:42:42 +
@@ -51,7 +51,7 @@
 	# remove the profile, if existing, to have clean config
 	rm -f scons.profile-deb
 	# the last argument specified that we only want files in lib installed -- common files (the executable) are already in the optimized package
-	NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version=${VERSION} brief=0 chunkSize=1 jobs=1 features=vtk,gts,opengl,openmp,qt4 PREFIX=debian/yade${_VERSION}-dbg/usr variant='' optimize=0 march= debug=1 CPPPATH=/usr/include/vtk-5.0:/usr/include/vtk-5.2:/usr/include/vtk-5.4:/usr/include/eigen2 QT4DIR=/usr/share/qt4 debian/yade${_VERSION}-dbg/usr/lib
+	NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version=${VERSION} brief=0 chunkSize=5 jobs=1 features=vtk,gts,opengl,qt4 PREFIX=debian/yade${_VERSION}-dbg/usr variant='' optimize=0 march= debug=1 CPPPATH=/usr/include/vtk-5.0:/usr/include/vtk-5.2:/usr/include/vtk-5.4:/usr/include/eigen2 QT4DIR=/usr/share/qt4 debian/yade${_VERSION}-dbg/usr/lib
 	#optimized build
 	NO_SCONS_GET_RECENT= scons profile=deb PREFIX=debian/yade${_VERSION}/usr variant='' optimize=1 debug=0
 	#install platform-independent files (docs, scripts, examples)
@@ -59,7 +59,11 @@
 	cp -r examples scripts debian/yade${_VERSION}/usr/share/doc/yade${_VERSION}
 	# copy pixmap files in relevant directories
 	mkdir -p debian/yade${_VERSION}/usr/share/pixmaps
-	cp debian/*.xpm debian/yade${_VERSION}/usr/share/pixmaps
+	mkdir -p debian/yade${_VERSION}/usr/share/applications
+	cp debian/yade16x16.xpm debian/yade${_VERSION}/usr/share/pixmaps/yade${_VERSION}_16x16.xpm
+	cp debian/yade32x32.xpm debian/yade${_VERSION}/usr/share/pixmaps/yade${_VERSION}_32x32.xpm
+	cp debian/yade${_VERSION}.desktop debian/yade${_VERSION}/usr/share/applications/
+	dh_installmenu
 
 	# UGLY! generate sphinx docs only if python-sphinx is installed (distinguishes distributions which should build it or not as per debian/control-template build-deps)
 	if dpkg-query -W python-sphinx; then cd doc/sphinx; PYTHONPATH=. YADE_PREFIX=../../debian/yade${_VERSION}/usr/ ../../debian/yade${_VERSION}/usr/bin/yade${_VERSION} yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex; cd ../..; mkdir -p ../../debian/yade${_VERSION}-doc/usr/share/doc/yade${_VERSION}; cp -r _build/html _build/latex/Yade.pdf ../../debian/yade${_VERSION}-doc/usr/share/doc/yade${_VERSION}; else echo Not building HTML documentation, since the python-sphinx package is not installed; fi
@@ -75,7 +79,7 @@
 	YADE_PREFIX=debian/yade${_VERSION}-dbg/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION} --debug --test
 
 # Build architecture-independent files here.
-binary-indep: build install
+binary-indep: build install 
 # We have nothing to do by default.
 
 # Build architecture-dependent files here.
@@ -87,7 +91,6 @@
 	dh_installdocs
 	dh_installexamples
 #	dh_install
-	dh_installmenu
 #	dh_installdebconf	
 #	dh_installlogrotate
 #	dh_installemacsen

=== removed file 'debian/yade-dbg.menu-template'
--- debian/yade-dbg.menu-template	2010-10-16 18:31:17 +
+++ debian/yade-dbg.menu-template	1970-01-01 00:00:00 +
@@ -1,9 +0,0 @@
-?package(y...@_version@):\
-	needs=X11\
-	section=Applications/Science/Physics\
-	title=Yade (@SNAPSHOT@ @VERSION@)\
-	command=x-terminal-emulator -T 'Yade @SNAPSHOT@ @VERSION@ (debug)' -x /usr/bin/y...@_version@ -- debug\
-	icon=/usr/share/pixmaps/yade32x32.xpm\
-	icon16x16=/usr/share/pixmaps/yade16x16.xpm\
-	icon32x32=/usr/share/pixmaps/yade32x32.xpm
-

=== added file 'debian/yade.desktop-template'
--- debian/yade.desktop-template	1970-01-01 00:00:00 +
+++ debian/yade.desktop-template	2010-11-26 07:42:42 +
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Yade @SNAPSHOT@ @VERSION@
+GenericName=Yade
+Exec=x-terminal-emulator -T 'Yade @SNAPSHOT@ @VERSION@' -x /usr/bin/y...@_version@
+Icon=/usr/share/pixmaps/y...@_version@_32x32.xpm
+Terminal=true
+Categories=Education;Physics;Science;

=== modified file 'debian/yade.menu-template'
--- debian/yade.menu-template	2010-10-16 18:31:17 +
+++ debian/yade.menu-template	2010-11-26 07:42:42 +
@@ -3,7 +3,7 @@
 	section=Applications/Science/Physics\
 	title=Yade (@SNAPSHOT@ @VERSION@)\