yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2444
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: yade
timestamp: Thu 2010-09-23 16:20:14 +0200
message:
  1. Some small fixes in debian/
  2. Warning fixes in shop.cpp
modified:
  debian/rules
  debian/yade-dbg.postinst-template
  debian/yade.postinst-template
  pkg/dem/meta/Shop.cpp


--
lp:yade
https://code.launchpad.net/~yade-dev/yade/trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription

=== modified file 'debian/rules'
--- debian/rules	2010-09-18 14:10:30 +0000
+++ debian/rules	2010-09-23 14:20:14 +0000
@@ -62,9 +62,9 @@
 	if dpkg-query -W python-sphinx; then cd doc/sphinx; PYTHONPATH=. YADE_PREFIX=../../debian/yade${_VERSION}/usr/ ../../debian/yade${_VERSION}/usr/bin/yade${_VERSION} yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex; cd ../..; mkdir -p ../../debian/yade${_VERSION}-doc/usr/share/doc/yade${_VERSION}; cp -r _build/html _build/latex/Yade.pdf ../../debian/yade${_VERSION}-doc/usr/share/doc/yade${_VERSION}; else echo "Not building HTML documentation, since the python-sphinx package is not installed"; fi
 	# generate manpages
 	YADE_PREFIX=debian/yade${_VERSION}/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION} --generate-manpage yade${_VERSION}.1
-	YADE_PREFIX=debian/yade${_VERSION}/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION}-multi --generate-manpage yade${_VERSION}-multi.1
+	YADE_PREFIX=debian/yade${_VERSION}/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION}-batch --generate-manpage yade${_VERSION}-batch.1
 	YADE_PREFIX=debian/yade${_VERSION}-dbg/usr debian/yade${_VERSION}-dbg/usr/bin/yade${_VERSION}-dbg --generate-manpage yade${_VERSION}-dbg.1
-	YADE_PREFIX=debian/yade${_VERSION}-dbg/usr debian/yade${_VERSION}-dbg/usr/bin/yade${_VERSION}-dbg-multi --generate-manpage yade${_VERSION}-dbg-multi.1
+	YADE_PREFIX=debian/yade${_VERSION}-dbg/usr debian/yade${_VERSION}-dbg/usr/bin/yade${_VERSION}-dbg-batch --generate-manpage yade${_VERSION}-dbg-batch.1
 
 check: install
 	dh_testdir
@@ -95,8 +95,8 @@
 #	dh_installinit
 #	dh_installcron
 #	dh_installinfo
-	dh_installman -p yade${_VERSION} yade${_VERSION}.1 yade${_VERSION}-multi.1
-	dh_installman -p yade${_VERSION}-dbg yade${_VERSION}-dbg.1 yade${_VERSION}-dbg-multi.1
+	dh_installman -p yade${_VERSION} yade${_VERSION}.1 yade${_VERSION}-batch.1
+	dh_installman -p yade${_VERSION}-dbg yade${_VERSION}-dbg.1 yade${_VERSION}-dbg-batch.1
 	dh_link
 	dh_strip --exclude=yade${_VERSION}-dbg   # don't strip the debug package
 	dh_compress

=== modified file 'debian/yade-dbg.postinst-template'
--- debian/yade-dbg.postinst-template	2010-06-18 13:02:01 +0000
+++ debian/yade-dbg.postinst-template	2010-09-23 14:20:14 +0000
@@ -20,7 +20,7 @@
 
 case "$1" in
     configure)
-	 	update-alternatives --install /usr/bin/yade-dbg yade-dbg /usr/bin/yade@_VERSION@-dbg @PRIORITY@ --slave /usr/bin/yade-dbg-multi yade-dbg-multi /usr/bin/yade@_VERSION@-dbg-multi --slave /usr/share/man/man1/yade-dbg.1.gz yade-dbg.1.gz /usr/share/man/man1/yade@_VERSION@xxxxxxxxx --slave /usr/share/man/man1/yade-dbg-multi.1.gz yade-dbg-multi.1.gz /usr/share/man/man1/yade@_VERSION@xxxxxxxxxxxxxxx
+	 	update-alternatives --install /usr/bin/yade-dbg yade-dbg /usr/bin/yade@_VERSION@-dbg @PRIORITY@ --slave /usr/bin/yade-dbg-batch yade-dbg-batch /usr/bin/yade@_VERSION@-dbg-batch --slave /usr/share/man/man1/yade-dbg.1.gz yade-dbg.1.gz /usr/share/man/man1/yade@_VERSION@xxxxxxxxx --slave /usr/share/man/man1/yade-dbg-batch.1.gz yade-dbg-batch.1.gz /usr/share/man/man1/yade@_VERSION@xxxxxxxxxxxxxxx
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

=== modified file 'debian/yade.postinst-template'
--- debian/yade.postinst-template	2010-06-18 13:02:01 +0000
+++ debian/yade.postinst-template	2010-09-23 14:20:14 +0000
@@ -20,7 +20,7 @@
 
 case "$1" in
     configure)
-	 	update-alternatives --install /usr/bin/yade yade /usr/bin/yade@_VERSION@ @PRIORITY@ --slave /usr/bin/yade-multi yade-multi /usr/bin/yade@_VERSION@-multi --slave /usr/share/man/man1/yade.1.gz yade.1.gz /usr/share/man/man1/yade@_VERSION@xxxxx --slave /usr/share/man/man1/yade-multi.1.gz yade-multi.1.gz /usr/share/man/man1/yade@_VERSION@xxxxxxxxxxx
+	 	update-alternatives --install /usr/bin/yade yade /usr/bin/yade@_VERSION@ @PRIORITY@ --slave /usr/bin/yade-batch yade-batch /usr/bin/yade@_VERSION@-batch --slave /usr/share/man/man1/yade.1.gz yade.1.gz /usr/share/man/man1/yade@_VERSION@xxxxx --slave /usr/share/man/man1/yade-batch.1.gz yade-batch.1.gz /usr/share/man/man1/yade@_VERSION@xxxxxxxxxxx
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

=== modified file 'pkg/dem/meta/Shop.cpp'
--- pkg/dem/meta/Shop.cpp	2010-09-19 20:43:44 +0000
+++ pkg/dem/meta/Shop.cpp	2010-09-23 14:20:14 +0000
@@ -1212,7 +1212,7 @@
 	Scene* scene=Omega::instance().getScene().get();
 	if (!scene->isPeriodic){ throw runtime_error("Can't compute stress of periodic cell in aperiodic simulation."); }
 	Matrix3r sigN(Matrix3r::Zero()),sigT(Matrix3r::Zero());
-	const Matrix3r& cellHsize(scene->cell->Hsize);
+	//const Matrix3r& cellHsize(scene->cell->Hsize);   //Disabled because of warning.
 	FOREACH(const shared_ptr<Interaction>& I, *scene->interactions){
 		if(!I->isReal()) continue;
 		GenericSpheresContact* geom=YADE_CAST<GenericSpheresContact*>(I->interactionGeometry.get());