yade-dev team mailing list archive

["Anton Gladky" <gladky.anton@xxxxxxxxx>]

The following commit has been merged in the master branch:
commit c265a1a42e542f34819bb31ed410384fa1aef0ce
Author: Anton Gladky <gladky.anton@xxxxxxxxx>
Date:   Sat Jul 2 07:51:37 2011 +0200

    Add build-depends-indep, some unsufficial changes.

diff --git a/debian/control b/debian/control
index a73f43a..4b6d2e9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,22 +7,24 @@ Uploaders: Anton Gladky <gladky.anton@xxxxxxxxx>
 DM-Upload-Allowed: yes
 Vcs-Git: git://git.debian.org/git/debian-science/packages/yade.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/yade.git
-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),
+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,
- 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,
- texlive-latex-recommended, texlive-latex-extra, lmodern, texlive-pictures, texlive-xetex, 
- python-sphinx (>=1.0.5), python-bibtex, graphviz, dvipng, python-xlib, python-qt4,
- pyqt4-dev-tools, libjs-jquery
+ 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
 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
+ python-matplotlib, python-tk, python-qt4, python-xlib, gnuplot, python-imaging, libjs-jquery
 Recommends: mencoder
 Description: Platform for discrete element modeling. Main optimized build
  Yet Another Dynamic Engine.
diff --git a/debian/rules b/debian/rules
index c575e11..7ab0185 100755
--- a/debian/rules
+++ b/debian/rules
@@ -32,12 +32,12 @@ override_dh_auto_build:
 	-cat /proc/meminfo
 	-cat /proc/cpuinfo
 	# the last argument specified that we only want files in lib installed -- common files (the executable) are already in the optimized package
-	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib)$ ; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version='' brief=0 chunkSize=2 -j1 features=vtk,gts,opengl,qt4,openmp PREFIX=$(tmpInstallDbg) variant='' CXXFLAGS='$(CXXFLAGS)' optimize=0 march= debug=1 
+	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib)$ ; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version='' brief=0 chunkSize=2 -j1 features=vtk,gts,opengl,qt4,openmp PREFIX=$(tmpInstallDbg) variant='' CXXFLAGS='$(CXXFLAGS)' optimize=0 debug=1 
 	#optimized build
 	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; NO_SCONS_GET_RECENT= scons profile=deb PREFIX=$(tmpInstall) variant=''  -j1 optimize=1 debug=0
 	# generate manpages
 	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; YADE_PREFIX=$(tmpInstallDbg) $(tmpInstallDbg)/bin/yade --debug --generate-manpage yade.1
-	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; YADE_PREFIX=$(tmpInstallDbg) $(tmpInstallDbg)/bin/yade-batch --debug --generate-manpage yade-batch.1
+	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade-batch --generate-manpage yade-batch.1
 
 override_dh_auto_test:
 	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; YADE_PREFIX=$(tmpInstallDbg) $(tmpInstall)/bin/yade --debug --test
diff --git a/debian/yade-doc.doc-base b/debian/yade-doc.doc-base
index 885e5d5..75a5f61 100644
--- a/debian/yade-doc.doc-base
+++ b/debian/yade-doc.doc-base
@@ -1,5 +1,5 @@
 Document: yade-documentation
-Title: This documentation decribes Yade version 0.60
+Title: This documentation describes Yade
 Author: Yade developers <yade-dev@xxxxxxxxxxxxxxxxxxx>
 Abstract: Yade is an extensible open-source framework for discrete numerical models, focused on Discrete Element Method. The computation parts are written in c++ using flexible object model, allowing independent implementation of new alogrithms and interfaces. Python is used for rapid and concise scene construction, simulation control, postprocessing and debugging.
 Section: Science/Physics

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