Merge branch 'erp5' into erp5-z2.13

CHANGES.txt

 Changes
 =======
 
-
-
 0.74.0 (2013-03-05)
 -------------------
 
@@ -134,13 +132,13 @@ Changes
     [Antoine Catton]
 
 0.64 (2012-08-27)
-----------------
+-----------------
 
   * Fix: remove "template" recipe which was collinding with slapos.recipe.template.
     [Antoine Catton]
 
 0.63 (2012-08-22)
-----------------
+-----------------
 
   * Add the ability to run command line in shellinabox. [Antoine Catton]
   * Add the ability to run shellinabox as root. (for LXC purpose) [Antoine Catton]
@@ -198,7 +196,7 @@ Changes
   * Add slapmonitor and slapreport recipes. [Mohamadou Mbengue]
 
 0.54.1 (2012-06-18)
------------------
+-------------------
 
   * Fix 0.54 release containing wrong code in request.py.
 
@@ -315,7 +313,7 @@ Changes
    [Cedric de Saint Martin]
 
 0.40.1 (2012-03-01)
------------------
+-------------------
 
  * Fix manifest to include files needed for apache. [Cedric de Saint Martin]
 
@@ -377,7 +375,7 @@ Changes
 -----------------
 
   * LAMP : Recipe can now call lampconfigure from slapos.toolbox which will
-   configure PHP application instance when needed. [Alain Takoudjou Kamdem]
+    configure PHP application instance when needed. [Alain Takoudjou Kamdem]
 
 0.31 (2011-10-16)
 -----------------
@@ -513,7 +511,7 @@ Changes
 -----------------
 
  * Add PHPMyAdmin software release used in SlapOS tutorials
- [Cedric de Saint Martin]
+   [Cedric de Saint Martin]
  * Add slaprunner software release [Cedric de Saint Martin]
 
 

component/ghostscript/buildout.cfg

@@ -13,7 +13,9 @@ depends =
   ${libtiff:version}
 configure-options =
   --disable-cups
+  --disable-threadsafe
   --with-system-libtiff
+  --without-libidn
   --without-x
   --with-drivers=FILES
   --with-fontpath=${ghostscript-fonts:location}
@@ -30,8 +32,8 @@ environment =
 
 [ghostscript-9]
 <= ghostscript-common
-url = http://downloads.ghostscript.com/public/ghostscript-9.06.tar.bz2
-md5sum = 46f9ebe40dc52755287b30704270db11
+url = http://downloads.ghostscript.com/public/ghostscript-9.07.tar.bz2
+md5sum = eea27befc1e85bef6d4768202f6b03a5
 
 [ghostscript-fonts]
 recipe = hexagonit.recipe.download

component/librsvg/buildout.cfg

 [buildout]
 parts = librsvg
-extends = 
+extends =
   ../bzip2/buildout.cfg
   ../pkgconfig/buildout.cfg
   ../libxml2/buildout.cfg
   ../zlib/buildout.cfg
   ../gtk-2/buildout.cfg
   ../xorg/buildout.cfg
+  ../xz-utils/buildout.cfg
 
 [libcroco]
 recipe = hexagonit.recipe.cmmi
-url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.3.tar.bz2
-md5sum = e1e93eeff4367c896f3959af34ba20eb
+url = http://ftp.gnome.org/pub/gnome/sources/libcroco/0.6/libcroco-0.6.8.tar.xz
+md5sum = 767e73c4174f75b99695d4530fd9bb80
 environment =
