[Fusionforge-commits] FusionForge branch feature/concurrent-ssh-http-for-scm updated. a5fbbecc727e6b13f6148e0f229b27956e5e2acb

Roland Mas lolando at fusionforge.org
Wed Dec 10 18:08:05 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/concurrent-ssh-http-for-scm has been updated
       via  a5fbbecc727e6b13f6148e0f229b27956e5e2acb (commit)
       via  b5c5a6d9016387c8bee2a64d9bcd8b693a76fb36 (commit)
       via  05f4037c5fff0bc17991c8217fc137b3b106748e (commit)
       via  bd0ef0f06eb0943bc4ad63a9d76e494d6df14f3b (commit)
       via  c5f7eba2b14d95f10fb064085566b43fa9bbd3f4 (commit)
      from  b37cbf4e5cef086a849b681e0146173b2fea3262 (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 a5fbbecc727e6b13f6148e0f229b27956e5e2acb
Merge: b37cbf4 b5c5a6d
Author: Roland Mas <lolando at debian.org>
Date:   Wed Dec 10 18:07:48 2014 +0100

    Merge branch 'master' into feature/concurrent-ssh-http-for-scm
    
    Conflicts:
    	autoinstall/install-src.sh
    	src/rpm/fusionforge.spec.in

diff --cc autoinstall/install-src.sh
index 450e697,595c666..73549ed
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@@ -42,8 -41,8 +42,8 @@@ if [ -e /etc/debian_version ]; the
  else
      yum install -y make tar
      backports_rpm
-     yum install -y gettext php-cli php-pgsql php-process \
+     yum install -y gettext php-cli php-pgsql php-process php-mbstring \
 -	httpd mod_ssl postgresql-server nscd \
 +	httpd httpd-itk mod_dav_svn mod_ssl postgresql-server nscd \
  	subversion augeas viewvc git gitweb \
  	mediawiki119 \
  	moin mod_wsgi python-psycopg2 \
diff --cc src/rpm/fusionforge.spec.in
index d8302b1,02e2c47..9842abc
--- a/src/rpm/fusionforge.spec.in
+++ b/src/rpm/fusionforge.spec.in
@@@ -167,7 -167,7 +167,7 @@@ f
  
  %package web
  Summary: Collaborative development tool - web part (using Apache)
- Requires: %{name}-common = %{version}-%{release}, %{name}-db = %{version}-%{release}, httpd, mod_ssl, php, php-pgsql, php-simplepie, php-pear-HTTP, php-nusoap, httpd-itk, mod_dav_svn, unoconv, poppler-utils
 -Requires: %{name}-common = %{version}-%{release}, %{name}-db = %{version}-%{release}, httpd, mod_ssl, php, php-pgsql, php-simplepie, php-pear-HTTP, php-nusoap, php-mbstring, unoconv, poppler-utils
++Requires: %{name}-common = %{version}-%{release}, %{name}-db = %{version}-%{release}, httpd, mod_ssl, php, php-pgsql, php-simplepie, php-pear-HTTP, php-nusoap, php-mbstring, httpd-itk, mod_dav_svn, unoconv, poppler-utils
  %description web
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,

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

Summary of changes:
 autoinstall/common-backports     |    4 ++--
 autoinstall/install-src.sh       |    2 +-
 src/rpm/fusionforge.spec.in      |    2 +-
 src/www/widgets/updatelayout.php |    6 ++++--
 4 files changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list