diff -Nru pyromaths-11.05.1b1/AUTHORS pyromaths-11.05.1b2/AUTHORS --- pyromaths-11.05.1b1/AUTHORS 2011-05-05 14:22:52.000000000 +0000 +++ pyromaths-11.05.1b2/AUTHORS 2012-01-08 22:09:51.000000000 +0000 @@ -12,3 +12,7 @@ ==================== Jacqueline Gouguenheim-Desloy (R.I.P.) Yves Gesnel + +Ubuntu packaging : +==================== + Didier Roche Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/._COPYING and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/._COPYING differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/._pyromaths-banniere.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/._pyromaths-banniere.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/._pyromaths.ico and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/._pyromaths.ico differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/._pyromaths.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/._pyromaths.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._2e-00.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._2e-00.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._2e-01.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._2e-01.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._2e-02.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._2e-02.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._2e-03.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._2e-03.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._2e-04.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._2e-04.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._2e-05.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._2e-05.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._2e-06.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._2e-06.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._3e-00.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._3e-00.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._3e-01.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._3e-01.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._3e-02.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._3e-02.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._3e-03.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._3e-03.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._3e-04.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._3e-04.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._3e-05.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._3e-05.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._3e-06.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._3e-06.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._3e-07.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._3e-07.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._3e-08.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._3e-08.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._3e-09.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._3e-09.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._3e-10.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._3e-10.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._3e-11.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._3e-11.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._3e-12.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._3e-12.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._3e-13.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._3e-13.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._3e-14.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._3e-14.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._4e-00.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._4e-00.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._4e-01.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._4e-01.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._4e-02.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._4e-02.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._4e-03.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._4e-03.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._4e-04.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._4e-04.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._4e-05.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._4e-05.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._4e-06.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._4e-06.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._4e-07.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._4e-07.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._4e-08.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._4e-08.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._4e-09.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._4e-09.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._4e-10.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._4e-10.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._4e-11.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._4e-11.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._4e-12.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._4e-12.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._4e-13.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._4e-13.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._4e-14.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._4e-14.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._4e-15.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._4e-15.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._4e-16.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._4e-16.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._5e-00.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._5e-00.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._5e-01.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._5e-01.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._5e-02.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._5e-02.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._5e-03.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._5e-03.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._5e-04.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._5e-04.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._5e-05.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._5e-05.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._5e-06.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._5e-06.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._5e-07.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._5e-07.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._5e-08.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._5e-08.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._5e-09.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._5e-09.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._5e-10.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._5e-10.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._5e-11.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._5e-11.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-00.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-00.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-01.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-01.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-02.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-02.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-03.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-03.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-04.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-04.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-05.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-05.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-06.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-06.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-07.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-07.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-08.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-08.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-09.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-09.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-10.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-10.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-11.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-11.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-12.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-12.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-13.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-13.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-14.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-14.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-15.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-15.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-16.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-16.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-17.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-17.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-18.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-18.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-19.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-19.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-20.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-20.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/vignettes/._6e-21.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/vignettes/._6e-21.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/._vignettes and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/._vignettes differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/images/._whatsthis.png and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/images/._whatsthis.png differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/._images and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/._images differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/linux/._pyromaths.1 and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/linux/._pyromaths.1 differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/linux/._pyromaths.desktop and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/linux/._pyromaths.desktop differ diff -Nru pyromaths-11.05.1b1/data/linux/pyromaths.desktop pyromaths-11.05.1b2/data/linux/pyromaths.desktop --- pyromaths-11.05.1b1/data/linux/pyromaths.desktop 2011-05-05 14:22:52.000000000 +0000 +++ pyromaths-11.05.1b2/data/linux/pyromaths.desktop 2012-01-08 22:09:51.000000000 +0000 @@ -1,8 +1,9 @@ [Desktop Entry] -Icon=/usr/share/pyromaths/images/pyromaths.png +Icon=/usr/share/pixmaps/pyromaths.png Version=1.0 Name=Pyromaths -Comment=Générateur d'exercices de maths +Comment=Generator for math worksheets for french college +Comment[fr]=Générateur d'exercices de maths Exec=/usr/bin/pyromaths Terminal=false Type=Application Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/._linux and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/._linux differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/packages/._tabvar.tex and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/packages/._tabvar.tex differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/._packages and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/._packages differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/templates/._evaluation.tex and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/templates/._evaluation.tex differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/templates/._pyromaths.tex and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/templates/._pyromaths.tex differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/data/._templates and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/data/._templates differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/._data and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/._data differ diff -Nru pyromaths-11.05.1b1/debian/changelog pyromaths-11.05.1b2/debian/changelog --- pyromaths-11.05.1b1/debian/changelog 2012-01-04 17:45:53.000000000 +0000 +++ pyromaths-11.05.1b2/debian/changelog 2012-03-28 15:37:17.000000000 +0000 @@ -1,3 +1,14 @@ +pyromaths (11.05.1b2-0ubuntu1) precise; urgency=low + + * New bugfix upstream release: + - add a icon for unity launcher + - add a french comment + * debian/control: + - add some missing deps + - bump Standards-Version to latest + + -- Didier Roche Wed, 28 Mar 2012 17:37:17 +0200 + pyromaths (11.05.1b1-0ubuntu2) precise; urgency=low * debian/control: diff -Nru pyromaths-11.05.1b1/debian/control pyromaths-11.05.1b2/debian/control --- pyromaths-11.05.1b1/debian/control 2012-01-04 16:38:20.000000000 +0000 +++ pyromaths-11.05.1b2/debian/control 2012-03-28 15:37:00.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Didier Roche Build-Depends: debhelper (>= 7.0.50~), python (>= 2.6.6-3~), -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://www.pyromaths.org Package: pyromaths @@ -14,6 +14,12 @@ python-qt4, python-lxml, texlive-latex-base, + python-lxml, + texlive-pstricks, + texlive-latex-base, + texlive-latex-extra, + texlive-fonts-recommended, + texlive-latex-recommended, Description: Generator for math worksheets for french college. Pyromaths is a program which generates math worksheets in PDF format. It not only provides the solution of the exercises, but a detailed correction Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/._debian and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/._debian differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/._.DS_Store and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/._.DS_Store differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/.DS_Store and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/.DS_Store differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/._MANIFEST.in and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/._MANIFEST.in differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/._NEWS and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/._NEWS differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/._pyromaths and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/._pyromaths differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/._README and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/._README differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/._setup.cfg and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/._setup.cfg differ diff -Nru pyromaths-11.05.1b1/setup.py pyromaths-11.05.1b2/setup.py --- pyromaths-11.05.1b1/setup.py 2011-05-05 14:22:52.000000000 +0000 +++ pyromaths-11.05.1b2/setup.py 2012-01-08 22:09:51.000000000 +0000 @@ -19,8 +19,9 @@ 'pyromaths.cinquiemes', 'pyromaths.sixiemes', 'pyromaths.lycee', 'pyromaths.outils', 'pyromaths.classes'], data_files=[ - ('share/pyromaths/images', [ 'data/images/pyromaths.png', - 'data/images/pyromaths-banniere.png', 'data/images/whatsthis.png' ] + ('share/pixmaps/', [ 'data/images/pyromaths.png' ] ), + ('share/pyromaths/images', [ 'data/images/pyromaths-banniere.png', + 'data/images/whatsthis.png' ] ), ('share/applications', ['data/linux/pyromaths.desktop']), ('share/man/man1', ['data/linux/pyromaths.1']), Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/cinquiemes/._aires.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/cinquiemes/._aires.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/cinquiemes/._cinquiemes.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/cinquiemes/._cinquiemes.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/cinquiemes/._construction.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/cinquiemes/._construction.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/cinquiemes/._diagrammes.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/cinquiemes/._diagrammes.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/cinquiemes/._fractions.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/cinquiemes/._fractions.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/cinquiemes/.___init__.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/cinquiemes/.___init__.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/cinquiemes/._priorites.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/cinquiemes/._priorites.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/cinquiemes/._proportionnalite.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/cinquiemes/._proportionnalite.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/cinquiemes/._relatifs.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/cinquiemes/._relatifs.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/cinquiemes/._reperage.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/cinquiemes/._reperage.py differ diff -Nru pyromaths-11.05.1b1/src/cinquiemes/reperage.py pyromaths-11.05.1b2/src/cinquiemes/reperage.py --- pyromaths-11.05.1b1/src/cinquiemes/reperage.py 2011-05-05 14:22:52.000000000 +0000 +++ pyromaths-11.05.1b2/src/cinquiemes/reperage.py 2012-01-07 17:38:21.000000000 +0000 @@ -85,8 +85,8 @@ def coordo_pts(nb): - """Génère une liste de nb coordonnées. Je m'arrange pour avoir des points sur les 4 quadrants - et sur les deux axes""" + """Génère une liste de nb coordonnées. Je m'arrange pour avoir des points + sur les 4 quadrants et sur les deux axes""" j=0 k=0 l=[] @@ -94,7 +94,8 @@ while i<4 and iNicolas Pourcelot pour ses conseils et son implication prochaine dans le code de Pyromaths ;
  • + Didier Roche pour l'intégration de Pyromaths dans les dépôts Ubuntu ; +
    • +
  • Jacqueline Gouguenheim-Desloy a porté Pyromaths sur Mac OS X à ses débuts. Son soutien et son amitié nous ont été précieux. Sa disparition est une perte douloureuse pour la communauté du logiciel libre.
    • Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/._interface.pyc and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/._interface.pyc differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/interface.pyc and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/interface.pyc differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/lycee/._ExoPolynome.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/lycee/._ExoPolynome.py differ diff -Nru pyromaths-11.05.1b1/src/lycee/ExoPolynome.py pyromaths-11.05.1b2/src/lycee/ExoPolynome.py --- pyromaths-11.05.1b1/src/lycee/ExoPolynome.py 2011-05-05 14:22:52.000000000 +0000 +++ pyromaths-11.05.1b2/src/lycee/ExoPolynome.py 2012-01-07 17:38:21.000000000 +0000 @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- from random import randrange -from ..classes.Polynome import * -from ..outils.Polynomes import * +from ..classes.Polynome import Fractions,Polynome, pTeX, TeX,simplifie_racine, RacineDegre2, radicalTeX, sqrt, fTeX +from ..outils.Polynomes import poly_racines_entieres, poly_racines_fractionnaires, poly_racines_quelconques, poly_id_remarquables,poly_degre3_racines_entieres, TeX_division, poly_degre3_racines_fractionnaires, randint from ..outils.decimaux import decimaux from ..outils.Arithmetique import pgcd Fractions=Fractions.Fractions Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/lycee/._ExoSecondDegre.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/lycee/._ExoSecondDegre.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/lycee/._Fonction.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/lycee/._Fonction.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/lycee/.___init__.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/lycee/.___init__.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/lycee/._lycee.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/lycee/._lycee.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/lycee/._Vecteurs.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/lycee/._Vecteurs.py differ diff -Nru pyromaths-11.05.1b1/src/lycee/Vecteurs.py pyromaths-11.05.1b2/src/lycee/Vecteurs.py --- pyromaths-11.05.1b1/src/lycee/Vecteurs.py 2011-05-05 14:22:52.000000000 +0000 +++ pyromaths-11.05.1b2/src/lycee/Vecteurs.py 2012-01-07 17:38:21.000000000 +0000 @@ -30,7 +30,7 @@ ##- simplifier des sommes ##- problèmes de colinéarité -from ..classes.Vecteurs import * +from ..classes.Vecteurs import randvect, Vecteur from ..classes.Racine import simplifie_racine import math from random import randint, shuffle @@ -144,25 +144,27 @@ def vecteurs_add(): '''Exercice sur la définition des vecteurs et leurs sommes.''' + t = None + while not t: + # Pour être sûr que l'exercice ait des solutions + (u, posux, posuy) = randvect(0, 10) + (v, posvx, posvy) = randvect(math.fabs(u.x)+1, 10) + (w, poswx, poswy) = randvect(math.fabs(v.x)+math.fabs(u.x)+2, 10) + + ## Construction du point pour la question 2 + if 18 - poswx - max(w.x,0) > 0: + restes = (18 - poswx - max(w.x,0),10) + pointy = randint(0,10) + elif poswy + min(w.y,0) > 10 - poswy - max(w.y,0): + restes = (poswx+min(w.x,0),poswy + min(w.y,0)) + pointy = randint(0,restes[1]) + else: + restes = (poswx+min(w.x,0),10 - poswy - max(w.y,0)) + pointy = randint(10 - restes[1],10) - (u, posux, posuy) = randvect(0, 10) - (v, posvx, posvy) = randvect(math.fabs(u.x)+1, 10) - (w, poswx, poswy) = randvect(math.fabs(v.x)+math.fabs(u.x)+2, 10) - - ## Construction du point pour la question 2 - if 18 - poswx - max(w.x,0) > 0: - restes = (18 - poswx - max(w.x,0),10) - pointy = randint(0,10) - elif poswy + min(w.y,0) > 10 - poswy - max(w.y,0): - restes = (poswx+min(w.x,0),poswy + min(w.y,0)) - pointy = randint(0,restes[1]) - else: - restes = (poswx+min(w.x,0),10 - poswy - max(w.y,0)) - pointy = randint(10 - restes[1],10) - - pointx = randint(18 - restes[0],18) + pointx = randint(18 - restes[0],18) - t = ChoixVecteur(u,v,w,pointx,pointy) + t = ChoixVecteur(u,v,w,pointx,pointy) exo=["\\exercice"] cor=["\\exercice*"] Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/._lycee and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/._lycee differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/._Affichage.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/._Affichage.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/._Arithmetique.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/._Arithmetique.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/._Conversions.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/._Conversions.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/._decimaux.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/._decimaux.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/._Fractions.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/._Fractions.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/._Geometrie.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/._Geometrie.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/.___init__.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/.___init__.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/__init__.pyc and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/__init__.pyc differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/.___init__.pyc and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/.___init__.pyc differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/._Polynomes.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/._Polynomes.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/._Priorites2.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/._Priorites2.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/._Priorites3.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/._Priorites3.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/._Priorites.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/._Priorites.py differ diff -Nru pyromaths-11.05.1b1/src/outils/Priorites.py pyromaths-11.05.1b2/src/outils/Priorites.py --- pyromaths-11.05.1b1/src/outils/Priorites.py 2011-05-05 14:22:52.000000000 +0000 +++ pyromaths-11.05.1b2/src/outils/Priorites.py 2012-01-07 17:38:21.000000000 +0000 @@ -4,8 +4,7 @@ from Affichage import decimaux from . import Arithmetique, Affichage import math -from .Fractions import * - +from .Fractions import EffectueSommeFractions, EffectueQuotientFractions, EffectueProduitFractions def EffectueCalcul(op, nb1, nb2, pre="", post=""): denominateur_max = 20 Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/._System.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/._System.py differ diff -Nru pyromaths-11.05.1b1/src/outils/System.py pyromaths-11.05.1b2/src/outils/System.py --- pyromaths-11.05.1b1/src/outils/System.py 2011-05-05 14:22:52.000000000 +0000 +++ pyromaths-11.05.1b2/src/outils/System.py 2012-01-07 17:38:21.000000000 +0000 @@ -222,12 +222,13 @@ call(["ps2pdf", "-sPAPERSIZE#a4", "%s.ps" % f0noext, "%s.pdf" % f0noext], stdout=log) log.close() nettoyage(f0noext) - if os.name == "nt": #Cas de Windows. - os.startfile('%s.pdf' % f0noext) - elif sys.platform == "darwin": #Cas de Mac OS X. - os.system('open %s.pdf' % f0noext) - else: - os.system('xdg-open %s.pdf' % f0noext) + if not "openpdf" in parametres or parametres["openpdf"]: + if os.name == "nt": #Cas de Windows. + os.startfile('%s.pdf' % f0noext) + elif sys.platform == "darwin": #Cas de Mac OS X. + os.system('open %s.pdf' % f0noext) + else: + os.system('xdg-open %s.pdf' % f0noext) if parametres['corrige'] and not parametres['creer_unpdf']: os.chdir(dir1) @@ -238,12 +239,13 @@ call(["ps2pdf", "-sPAPERSIZE#a4", "%s.ps" % f1noext, "%s.pdf" % f1noext], stdout=log) log.close() nettoyage(f1noext) - if os.name == "nt": #Cas de Windows. - os.startfile('%s.pdf' % f1noext) - elif sys.platform == "darwin": #Cas de Mac OS X. - os.system('open %s.pdf' % f1noext) - else: - os.system('xdg-open %s.pdf' % f1noext) + if not "openpdf" in parametres or parametres["openpdf"]: + if os.name == "nt": #Cas de Windows. + os.startfile('%s.pdf' % f1noext) + elif sys.platform == "darwin": #Cas de Mac OS X. + os.system('open %s.pdf' % f1noext) + else: + os.system('xdg-open %s.pdf' % f1noext) else: os.remove('%s-corrige.tex' % f0noext) Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/._System.pyc and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/._System.pyc differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/System.pyc and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/System.pyc differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/._TestEnv.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/._TestEnv.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/._TestEnv.pyc and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/._TestEnv.pyc differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/TestEnv.pyc and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/TestEnv.pyc differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/._TexFiles.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/._TexFiles.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/._TexFiles.pyc and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/._TexFiles.pyc differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/TexFiles.pyc and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/TexFiles.pyc differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/outils/._TeXMiseEnForme.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/outils/._TeXMiseEnForme.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/._outils and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/._outils differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/._pyromaths.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/._pyromaths.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/._pyromaths.pyc and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/._pyromaths.pyc differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/pyromaths.pyc and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/pyromaths.pyc differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/quatriemes/._calcul_mental.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/quatriemes/._calcul_mental.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/quatriemes/._developpements.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/quatriemes/._developpements.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/quatriemes/._fractions.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/quatriemes/._fractions.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/quatriemes/._geometrie.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/quatriemes/._geometrie.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/quatriemes/.___init__.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/quatriemes/.___init__.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/quatriemes/._litteral.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/quatriemes/._litteral.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/quatriemes/._puissances.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/quatriemes/._puissances.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/quatriemes/._quatriemes.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/quatriemes/._quatriemes.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/._quatriemes and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/._quatriemes differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/sixiemes/._aires.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/sixiemes/._aires.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/sixiemes/._angles.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/sixiemes/._angles.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/sixiemes/._arrondi.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/sixiemes/._arrondi.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/sixiemes/._decimaux.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/sixiemes/._decimaux.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/sixiemes/._droites.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/sixiemes/._droites.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/sixiemes/._espace.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/sixiemes/._espace.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/sixiemes/._fractions.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/sixiemes/._fractions.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/sixiemes/.___init__.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/sixiemes/.___init__.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/sixiemes/._operations.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/sixiemes/._operations.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/sixiemes/._quotients.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/sixiemes/._quotients.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/sixiemes/._sixiemes.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/sixiemes/._sixiemes.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/sixiemes/._symetrie.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/sixiemes/._symetrie.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/._sixiemes and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/._sixiemes differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/troisiemes/._affine.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/troisiemes/._affine.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/troisiemes/._arithmetique.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/troisiemes/._arithmetique.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/troisiemes/._developpements.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/troisiemes/._developpements.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/troisiemes/._equations.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/troisiemes/._equations.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/troisiemes/._fractions.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/troisiemes/._fractions.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/troisiemes/._geometrie.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/troisiemes/._geometrie.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/troisiemes/.___init__.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/troisiemes/.___init__.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/troisiemes/._pgcd.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/troisiemes/._pgcd.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/troisiemes/._proba.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/troisiemes/._proba.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/troisiemes/._proportionnalite.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/troisiemes/._proportionnalite.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/troisiemes/._puissances.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/troisiemes/._puissances.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/troisiemes/._racines.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/troisiemes/._racines.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/troisiemes/._systemes.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/troisiemes/._systemes.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/troisiemes/._troisiemes.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/troisiemes/._troisiemes.py differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/._troisiemes and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/._troisiemes differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/._Values.py and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/._Values.py differ diff -Nru pyromaths-11.05.1b1/src/Values.py pyromaths-11.05.1b2/src/Values.py --- pyromaths-11.05.1b1/src/Values.py 2011-05-05 14:22:52.000000000 +0000 +++ pyromaths-11.05.1b2/src/Values.py 2012-01-08 22:09:51.000000000 +0000 @@ -25,6 +25,14 @@ else: return '/usr/share/pyromaths/' +def icon_dir(): + """Renvoie le dossier où se trouve l'icône, selon qu'on utilise pyromaths à + partir des sources, de l'exécutable win32 ou du paquet deb""" + if we_are_frozen() or exists(join(abspath(dirname(__file__)),'../data/')): + return join(DATADIR, 'images', 'pyromaths.png') + else: + return join('/usr/share/pixmaps', 'pyromaths.png') + if name == 'nt': def home(): return unicode(environ['USERPROFILE'], getfilesystemencoding()) @@ -38,17 +46,22 @@ return join(home(), "Library", "Application Support", "Pyromaths") else: def home(): - return unicode(environ['HOME'], getfilesystemencoding()) + try: + return unicode(environ['HOME'], getfilesystemencoding()) + except KeyError: + # Pyromaths en ligne, l'user apache n'a pas de $HOME + return "" def configdir(): return join(home(), ".config", "pyromaths") -VERSION = '11.05.1b1' +VERSION = '11.05.1b2' COPYRIGHT_YEAR = strftime('%Y') COPYRIGHTS = u'© 2006 – %s Jérôme Ortais
    \n' \ u'Pyromaths est distribué sous ' \ u'licence GPL.' % (COPYRIGHT_YEAR) WEBSITE = 'http://www.pyromaths.org/' DATADIR = data_dir() +ICONDIR = icon_dir() HOME = home() CONFIGDIR = configdir() Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/._Values.pyc and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/._Values.pyc differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/src/Values.pyc and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/src/Values.pyc differ Binary files /tmp/Zc6px1BV5s/pyromaths-11.05.1b1/._src and /tmp/bKt6U8x3GD/pyromaths-11.05.1b2/._src differ