[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. upstream/0.70.0-95-geab93e5

[Anton Gladky]

The following commit has been merged in the master branch:
commit eab93e5aff0e1495b053a11ea42c8bf5141fdcf4
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon Oct 24 22:47:53 2011 +0200

    Update patch (suffix).

diff --git a/debian/patches/get_rid_off_suffix.patch b/debian/patches/get_rid_off_suffix.patch
index d873f61..49a5440 100644
--- a/debian/patches/get_rid_off_suffix.patch
+++ b/debian/patches/get_rid_off_suffix.patch
@@ -1,14 +1,13 @@
 Description: Delete the suffix
 Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2011-06-22
-
+Last-Update: 2011-10-24
 --- a/SConstruct
 +++ b/SConstruct
-@@ -189,7 +189,7 @@
+@@ -186,7 +186,7 @@
  if not env.has_key('realVersion') or not env['realVersion']: env['realVersion']=yadeSCons.getRealVersion() or 'unknown' # unknown if nothing returned
  if not env.has_key('version'): env['version']=env['realVersion']
  
--env['SUFFIX']='-'+env['version']+env['variant']
+-env['SUFFIX']=('-'+env['version'] if len(env['version'])>0 else '')+env['variant']
 +env['SUFFIX']=''
  env['SUFFIX_DBG']=env['SUFFIX']+('' if not env['debug'] else '/dbg')
  env['LIBDIR']='$PREFIX/lib/yade$SUFFIX_DBG'

-- 
Yet Another Dynamic Engine. Platform for discrete element modeling.