-  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PATH=${pkgconfig:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${pkgconfig:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig
   LDFLAGS=-Wl,-rpath=${zlib:location}/lib
 
 [librsvg]
 recipe = hexagonit.recipe.cmmi
 version = 2.36.1
-url = http://www.nexedi.org/static/tarballs/librsvg/librsvg-${:version}.tar.gz
-md5sum = 699cb7124d319035346e69782baa7c36
-# The original source provided by gnome is tar.xz and it is not a supported compression
-# on hexagonit.recipe.cmmi neither by slapos.recipe.build, so keep alternative source
-# with tar.gz format as a temporary alternative for this.
-# url = http://ftp.acc.umu.se/pub/GNOME/sources/librsvg/2.36/librsvg-2.36.1.tar.xz
+url = http://ftp.gnome.org/pub/GNOME/sources/librsvg/2.36/librsvg-2.36.4.tar.xz
+md5sum = 3c94524c8ccf668e30b236f409239f54
 configure-options =
   --disable-static
   --disable-gtk-theme
@@ -34,7 +31,7 @@ configure-options =
   --disable-tools
   --disable-gtk-doc-html
   --enable-introspection=no
-environment = 
-  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${pango:location}/bin:%(PATH)s
+environment =
+  PATH=${gdk-pixbuf:location}/bin:${glib:location}/bin:${libxml2:location}/bin:${pkgconfig:location}/bin:${pango:location}/bin:${xz-utils:location}/bin:%(PATH)s
   PKG_CONFIG_PATH=${cairo:location}/lib/pkgconfig:${fontconfig:location}/lib/pkgconfig:${freetype:location}/lib/pkgconfig:${gdk-pixbuf:location}/lib/pkgconfig:${glib:location}/lib/pkgconfig:${kbproto:location}/lib/pkgconfig:${libX11:location}/lib/pkgconfig:${libpng:location}/lib/pkgconfig:${libXau:location}/lib/pkgconfig:${libXrender:location}/lib/pkgconfig:${libcroco:location}/lib/pkgconfig:${libxcb:location}/lib/pkgconfig:${libxml2:location}/lib/pkgconfig:${pango:location}/lib/pkgconfig:${pixman:location}/lib/pkgconfig:${zlib:location}/lib/pkgconfig:${xorg-libpthread-stubs:location}/lib/pkgconfig:${xproto:location}/lib/pkgconfig
   LDFLAGS=-L${bzip2:location}/lib -Wl,-rpath=${bzip2:location}/lib -Wl,-rpath=${zlib:location}/lib

component/poppler/buildout.cfg

@@ -13,8 +13,8 @@ extends =
 
 [poppler]
 recipe = hexagonit.recipe.cmmi
-md5sum = c7038be37a7d446544e83a7df3c26196
-url = http://poppler.freedesktop.org/poppler-0.22.0.tar.gz
+md5sum = 3939740201c59c470bc7198003450a20
+url = http://poppler.freedesktop.org/poppler-0.22.2.tar.gz
 depends =
   ${libtiff:version}
 configure-options =

stack/erp5/buildout.cfg

@@ -125,6 +125,7 @@ parts =
   fix-products-paths
 # some additional utils
   slapos-toolbox
+  zodbanalyze
 
 # Local development
   slapos.cookbook-repository
@@ -491,6 +492,16 @@ scripts =
 extra-paths =
   ${erp5:location}
 
+[zodbanalyze]
+recipe = zc.recipe.egg
+python = python2.7
+eggs =
+  ZODB3
+  erp5.util
+entry-points =
+  zodbanalyze=erp5.util.zodbanalyze:main
+scripts = zodbanalyze
+
 [cloudooo-repository]
 branch = master
 revision = 6629837c96ae58e96cac019044ce95d19cb7a659
@@ -614,7 +625,7 @@ coverage = 3.6
 csp-eventlet = 0.7.0
 elementtree = 1.2.7-20070827-preview
 erp5.recipe.cmmiforcei686 = 0.1.3
-erp5.util = 0.4.31
+erp5.util = 0.4.33
 erp5diff = 0.8.1.5
 eventlet = 0.12.1
 feedparser = 5.1.3

stack/lamp/buildout.cfg

@@ -285,64 +285,55 @@ signature-certificate-list =
   n9MuhWaT21VOYhIGzJFPw5XW47/RrwhR
   -----END CERTIFICATE-----
 
-
 [versions]
-# Fetch stable version of lxml, not beta
-lxml = 3.0.2
-
 Jinja2 = 2.6
 Werkzeug = 0.8.3
-apache-libcloud = 0.11.4
+apache-libcloud = 0.12.1
 async = 0.6.1
 buildout-versions = 1.7
 gitdb = 0.5.4
 hexagonit.recipe.cmmi = 1.6
 inotifyx = 0.2.0
+lxml = 3.1.0
 meld3 = 0.6.10
 netaddr = 0.7.10
 pycrypto = 2.6
 pytz = 2012j
 rdiff-backup = 1.0.5
-slapos.cookbook = 0.73.1
-slapos.recipe.build = 0.11.5
+slapos.cookbook = 0.74.0
+slapos.recipe.build = 0.11.6
 slapos.recipe.download = 1.0.dev-r4053
 slapos.recipe.template = 2.4.2
-slapos.toolbox = 0.33
+slapos.toolbox = 0.33.1
 smmap = 0.8.2
 
-plone.recipe.command = 1.1
-
 # Required by:
 # slapos.core==0.35.1
-# slapos.toolbox==0.33
+# slapos.toolbox==0.33.1
 Flask = 0.9
 
 # Required by:
-# slapos.toolbox==0.33
+# slapos.toolbox==0.33.1
 GitPython = 0.3.2.RC1
 
 # Required by:
-# slapos.toolbox==0.33
+# slapos.toolbox==0.33.1
 atomize = 0.1.1
 
 # Required by:
-# slapos.toolbox==0.33
+# slapos.toolbox==0.33.1
 feedparser = 5.1.3
 
-# Required by:
-# hexagonit.recipe.cmmi==1.6
-hexagonit.recipe.download = 1.6nxd002
-
 # Required by:
 # slapos.core==0.35.1
 netifaces = 0.8
 
 # Required by:
-# slapos.toolbox==0.33
-paramiko = 1.9.0
+# slapos.toolbox==0.33.1
+paramiko = 1.10.0
 
 # Required by:
-# slapos.toolbox==0.33
+# slapos.toolbox==0.33.1
 psutil = 0.6.1
 
 # Required by:
@@ -350,16 +341,16 @@ psutil = 0.6.1
 pyflakes = 0.6.1
 
 # Required by:
-# slapos.cookbook==0.73.1
+# slapos.cookbook==0.74.0
 # slapos.core==0.35.1
-# slapos.toolbox==0.33
+# slapos.toolbox==0.33.1
 # supervisor==3.0b1
 # zc.buildout==1.6.0-dev-SlapOS-010
-# zope.interface==4.0.3
+# zope.interface==4.0.5
 setuptools = 0.6c12dev-r88846
 
 # Required by:
-# slapos.toolbox==0.33
+# slapos.toolbox==0.33.1
 slapos.core = 0.35.1
 
 # Required by:
@@ -371,19 +362,9 @@ supervisor = 3.0b1
 unittest2 = 0.5.1
 
 # Required by:
-# slapos.toolbox==0.33
+# slapos.toolbox==0.33.1
 xml-marshaller = 0.9.7
 
 # Required by:
 # slapos.core==0.35.1
-zope.interface = 4.0.3
-
-cp.recipe.cmd = 0.4
-
-# Required by:
-# zope.testing==4.1.1
-zope.exceptions = 4.0.5
-
-# Required by:
-# cp.recipe.cmd==0.4
-zope.testing = 4.1.1
+zope.interface = 4.0.5
\ No newline at end of file