← Back to team overview

yade-dev team mailing list archive

[Branch ~yade-dev/yade/trunk] Rev 2578: 1. Backporting changed from 0.60 branch

 

------------------------------------------------------------
revno: 2578
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: yade
timestamp: Mon 2010-11-29 18:24:26 +0100
message:
  1. Backporting changed from 0.60 branch
modified:
  debian/control-template
  debian/rules
  debian/yade.desktop-template
  debian/yade.menu-template
  debian/yade.postinst-template


--
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/control-template'
--- debian/control-template	2010-10-26 13:41:30 +0000
+++ debian/control-template	2010-11-29 17:24:26 +0000
@@ -2,22 +2,34 @@
 Section: x11
 Priority: optional
 Maintainer: Václav Šmilauer <eudoxos@xxxxxxxx>
-Build-Depends: debhelper (>= 5), scons, freeglut3-dev, libboost-dev (>=1.35), libboost-date-time-dev (>=1.35), libboost-filesystem-dev (>=1.35), libboost-thread-dev (>=1.35), libboost-regex-dev (>=1.35), libboost-python-dev (>=1.35), libboost-iostreams-dev (>=1.35), libboost-program-options-dev, libboost-serialization-dev, libloki-dev, liblog4cxx9-dev | liblog4cxx10-dev, docbook-to-man, ipython, libgts-dev, python-numpy, g++(>>4.0), libvtk5-dev, libgl1-mesa-dev, gdb, ipython, python-matplotlib, python-tk, libeigen2-dev, libqglviewer-qt4-dev @', binutils-gold' if DISTRIBUTION not in ('hardy','intrepid','jaunty','lenny') else ''@ @', texlive-latex-recommended, texlive-latex-extra, lmodern, texlive-pictures, texlive-xetex, python-sphinx (>=0.99), python-bibtex, graphviz, dvipng' if DISTRIBUTION not in ('hardy','intrepid','jaunty','lenny') else ''@, python-xlib, python-qt4, pyqt4-dev-tools
+Build-Depends: debhelper (>= 5), scons, freeglut3-dev, libboost-dev (>=1.35), libboost-date-time-dev (>=1.35), libboost-filesystem-dev (>=1.35), libboost-thread-dev (>=1.35), libboost-regex-dev (>=1.35), libboost-python-dev (>=1.35), libboost-iostreams-dev (>=1.35), libboost-program-options-dev, libboost-serialization-dev, libloki-dev, liblog4cxx9-dev | liblog4cxx10-dev, docbook-to-man, ipython, libgts-dev, python-numpy, g++(>>4.0), libvtk5-dev, libgl1-mesa-dev, gdb, ipython, python-matplotlib, python-tk, libeigen2-dev, libqglviewer-qt4-dev @', binutils-gold' if DISTRIBUTION not in ('hardy','intrepid','jaunty','lenny') else ''@ @', texlive-latex-recommended, texlive-latex-extra, lmodern, texlive-pictures, texlive-xetex, python-sphinx (>=0.99), python-bibtex, graphviz, dvipng' if DISTRIBUTION not in ('hardy','intrepid','jaunty','lenny') else ''@, python-xlib, python-qt4, pyqt4-dev-tools, clang
 Standards-Version: 3.7.2
 
 Package: yade@_VERSION@
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, python-numpy, ipython, python-matplotlib, python-tk, python-qt4, python-xlib, mencoder, gnuplot
-Description: Platform for dynamical modeling.
- Yet Another Dynamic Engine. etc.
+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: yade@_VERSION@-dbg
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, yade@_VERSION@, gdb
-Description: Platform for dynamical modeling.
- Yet Another Dynamic Engine. etc.
+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 debug build of yade.
 
@@ -25,28 +37,58 @@
 Architecture: all
 Recommends: yade@_VERSION@ | yade@_VERSION@-dbg
 Depends: 
-Description: Platform for dynamical modeling.
- Yet Another Dynamic Engine. etc.
+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 examples, test scripts and documentation.
 
 Package: yade@SNAPSHOT@
 Architecture: all
 Depends: yade@_VERSION@
-Description: Platform for dynamical modeling.
+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 depends on the latest
  @'snapshot' if SNAPSHOT else 'stable release'@ of Yade.
 
 Package: yade@SNAPSHOT@-dbg
 Architecture: all
 Depends: yade@_VERSION@-dbg
-Description: Platform for dynamical modeling.
+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 depends on the latest debug build of
  @'snapshot' if SNAPSHOT else 'stable release'@ of Yade.
 
 Package: yade@SNAPSHOT@-doc
 Architecture: all
 Depends: yade@_VERSION@-doc
-Description: Platform for dynamical modeling.
+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 depends on the latest documentation of
  @'snapshot' if SNAPSHOT else 'stable release'@ of Yade.

=== modified file 'debian/rules'
--- debian/rules	2010-11-26 07:42:42 +0000
+++ debian/rules	2010-11-29 17:24:26 +0000
@@ -104,7 +104,7 @@
 #	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 --all --exclude=/usr/share/doc # don't compress documentation and examples
+	#dh_compress --all --exclude=/usr/share/doc # don't compress documentation and examples
 	dh_fixperms
 #	dh_perl
 	dh_makeshlibs
@@ -113,6 +113,7 @@
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
+	dh_installmenu
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure

=== modified file 'debian/yade.desktop-template'
--- debian/yade.desktop-template	2010-11-26 07:42:42 +0000
+++ debian/yade.desktop-template	2010-11-29 17:24:26 +0000
@@ -2,7 +2,7 @@
 Type=Application
 Name=Yade @SNAPSHOT@ @VERSION@
 GenericName=Yade
-Exec=x-terminal-emulator -T 'Yade @SNAPSHOT@ @VERSION@' -x /usr/bin/yade@_VERSION@
+Exec=x-terminal-emulator -T 'Yade @SNAPSHOT@ @VERSION@' -e /usr/bin/yade@_VERSION@
 Icon=/usr/share/pixmaps/yade@_VERSION@_32x32.xpm
-Terminal=true
+Terminal=false
 Categories=Education;Physics;Science;

=== modified file 'debian/yade.menu-template'
--- debian/yade.menu-template	2010-11-26 07:42:42 +0000
+++ debian/yade.menu-template	2010-11-29 17:24:26 +0000
@@ -2,7 +2,7 @@
 	needs="X11"\
 	section="Applications/Science/Physics"\
 	title="Yade (@SNAPSHOT@ @VERSION@)"\
-	command="x-terminal-emulator -T 'Yade @SNAPSHOT@ @VERSION@' -x /usr/bin/yade@_VERSION@"\
+	command="x-terminal-emulator -T 'Yade @SNAPSHOT@ @VERSION@' -e /usr/bin/yade@_VERSION@"\
 	icon=/usr/share/pixmaps/yade@_VERSION@_32x32.xpm\
 	icon16x16=/usr/share/pixmaps/yade@_VERSION@_16x16.xpm\
 	icon32x32=/usr/share/pixmaps/yade@_VERSION@_32x32.xpm

=== modified file 'debian/yade.postinst-template'
--- debian/yade.postinst-template	2010-11-26 07:42:42 +0000
+++ debian/yade.postinst-template	2010-11-29 17:24:26 +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-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
+	 	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 yade.1 /usr/share/man/man1/yade@_VERSION@.1 --slave /usr/share/man/man1/yade-batch.1 yade-batch.1 /usr/share/man/man1/yade@_VERSION@-batch.1
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)