yade-dev team mailing list archive

Thread
Date

[Branch ~yade-dev/yade/trunk] Rev 2675: 1. Debian-directory cleaning and modifying (checked with lintian -IE --pedantic, no warnings at a...

To: Yade developers <yade-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Mon, 24 Jan 2011 09:03:27 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 2675
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
branch nick: yade
timestamp: Mon 2011-01-24 10:01:38 +0100
message:
  1. Debian-directory cleaning and modifying (checked with lintian -IE --pedantic, no warnings at all).
removed:
  debian/docs
  debian/postrm
  debian/preinst
  debian/yade-dbg.postinst-template
  debian/yade-dbg.prerm-template
  debian/yade.prerm-template
added:
  debian/yade-doc.doc-base-template
  debian/yade-doc.docs-template
  debian/yade.docs-template
  debian/yade.examples-template
  debian/yade.install-template
modified:
  debian/control-template
  debian/rules
  debian/yade.desktop-template
  debian/yade.menu-template
  doc/sphinx/installation.rst
  scripts/debian-prep


--
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	2011-01-18 16:04:27 +0000
+++ debian/control-template	2011-01-24 09:01:38 +0000
@@ -1,15 +1,17 @@
 Source: yade@_VERSION@
 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, 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
+Homepage: https://launchpad.net/yade
+Maintainer: Anton Gladky <gladky.anton@xxxxxxxxx>
+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, python-support, 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, python-matplotlib, python-tk, libeigen2-dev, libqglviewer-qt4-dev , binutils-gold , texlive-latex-recommended, texlive-latex-extra, lmodern, texlive-pictures, texlive-xetex, python-sphinx (>=0.99), python-bibtex, graphviz, dvipng, python-xlib, python-qt4, pyqt4-dev-tools, clang, libjs-jquery
 Standards-Version: 3.9.1
 
 Package: yade@_VERSION@
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python-numpy, ipython, python-matplotlib, python-tk, python-qt4, python-xlib, mencoder, gnuplot, python-imaging
-Description: Platform for discrete element modeling. Main optimized build.
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-numpy, ipython, python-matplotlib, python-tk, python-qt4, python-xlib, mencoder, gnuplot, python-imaging, libjs-jquery
+Description: Platform for discrete element modeling. Main optimized build
  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, 
@@ -21,9 +23,12 @@
 
 Package: yade@_VERSION@-dbg
 Architecture: any
+Section: debug
+Priority: extra
 Depends: ${shlibs:Depends}, ${misc:Depends}, yade@_VERSION@, gdb
-Description: Platform for discrete element modeling. Debug build.
+Description: Platform for discrete element modeling. Debug build
  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, 
@@ -35,10 +40,12 @@
 
 Package: yade@_VERSION@-doc
 Architecture: all
+Section: doc
 Recommends: yade@_VERSION@ | yade@_VERSION@-dbg
 Depends: ${misc:Depends}
-Description: Platform for discrete element modeling. Documentation.
+Description: Platform for discrete element modeling. 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, 
@@ -48,11 +55,12 @@
  .
  This package contains examples, test scripts and documentation.
 
-Package: yade@SNAPSHOT@
+Package: yade
 Architecture: all
 Depends: yade@_VERSION@, ${misc:Depends}
-Description: Platform for discrete element modeling. Snapshot version.
+Description: Platform for discrete element modeling. Snapshot 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, 
@@ -61,13 +69,16 @@
  simulation control, postprocessing and debugging.
  .
  This package depends on the latest
- @'snapshot' if SNAPSHOT else 'stable release'@ of Yade.
+ stable release of Yade, virtual package.
 
-Package: yade@SNAPSHOT@-dbg
+Package: yade-dbg
 Architecture: all
+Section: debug
+Priority: extra
 Depends: yade@_VERSION@-dbg, yade@_VERSION@, ${misc:Depends}
-Description: Platform for discrete element modeling. Snapshot debug version.
+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, 
@@ -76,13 +87,15 @@
  simulation control, postprocessing and debugging.
  .
  This package depends on the latest debug build of
- @'snapshot' if SNAPSHOT else 'stable release'@ of Yade.
+ stable release of Yade, virtual package
 
-Package: yade@SNAPSHOT@-doc
+Package: yade-doc
 Architecture: all
+Section: doc
 Depends: yade@_VERSION@-doc, ${misc:Depends}
-Description: Platform for discrete element modeling. Snapshot documentation.
+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, 
@@ -91,4 +104,4 @@
  simulation control, postprocessing and debugging.
  .
  This package depends on the latest documentation of
- @'snapshot' if SNAPSHOT else 'stable release'@ of Yade.
+ stable release of Yade, virtual package.

=== removed file 'debian/docs'
--- debian/docs	2007-03-31 06:18:17 +0000
+++ debian/docs	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-INSTALL
-

=== removed file 'debian/postrm'
--- debian/postrm	2010-10-10 12:36:14 +0000
+++ debian/postrm	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-#!/bin/sh
-# postrm script for yade
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-if test -x /usr/bin/update-menus; then update-menus; fi
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
-
-

=== removed file 'debian/preinst'
--- debian/preinst	2007-03-31 06:18:17 +0000
+++ debian/preinst	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-#!/bin/sh
-# preinst script for yade
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <new-preinst> `install'
-#        * <new-preinst> `install' <old-version>
-#        * <new-preinst> `upgrade' <old-version>
-#        * <old-preinst> `abort-upgrade' <new-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    install|upgrade)
-    ;;
-
-    abort-upgrade)
-    ;;
-
-    *)
-        echo "preinst 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
-
-

