Merge branch 'master' of git.debian.org:/git/pkg-exppsy/neurodebian

* 'master' of git.debian.org:/git/pkg-exppsy/neurodebian:
  ENH: 1 more "build-dependency" for the website
  BF: previous monkey-patch doesn't work with elderly backport of sphinx (1.0.7) on squeeze
  ENH: monkey patch regexp for english words -- we need to allow searching package names
  Updated submodules.

diff --combined Makefile
index 73f0ab7d87a1e9229200ae51bc8a1b7080ee67fa,644d8b0bea1f3ee26c33e0d42bb5a465306a9667..c44b1233dbd713366802453aa118cf9ade3b3ded
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -15,7 -15,7 +15,7 @@@ refresh: upload-website-stamp mirmo
  
  website-build-depends:
        : # Python modules
-       sudo apt-get install python-sphinx python-argparse python-xdg python-debian
+       sudo apt-get install python-sphinx python-argparse python-xdg python-debian python-html5lib
        : # JavaScripts
        sudo apt-get install libjs-jquery-easing libjs-jquery-mousewheel libjs-jquery-fancybox
  
@@@ -51,15 -51,11 +51,15 @@@ source: source-stam
  source-stamp: 
        mkdir -p build/src/pkgs/
        mkdir -p build/src/lists/
 +      mkdir -p build/src/_static/
        mkdir -p build/src/pkglists/
        $(BIGMESS) mkpkgs  -d build/src/pkgs/
        $(BIGMESS) mkaptcfgs -d build/src/lists/
        $(BIGMESS) mkrepocfg > build/src/sources_lists
        $(BIGMESS) mkpkgtocs -d build/src/pkglists > build/src/pkgs.rst
 +      cp 3rd/nvd3/*.min.js build/src/_static/
 +      cp 3rd/nvd3/lib/d3*.min.js build/src/_static/
 +      cp 3rd/nvd3/src/nv*.css build/src/_static/
        touch $@
  
  cachefiles: