yade-dev team mailing list archive

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

The following commit has been merged in the master branch:
commit 066e0c259c702c2dfd78bec71d422a0804cc84c1
Author: Anton Gladky <gladky.anton@xxxxxxxxx>
Date:   Wed May 22 21:22:18 2013 +0200

    Ship libraries in libyade-package. Add python-bindings. (Closes: #708469)

diff --git a/debian/control b/debian/control
index bd35c6c..b7872ff 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers@lists.alioth.
 Uploaders: Anton Gladky <gladk@xxxxxxxxxx>
 Vcs-Git: git://git.debian.org/git/debian-science/packages/yade.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/yade.git
+X-Python-Version: current
 Build-Depends:
  binutils-gold [amd64 i386 armel armhf powerpc sparc],
  cmake,
@@ -24,6 +25,7 @@ Build-Depends:
  libxi-dev,
  libxmu-dev,
  pyqt4-dev-tools,
+ python-all-dev (>= 2.6.6-3~),
  python-argparse,
  python-gts,
  python-imaging,
@@ -52,15 +54,57 @@ Package: yade
 Architecture: any
 Pre-Depends:
  ${misc:Pre-Depends}
-Multi-Arch: same
+Multi-Arch: foreign
 Depends:
  gnuplot,
  gtk2-engines-pixbuf,
  ipython,
- libjs-jquery,
- libjs-underscore,
- python (<<2.8),
- python (>= 2.7),
+ libyade (= ${binary:Version}),
+ python-yade (= ${binary:Version}), 
+ ${misc:Depends}
+Recommends:
+ mencoder
+Description: Platform for discrete element modeling
+ 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 speed-optimized build of yade.
+
+Package: libyade
+Architecture: any
+Pre-Depends:
+ ${misc:Pre-Depends}
+Multi-Arch: same
+Breaks: yade (<<0.97.0-1~)
+Replaces: yade (<<0.97.0-1~)
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Description: Platform for discrete element modeling. Libraries
+ 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 yade`s libraries.
+
+Package: python-yade
+Architecture: any
+Pre-Depends:
+ ${misc:Pre-Depends}
+Multi-Arch: same
+Depends:
+ libyade (= ${binary:Version}),
  python-argparse,
  python-gts,
  python-imaging,
@@ -73,9 +117,7 @@ Depends:
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends}
-Recommends:
- mencoder
-Description: Platform for discrete element modeling
+Description: Platform for discrete element modeling. Python bindings
  Yet Another Dynamic Engine.
  .
  Extensible open-source framework for discrete numerical models,
@@ -85,7 +127,7 @@ Description: Platform for discrete element modeling
  Python is used for rapid and concise scene construction,
  simulation control, postprocessing and debugging.
  .
- This package contains speed-optimized build of yade.
+ This package contains python bindings for yade.
 
 Package: yade-doc
 Architecture: all
diff --git a/debian/libyade.install b/debian/libyade.install
new file mode 100644
index 0000000..6845771
--- /dev/null
+++ b/debian/libyade.install
@@ -0,0 +1 @@
+usr/lib
diff --git a/debian/python-yade.pyinstall b/debian/python-yade.pyinstall
new file mode 100644
index 0000000..f5ce34e
--- /dev/null
+++ b/debian/python-yade.pyinstall
@@ -0,0 +1,3 @@
+debian/tmp/usr/lib/*/yade/py/yade/*.* yade
+debian/tmp/usr/lib/*/yade/py/yade/qt/*.* yade.qt
+debian/tmp/usr/lib/*/yade/py/yade/tests/*.* yade.tests
diff --git a/debian/rules b/debian/rules
index 2a9797a..d7b63f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,7 +10,7 @@ ifeq (,$(filter $(DEB_HOST_ARCH),$(parallelbuild_archs)))
 endif
 
 %:
-	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) $(parallel_flag)
+	dh $@ --buildsystem=cmake --builddirectory=$(BUILDDIR) --with python2 $(parallel_flag)
 
 export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
@@ -65,3 +65,8 @@ override_dh_auto_test:
 override_dh_installdocs-indep:
 	dh_installdocs
 	dh_sphinxdoc
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf $(BUILDDIR)
+
diff --git a/debian/yade.install b/debian/yade.install
index eade1f8..31db6db 100644
--- a/debian/yade.install
+++ b/debian/yade.install
@@ -1,3 +1,3 @@
 debian/*.xpm usr/share/pixmaps/
 debian/yade.desktop usr/share/applications/
-usr
+usr/bin

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