[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. upstream/0.60.2-80-ge974607

[Anton Gladky]

The following commit has been merged in the master branch:
commit e974607dcc20522f12477f3baaa91883368b04d4
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Jun 23 20:34:30 2011 +0200

    Fix version numbering.

diff --git a/debian/patches/fix_version_number.patch b/debian/patches/fix_version_number.patch
new file mode 100644
index 0000000..d78abf7
--- /dev/null
+++ b/debian/patches/fix_version_number.patch
@@ -0,0 +1,9 @@
+Description: change version number
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2011-06-23
+
+--- a/VERSION
++++ b/VERSION
+@@ -1 +1 @@
+-0.60
++0.60.2
diff --git a/debian/patches/get_rid_off_suffix.patch b/debian/patches/get_rid_off_suffix.patch
new file mode 100644
index 0000000..d873f61
--- /dev/null
+++ b/debian/patches/get_rid_off_suffix.patch
@@ -0,0 +1,15 @@
+Description: Delete the suffix
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2011-06-22
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -189,7 +189,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['SUFFIX_DBG']=env['SUFFIX']+('' if not env['debug'] else '/dbg')
+ env['LIBDIR']='$PREFIX/lib/yade$SUFFIX_DBG'
+ print "Yade version is `%s' (%s), installed files will be suffixed with `%s'."%(env['version'],env['realVersion'],env['SUFFIX'])
diff --git a/debian/patches/series b/debian/patches/series
index eba16fa..406bca6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,5 @@ fix_absent_syncSizesOfContainers.patch
 fix_FTBFS_on_KFreeBSD.patch
 fix_compilation_with_eigen3.patch
 use_eigen3_instead_of_eigen2.patch
+get_rid_off_suffix.patch
+fix_version_number.patch

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