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

[Anton Gladky]

The following commit has been merged in the master branch:
commit 8466b41f494fb88a9651d3d7ea3f3a4ebc861c80
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sat Nov 5 19:47:55 2011 +0100

    Remove yade-dbg binary, it is too large (about 200mb).

diff --git a/debian/control b/debian/control
index 7dfd3f3..89b91ba 100644
--- a/debian/control
+++ b/debian/control
@@ -41,22 +41,6 @@ Description: Platform for discrete element modeling. Main optimized build
  .
  This package contains speed-optimized build of yade.
 
-Package: yade-dbg
-Architecture: any
-Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends}, yade
-Description: Platform for discrete element modeling. Debug build
- Yet Another Dynamic Engine.
- .
- 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 algorithms and interfaces. 
- Python is used for rapid and concise scene construction, 
- simulation control, postprocessing and debugging.
- .
- This package contains debug build of yade.
-
 Package: yade-doc
 Architecture: all
 Section: doc
diff --git a/debian/rules b/debian/rules
index c821554..edcec9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 tmpDirMatplotLib = $(CURDIR)/debian/matplotlib
 tmpInstall = $(CURDIR)/debian/inst
-tmpInstallDbg = $(CURDIR)/debian/inst-dbg
 CXXFLAGS := -Wall $(shell dpkg-buildflags --get CXXFLAGS)
 
 %:
@@ -16,14 +15,12 @@ override_dh_auto_clean:
 	rm -f *.1
 	rm -rf $(tmpDirMatplotLib)
 	rm -rf $(tmpInstall)
-	rm -rf $(tmpInstallDbg)
 	find . -name '*.pyc' -print0 | xargs -0 rm -f
 	dh_clean 
 
 override_dh_auto_configure:
 	mkdir -p $(tmpDirMatplotLib)
 	mkdir -p $(tmpInstall)
-	mkdir -p $(tmpInstallDbg)
 
 override_dh_auto_build:
 	# remove the profile, if existing, to have clean config
@@ -31,18 +28,14 @@ override_dh_auto_build:
 	#Output an information about available memory and CPU
 	-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 features=vtk,gts,opengl,qt4,openmp PREFIX=$(tmpInstallDbg) variant='' CXXFLAGS='$(CXXFLAGS)' optimize=0 -j1 march= debug=1 
 	#optimized build
-	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; NO_SCONS_GET_RECENT= scons profile=deb PREFIX=$(tmpInstall) variant=''  -j1 optimize=1 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=$(tmpInstallDbg) $(tmpInstallDbg)/bin/yade --debug --generate-manpage yade.1
+	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
 
 override_dh_auto_test:
-	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; YADE_PREFIX=$(tmpInstallDbg) $(tmpInstall)/bin/yade --debug --test
 	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade --test
-	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; YADE_PREFIX=$(tmpInstallDbg) $(tmpInstall)/bin/yade --debug --check
 	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade --check
 	#Delete all pyc files
 	find . -name '*.pyc' -print0 | xargs -0 rm -f
@@ -53,9 +46,6 @@ override_dh_installchangelogs:
 override_dh_installman:
 	dh_installman -p yade yade.1 yade-batch.1
 
-override_dh_strip:
-	dh_strip --exclude=yade-dbg   # don't strip the debug package
-
 override_dh_compress:
 	dh_compress --all -X.py -X.stl -X.gts -X.geo -X.mesh -X.msh -X.pdf -X.png -X.svg -X.txt -X.js -X.inv
 
diff --git a/debian/yade-dbg.install b/debian/yade-dbg.install
deleted file mode 100644
index 2cdd0d3..0000000
--- a/debian/yade-dbg.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/inst-dbg/lib/* usr/lib

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