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

Anton Gladky gladky.anton at gmail.com
Wed Apr 4 19:18:36 UTC 2012


The following commit has been merged in the master branch:
commit c554c522ed48883ad6197dede1d9a3871dd1ddfc
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Wed Apr 4 21:18:27 2012 +0200

    Disable log4cxx feature due to crash in this lib.

diff --git a/debian/changelog b/debian/changelog
index b07ee9f..3c32439 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,6 @@ yade (0.70.0-5) unstable; urgency=low
   * [db2c9f6] Add gtk2-engines-pixbuf to depends section.
   * [a563b30] Use Standards-Version: 3.9.3. No changes.
   * [4454d5d] Small fixes due to ipython 0.12 migration.
-  * [e16453f] Enable log4cxx-feature.
 
  -- Anton Gladky <gladky.anton at gmail.com>  Tue, 03 Apr 2012 21:43:00 +0200
 
diff --git a/debian/control b/debian/control
index e117895..721b725 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Build-Depends: debhelper (>= 7.0.50~), scons, binutils-gold [amd64 i386],
  libboost-regex-dev (>=1.35), libboost-python-dev (>=1.35),
  libboost-iostreams-dev (>=1.35), libboost-program-options-dev, 
  python-support, libboost-serialization-dev, libloki-dev, 
- liblog4cxx10-dev,
  docbook-to-man, ipython, libgts-dev, python-numpy, g++(>>4.0), libvtk5-dev, 
  libgl1-mesa-dev, gdb, python-matplotlib, python-tk, libeigen3-dev, 
  libqglviewer-qt4-dev, python-xlib, python-qt4, pyqt4-dev-tools, python-imaging
diff --git a/debian/rules b/debian/rules
index f8af17f..bc9f065 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,7 @@ override_dh_auto_build:
 	-cat /proc/meminfo
 	-cat /proc/cpuinfo
 	#optimized build
-	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib)$ ; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version='' brief=0 chunkSize=2 features=vtk,gts,opengl,qt4,openmp,log4cxx PREFIX=$(tmpInstall) variant='' CXXFLAGS='$(CXXFLAGS)' optimize=1 -j1 march= debug=0 
+	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib)$ ; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version='' brief=0 chunkSize=2 features=vtk,gts,opengl,qt4,openmp PREFIX=$(tmpInstall) variant='' CXXFLAGS='$(CXXFLAGS)' optimize=1 -j1 march= debug=0 
 	# generate manpages
 	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade --generate-manpage yade.1
 	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade-batch --generate-manpage yade-batch.1

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



More information about the debian-science-commits mailing list