[Fusionforge-commits] FusionForge branch 6.1 updated. v6.1alpha0-38-g9694fe1
Franck Villaume
nerville at libremir.placard.fr.eu.org
Sun Oct 29 11:33:43 CET 2017
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, 6.1 has been updated
via 9694fe126932c4518931b42c13e479745fc1951b (commit)
via 5e47a83484b644802722b2024772923e1f8f4403 (commit)
from d46438c6286fd1ced28b8c832e057c26248b90f0 (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=9694fe126932c4518931b42c13e479745fc1951b
commit 9694fe126932c4518931b42c13e479745fc1951b
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Sun Oct 29 11:32:20 2017 +0100
tabs
diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index ecc1b46..0498dd9 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -31,28 +31,28 @@ if [ -e /etc/debian_version ]; then
backports_deb
apt-get update
if grep -q ^8 /etc/debian_version; then
- apt-get install -y make gettext php5-cli php5-pgsql php-htmlpurifier php-http php-text-captcha \
- libapache2-mpm-itk libapache2-mod-svn \
- libapache2-mod-php5 \
- apache2 postgresql postgresql-contrib libnss-pgsql2 unscd \
- cvs subversion viewvc python-pycurl git mercurial xinetd \
- python-moinmoin libapache2-mod-wsgi python-psycopg2 \
- unoconv poppler-utils dpkg-dev \
- libmarkdown-php \
- vsftpd \
- fonts-dejavu-core
- apt-get -y install mediawiki -t jessie-backports
+ apt-get install -y make gettext php5-cli php5-pgsql php-htmlpurifier php-http php-text-captcha \
+ libapache2-mpm-itk libapache2-mod-svn \
+ libapache2-mod-php5 \
+ apache2 postgresql postgresql-contrib libnss-pgsql2 unscd \
+ cvs subversion viewvc python-pycurl git mercurial xinetd \
+ python-moinmoin libapache2-mod-wsgi python-psycopg2 \
+ unoconv poppler-utils dpkg-dev \
+ libmarkdown-php \
+ vsftpd \
+ fonts-dejavu-core
+ apt-get -y install mediawiki -t jessie-backports
else
- apt-get install -y make gettext php-cli php-pgsql php-htmlpurifier php-http php-text-captcha \
- libapache2-mpm-itk libapache2-mod-svn \
- libapache2-mod-php \
- apache2 postgresql postgresql-contrib libnss-pgsql2 unscd \
- cvs subversion viewvc python-pycurl git mercurial xinetd \
- python-moinmoin libapache2-mod-wsgi python-psycopg2 \
- unoconv poppler-utils dpkg-dev \
- libmarkdown-php \
- vsftpd \
- fonts-dejavu-core mediawiki
+ apt-get install -y make gettext php-cli php-pgsql php-htmlpurifier php-http php-text-captcha \
+ libapache2-mpm-itk libapache2-mod-svn \
+ libapache2-mod-php \
+ apache2 postgresql postgresql-contrib libnss-pgsql2 unscd \
+ cvs subversion viewvc python-pycurl git mercurial xinetd \
+ python-moinmoin libapache2-mod-wsgi python-psycopg2 \
+ unoconv poppler-utils dpkg-dev \
+ libmarkdown-php \
+ vsftpd \
+ fonts-dejavu-core mediawiki
fi
if ! dpkg-vendor --is Ubuntu; then
apt-get install locales-all # https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1394929
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=5e47a83484b644802722b2024772923e1f8f4403
commit 5e47a83484b644802722b2024772923e1f8f4403
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date: Sun Oct 29 11:32:10 2017 +0100
add missing plugin mediawiki
diff --git a/autoinstall/install.sh b/autoinstall/install.sh
index efc9dbf..48999c5 100755
--- a/autoinstall/install.sh
+++ b/autoinstall/install.sh
@@ -41,12 +41,12 @@ if [ -e /etc/debian_version ]; then
# Additional components for testsuite
$APT install fusionforge-shell fusionforge-scm fusionforge-ftp \
fusionforge-plugin-scmcvs fusionforge-plugin-scmsvn fusionforge-plugin-scmgit fusionforge-plugin-scmbzr fusionforge-plugin-scmhg \
- fusionforge-plugin-moinmoin \
+ fusionforge-plugin-moinmoin fusionforge-plugin-mediawiki \
fusionforge-plugin-blocks fusionforge-plugin-taskboard \
fusionforge-plugin-message fusionforge-plugin-repositoryapi
$APT install dpkg-dev
if ! dpkg-vendor --is Ubuntu; then
- apt-get install locales-all # https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1394929
+ apt-get install locales-all # https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1394929
fi
fi
elif [ -e /etc/SuSE-release ]; then
-----------------------------------------------------------------------
Summary of changes:
autoinstall/install-src.sh | 42 +++++++++++++++++++++---------------------
autoinstall/install.sh | 4 ++--
2 files changed, 23 insertions(+), 23 deletions(-)
hooks/post-receive
--
FusionForge
More information about the Fusionforge-commits
mailing list