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/plugin-globalactivity has been updated
via 70e7f63d190af7aaf3caf8e6919ea23aaf893e90 (commit)
from 268c86845dd49700e19f6cfd937ab6e359b5b1e9 (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=70e7f63d190af7aaf3caf8e6919ea23aaf893e90
commit 70e7f63d190af7aaf3caf8e6919ea23aaf893e90
Author: Roland Mas <[email protected]>
Date: Fri Oct 7 14:21:15 2016 +0200
Install globalactivity plugin by default
The globalactivity plugin enhances the feature set without removing
anything, so it's now installed by default, just like the authbuiltin
plugin: implemented as a plugin, but shipped and enabled with no extra
action needed.
diff --git a/autoinstall/install-src.sh b/autoinstall/install-src.sh
index b1e476e..b75eca5 100755
--- a/autoinstall/install-src.sh
+++ b/autoinstall/install-src.sh
@@ -56,7 +56,6 @@ fi
make install-base install-shell install-scm \
install-plugin-scmsvn install-plugin-scmgit \
install-plugin-blocks install-plugin-moinmoin \
- install-plugin-online_help install-plugin-taskboard
install-plugin-message \
- install-plugin-globalactivity
+ install-plugin-online_help install-plugin-taskboard
install-plugin-message
make post-install
)
diff --git a/autoinstall/install.sh b/autoinstall/install.sh
index b6b15f0..55c14d5 100755
--- a/autoinstall/install.sh
+++ b/autoinstall/install.sh
@@ -43,7 +43,7 @@ if [ -e /etc/debian_version ]; then
fusionforge-plugin-scmgit fusionforge-plugin-scmsvn
fusionforge-plugin-scmbzr \
fusionforge-plugin-moinmoin \
fusionforge-plugin-blocks fusionforge-plugin-taskboard \
- fusionforge-plugin-message fusionforge-plugin-globalactivity
+ fusionforge-plugin-message
if ! dpkg-vendor --is Ubuntu; then
apt-get install locales-all #
https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1394929
fi
@@ -58,6 +58,6 @@ else
yum --enablerepo=epel install -y fusionforge fusionforge-shell
fusionforge-scm \
fusionforge-plugin-scmgit fusionforge-plugin-scmsvn \
fusionforge-plugin-blocks fusionforge-plugin-online_help
fusionforge-plugin-taskboard \
- fusionforge-plugin-message fusionforge-plugin-moinmoin
fusionforge-plugin-globalactivity
+ fusionforge-plugin-message fusionforge-plugin-moinmoin
fi
fi
diff --git a/src/GNUmakefile b/src/GNUmakefile
index 198a9dd..b63b9c5 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -61,7 +61,7 @@ install-config: install-base-dirs
> $(DESTDIR)$(config_path)/config.ini; \
fi
-install-common: install-config install-plugin-authbuiltin
+install-common: install-config install-plugin-authbuiltin
install-plugin-globalactivity
$(MAKE) -C locale DESTDIR=$(DESTDIR) PREFIX=$(PREFIX) install
$(CP_R) VERSION bin common templates $(DESTDIR)$(pkgdatadir)/
chmod 755 $(DESTDIR)$(pkgdatadir)/bin/ssh_akc.php
diff --git a/src/db/20161007-globalactivity.sql
b/src/db/20161007-globalactivity.sql
new file mode 100644
index 0000000..10ceca0
--- /dev/null
+++ b/src/db/20161007-globalactivity.sql
@@ -0,0 +1 @@
+INSERT INTO plugins (plugin_name, plugin_desc) VALUES ('globalactivity',
'Global activity');
diff --git a/src/debian/plugins b/src/debian/plugins
index 1ef362e..f2a4228 100644
--- a/src/debian/plugins
+++ b/src/debian/plugins
@@ -62,9 +62,6 @@ Depends: libarc-php, fusionforge-plugin-compactpreview
Package: fusionforge-plugin-foafprofiles
Depends:
-Package: fusionforge-plugin-globalactivity
-Depends:
-
Package: fusionforge-plugin-globalsearch
Depends: libxml-rss-perl, libgetopt-mixed-perl, libdbi-perl, libwww-perl,
libcrypt-ssleay-perl, libunicode-string-perl, ${perl:Depends}
-----------------------------------------------------------------------
Summary of changes:
autoinstall/install-src.sh | 3 +--
autoinstall/install.sh | 4 ++--
src/GNUmakefile | 2 +-
src/db/20161007-globalactivity.sql | 1 +
src/debian/plugins | 3 ---
5 files changed, 5 insertions(+), 8 deletions(-)
create mode 100644 src/db/20161007-globalactivity.sql
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
