[Fusionforge-commits] FusionForge branch feature/twig-template-engine updated. 523c9729b3b8ab22993ebbf04f2303e5f82f6f91

Roland Mas lolando at fusionforge.org
Wed Nov 19 15:21:49 CET 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, feature/twig-template-engine has been updated
       via  523c9729b3b8ab22993ebbf04f2303e5f82f6f91 (commit)
       via  ba94cd50205993fce7299a471dda9dfa0996af12 (commit)
       via  c9b54601e95192c108fd5a8ed39c3cc87d949db2 (commit)
       via  7fab0c0af55945402f71ec0f392f269f7b8c2601 (commit)
       via  5f2a514d161580c975bc2dc5c491f16c7e176661 (commit)
       via  cf0a407a3772af8b3cf09d6f71053cac50d2175b (commit)
       via  359befb6fd227c750f3a6f216b3e50c03d337566 (commit)
       via  2c907b6d06d3a1ab88bb5042cedabcfac55f4915 (commit)
       via  fba37cfb59726b3945a1c21290d71d0f96c4d1b4 (commit)
       via  9618b0a23782c1ec9e0a162cc41620fb79728a8f (commit)
       via  61eb9e029efc3885c8384ce58d71dd89d1bca21f (commit)
      from  021ff3e3ecd7cc465b79a0966f318d0eebed22dc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 523c9729b3b8ab22993ebbf04f2303e5f82f6f91
Merge: 021ff3e ba94cd5
Author: Roland Mas <lolando at debian.org>
Date:   Wed Nov 19 15:20:56 2014 +0100

    Merge branch 'master' into feature/twig-template-engine

diff --cc autoinstall/install-src.sh
index fba35d8,ab5a746..6d89e49
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@@ -33,10 -33,9 +33,10 @@@ if [ -e /etc/debian_version ]; the
  	apache2 locales-all postgresql libnss-pgsql2 unscd \
  	subversion augeas-tools viewvc git \
  	mediawiki \
 +	php-twig \
  	python-moinmoin libapache2-mod-wsgi python-psycopg2
  else
-     yum install -y make
+     yum install -y make tar
      backports_rpm
      yum install -y gettext php-cli php-pgsql php-process \
  	httpd mod_ssl postgresql-server nscd \

-----------------------------------------------------------------------

Summary of changes:
 autoinstall/install-src.sh                         |    2 +-
 autoinstall/install.sh                             |    1 +
 src/debian/fusionforge-db-local.postinst           |    3 +-
 src/debian/fusionforge-mta-exim4.postinst          |    3 +-
 src/debian/fusionforge-mta-postfix.postinst        |    3 +-
 src/debian/fusionforge-shell.postinst              |   15 ++---
 src/post-install.d/db/db.sh                        |    1 +
 .../{common/common.sh => db/upgrade-conf.sh}       |   14 +++--
 src/post-install.d/mta-exim4/mta-exim4.sh          |   26 ++++----
 src/post-install.d/mta-exim4/upgrade-conf.sh       |   62 ++++++++++++++++++++
 src/post-install.d/mta-postfix/mta-postfix.sh      |    2 +
 .../user.sh => mta-postfix/upgrade-conf.sh}        |   32 +++++-----
 src/post-install.d/shell/shell.sh                  |    3 +-
 .../{common/common.sh => shell/upgrade-conf.sh}    |   12 ++--
 14 files changed, 129 insertions(+), 50 deletions(-)
 copy src/post-install.d/{common/common.sh => db/upgrade-conf.sh} (67%)
 create mode 100755 src/post-install.d/mta-exim4/upgrade-conf.sh
 copy src/post-install.d/{common/user.sh => mta-postfix/upgrade-conf.sh} (57%)
 copy src/post-install.d/{common/common.sh => shell/upgrade-conf.sh} (78%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list