Merge branch 'erp5' into vifib

software/erp5/instance.cfg

@@ -58,6 +58,7 @@ link_binary_list =
   ${w3m:location}/bin/w3m
   ${xpdf:location}/bin/pdfinfo
   ${xpdf:location}/bin/pdftotext
+  ${poppler:location}/bin/pdftohtml
 
 # XXX: products won't be needed as soon as all ERP5 (and products-deps)
 # products will be eggified so then it will be possible to use them thanks to

software/erp5/software.cfg

@@ -23,6 +23,6 @@ module = erp5
 # Default template for erp5 instance.
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg
-md5sum = 9bc4cb9221bb5cc973b3ff7c4720a21b
+md5sum = 11e2d4205ba2cb0039f84f708331225f
 output = ${buildout:directory}/template.cfg
 mode = 0644

stack/erp5.cfg

@@ -80,6 +80,7 @@ parts =
   varnish-2.1
   stunnel
   w3m
+  poppler
   xpdf
   libpng12
   ghostscript