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

Roland Mas lolando at fusionforge.org
Mon Oct 27 15:45:29 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  d3b62525ff1771572795cf80fc39c142250c7803 (commit)
       via  8daa83bf14be444dc9d13842a9bfd97bf2b69d20 (commit)
       via  da99f2ee23d4b2c9e1464d12d108dd83a69ff8b7 (commit)
       via  f043ba9d27e4daa792a570d0a46f8ae105e609a4 (commit)
       via  9ebab47e111746294e491d84af59905d36bd3491 (commit)
       via  0f6abe86c1ef7b227ae27acfbb4b1f147d321684 (commit)
       via  dc9c785070a0a002bbc79894d84b62a8b4f94e70 (commit)
      from  dabb0516b9e0be7127d35d235e92ab031f587b66 (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 d3b62525ff1771572795cf80fc39c142250c7803
Merge: dabb051 8daa83b
Author: Roland Mas <lolando at debian.org>
Date:   Mon Oct 27 15:45:17 2014 +0100

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

diff --cc src/rpm/fusionforge.spec.in
index 9455093,e03b1ba..d5f2b1e
--- a/src/rpm/fusionforge.spec.in
+++ b/src/rpm/fusionforge.spec.in
@@@ -154,7 -158,7 +158,7 @@@ f
  
  %package web
  Summary: Collaborative development tool - web part (using Apache)
- Requires: %{name}-common = %{version}, %{name}-db = %{version}, httpd, mod_ssl, php, php-pgsql, php-simplepie, php-nusoap, php-twig
 -Requires: %{name}-common = %{version}-%{release}, %{name}-db = %{version}-%{release}, httpd, mod_ssl, php, php-pgsql, php-simplepie, php-nusoap
++Requires: %{name}-common = %{version}-%{release}, %{name}-db = %{version}-%{release}, httpd, mod_ssl, php, php-pgsql, php-simplepie, php-nusoap, php-twig
  %description web
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,

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

Summary of changes:
 autoinstall/build.sh                     |    9 +++++--
 src/GNUmakefile                          |    1 +
 src/common/include/FusionForge.class.php |   14 -----------
 src/common/pkginfo.inc.php.template      |    3 ---
 src/debian/rules                         |    4 ++++
 src/rpm/fusionforge.spec.in              |   38 +++++++++++++++++-------------
 src/rpm/gen_spec.sh                      |   13 ++++++++--
 src/www/account/change_email.php         |    2 +-
 8 files changed, 45 insertions(+), 39 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list