=== modified file 'debian/rules'
--- debian/rules	2010-11-29 17:24:26 +0000
+++ debian/rules	2011-01-24 09:01:38 +0000
@@ -1,13 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
 
 export VERSION=$(shell cat VERSION)
 export _VERSION=-${VERSION}
@@ -15,17 +6,11 @@
 configure: configure-stamp
 configure-stamp:
 	dh_testdir
-	# eudoxos: all configuration done automatically when compiling & installing
 	touch configure-stamp
 build: build-stamp
 
 build-stamp: configure-stamp 
 	dh_testdir
-
-	# Add here commands to compile the package.
-	#$(MAKE)
-	## eudoxos: noting to be done here, will be done at the same time as installation
-	#docbook-to-man debian/yade.sgml > yade.1
 	touch $@
 
 clean:
@@ -44,29 +29,16 @@
 install: build
 	dh_testdir
 	dh_testroot
-	##TMP dh_clean -k 
 	dh_installdirs
 	## files VERSION and _VERSION contain snapshot version without/with leading '-' respectively (like svn1113 and -svn1113)
 	#debug build
 	# remove the profile, if existing, to have clean config
 	rm -f scons.profile-deb
 	# the last argument specified that we only want files in lib installed -- common files (the executable) are already in the optimized package
-	NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version=${VERSION} brief=0 chunkSize=5 jobs=1 features=vtk,gts,opengl,qt4 PREFIX=debian/yade${_VERSION}-dbg/usr variant='' optimize=0 march= debug=1 CPPPATH=/usr/include/vtk-5.0:/usr/include/vtk-5.2:/usr/include/vtk-5.4:/usr/include/eigen2 QT4DIR=/usr/share/qt4 debian/yade${_VERSION}-dbg/usr/lib
+	NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version=${VERSION} brief=0 chunkSize=5 jobs=1 features=vtk,gts,opengl,qt4 PREFIX=debian/yade${_VERSION}-dbg/usr variant='' optimize=0 march= debug=1 debian/yade${_VERSION}-dbg/usr/lib
 	#optimized build
 	NO_SCONS_GET_RECENT= scons profile=deb PREFIX=debian/yade${_VERSION}/usr variant='' optimize=1 debug=0
-	#install platform-independent files (docs, scripts, examples)
-	mkdir -p debian/yade${_VERSION}/usr/share/doc/yade${_VERSION}
-	cp -r examples scripts debian/yade${_VERSION}/usr/share/doc/yade${_VERSION}
-	# copy pixmap files in relevant directories
-	mkdir -p debian/yade${_VERSION}/usr/share/pixmaps
-	mkdir -p debian/yade${_VERSION}/usr/share/applications
-	cp debian/yade16x16.xpm debian/yade${_VERSION}/usr/share/pixmaps/yade${_VERSION}_16x16.xpm
-	cp debian/yade32x32.xpm debian/yade${_VERSION}/usr/share/pixmaps/yade${_VERSION}_32x32.xpm
-	cp debian/yade${_VERSION}.desktop debian/yade${_VERSION}/usr/share/applications/
-	dh_installmenu
-
-	# UGLY! generate sphinx docs only if python-sphinx is installed (distinguishes distributions which should build it or not as per debian/control-template build-deps)
-	if dpkg-query -W python-sphinx; then cd doc/sphinx; PYTHONPATH=. YADE_PREFIX=../../debian/yade${_VERSION}/usr/ ../../debian/yade${_VERSION}/usr/bin/yade${_VERSION} yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex; cd ../..; mkdir -p ../../debian/yade${_VERSION}-doc/usr/share/doc/yade${_VERSION}; cp -r _build/html _build/latex/Yade.pdf ../../debian/yade${_VERSION}-doc/usr/share/doc/yade${_VERSION}; else echo "Not building HTML documentation, since the python-sphinx package is not installed"; fi
+	cd doc/sphinx; PYTHONPATH=. YADE_PREFIX=../../debian/yade${_VERSION}/usr/ ../../debian/yade${_VERSION}/usr/bin/yade${_VERSION} yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex; cd ../..;
 	# generate manpages
 	YADE_PREFIX=debian/yade${_VERSION}/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION} --generate-manpage yade${_VERSION}.1
 	YADE_PREFIX=debian/yade${_VERSION}/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION}-batch --generate-manpage yade${_VERSION}-batch.1
