------------------------------------------------------------ revno: 2574 committer: Anton Gladky <gladky.an...@gmail.com> branch nick: trunk timestamp: Fri 2010-11-26 08:42:42 +0100 message: 1. Changes from 0.60 (debian packaging). removed: debian/yade-dbg.menu-template added: debian/yade.desktop-template modified: debian/rules debian/yade.menu-template debian/yade.postinst-template 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/rules' --- debian/rules 2010-10-16 18:31:17 +0000 +++ debian/rules 2010-11-26 07:42:42 +0000 @@ -51,7 +51,7 @@ # 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=1 jobs=1 features=vtk,gts,opengl,openmp,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 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 #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) @@ -59,7 +59,11 @@ 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 - cp debian/*.xpm 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 @@ -75,7 +79,7 @@ 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 +binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. @@ -87,7 +91,6 @@ dh_installdocs dh_installexamples # dh_install - dh_installmenu # dh_installdebconf # dh_installlogrotate # dh_installemacsen === removed file 'debian/yade-dbg.menu-template' --- debian/yade-dbg.menu-template 2010-10-16 18:31:17 +0000 +++ debian/yade-dbg.menu-template 1970-01-01 00:00:00 +0000 @@ -1,9 +0,0 @@ -?package(y...@_version@):\ - needs="X11"\ - section="Applications/Science/Physics"\ - title="Yade (@SNAPSHOT@ @VERSION@)"\ - command="x-terminal-emulator -T 'Yade @SNAPSHOT@ @VERSION@ (debug)' -x /usr/bin/y...@_version@ -- debug"\ - icon=/usr/share/pixmaps/yade32x32.xpm\ - icon16x16=/usr/share/pixmaps/yade16x16.xpm\ - icon32x32=/usr/share/pixmaps/yade32x32.xpm - === added file 'debian/yade.desktop-template' --- debian/yade.desktop-template 1970-01-01 00:00:00 +0000 +++ debian/yade.desktop-template 2010-11-26 07:42:42 +0000 @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=Application +Name=Yade @SNAPSHOT@ @VERSION@ +GenericName=Yade +Exec=x-terminal-emulator -T 'Yade @SNAPSHOT@ @VERSION@' -x /usr/bin/y...@_version@ +Icon=/usr/share/pixmaps/y...@_version@_32x32.xpm +Terminal=true +Categories=Education;Physics;Science; === modified file 'debian/yade.menu-template' --- debian/yade.menu-template 2010-10-16 18:31:17 +0000 +++ debian/yade.menu-template 2010-11-26 07:42:42 +0000 @@ -3,7 +3,7 @@ section="Applications/Science/Physics"\ title="Yade (@SNAPSHOT@ @VERSION@)"\ command="x-terminal-emulator -T 'Yade @SNAPSHOT@ @VERSION@' -x /usr/bin/y...@_version@"\ - icon=/usr/share/pixmaps/yade32x32.xpm\ - icon16x16=/usr/share/pixmaps/yade16x16.xpm\ - icon32x32=/usr/share/pixmaps/yade32x32.xpm + icon=/usr/share/pixmaps/y...@_version@_32x32.xpm\ + icon16x16=/usr/share/pixmaps/y...@_version@_16x16.xpm\ + icon32x32=/usr/share/pixmaps/y...@_version@_32x32.xpm === modified file 'debian/yade.postinst-template' --- debian/yade.postinst-template 2010-10-10 12:36:14 +0000 +++ debian/yade.postinst-template 2010-11-26 07:42:42 +0000 @@ -32,8 +32,6 @@ ;; 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. === modified file 'scripts/debian-prep' --- scripts/debian-prep 2010-10-16 18:31:17 +0000 +++ scripts/debian-prep 2010-11-26 07:42:42 +0000 @@ -38,7 +38,7 @@ ('yade.prerm-template','yade-%s.prerm'%VERSION), ('yade-dbg.prerm-template','yade-%s-dbg.prerm'%VERSION), ('yade.menu-template','yade-%s.menu'%VERSION), - ('yade-dbg.menu-template','yade-%s-dbg.menu'%VERSION), + ('yade.desktop-template','yade-%s.desktop'%VERSION), ('control-template','control')]: copyReplace('debian/'+f1,'debian/'+f2)
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : yade-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp