Merge branch 'upstream'

00.Repository.Rules.txt

-SlapOS repository rules
-=======================
-
-Short version for impatient
----------------------------
-
-'master' branch is always stable. One shall never work in this branch. One
-shall expect reversion or removal of his commits in 'master' branch, if they
-are not because of merging another branch.
-
-Everyone has to create branch, basing on 'master' or any other branch. All
-work shall be done in such branch. It is advised to review it before merging
-into 'master'. It is very good habit to tag such merges.
-
-A bit more background
----------------------
-
-SlapOS repository 'master' branch is supposed to be stable. No new work is
-accepted on this branch. Each time someone uses (clones, extends) 'master'
-branch it is supposed to work (as far as it was tested).
-
-Tags on 'master' branch are supposed to be repeatable software definitions
-forever. All versions and external links shall be setup in a way, that they
-wouldn't change in day, month, year, etc.
-
-Everyone can make his own branch to introduce new software to SlapOS. There
-are no rules about those branches, as each software is specific.
-
-It is good idea to ask for review before merging changes into 'master' branch.
-Peer review can detect issues not detected by testing, development or self
-analysis.
-
-After some software is stabilised and no more work is planned it is acceptable
-to remove such abandoned branch in order to minimise amount of branches.

component/git/buildout.cfg

@@ -13,8 +13,8 @@ parts =
 
 [git]
 recipe = hexagonit.recipe.cmmi
-url = http://kernel.org/pub/software/scm/git/git-1.7.3.4.tar.bz2
-md5sum = 3a2602016f98c529cda7b9fad1a6e216
+url = http://kernel.org/pub/software/scm/git/git-1.7.4.5.tar.bz2
+md5sum = 2fa6c4c847ed87523cf55de54af457eb
 configure-options =
   --with-curl=${curl:location}
   --with-openssl=${openssl:location}

component/libreoffice-bin/buildout.cfg

@@ -10,7 +10,7 @@ versions = versions
 
 [versions]
 # special version of z3c.recipe.openoffice with architecture autodetection
-z3c.recipe.openoffice = 0.3.1dev7
+z3c.recipe.openoffice = 0.3.1dev8
 
 [libreoffice-bin]
 recipe = z3c.recipe.openoffice