Commit 6e3fd682 authored by Jérôme Ortais's avatar Jérôme Ortais
Browse files

Version 11.05.1b1 : correction de bugs.

parent cfb0221f
......@@ -73,39 +73,6 @@ gpg --default-key "Jérôme Ortais" -bao Release.gpg Release &&
tar vjcf ${ARCHIVEPATH}/debs-${VERSION}.tar.bz2 dists/ Packages Packages.gz Packages.bz2 Release Release.gpg &&
cd ${PYROPATH} &&
rm -r /tmp/repo_debian
sleep 40
echo "#-------------------------------------------
#-------- CRÉATION DU PAQUET DEBIAN --------
#-------------------------------------------"
cd $ARCHIVEPATH
mkdir -p tmpdeb
cd tmpdeb &&
cp -r $PYROPATH/scripts/linux/* .
tar jxf ../pyromaths-${VERSION}-sources.tar.bz2 &&
#mv data pyromaths/ &&
mv pyromaths-${VERSION} pyromaths &&
cd pyromaths
python ../setup.py &&
mv *.rpm pyromaths_${VERSION}.tar.gz ../ &&
cd .. &&
rm -r pyromaths &&
tar vzxf pyromaths_${VERSION}.tar.gz &&
cd pyromaths &&
debuild -k0xB39EE5B6 &&
cd .. &&
mkdir dists &&
mv pyromaths_${VERSION}_all.deb dists/ &&
sudo dpkg-scanpackages . /dev/null > Packages &&
sudo dpkg-scanpackages . /dev/null | gzip -c9 > Packages.gz &&
sudo dpkg-scanpackages . /dev/null | bzip2 -c9 > Packages.bz2 &&
apt-ftparchive release . > /tmp/Release.tmp &&
mv /tmp/Release.tmp Release &&
gpg --default-key "Jérôme Ortais" -bao Release.gpg Release &&
tar vjcf ARCHIVEPATH../debs-${VERSION}.tar.bz2 dists/ Packages Packages.gz Packages.bz2 Release Release.gpg &&
mv *.rpm dists/*.deb .. &&
cd ${ARCHIVEPATH} &&
rm -r tmpdeb &&
echo "#-------------------------------------------
#------- CRÉATION DU BINAIRE WINDOWS -------
......
pyromaths (11.05.1b1-1) unstable; urgency=low
* Gestion des version 2.5 à 2.7 de Python
-- Jérôme Ortais <jerome.ortais@pyromaths.org> Thu, 05 May 2011 16:16:00 +0100
pyromaths (11.05-1) unstable; urgency=low
* Initial release
......
......@@ -3,6 +3,7 @@ Section: math
Priority: optional
Maintainer: Jérôme Ortais <jerome.ortais@pyromaths.org>
Build-Depends: debhelper (>= 7)
Build-Depends-Indep: python-support (>= 0.5.3)
Standards-Version: 3.9.1
Homepage: http://www.pyromaths.org/
......
......@@ -8,6 +8,7 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
include /usr/share/python/python.mk
clean:
dh_testdir
......@@ -35,7 +36,8 @@ binary-indep: build install
dh_icons
dh_compress -X.pdf -X.py
dh_fixperms
#dh_pycentral
#dh_python2 -i -V '2.5-3.0' -p pyromaths -v
dh_pysupport
dh_installdeb
dh_gencontrol
dh_md5sums
......
......@@ -17,11 +17,11 @@
<!-- Version number -->
<key>CFBundleShortVersionString</key>
<string>11.05</string>
<string>11.05.2</string>
<!-- Build number -->
<key>CFBundleVersion</key>
<string>11.05</string>
<string>11.05.2</string>
<!-- Copyright notice -->
<key>NSHumanReadableCopyright</key>
......
-----BEGIN PGP MESSAGE-----
Version: GnuPG v2.0.14 (GNU/Linux)
hQIOA3Vp2L7DX7gyEAf/fVJ9DdxgwPtj/7FaVHKXQk65o47llN8fKANeCylURkZ8
uVurMoPCiMfKjvNdX5A96Z9UL6yHBHMQINOLR3Fdc8o03YS4S4dTY55zk3qeCoxs
Zo4MqQmPE+YvkAUzogzbv1rArcj9j177hF43RPMu/QiQGC4A/A9SvApa79QLNEGl
W0tTWqIM/433XOFUcnNqWFnKrZTwv/KYQQDGkrztKpS5rWkXBvB20UDDfMVCEch0
5GejApgX5/0Gp2t84FA3wQ/zgCtFY7hbSjrXw84gM4pR099KVZeAq5nPBr9DTPSc
pccD78XOwxpvwGhu00VAsnLQp17SwsnWsfN1E+8FWAf+LOddTR8PZRg6gXkxKO+j
YLFPic23pfHPsV2c1V7ce3rHbNBLxsPYitQgM6qaHPMeX0ZncPBklwNmxzW/UozW
7rEPt3W9fexH0lsdkFg6em8C53nUogWFCKn2i95bOeuCTTxJ/h0Ap0BNtbpYeCgy
S1eA4Beya/WF2SMbTBBBDeh78lYGQQXpehFsVwk/p5NHGuYsQTk5c4qhErCoBB29
pQ2cmCzCZxqrrLx+7RoEKg5sALw9yy9LSXqVFNRp02dVMA8Ws3xW25DACgA66XeI
+wlGKyeXDdZ/YLgkSeu8HJhYOApgROcgBx3GAdaz8GcTNyahXvvyGS0d458xAn/Z
l9LpAfpwCM/vt87MwkcpwxurijArqRqvsDUxTM0W+CHY948GfC15z+WtI53rH3p1
w4A0uMPH1wmIy/cd045b2W56JtE63noA/VTEowdD0EI6ySMWxJMLqUpm/n/rXhoD
PPZHzYXHyQ10EjmZhOXP2lAYik1P3EpIaAijEYPi8ojlLyR78CvONeD0sQCTU1ru
8ztMZlV4HBl75EK+6+N5rrjQywjKQ1rrSRUMh+qA+R5zmnPWwxiA+oJuvcmp+Orf
qtLd0mAvVqzSaZqU4B6XwHSl1NvfWoZw+vDJztO5XEING9Jc5KbEL206MqZsilhh
UHH1uetOBdtyQEnYDvECLfJWK/gUFBZrakLbczxqk/1nEZu1Om+tl+fEgrnPc4Jh
tK/kJnDJUVIJGxvhJ1jz3bGGRPkVQ9hDepFvNKTRJBKYTQiendF17r5L5iHDnvKo
Z0hCFWnSs9ydHABifm9Kehw6h5JuSl+UPaT9MG90ILDoXBWWWHbFEvtET7d15f6z
xkJemynJs4MKxuawb8D6z2rGC9GtmlU8IXz2XDJvIBf0uuQon313GooarDk4IegG
tqWeE6di0I87GR5ErFG1lTuibopePWn0o5e4W+a7e3p6fg99Qfa6D2b2wyrWh4yU
wJx9wvoPVkYlIdxQtAf0oPv0h8npfWSPj6jrMn2VA164RELAQDHQGN4aY8mpa+E5
6SOdnpttwaL6Onkwa2gKB2ZBqI9YpCU+FHHtreHNGXrTGUdF4ZSexcBfph1brIWP
ApyQCpj3yLekJJCDVBkNphhYpbkPaGe1UXh4ndmCKCm4b1LHZuSeTsNQjxtv8let
rv8Jz9jlKs3UPD0/rx8PHhpWMVnLCRlMeY+Hz302XkSsfDi96l59wjlx7zgZT6qd
6uJ8a6Z7PmiC18WwkaStyO4dBu2XcazI5Cp4FhA1rVod67MepnleXeRDbk7tibY8
eDmBGHEiV1a+qcsOeoxAJzqiaauruZkr6Xzno1hYm2FHlNIRLa1CbEshX2DsZ4q/
NT+3goo=
=pZ8p
hQIOA3Vp2L7DX7gyEAf9G3UN7e86KAWLI3vhnk06b6BqtDGaZWPnN3PtIzUu3MOv
EXjBl6ZPEYthDaO/Dp1Ecpkl+vp6yc9XRmZqJjuw1qzG0WcDSDZNqliSJEpxSMuU
Sx6AE1wkFujuTRXvg6oPIC74ys8Ljj0pVTZRs02O5PlYoXE1O2WkJi/ziSOcOjmO
/d/8YUrf69kkrqYHFtUmmDAAHc4aimJzoDXmG4AaAWHsSG46qgwVF8D7T587+A61
/usjO5Ex+veuLLkOPwW7gG3kP7rJIWqdpTEV5yOu2JhqTCzVaPGv5pyPs3tTNYSO
a1MMc38sNbrEmDbGikkbAt2xBdopSadCrF5cj/A6Twf/bYQ3lIHb+41xY6see0bo
vWjfe3+ebRDH1jy5X9EyogGfGGG0vpPxCOP94jRb/fIaBtr7avPnM0WQMU5GraOr
KKBqqYA4j+/vkJjRHzLdePiPD4dLpUVk/Qn6VI5dh/g5KMCTJyPaGgdJIdjfHtVE
3rCn/DwKqDtVgRM2alIS20feSWz8ynZ0PVLOk8ChhVF3NU9s9YGFRIhpbw1wmbcU
+nPjVx326wampdeUpMPdmTwXxHxy8VmEEj4l/qZ81K/etv57RKzgHy3YCvsBIA75
tnvBhXRNjo8U3gI5mtSV5l5qpgYjItS7B0wQRz/LUvzL4/xzVykqB431vHGD86BE
BdLpAdVheSrGJo0id5Vb6FLVTldo5ktCdURFeR3CtcdWbri0zPQNlOhngibZ001y
KJ883634WuGF5DdamTBg5vix9UNgIHczFw2U9fbcNy14S+ZTIcq5f0PN/ary0wrp
R5WHYS92oASK/W2XPAA0FBTGvP11+JwsdGD1yuzMMNCCpAS9EZAfiQDdGaNOjhVH
nLXOT6tZqPpenlamcipx3u6GVcGyK6eSY3iIbj9WQ/ml9iYjnJNb7ozmqJnm0Jkc
T3m5sLk3538t5TOPGfyuThGmBVK6+Xv9Wns+cC7ZIo9iOnmoi1fk3L5Nz2eyJU+E
EOLdIWKL13FXUQQ5od9KBtY4CmYU5v+04JmC8jg6I+rRksvw3Gmbz+07R7OceAti
QcmHMQAggsUDOvD+GJKdcKOFcmxir3NyNOKWrzERq2/lucANeRwa9gwDYZ4aLEeF
Mk6jwelde7aYXNNG901X52wh+y3seQNlgdmkSJHfweMhq9owcQILdUk8iHlXst8/
/W8kO5HCv8Jfr879u/Xxjr8f1h8Ikc2sOPBEQTF/W6muF0czVuzNqJZVRbjoeJ2L
AJ9gZypDs3maXkqN+QenXJrCuPHJX+UKiM7VYJx5aJwfOf0OCKfTX6GwQSPTRWoh
iiKZaR/1WrxC0dKzCS5yZu2v+TmqOP67SEAgspU415UaGUTAZKC2uSFimU6D5DfL
wMdgAE9cUGYXXYMUwiim36+9SZZVtKK5nxNvHwKnk5ctyTsA778Ee7cMCFkKv/ml
dB6jU45cPedkNe0VVNxG1eIus5sd2Cu15qXY+ARWPwm0UpgoeA5YFz/Z09MkIjOy
smxlrX5ar+gpsTdeYIXORojpzpfw2EuMp+ovCn/BMTQLpAaMfF47tBVRo8OMxNbm
GIhD/waHZISzw/yMFkqVCqaOoD5l4GzxncLHe7RRfmma7L27DfrQxIeJYfapFHVn
JpSsiKSuOb++gbkqB93Vq8dCZBqGcUvywSEw4WUh5/bb9xVZ9DJbsq0D1JVAPp3T
d1LVBSQd8+oE1mO5AzVL/I/4bzersH7uIIYH/mu6Nr/ggtyrTCCiLok=
=DMJq
-----END PGP MESSAGE-----
......@@ -42,7 +42,7 @@ else:
def configdir():
return join(home(), ".config", "pyromaths")
VERSION = '11.05'
VERSION = '11.05.1b1'
COPYRIGHT_YEAR = strftime('%Y')
COPYRIGHTS = u'© 2006 – %s Jérôme Ortais<br/>\n' \
u'<span style=" font-size:small;">Pyromaths est distribué sous ' \
......
......@@ -278,7 +278,7 @@ class Polynome():
other = Polynome(repr(other), self.var)
return other*self
if isinstance(other, str):
from src.outils.Priorites3 import splitting
from ..outils.Priorites3 import splitting
ls = splitting(other)
if ls.count("+") or ls.count("-"):
# Réduire @other avant de faire le produit et vérifier s'il faut
......
......@@ -24,7 +24,7 @@
import sys, os, codecs
from lxml import etree
from lxml import _elementpath as DONTUSE # Astuce pour inclure lxml dans Py2exe
from re import sub, findall
from re import findall
from .TexFiles import mise_en_forme
......@@ -72,7 +72,7 @@ def create_config_file():
etree.SubElement(subchild, "email").text=u"jerome.ortais@pyromaths.org"
etree.SubElement(subchild, "site").text="http://www.pyromaths.org"
return etree.tostring(root, pretty_print=True, encoding="UTF-8", xml_declaration=True).decode('utf-8', 'strict')
return etree.tostring(root, pretty_print=True, encoding=unicode)
def indent(elem, level=0):
"""Indente correctement les fichiers xml.
......@@ -128,7 +128,7 @@ def modify_config_file(file):
oldtag.text = element.text
if modifie:
f = codecs.open(os.path.join(CONFIGDIR, "pyromaths.xml"), encoding='utf-8', mode = 'w')
f.write(etree.tostring(indent(oldroot), pretty_print=True, encoding="utf-8", xml_declaration=True).decode('utf-8', 'strict'))
f.write(etree.tostring(indent(oldroot), pretty_print=True, encoding=unicode))
f.close()
#==============================================================
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment