Merge branch 'erp5' into erp5-z2.13

software/jio/instance.cfg.in

@@ -47,6 +47,6 @@ LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:locatio
 
 [phantomjs-wrapper]
 recipe = slapos.cookbook:wrapper
-command-line = ${phantomjs:location}/bin/phantomjs
+command-line = ${phantomjs:location}/phantomjs-slapos
 wrapper-path = $${directory:bin}/phantomjs
-parameters_extra = true
+parameters_extra = true
\ No newline at end of file

software/jio/software.cfg

@@ -43,7 +43,7 @@ recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/instance.cfg.in
 output = ${buildout:directory}/instance.cfg
 # MD5 checksum can be skipped for development, but must be filled for production
-md5sum = 1ef1bc6a3fb81300ce7139c512af96d7
+md5sum = 94421503ca09f77ee1e94e4b1ef4e6a7
 mode = 0644
 
 [jio-repository]

stack/erp5/buildout.cfg

@@ -643,7 +643,7 @@ greenlet = 0.4.0
 hexagonit.recipe.cmmi = 1.6
 http-parser = 0.8.1
 huBarcode = 0.63
-inotifyx = 0.2.0-1
+inotifyx = 0.2.0
 ipdb = 0.7
 ipython = 0.13.2
 meld3 = 0.6.10