allpy
changeset 618:b17985965fa7
Automated merge with ssh://kodomo/allpy
| author | boris (kodomo) <bnagaev@gmail.com> |
|---|---|
| date | Fri, 29 Apr 2011 16:35:24 +0400 |
| parents | 619a6371b098 8f9deeb1339d |
| children | b1d9fb2a7e2a |
| files | debian/geometrical-core.install |
| diffstat | 9 files changed, 81 insertions(+), 8 deletions(-) [+] |
line diff
1.1 --- a/.hgignore Fri Apr 29 16:21:23 2011 +0400 1.2 +++ b/.hgignore Fri Apr 29 16:35:24 2011 +0400 1.3 @@ -26,8 +26,9 @@ 1.4 debian/python-allpy/ 1.5 debian/blocks3d/ 1.6 debian/blocks3d-wt/ 1.7 -debian/geometrical-core/ 1.8 +debian/geometrical-core2/ 1.9 1.10 +debian/bin/ 1.11 debian/*.substvars 1.12 debian/*.debhelper* 1.13 debian/*stamp*
2.1 --- a/.hgtags Fri Apr 29 16:21:23 2011 +0400 2.2 +++ b/.hgtags Fri Apr 29 16:35:24 2011 +0400 2.3 @@ -1,2 +1,5 @@ 2.4 c51ef42eb5e5c2c98dac3c99271777905fb4da76 first run 2.5 c1b67c10f8f3db62cce4b70c292a5882e91bf5b6 0.0 2.6 +292b74612a42f2a1f270ad8184cc0883ad215564 1.1.0 2.7 +364232e428887b5b7ec2f697c3aaa83c434449d3 1.2.0 2.8 +b730512ecae51c89e8d268cd524270bbc50afc8a 1.3.0
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 3.2 +++ b/NEWS Fri Apr 29 16:35:24 2011 +0400 3.3 @@ -0,0 +1,4 @@ 3.4 +1.3.0 (2011-04-15) 3.5 + 3.6 + * new: started NEWS file 3.7 + * new: started tracking version numbers
4.1 --- a/README.devel Fri Apr 29 16:21:23 2011 +0400 4.2 +++ b/README.devel Fri Apr 29 16:35:24 2011 +0400 4.3 @@ -1,13 +1,42 @@ 4.4 +Using library in-place 4.5 +====================== 4.6 + 4.7 To use the library in-place, without installing, you have to add it's 4.8 directory to PYTHONPATH. 4.9 4.10 -e.g, type this in your shell: 4.11 +e.g, type this in your shell:: 4.12 4.13 - export PYTHONPATH=`pwd` 4.14 + export PYTHONPATH=`pwd` 4.15 4.16 -alternatively, you can type: 4.17 +alternatively, you can type:: 4.18 4.19 . ./SETPATH 4.20 4.21 which adds the right path to PYTHONPATH and also adds 'utils' directory 4.22 -to PATH 4.23 +to PATH. 4.24 + 4.25 +NEWS file 4.26 +========= 4.27 + 4.28 +NEWS file contains news that are important to the library users, not to the 4.29 +devels. It must contain a word abot every change in any interfaces. It may 4.30 +contain a word about bugfix, if that bugfix was important and could cause users 4.31 +some grief. It must not contain anything else. 4.32 + 4.33 +The file grows upwards (like blog, so that all the most important things are at 4.34 +the top, like) 4.35 + 4.36 +Example file format:: 4.37 + 4.38 + 1.3.1 (2011-05-01) 4.39 + * bugfix: the Moon was going to fall 4.40 + 4.41 + 1.3.0 (2011-04-15) 4.42 + 4.43 + * new: new feature description 4.44 + * new: new feature description 4.45 + * change(!): critical library interface change 4.46 + * change: change in the library interface 4.47 + * bugfix: short bug summary, see #ticket 4.48 + * bugfix: important bug that could destroy the Earth but did not hit trac 4.49 +
5.1 --- a/debian/changelog Fri Apr 29 16:21:23 2011 +0400 5.2 +++ b/debian/changelog Fri Apr 29 16:35:24 2011 +0400 5.3 @@ -1,3 +1,27 @@ 5.4 +allpy (1.3.0-2) unstable; urgency=low 5.5 + 5.6 + * renamed geometrical-core to geometrical-core2 by request of Boris, 5.7 + since the new version may yet be inferior to the old one in some aspects 5.8 + 5.9 + -- Danya Alexeyevsky <dendik@kodomo.fbb.msu.ru> Fri, 15 Apr 2011 22:31:11 +0400 5.10 + 5.11 +allpy (1.3.0-1) unstable; urgency=low 5.12 + 5.13 + * geometrical-core depends on particular version of python-allpy (>= 1.0.0) 5.14 + 5.15 + -- Danya Alexeyevsky <dendik@kodomo.fbb.msu.ru> Fri, 15 Apr 2011 22:07:18 +0400 5.16 + 5.17 +allpy (1.3.0) unstable; urgency=low 5.18 + 5.19 + * New allpy release. 5.20 + Version tracking an compact history starts with this version. The question 5.21 + of related programs and utils versioning is yet undecided. 5.22 + * New geometrical-core requires two packages with local install. 5.23 + Added sed script to add /usr/share/geometrical-core to sys.path. 5.24 + The required packages go there. 5.25 + 5.26 + -- Danya Alexeyevsky <dendik@kodomo.fbb.msu.ru> Fri, 15 Apr 2011 21:21:40 +0400 5.27 + 5.28 allpy (0.0-6) unstable; urgency=medium 5.29 5.30 * blocks3d-wt: reorganized apache configs for more stable operation
6.1 --- a/debian/control.in Fri Apr 29 16:21:23 2011 +0400 6.2 +++ b/debian/control.in Fri Apr 29 16:35:24 2011 +0400 6.3 @@ -10,9 +10,9 @@ 6.4 Depends: ${python:Depends}, ${misc:Depends} 6.5 Description: Python library for working with alignments 6.6 6.7 -Package: geometrical-core 6.8 +Package: geometrical-core2 6.9 Architecture: all 6.10 -Depends: ${python:Depends}, ${misc:Depends} 6.11 +Depends: python-allpy (>= 1.0.0), ${python:Depends}, ${misc:Depends} 6.12 Description: Find geometrical core in a multiple alignment 6.13 6.14 Package: blocks3d
7.1 --- a/debian/geometrical-core.install Fri Apr 29 16:21:23 2011 +0400 7.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 7.3 @@ -1,1 +0,0 @@ 7.4 -geometrical_core/geometrical-core usr/bin
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/debian/geometrical-core2.install Fri Apr 29 16:35:24 2011 +0400 8.3 @@ -0,0 +1,2 @@ 8.4 +debian/bin/geometrical-core2 usr/bin 8.5 +geometrical_core/*.py usr/share/geometrical-core2
9.1 --- a/debian/rules Fri Apr 29 16:21:23 2011 +0400 9.2 +++ b/debian/rules Fri Apr 29 16:35:24 2011 +0400 9.3 @@ -11,6 +11,17 @@ 9.4 build/python-allpy:: 9.5 make -C docs html 9.6 9.7 +build/geometrical-core2:: 9.8 + -mkdir debian/bin 9.9 + fix_path='import sys\nsys.path.append("/usr/share/geometrical-core2")'; \ 9.10 + cat geometrical_core/geometrical-core \ 9.11 + | sed "1 { x; s@^@\n$${fix_path}\n@; x }; /^$$/ x" \ 9.12 + > debian/bin/geometrical-core2 9.13 + chmod +x debian/bin/geometrical-core2 9.14 + 9.15 +clean:: 9.16 + rm -rf debian/bin 9.17 + 9.18 # Manually build blocks3d-wt to avoid build-dependency on qmake 9.19 b3dwt = blocks3d/wt 9.20 b3dwt_cpp = $(wildcard $(b3dwt)/*.C)