← Back to team overview

yade-dev team mailing list archive

[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. debian/0.90.3-1_exp1-14-g239acd3

 

The following commit has been merged in the master branch:
commit a391f24c83f4104616244a76356b22d3a8eb7545
Author: Anton Gladky <gladky.anton@xxxxxxxxx>
Date:   Tue May 14 21:37:57 2013 +0200

    Use help2man to generate manpages.

diff --git a/debian/rules b/debian/rules
index 5351fc3..85150f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,7 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 export MPLCONFIGDIR := $(tmpDirMatplotLib) 
 export HOME := $(tmpDirMatplotLib) 
 export LD_LIBRARY_PATH :=  $(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py/gts:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py/yade:$(tmpInstall)/usr/lib/$(DEB_HOST_MULTIARCH)/yade/py/yade/qt:$(LD_LIBRARY_PATH); 
+export DEB_HOST_MULTIARCH := $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 export YADE_PREFIX := $(tmpInstall)/usr
 
 extra_flags += \
@@ -31,8 +32,8 @@ override_dh_auto_configure:
 override_dh_auto_install-arch:
 	dh_auto_install -a
 	# generate manpages
-	$(tmpInstall)/usr/bin/yade --generate-manpage yade.1
-	$(tmpInstall)/usr/bin/yade-batch --generate-manpage yade-batch.1
+	help2man $(tmpInstall)/usr/bin/yade > yade.1
+	help2man $(tmpInstall)/usr/bin/yade-batch > yade-batch.1
 	$(tmpInstall)/usr/bin/yade --test
 	$(tmpInstall)/usr/bin/yade --check
 	#Delete all pyc files
@@ -52,3 +53,9 @@ override_dh_auto_install-indep:
 	cd $(CURDIR)/doc/sphinx; PYTHONPATH=. $(tmpInstall)/usr/bin/yade yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex;
 	#Delete all pyc files
 	find . -name '*.pyc' -print0 | xargs -0 rm -f
+
+override_dh_auto_test: 
+
+override_dh_installdocs-indep:
+	dh_installdocs
+	dh_sphinxdoc
diff --git a/debian/yade-doc.links b/debian/yade-doc.links
deleted file mode 100644
index a4a4b9f..0000000
--- a/debian/yade-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/javascript/underscore/underscore.js usr/share/doc/yade-doc/html/_static/underscore.js

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