@@ -75,45 +47,30 @@
 	dh_testdir
 	dh_testroot
 	YADE_PREFIX=debian/yade${_VERSION}/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION} --test
-	# prefix is for libs, but the executable is only in the optimized package directory
 	YADE_PREFIX=debian/yade${_VERSION}-dbg/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION} --debug --test
 
-# Build architecture-independent files here.
 binary-indep: build install 
-# We have nothing to do by default.
 
-# Build architecture-dependent files here.
-## check added by eudoxos
 binary-arch: build install check
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog
+	dh_pysupport
 	dh_installdocs
+	dh_install
 	dh_installexamples
-#	dh_install
-#	dh_installdebconf	
-#	dh_installlogrotate
-#	dh_installemacsen
-#	dh_installpam
-#	dh_installmime
-#	dh_python
-#	dh_installinit
-#	dh_installcron
-#	dh_installinfo
+	dh_installmenu
 	dh_installman -p yade${_VERSION} yade${_VERSION}.1 yade${_VERSION}-batch.1
-#	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 -X.py -X.stl -X.gts -X.geo -X.mesh -X.msh -X.pdf -X.png -X.svg -X.txt -X.js -X.inv
 	dh_fixperms
-#	dh_perl
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
-	dh_installmenu
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure

=== removed file 'debian/yade-dbg.postinst-template'
--- debian/yade-dbg.postinst-template	2010-10-16 18:31:17 +0000
+++ debian/yade-dbg.postinst-template	1970-01-01 00:00:00 +0000
@@ -1,41 +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)
-    ;;
-
-    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
-
-

=== removed file 'debian/yade-dbg.prerm-template'
--- debian/yade-dbg.prerm-template	2010-10-16 18:31:17 +0000
+++ debian/yade-dbg.prerm-template	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-#!/bin/sh
-# prerm script for yade
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm 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
-
-

