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

[Anton Gladky]

The following commit has been merged in the master branch:
commit 0e1132630fd8b1b272f4fe8123d0ce1a522d0b65
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue Oct 25 20:55:19 2011 +0200

    Replace underscore.js by the link on packaged version

diff --git a/debian/control b/debian/control
index 4b6d2e9..5d7a0f8 100644
--- a/debian/control
+++ b/debian/control
@@ -11,20 +11,22 @@ Build-Depends: debhelper (>= 7.0.50~), scons, binutils-gold [amd64 i386],
  freeglut3-dev, libboost-dev (>=1.35), libboost-date-time-dev (>=1.35), 
  libboost-filesystem-dev (>=1.35), libboost-thread-dev (>=1.35), 
  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,
+ 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
 Build-Depends-Indep: texlive-latex-recommended, texlive-latex-extra, lmodern, 
  texlive-pictures, texlive-xetex, libjs-jquery, python-sphinx (>=1.0.6),
- python-bibtex, graphviz, dvipng
+ python-bibtex, graphviz, dvipng, libjs-underscore
 Standards-Version: 3.9.2
 
 Package: yade
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-numpy, ipython,
- python-matplotlib, python-tk, python-qt4, python-xlib, gnuplot, python-imaging, libjs-jquery
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, 
+ python-numpy, ipython, python-matplotlib, python-tk, python-qt4, 
+ python-xlib, gnuplot, python-imaging, libjs-jquery, libjs-underscore
 Recommends: mencoder
 Description: Platform for discrete element modeling. Main optimized build
  Yet Another Dynamic Engine.
diff --git a/debian/yade-doc.links b/debian/yade-doc.links
new file mode 100644
index 0000000..a4a4b9f
--- /dev/null
+++ b/debian/yade-doc.links
@@ -0,0 +1 @@
+usr/share/javascript/underscore/underscore.js usr/share/doc/yade-doc/html/_static/underscore.js

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