The following commit has been merged in the master branch:
commit 1612906bdfe2875d944b122ff2232d7e4f157484
Author: Anton Gladky <[email protected]>
Date: Thu Jun 23 20:34:30 2011 +0200
Reduce the number of binary-packages twice.
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 52c6df3..a73f43a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Anton Gladky <[email protected]>
DM-Upload-Allowed: yes
Vcs-Git: git://git.debian.org/git/debian-science/packages/yade.git
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/yade.git
-Build-Depends: debhelper (>= 7.0.50), scons, binutils-gold [amd64 i386],
freeglut3-dev, libboost-dev (>=1.35),
+Build-Depends: debhelper (>= 7.0.50~), scons, binutils-gold [amd64 i386],
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, python-support,
@@ -19,11 +19,10 @@ Build-Depends: debhelper (>= 7.0.50), scons, binutils-gold
[amd64 i386], freeglu
pyqt4-dev-tools, libjs-jquery
Standards-Version: 3.9.2
-Package: yade-0.60
+Package: yade
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-numpy,
ipython,
- python-matplotlib, python-tk, python-qt4, python-xlib, gnuplot,
python-imaging,
- libjs-jquery
+ python-matplotlib, python-tk, python-qt4, python-xlib, gnuplot, python-imaging
Recommends: mencoder
Description: Platform for discrete element modeling. Main optimized build
Yet Another Dynamic Engine.
@@ -37,10 +36,10 @@ Description: Platform for discrete element modeling. Main
optimized build
.
This package contains speed-optimized build of yade.
-Package: yade-0.60-dbg
+Package: yade-dbg
Architecture: any
Section: debug
-Depends: ${shlibs:Depends}, ${misc:Depends}, yade-0.60
+Depends: ${shlibs:Depends}, ${misc:Depends}, yade
Description: Platform for discrete element modeling. Debug build
Yet Another Dynamic Engine.
.
@@ -53,11 +52,11 @@ Description: Platform for discrete element modeling. Debug
build
.
This package contains debug build of yade.
-Package: yade-0.60-doc
+Package: yade-doc
Architecture: all
Section: doc
-Recommends: yade-0.60
-Depends: ${misc:Depends}
+Recommends: yade
+Depends: ${misc:Depends}, libjs-jquery
Description: Platform for discrete element modeling. Documentation
Yet Another Dynamic Engine.
.
@@ -69,53 +68,3 @@ Description: Platform for discrete element modeling.
Documentation
simulation control, postprocessing and debugging.
.
This package contains examples, test scripts and documentation.
-
-Package: yade
-Architecture: all
-Depends: yade-0.60, ${misc:Depends}
-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
- stable release of Yade, virtual package.
-
-Package: yade-dbg
-Architecture: all
-Section: debug
-Depends: yade-0.60-dbg, yade-0.60, ${misc:Depends}
-Description: Platform for discrete element modeling. Snapshot debug version
- 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
- stable release of Yade, virtual package
-
-Package: yade-doc
-Architecture: all
-Section: doc
-Depends: yade-0.60-doc, ${misc:Depends}
-Description: Platform for discrete element modeling. Snapshot documentation
- 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
- stable release of Yade, virtual package.
diff --git a/debian/rules b/debian/rules
index cc87887..d2b2c0c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,15 +3,13 @@
tmpDirMatplotLib = $(CURDIR)/debian/matplotlib
tmpInstall = $(CURDIR)/debian/inst
tmpInstallDbg = $(CURDIR)/debian/inst-dbg
-export VERSION=$(shell cat VERSION)
-export _VERSION=-$(VERSION)
CXXFLAGS := -Wall $(shell dpkg-buildflags --get CXXFLAGS)
%:
dh $@
override_dh_auto_clean:
- rm -rf debian/build-* `find debian/ -name 'yade-*' -type d`
+ rm -rf debian/build
rm -rf doc/sphinx/_build
rm -rf tags
rm -f scons.profile-deb
@@ -34,16 +32,16 @@ override_dh_auto_build:
-cat /proc/meminfo
-cat /proc/cpuinfo
# the last argument specified that we only want files in lib installed
-- common files (the executable) are already in the optimized package
- export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib)$ ;
NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr
version=$(VERSION) brief=0 chunkSize=2 -j1 features=vtk,gts,opengl,qt4,openmp
PREFIX=$(tmpInstallDbg) variant='' CXXFLAGS='$(CXXFLAGS)' optimize=0 march=
debug=1 $(tmpInstallDbg)/lib
+ export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib)$ ;
NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr
version='' brief=0 chunkSize=2 -j1 features=vtk,gts,opengl,qt4,openmp
PREFIX=$(tmpInstallDbg) variant='' CXXFLAGS='$(CXXFLAGS)' optimize=0 march=
debug=1 $(tmpInstallDbg)/lib
#optimized build
export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ;
NO_SCONS_GET_RECENT= scons profile=deb PREFIX=$(tmpInstall) variant='' -j1
optimize=1 debug=0
# generate manpages
- export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ;
YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade$(_VERSION) --generate-manpage
yade$(_VERSION).1
- export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ;
YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade$(_VERSION)-batch
--generate-manpage yade$(_VERSION)-batch.1
+ export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ;
YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade --generate-manpage yade.1
+ export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ;
YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade-batch --generate-manpage
yade-batch.1
override_dh_auto_test:
- export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ;
YADE_PREFIX=$(tmpInstallDbg) $(tmpInstall)/bin/yade$(_VERSION) --debug --test
- export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ;
YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade$(_VERSION) --test
+ export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ;
YADE_PREFIX=$(tmpInstallDbg) $(tmpInstall)/bin/yade --debug --test
+ export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ;
YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade --test
#Delete all pyc files
find . -name '*.pyc' -print0 | xargs -0 rm -f
@@ -51,10 +49,10 @@ override_dh_installchangelogs:
dh_installchangelogs ChangeLog
override_dh_installman:
- dh_installman -p yade$(_VERSION) yade$(_VERSION).1
yade$(_VERSION)-batch.1
+ dh_installman -p yade yade.1 yade-batch.1
override_dh_strip:
- dh_strip --exclude=yade$(_VERSION)-dbg # don't strip the debug package
+ dh_strip --exclude=yade-dbg # don't strip the debug package
override_dh_compress:
dh_compress --all -X.py -X.stl -X.gts -X.geo -X.mesh -X.msh -X.pdf
-X.png -X.svg -X.txt -X.js -X.inv
@@ -62,7 +60,7 @@ override_dh_compress:
binary-indep:
dh --until dh_auto_build $@
#Generate docs
- export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; cd
doc/sphinx; PYTHONPATH=. YADE_PREFIX=$(tmpInstall)
$(tmpInstall)/bin/yade$(_VERSION) yadeSphinx.py; cd _build/latex; xelatex
Yade.tex; xelatex Yade.tex; xelatex Yade.tex; cd ../..;
+ export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; cd
doc/sphinx; PYTHONPATH=. YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade
yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex
Yade.tex;
dh --after dh_auto_build $@
binary-arch:
diff --git a/debian/yade-0.60.install b/debian/yade-0.60.install
deleted file mode 100644
index b5bb7dd..0000000
--- a/debian/yade-0.60.install
+++ /dev/null
@@ -1,4 +0,0 @@
-debian/yade-0.60_16x16.xpm usr/share/pixmaps/
-debian/yade-0.60_32x32.xpm usr/share/pixmaps/
-debian/yade-0.60.desktop usr/share/applications/
-debian/inst/* usr
diff --git a/debian/yade-0.60.menu b/debian/yade-0.60.menu
deleted file mode 100644
index 1cc5d2a..0000000
--- a/debian/yade-0.60.menu
+++ /dev/null
@@ -1,8 +0,0 @@
-?package(yade-0.60):\
- needs="X11"\
- section="Applications/Science/Physics"\
- title="Yade (0.60)"\
- command="/usr/bin/yade-0.60"\
- icon="/usr/share/pixmaps/yade-0.60_32x32.xpm"\
- icon16x16="/usr/share/pixmaps/yade-0.60_16x16.xpm"\
- icon32x32="/usr/share/pixmaps/yade-0.60_32x32.xpm"
diff --git a/debian/yade-0.60.postinst b/debian/yade-0.60.postinst
deleted file mode 100644
index 9e9aa16..0000000
--- a/debian/yade-0.60.postinst
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/sh
-# postinst script for yade
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-# * <postinst> `configure' <most-recently-configured-version>
-# * <old-postinst> `abort-upgrade' <new version>
-# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-# <new-version>
-# * <postinst> `abort-remove'
-# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-# <failed-install-package> <version> `removing'
-# <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
- configure)
- update-alternatives --install /usr/bin/yade yade
/usr/bin/yade-0.60 6000 --slave /usr/bin/yade-batch yade-batch
/usr/bin/yade-0.60-batch --slave /usr/share/man/man1/yade.1.gz yade.1.gz
/usr/share/man/man1/yade-0.60.1.gz --slave /usr/share/man/man1/yade-batch.1.gz
yade-batch.1.gz /usr/share/man/man1/yade-0.60-batch.1.gz
- ;;
-
- abort-upgrade|abort-remove|abort-deconfigure)
- ;;
-
- *)
- echo "postinst called with unknown argument \`$1'" >&2
- exit 1
- ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-
diff --git a/debian/yade-0.60-dbg.install b/debian/yade-dbg.install
similarity index 100%
rename from debian/yade-0.60-dbg.install
rename to debian/yade-dbg.install
diff --git a/debian/yade-0.60-doc.doc-base b/debian/yade-doc.doc-base
similarity index 75%
rename from debian/yade-0.60-doc.doc-base
rename to debian/yade-doc.doc-base
index 71eee3f..885e5d5 100644
--- a/debian/yade-0.60-doc.doc-base
+++ b/debian/yade-doc.doc-base
@@ -1,12 +1,12 @@
-Document: yade-0.60-documentation
+Document: yade-documentation
Title: This documentation decribes Yade version 0.60
Author: Yade developers <[email protected]>
Abstract: Yade is an 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
alogrithms and interfaces. Python is used for rapid and concise scene
construction, simulation control, postprocessing and debugging.
Section: Science/Physics
Format: html
-Index: /usr/share/doc/yade-0.60-doc/html/index.html
-Files: /usr/share/doc/yade-0.60-doc/*.*
+Index: /usr/share/doc/yade-doc/html/index.html
+Files: /usr/share/doc/yade-doc/*.*
Format: PDF
-Files: /usr/share/doc/yade-0.60-doc/Yade.pdf
+Files: /usr/share/doc/yade-doc/Yade.pdf
diff --git a/debian/yade-0.60-doc.docs b/debian/yade-doc.docs
similarity index 100%
rename from debian/yade-0.60-doc.docs
rename to debian/yade-doc.docs
diff --git a/debian/yade-0.60.desktop b/debian/yade.desktop
similarity index 54%
rename from debian/yade-0.60.desktop
rename to debian/yade.desktop
index 5990c4f..f1c83c7 100644
--- a/debian/yade-0.60.desktop
+++ b/debian/yade.desktop
@@ -1,8 +1,8 @@
[Desktop Entry]
Type=Application
-Name=Yade 0.60
+Name=Yade
GenericName=Yade
-Exec=/usr/bin/yade-0.60
-Icon=/usr/share/pixmaps/yade-0.60_32x32.xpm
+Exec=/usr/bin/yade
+Icon=/usr/share/pixmaps/yade_32x32.xpm
Terminal=true
Categories=Education;Physics;Science;
diff --git a/debian/yade-0.60.docs b/debian/yade.docs
similarity index 100%
rename from debian/yade-0.60.docs
rename to debian/yade.docs
diff --git a/debian/yade-0.60.examples b/debian/yade.examples
similarity index 100%
rename from debian/yade-0.60.examples
rename to debian/yade.examples
diff --git a/debian/yade.install b/debian/yade.install
new file mode 100644
index 0000000..8e4fd3f
--- /dev/null
+++ b/debian/yade.install
@@ -0,0 +1,3 @@
+debian/*.xpm usr/share/pixmaps/
+debian/yade.desktop usr/share/applications/
+debian/inst/* usr
diff --git a/debian/yade.menu b/debian/yade.menu
new file mode 100644
index 0000000..36bdb45
--- /dev/null
+++ b/debian/yade.menu
@@ -0,0 +1,8 @@
+?package(yade):\
+ needs="X11"\
+ section="Applications/Science/Physics"\
+ title="Yade"\
+ command="/usr/bin/yade"\
+ icon="/usr/share/pixmaps/yade_32x32.xpm"\
+ icon16x16="/usr/share/pixmaps/yade_16x16.xpm"\
+ icon32x32="/usr/share/pixmaps/yade_32x32.xpm"
diff --git a/debian/yade-0.60_16x16.xpm b/debian/yade_16x16.xpm
similarity index 100%
rename from debian/yade-0.60_16x16.xpm
rename to debian/yade_16x16.xpm
diff --git a/debian/yade-0.60_32x32.xpm b/debian/yade_32x32.xpm
similarity index 100%
rename from debian/yade-0.60_32x32.xpm
rename to debian/yade_32x32.xpm
--
Yet Another Dynamic Engine. Platform for discrete element modeling.
_______________________________________________
Mailing list: https://launchpad.net/~yade-dev
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yade-dev
More help : https://help.launchpad.net/ListHelp
