Документ взят из кэша поисковой машины. Адрес оригинального документа : http://kodomo.fbb.msu.ru/hg/allpy/raw-rev/b17985965fa7 Дата изменения: Unknown Дата индексирования: Tue Oct 2 07:57:13 2012 Кодировка:

# HG changeset patch
# User boris (kodomo)
# Date 1304080524 -14400
# Node ID b17985965fa79fe8ce8534753094846a5417dbae
# Parent 619a6371b0989c74547ac083b1bff27dc549318f# Parent 8f9deeb1339d73fef3e9cd761c6753e9ff8944f6
Automated merge with ssh://kodomo/allpy

diff -r 619a6371b098 -r b17985965fa7 .hgignore
--- a/.hgignore Fri Apr 29 16:21:23 2011 +0400
+++ b/.hgignore Fri Apr 29 16:35:24 2011 +0400
@@ -26,8 +26,9 @@
debian/python-allpy/
debian/blocks3d/
debian/blocks3d-wt/
-debian/geometrical-core/
+debian/geometrical-core2/

+debian/bin/
debian/*.substvars
debian/*.debhelper*
debian/*stamp*
diff -r 619a6371b098 -r b17985965fa7 .hgtags
--- a/.hgtags Fri Apr 29 16:21:23 2011 +0400
+++ b/.hgtags Fri Apr 29 16:35:24 2011 +0400
@@ -1,2 +1,5 @@
c51ef42eb5e5c2c98dac3c99271777905fb4da76 first run
c1b67c10f8f3db62cce4b70c292a5882e91bf5b6 0.0
+292b74612a42f2a1f270ad8184cc0883ad215564 1.1.0
+364232e428887b5b7ec2f697c3aaa83c434449d3 1.2.0
+b730512ecae51c89e8d268cd524270bbc50afc8a 1.3.0
diff -r 619a6371b098 -r b17985965fa7 NEWS
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/NEWS Fri Apr 29 16:35:24 2011 +0400
@@ -0,0 +1,4 @@
+1.3.0 (2011-04-15)
+
+ * new: started NEWS file
+ * new: started tracking version numbers
diff -r 619a6371b098 -r b17985965fa7 README.devel
--- a/README.devel Fri Apr 29 16:21:23 2011 +0400
+++ b/README.devel Fri Apr 29 16:35:24 2011 +0400
@@ -1,13 +1,42 @@
+Using library in-place
+======================
+
To use the library in-place, without installing, you have to add it's
directory to PYTHONPATH.

-e.g, type this in your shell:
+e.g, type this in your shell::

- export PYTHONPATH=`pwd`
+ export PYTHONPATH=`pwd`

-alternatively, you can type:
+alternatively, you can type::

. ./SETPATH

which adds the right path to PYTHONPATH and also adds 'utils' directory
-to PATH
+to PATH.
+
+NEWS file
+=========
+
+NEWS file contains news that are important to the library users, not to the
+devels. It must contain a word abot every change in any interfaces. It may
+contain a word about bugfix, if that bugfix was important and could cause users
+some grief. It must not contain anything else.
+
+The file grows upwards (like blog, so that all the most important things are at
+the top, like)
+
+Example file format::
+
+ 1.3.1 (2011-05-01)
+ * bugfix: the Moon was going to fall
+
+ 1.3.0 (2011-04-15)
+
+ * new: new feature description
+ * new: new feature description
+ * change(!): critical library interface change
+ * change: change in the library interface
+ * bugfix: short bug summary, see #ticket
+ * bugfix: important bug that could destroy the Earth but did not hit trac
+
diff -r 619a6371b098 -r b17985965fa7 debian/changelog
--- a/debian/changelog Fri Apr 29 16:21:23 2011 +0400
+++ b/debian/changelog Fri Apr 29 16:35:24 2011 +0400
@@ -1,3 +1,27 @@
+allpy (1.3.0-2) unstable; urgency=low
+
+ * renamed geometrical-core to geometrical-core2 by request of Boris,
+ since the new version may yet be inferior to the old one in some aspects
+
+ -- Danya Alexeyevsky Fri, 15 Apr 2011 22:31:11 +0400
+
+allpy (1.3.0-1) unstable; urgency=low
+
+ * geometrical-core depends on particular version of python-allpy (>= 1.0.0)
+
+ -- Danya Alexeyevsky Fri, 15 Apr 2011 22:07:18 +0400
+
+allpy (1.3.0) unstable; urgency=low
+
+ * New allpy release.
+ Version tracking an compact history starts with this version. The question
+ of related programs and utils versioning is yet undecided.
+ * New geometrical-core requires two packages with local install.
+ Added sed script to add /usr/share/geometrical-core to sys.path.
+ The required packages go there.
+
+ -- Danya Alexeyevsky Fri, 15 Apr 2011 21:21:40 +0400
+
allpy (0.0-6) unstable; urgency=medium

* blocks3d-wt: reorganized apache configs for more stable operation
diff -r 619a6371b098 -r b17985965fa7 debian/control.in
--- a/debian/control.in Fri Apr 29 16:21:23 2011 +0400
+++ b/debian/control.in Fri Apr 29 16:35:24 2011 +0400
@@ -10,9 +10,9 @@
Depends: ${python:Depends}, ${misc:Depends}
Description: Python library for working with alignments

-Package: geometrical-core
+Package: geometrical-core2
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}
+Depends: python-allpy (>= 1.0.0), ${python:Depends}, ${misc:Depends}
Description: Find geometrical core in a multiple alignment

Package: blocks3d
diff -r 619a6371b098 -r b17985965fa7 debian/geometrical-core.install
--- a/debian/geometrical-core.install Fri Apr 29 16:21:23 2011 +0400
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-geometrical_core/geometrical-core usr/bin
diff -r 619a6371b098 -r b17985965fa7 debian/geometrical-core2.install
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/geometrical-core2.install Fri Apr 29 16:35:24 2011 +0400
@@ -0,0 +1,2 @@
+debian/bin/geometrical-core2 usr/bin
+geometrical_core/*.py usr/share/geometrical-core2
diff -r 619a6371b098 -r b17985965fa7 debian/rules
--- a/debian/rules Fri Apr 29 16:21:23 2011 +0400
+++ b/debian/rules Fri Apr 29 16:35:24 2011 +0400
@@ -11,6 +11,17 @@
build/python-allpy::
make -C docs html

+build/geometrical-core2::
+ -mkdir debian/bin
+ fix_path='import sys\nsys.path.append("/usr/share/geometrical-core2")'; \
+ cat geometrical_core/geometrical-core \
+ | sed "1 { x; s@^@\n$${fix_path}\n@; x }; /^$$/ x" \
+ > debian/bin/geometrical-core2
+ chmod +x debian/bin/geometrical-core2
+
+clean::
+ rm -rf debian/bin
+
# Manually build blocks3d-wt to avoid build-dependency on qmake
b3dwt = blocks3d/wt
b3dwt_cpp = $(wildcard $(b3dwt)/*.C)