← 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.97.0-1-12-ga0945e9

 

The following commit has been merged in the master branch:
commit 8c3c56bc35983f47357b9d83c02c5365efaf0db7
Author: Anton Gladky <gladky.anton@xxxxxxxxx>
Date:   Sat May 25 19:31:25 2013 +0200

    Minor changes.

diff --git a/debian/control b/debian/control
index 0da1fd7..85290bf 100644
--- a/debian/control
+++ b/debian/control
@@ -62,6 +62,7 @@ Depends:
  ipython,
  libyade (= ${binary:Version}),
  python-yade (= ${binary:Version}), 
+ ${python:Depends},
  ${misc:Depends}
 Recommends:
  mencoder
@@ -101,9 +102,10 @@ Description: Platform for discrete element modeling. Libraries
 
 Package: python-yade
 Architecture: any
+Section: python
 Pre-Depends:
  ${misc:Pre-Depends}
-Multi-Arch: same
+Multi-Arch: foreign
 Depends:
  libyade (= ${binary:Version}),
  python-argparse,
@@ -111,7 +113,6 @@ Depends:
  python-imaging,
  python-matplotlib,
  python-minieigen,
- python-numpy,
  python-qt4,
  python-tk,
  python-xlib,
diff --git a/debian/libyade.lintian-overrides b/debian/libyade.lintian-overrides
new file mode 100644
index 0000000..af5e9c0
--- /dev/null
+++ b/debian/libyade.lintian-overrides
@@ -0,0 +1 @@
+libyade: binary-or-shlib-defines-rpath 
diff --git a/debian/python-yade.lintian-overrides b/debian/python-yade.lintian-overrides
new file mode 100644
index 0000000..0b86786
--- /dev/null
+++ b/debian/python-yade.lintian-overrides
@@ -0,0 +1 @@
+python-yade: binary-or-shlib-defines-rpath 
diff --git a/debian/rules b/debian/rules
index d7b63f6..3e4b9b7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,6 +44,7 @@ override_dh_auto_install-arch:
 	$(tmpInstall)/usr/bin/yade --check
 	#Delete all pyc files
 	find . -name '*.pyc' -print0 | xargs -0 rm -f
+	dh_numpy
 
 override_dh_installchangelogs:
 	dh_installchangelogs ChangeLog
diff --git a/debian/yade.lintian-overrides b/debian/yade.lintian-overrides
deleted file mode 100644
index 8298445..0000000
--- a/debian/yade.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-yade: binary-or-shlib-defines-rpath 

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