1.1 --- a/.hgignore	Sun Feb 20 21:05:03 2011 +0300
     1.2 +++ b/.hgignore	Sun Feb 20 21:19:53 2011 +0300
     1.3 @@ -3,6 +3,9 @@
     1.4  # Compiler-generated junk
     1.5  *.pyc
     1.6  build
     1.7 +*.o
     1.8 +blocks3d/wt/blocks3d-wt
     1.9 +debian/.dep
    1.10  
    1.11  # Junk from text-editors
    1.12  *.geany
    1.13 @@ -13,7 +16,10 @@
    1.14  
    1.15  # Temporary files from debianization
    1.16  debian/python-allpy/
    1.17 +debian/blocks3d/
    1.18 +debian/blocks3d-wt/
    1.19  debian/geometrical-core/
    1.20 +
    1.21  debian/*.substvars
    1.22  debian/*.debhelper*
    1.23  debian/*stamp*

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/debian/apache/blocks3d	Sun Feb 20 21:19:53 2011 +0300
     2.3 @@ -0,0 +1,16 @@
     2.4 +ScriptAlias /blocks3d /var/lib/blocks3d-wt/blocks3d-wt
     2.5 +
     2.6 +<Directory /var/lib/blocks3d-wt/>
     2.7 +    Order allow,deny
     2.8 +    Allow from all
     2.9 +    Options ExecCGI FollowSymLinks
    2.10 +
    2.11 +    <IfModule mod_fcgid.c>
    2.12 +        SetHandler fcgid-script
    2.13 +    </IfModule>
    2.14 +    <IfModule mod_fastcgi.c>
    2.15 +        SetHandler fastcgi-script
    2.16 +    </IfModule>
    2.17 +</Directory>
    2.18 +
    2.19 +# vim: set ft=apache et ts=4 sts=4 sw=4:

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/debian/blocks3d-wt.dirs	Sun Feb 20 21:19:53 2011 +0300
     3.3 @@ -0,0 +1,1 @@
     3.4 +/var/run/wt

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/debian/blocks3d-wt.install	Sun Feb 20 21:19:53 2011 +0300
     4.3 @@ -0,0 +1,4 @@
     4.4 +blocks3d/wt/blocks3d-wt usr/lib/blocks3d-wt
     4.5 +blocks3d/wt/files usr/share/blocks3d-wt
     4.6 +blocks3d/wt/locales usr/share/blocks3d-wt
     4.7 +debian/apache/blocks3d etc/apache2/sites-available

     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/debian/blocks3d-wt.links	Sun Feb 20 21:19:53 2011 +0300
     5.3 @@ -0,0 +1,3 @@
     5.4 +usr/lib/blocks3d-wt/blocks3d-wt var/lib/blocks3d-wt/blocks3d-wt
     5.5 +usr/share/blocks3d-wt/files var/lib/blocks3d-wt/files
     5.6 +usr/share/blocks3d-wt/locales var/lib/blocks3d-wt/locales

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/debian/blocks3d-wt.postinst	Sun Feb 20 21:19:53 2011 +0300
     6.3 @@ -0,0 +1,5 @@
     6.4 +#!/bin/sh
     6.5 +
     6.6 +chown www-data.www-data /var/run/wt
     6.7 +
     6.8 +#DEBHELPER#

     7.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.2 +++ b/debian/blocks3d.install	Sun Feb 20 21:19:53 2011 +0300
     7.3 @@ -0,0 +1,1 @@
     7.4 +blocks3d/*.py blocks3d/*.htm usr/share/blocks3d

     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/debian/blocks3d.links	Sun Feb 20 21:19:53 2011 +0300
     8.3 @@ -0,0 +1,1 @@
     8.4 +usr/share/blocks3d/Blocks3D.py usr/bin/blocks3d

     9.1 --- a/debian/changelog	Sun Feb 20 21:05:03 2011 +0300
     9.2 +++ b/debian/changelog	Sun Feb 20 21:19:53 2011 +0300
     9.3 @@ -1,4 +1,13 @@
     9.4 - -- Danya Alexeyevsky <dendik@kodomo.fbb.msu.ru>  Mon, 22 Nov 2010 14:03:22 +0300
     9.5 +allpy (0.0-4) unstable; urgency=medium
     9.6 +
     9.7 +  * Fixed setup.py to install allpy/data too (surprisingly, it did not
     9.8 +    do it itself)
     9.9 +  * Blocks3D_config: guess location of html.htm properly
    9.10 +  * Removed mktemp_string in favour of one-time mkdtemp invocation
    9.11 +  * Debianized blocks3d, blocks3d-wt; fixed debian dependencies for
    9.12 +    python-allpy where necessary
    9.13 +
    9.14 + -- Danya Alexeyevsky <dendik@kodomo.fbb.msu.ru>  Sun, 20 Feb 2011 20:47:04 +0300
    9.15  
    9.16  allpy (0.0-3) unstable; urgency=medium
    9.17  

    10.1 --- a/debian/control.in	Sun Feb 20 21:05:03 2011 +0300
    10.2 +++ b/debian/control.in	Sun Feb 20 21:19:53 2011 +0300
    10.3 @@ -2,15 +2,29 @@
    10.4  Section: science
    10.5  Priority: optional
    10.6  Maintainer: Danya Alexeyevsky <dendik@kodomo.fbb.msu.ru>
    10.7 -Standards-Version: 3.6.1
    10.8 -Build-Depends: @cdbs@
    10.9 +Standards-Version: 3.8.1
   10.10 +Build-Depends: @cdbs@, libwt-dev (>= 3.1.8), libwthttp-dev
   10.11  
   10.12  Package: python-allpy
   10.13  Architecture: all
   10.14 -Depends: python (>> 2.5)
   10.15 +Depends: ${python:Depends}, ${misc:Depends}
   10.16  Description: Python library for working with alignments
   10.17  
   10.18  Package: geometrical-core
   10.19  Architecture: all
   10.20 -Depends: python-allpy
   10.21 +Depends: ${python:Depends}, ${misc:Depends}
   10.22  Description: Find geometrical core in a multiple alignment
   10.23 +
   10.24 +Package: blocks3d
   10.25 +Architecture: all
   10.26 +Depends: ${python:Depends}, ${misc:Depends}
   10.27 +Description: Detect fine blocks of alignment by structure interposition
   10.28 +
   10.29 +Package: blocks3d-wt
   10.30 +Architecture: any
   10.31 +Depends:
   10.32 + blocks3d,
   10.33 + libwt-common (>= 3.1.8),
   10.34 + libapache2-mod-fcgid | libapache2-mod-fastcgi,
   10.35 + ${shlibs:Depends}
   10.36 +Description: Web interface to blocks 3D

    11.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    11.2 +++ b/debian/python-allpy.docs	Sun Feb 20 21:19:53 2011 +0300
    11.3 @@ -0,0 +1,2 @@
    11.4 +docs/build/html
    11.5 +docs/source

    12.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    12.2 +++ b/debian/python-allpy.install	Sun Feb 20 21:19:53 2011 +0300
    12.3 @@ -0,0 +1,1 @@
    12.4 +allpy usr/lib/python2.6/site-packages

    13.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
    13.2 +++ b/debian/pyversions	Sun Feb 20 21:19:53 2011 +0300
    13.3 @@ -0,0 +1,1 @@
    13.4 +2.4-

    14.1 --- a/debian/rules	Sun Feb 20 21:05:03 2011 +0300
    14.2 +++ b/debian/rules	Sun Feb 20 21:19:53 2011 +0300
    14.3 @@ -1,8 +1,34 @@
    14.4  #!/usr/bin/make -f
    14.5 +
    14.6  DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes
    14.7  DEB_PYTHON_SYSTEM = pysupport
    14.8 +DEB_COMPRESS_EXCLUDE = .py
    14.9 +DEB_PYTHON_MODULE_PACKAGES = $(filter-out blocks3d-wt, $(DEB_PACKAGES))
   14.10 +
   14.11  include /usr/share/cdbs/1/rules/debhelper.mk
   14.12  include /usr/share/cdbs/1/class/python-distutils.mk
   14.13  
   14.14 -DEB_COMPRESS_EXCLUDE := .py
   14.15 -DEB_DESTDIR = debian/python-allpy
   14.16 +build/python-allpy::
   14.17 +	make -C docs html
   14.18 +
   14.19 +# Manually build blocks3d-wt to avoid build-dependency on qmake
   14.20 +b3dwt = blocks3d/wt
   14.21 +b3dwt_cpp = $(wildcard $(b3dwt)/*.C)
   14.22 +b3dwt_o = $(b3dwt_cpp:.C=.o)
   14.23 +b3dwt_exe = $(b3dwt)/blocks3d-wt
   14.24 +
   14.25 +-include debian/.dep
   14.26 +
   14.27 +build/blocks3d-wt:: $(b3dwt_exe) debian/.dep
   14.28 +
   14.29 +$(b3dwt_exe): $(b3dwt_o)
   14.30 +	$(CC) -o $@ $^ -lwt -lwtfcgi -lboost_signals -O3
   14.31 +
   14.32 +$(b3wdt)/%.o:
   14.33 +	$(CC) -o $@ $< -O3
   14.34 +
   14.35 +clean::
   14.36 +	rm -f $(b3dwt_o)
   14.37 +
   14.38 +debian/.dep: $(b3dwt_cpp)
   14.39 +	$(CC) $^ -MM > $@