[Fusionforge-commits] FusionForge branch master updated. 6.0.4-1030-g1a2ccf2

Roland Mas lolando at libremir.placard.fr.eu.org
Thu Oct 13 20:16:59 CEST 2016


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, master has been updated
       via  1a2ccf27d92cca56b3d8844bd41e7e93ebf4c527 (commit)
       via  d7c8e79a388fd07c9807d0da5af53f16f89442a3 (commit)
       via  1374529f96024e704354369732983162dfe50ae6 (commit)
       via  61e37846fe6e85cbdac7e91a029901901625531e (commit)
       via  954449d70cd3d54453d20a16e738880afd33874d (commit)
       via  4adb35a6080d2b7aaea18a1bbd0079e8e2bab3b1 (commit)
      from  724c4f9785d7749bd23decc18308ee87dd033d5b (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 -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=1a2ccf27d92cca56b3d8844bd41e7e93ebf4c527

commit 1a2ccf27d92cca56b3d8844bd41e7e93ebf4c527
Merge: 724c4f9 d7c8e79
Author: Roland Mas <lolando at debian.org>
Date:   Thu Oct 13 20:16:50 2016 +0200

    Merge branch '6.0'

diff --cc autoinstall/install-src.sh
index 6b01ad3,3dac20b..7afd735
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@@ -32,8 -32,8 +32,8 @@@ if [ -e /etc/debian_version ]; the
      apt-get install -y make gettext php5-cli php5-pgsql php-htmlpurifier php-http \
  	libapache2-mpm-itk libapache2-mod-svn \
  	libapache2-mod-php5 \
 -	apache2 postgresql libnss-pgsql2 unscd \
 +	apache2 postgresql postgresql-contrib libnss-pgsql2 unscd \
- 	subversion viewvc python-pycurl git xinetd \
+ 	cvs subversion viewvc python-pycurl git xinetd \
  	python-moinmoin libapache2-mod-wsgi python-psycopg2 \
  	unoconv poppler-utils dpkg-dev
      if ! dpkg-vendor --is Ubuntu; then
@@@ -44,10 -44,10 +44,10 @@@ els
      backports_rpm
      yum --enablerepo=epel install -y httpd-itk
      yum install -y gettext php-cli php-pgsql php-process php-mbstring php-pear-HTTP \
 -	httpd mod_dav_svn mod_ssl postgresql-server nscd \
 +	httpd mod_dav_svn mod_ssl postgresql-server postgresql-contrib nscd \
- 	subversion viewvc python-pycurl git gitweb xinetd \
+ 	cvs subversion viewvc python-pycurl git gitweb xinetd \
  	moin mod_wsgi python-psycopg2 \
 -	unoconv poppler-utils
 +	unoconv poppler-utils libreoffice-headless
  fi
  
  (
diff --cc autoinstall/install.sh
index 493a87e,1156123..494f1bf
--- a/autoinstall/install.sh
+++ b/autoinstall/install.sh
@@@ -37,10 -37,10 +37,10 @@@ if [ -e /etc/debian_version ]; the
      else
  	# Initial installation
  	$APT install fusionforge
 -	
 +
  	# Additional components for testsuite
  	$APT install fusionforge-shell fusionforge-scm \
- 	    fusionforge-plugin-scmgit fusionforge-plugin-scmsvn fusionforge-plugin-scmbzr \
+ 	    fusionforge-plugin-scmcvs fusionforge-plugin-scmsvn fusionforge-plugin-scmgit fusionforge-plugin-scmbzr \
  	    fusionforge-plugin-moinmoin \
  	    fusionforge-plugin-blocks fusionforge-plugin-taskboard \
  	    fusionforge-plugin-message
@@@ -57,8 -57,8 +57,8 @@@ els
      else
  	# Initial installation
  	yum --enablerepo=epel install -y fusionforge fusionforge-shell fusionforge-scm \
- 	    fusionforge-plugin-scmgit fusionforge-plugin-scmsvn \
+ 	    fusionforge-plugin-scmcvs fusionforge-plugin-scmsvn fusionforge-plugin-scmgit \
  	    fusionforge-plugin-blocks fusionforge-plugin-online_help fusionforge-plugin-taskboard \
 -	    fusionforge-plugin-message
 +	    fusionforge-plugin-message fusionforge-plugin-moinmoin
      fi
  fi

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

Summary of changes:
 autoinstall/install-src.sh                         |  6 +-
 autoinstall/install.sh                             |  4 +-
 src/plugins/scmcvs/bin/install.sh                  | 38 +++++++-----
 src/plugins/scmcvs/common/CVSPlugin.class.php      | 72 ++++++++++------------
 src/plugins/scmcvs/sbin/cvs-pserver                | 10 +--
 src/www/scm/viewvc.php                             |  2 +-
 .../cvsTest.php}                                   | 62 ++++++++++++-------
 7 files changed, 103 insertions(+), 91 deletions(-)
 copy tests/func/{50_PluginsScmSvn/svnSSHTest.php => 50_PluginsScmCVS/cvsTest.php} (50%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list