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

# HG changeset patch
# User Daniil Alexeyevsky
# Date 1298224070 -10800
# Node ID 807e1e71bc33b5dc29f13207e9847322dee52a87
# Parent c3dc06b7fdcf9e391ab2581a745a26c5b1c9eeec
Debianized blocks3d, blocks3d-wt; fixed debian dependencies for python-allpy where necessary

diff -r c3dc06b7fdcf -r 807e1e71bc33 .hgignore
--- a/.hgignore Fri Feb 18 19:04:43 2011 +0300
+++ b/.hgignore Sun Feb 20 20:47:50 2011 +0300
@@ -3,6 +3,9 @@
# Compiler-generated junk
*.pyc
build
+*.o
+blocks3d/wt/blocks3d-wt
+debian/.dep

# Junk from text-editors
*.geany
@@ -13,7 +16,10 @@

# Temporary files from debianization
debian/python-allpy/
+debian/blocks3d/
+debian/blocks3d-wt/
debian/geometrical-core/
+
debian/*.substvars
debian/*.debhelper*
debian/*stamp*
diff -r c3dc06b7fdcf -r 807e1e71bc33 debian/apache/blocks3d
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/apache/blocks3d Sun Feb 20 20:47:50 2011 +0300
@@ -0,0 +1,16 @@
+ScriptAlias /blocks3d /var/lib/blocks3d-wt/blocks3d-wt
+
+
+ Order allow,deny
+ Allow from all
+ Options ExecCGI FollowSymLinks
+
+
+ SetHandler fcgid-script
+
+
+ SetHandler fastcgi-script
+
+
+
+# vim: set ft=apache et ts=4 sts=4 sw=4:
diff -r c3dc06b7fdcf -r 807e1e71bc33 debian/blocks3d-wt.dirs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/blocks3d-wt.dirs Sun Feb 20 20:47:50 2011 +0300
@@ -0,0 +1,1 @@
+/var/run/wt
diff -r c3dc06b7fdcf -r 807e1e71bc33 debian/blocks3d-wt.install
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/blocks3d-wt.install Sun Feb 20 20:47:50 2011 +0300
@@ -0,0 +1,4 @@
+blocks3d/wt/blocks3d-wt usr/lib/blocks3d-wt
+blocks3d/wt/files usr/share/blocks3d-wt
+blocks3d/wt/locales usr/share/blocks3d-wt
+debian/apache/blocks3d etc/apache2/sites-available
diff -r c3dc06b7fdcf -r 807e1e71bc33 debian/blocks3d-wt.links
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/blocks3d-wt.links Sun Feb 20 20:47:50 2011 +0300
@@ -0,0 +1,3 @@
+usr/lib/blocks3d-wt/blocks3d-wt var/lib/blocks3d-wt/blocks3d-wt
+usr/share/blocks3d-wt/files var/lib/blocks3d-wt/files
+usr/share/blocks3d-wt/locales var/lib/blocks3d-wt/locales
diff -r c3dc06b7fdcf -r 807e1e71bc33 debian/blocks3d-wt.postinst
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/blocks3d-wt.postinst Sun Feb 20 20:47:50 2011 +0300
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+chown www-data.www-data /var/run/wt
+
+#DEBHELPER#
diff -r c3dc06b7fdcf -r 807e1e71bc33 debian/blocks3d.install
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/blocks3d.install Sun Feb 20 20:47:50 2011 +0300
@@ -0,0 +1,1 @@
+blocks3d/*.py blocks3d/*.htm usr/share/blocks3d
diff -r c3dc06b7fdcf -r 807e1e71bc33 debian/blocks3d.links
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/blocks3d.links Sun Feb 20 20:47:50 2011 +0300
@@ -0,0 +1,1 @@
+usr/share/blocks3d/Blocks3D.py usr/bin/blocks3d
diff -r c3dc06b7fdcf -r 807e1e71bc33 debian/changelog
--- a/debian/changelog Fri Feb 18 19:04:43 2011 +0300
+++ b/debian/changelog Sun Feb 20 20:47:50 2011 +0300
@@ -1,4 +1,13 @@
- -- Danya Alexeyevsky Mon, 22 Nov 2010 14:03:22 +0300
+allpy (0.0-4) unstable; urgency=medium
+
+ * Fixed setup.py to install allpy/data too (surprisingly, it did not
+ do it itself)
+ * Blocks3D_config: guess location of html.htm properly
+ * Removed mktemp_string in favour of one-time mkdtemp invocation
+ * Debianized blocks3d, blocks3d-wt; fixed debian dependencies for
+ python-allpy where necessary
+
+ -- Danya Alexeyevsky Sun, 20 Feb 2011 20:47:04 +0300

allpy (0.0-3) unstable; urgency=medium

diff -r c3dc06b7fdcf -r 807e1e71bc33 debian/control.in
--- a/debian/control.in Fri Feb 18 19:04:43 2011 +0300
+++ b/debian/control.in Sun Feb 20 20:47:50 2011 +0300
@@ -2,15 +2,29 @@
Section: science
Priority: optional
Maintainer: Danya Alexeyevsky
-Standards-Version: 3.6.1
-Build-Depends: @cdbs@
+Standards-Version: 3.8.1
+Build-Depends: @cdbs@, libwt-dev (>= 3.1.8), libwthttp-dev

Package: python-allpy
Architecture: all
-Depends: python (>> 2.5)
+Depends: ${python:Depends}, ${misc:Depends}
Description: Python library for working with alignments

Package: geometrical-core
Architecture: all
-Depends: python-allpy
+Depends: ${python:Depends}, ${misc:Depends}
Description: Find geometrical core in a multiple alignment
+
+Package: blocks3d
+Architecture: all
+Depends: ${python:Depends}, ${misc:Depends}
+Description: Detect fine blocks of alignment by structure interposition
+
+Package: blocks3d-wt
+Architecture: any
+Depends:
+ blocks3d,
+ libwt-common (>= 3.1.8),
+ libapache2-mod-fcgid | libapache2-mod-fastcgi,
+ ${shlibs:Depends}
+Description: Web interface to blocks 3D
diff -r c3dc06b7fdcf -r 807e1e71bc33 debian/python-allpy.docs
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/python-allpy.docs Sun Feb 20 20:47:50 2011 +0300
@@ -0,0 +1,2 @@
+docs/build/html
+docs/source
diff -r c3dc06b7fdcf -r 807e1e71bc33 debian/python-allpy.install
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/python-allpy.install Sun Feb 20 20:47:50 2011 +0300
@@ -0,0 +1,1 @@
+allpy usr/lib/python2.6/site-packages
diff -r c3dc06b7fdcf -r 807e1e71bc33 debian/pyversions
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/debian/pyversions Sun Feb 20 20:47:50 2011 +0300
@@ -0,0 +1,1 @@
+2.4-
diff -r c3dc06b7fdcf -r 807e1e71bc33 debian/rules
--- a/debian/rules Fri Feb 18 19:04:43 2011 +0300
+++ b/debian/rules Sun Feb 20 20:47:50 2011 +0300
@@ -1,8 +1,34 @@
#!/usr/bin/make -f
+
DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes
DEB_PYTHON_SYSTEM = pysupport
+DEB_COMPRESS_EXCLUDE = .py
+DEB_PYTHON_MODULE_PACKAGES = $(filter-out blocks3d-wt, $(DEB_PACKAGES))
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk

-DEB_COMPRESS_EXCLUDE := .py
-DEB_DESTDIR = debian/python-allpy
+build/python-allpy::
+ make -C docs html
+
+# Manually build blocks3d-wt to avoid build-dependency on qmake
+b3dwt = blocks3d/wt
+b3dwt_cpp = $(wildcard $(b3dwt)/*.C)
+b3dwt_o = $(b3dwt_cpp:.C=.o)
+b3dwt_exe = $(b3dwt)/blocks3d-wt
+
+-include debian/.dep
+
+build/blocks3d-wt:: $(b3dwt_exe) debian/.dep
+
+$(b3dwt_exe): $(b3dwt_o)
+ $(CC) -o $@ $^ -lwt -lwtfcgi -lboost_signals -O3
+
+$(b3wdt)/%.o:
+ $(CC) -o $@ $< -O3
+
+clean::
+ rm -f $(b3dwt_o)
+
+debian/.dep: $(b3dwt_cpp)
+ $(CC) $^ -MM > $@