=== added file 'debian/yade-doc.doc-base-template'
--- debian/yade-doc.doc-base-template	1970-01-01 00:00:00 +0000
+++ debian/yade-doc.doc-base-template	2011-01-24 09:01:38 +0000
@@ -0,0 +1,12 @@
+Document: yade-0.60-documentation
+Title: This documentation decribes Yade version 0.60
+Author: Yade developers <yade-dev@xxxxxxxxxxxxxxxxxxx>
+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/*.*
+
+Format: PDF
+Files: /usr/share/doc/yade-0.60-doc/Yade.pdf

=== added file 'debian/yade-doc.docs-template'
--- debian/yade-doc.docs-template	1970-01-01 00:00:00 +0000
+++ debian/yade-doc.docs-template	2011-01-24 09:01:38 +0000
@@ -0,0 +1,2 @@
+doc/sphinx/_build/html
+doc/sphinx/_build/latex/Yade.pdf

=== modified file 'debian/yade.desktop-template'
--- debian/yade.desktop-template	2010-11-29 17:24:26 +0000
+++ debian/yade.desktop-template	2011-01-24 09:01:38 +0000
@@ -1,8 +1,8 @@
 [Desktop Entry]
 Type=Application
-Name=Yade @SNAPSHOT@ @VERSION@
+Name=Yade @VERSION@
 GenericName=Yade
-Exec=x-terminal-emulator -T 'Yade @SNAPSHOT@ @VERSION@' -e /usr/bin/yade@_VERSION@
+Exec=/usr/bin/yade@_VERSION@
 Icon=/usr/share/pixmaps/yade@_VERSION@_32x32.xpm
-Terminal=false
+Terminal=true
 Categories=Education;Physics;Science;

=== added file 'debian/yade.docs-template'
--- debian/yade.docs-template	1970-01-01 00:00:00 +0000
+++ debian/yade.docs-template	2011-01-24 09:01:38 +0000
@@ -0,0 +1,1 @@
+scripts

=== added file 'debian/yade.examples-template'
--- debian/yade.examples-template	1970-01-01 00:00:00 +0000
+++ debian/yade.examples-template	2011-01-24 09:01:38 +0000
@@ -0,0 +1,1 @@
+examples/*

=== added file 'debian/yade.install-template'
--- debian/yade.install-template	1970-01-01 00:00:00 +0000
+++ debian/yade.install-template	2011-01-24 09:01:38 +0000
@@ -0,0 +1,3 @@
+debian/yade@_VERSION@_16x16.xpm usr/share/pixmaps/
+debian/yade@_VERSION@_32x32.xpm usr/share/pixmaps/
+debian/yade@_VERSION@.desktop usr/share/applications/

=== modified file 'debian/yade.menu-template'
--- debian/yade.menu-template	2010-11-29 17:24:26 +0000
+++ debian/yade.menu-template	2011-01-24 09:01:38 +0000
@@ -1,9 +1,8 @@
 ?package(yade@_VERSION@):\
 	needs="X11"\
 	section="Applications/Science/Physics"\
-	title="Yade (@SNAPSHOT@ @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
-
+	title="Yade (@VERSION@)"\
+	command="/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"

=== removed file 'debian/yade.prerm-template'
--- debian/yade.prerm-template	2010-01-09 13:13:52 +0000
+++ debian/yade.prerm-template	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-#!/bin/sh
-# prerm script for yade
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <prerm> `remove'
-#        * <old-prerm> `upgrade' <new-version>
-#        * <new-prerm> `failed-upgrade' <old-version>
-#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
-#        * <deconfigured's-prerm> `deconfigure' `in-favour'
-#          <package-being-installed> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    remove|upgrade|deconfigure)
-        update-alternatives --remove yade /usr/bin/yade@_VERSION@
-    ;;
-
-    failed-upgrade)
-    ;;
-
-    *)
-        echo "prerm 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
-
-

=== modified file 'doc/sphinx/installation.rst'
--- doc/sphinx/installation.rst	2011-01-13 10:21:10 +0000
+++ doc/sphinx/installation.rst	2011-01-24 09:01:38 +0000
@@ -62,7 +62,7 @@
 	python-matplotlib libsqlite3-dev python-numeric python-tk gnuplot doxygen \
 	libgts-dev python-pygraphviz libvtk5-dev python-scientific bzr libeigen2-dev \
 	binutils-gold python-xlib python-qt4 pyqt4-dev-tools \
-	libqglviewer-qt4-dev python-imaging
+	libqglviewer-qt4-dev python-imaging libjs-jquery
 
 command line (cut&paste to the terminal under root privileges) for Fedora (not good tested yet!)::
 
@@ -71,7 +71,7 @@
 	log4cxx log4cxx-devel python-devel boost-python ipython python-matplotlib \
 	sqlite-devel python-numeric ScientificPython-tk gnuplot doxygen gts-devel \
 	graphviz-python vtk-devel ScientificPython bzr eigen2-devel libQGLViewer-devel \
-	loki-lib-devel python-xlib PyQt4 PyQt4-devel python-imaging
+	loki-lib-devel python-xlib PyQt4 PyQt4-devel python-imaging 
 
 
 Compilation

=== modified file 'scripts/debian-prep'
--- scripts/debian-prep	2010-11-26 10:32:34 +0000
+++ scripts/debian-prep	2011-01-24 09:01:38 +0000
@@ -34,13 +34,18 @@
 		ff2.write(re.sub(r'@([^@]*)@',lambda m: str(eval(m.group(1))),l))
 for f1,f2 in [
 	('yade.postinst-template','yade-%s.postinst'%VERSION),
-	('yade-dbg.postinst-template','yade-%s-dbg.postinst'%VERSION),
-	('yade.prerm-template','yade-%s.prerm'%VERSION),
-	('yade-dbg.prerm-template','yade-%s-dbg.prerm'%VERSION),
+	('yade.desktop-template','yade-%s.desktop'%VERSION),
+	('yade.docs-template','yade-%s.docs'%VERSION),
+	('yade.examples-template','yade-%s.examples'%VERSION),
+	('yade.install-template','yade-%s.install'%VERSION),
 	('yade.menu-template','yade-%s.menu'%VERSION),
-	('yade.desktop-template','yade-%s.desktop'%VERSION),
+	('yade-doc.doc-base-template','yade-%s-doc.doc-base'%VERSION),
+	('yade-doc.docs-template','yade-%s-doc.docs'%VERSION),
 	('control-template','control')]:
 		copyReplace('debian/'+f1,'debian/'+f2)
+os.system('cp debian/yade16x16.xpm debian/yade-%s_16x16.xpm'%VERSION)
+os.system('cp debian/yade32x32.xpm debian/yade-%s_32x32.xpm'%VERSION)
+
 
 # package is yade-0.50, but with UPDATE .1, it is version 0.50.1

Follow ups

Re: [Branch ~yade-dev/yade/trunk] Rev 2675: 1. Debian-directory cleaning and modifying (checked with lintian -IE --pedantic, no warnings at a...
From: Václav Šmilauer, 2011-01-26