[Fusionforge-commits] FusionForge branch GUM updated. 08f7c5f7388289de0235a479751073b86f61471e

Sylvain Beucler beuc-inria at fusionforge.org
Thu Aug 28 16:15:49 CEST 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, GUM has been updated
       via  08f7c5f7388289de0235a479751073b86f61471e (commit)
       via  d190317e5f60a2c1b5bdf0640cff60c6b6912524 (commit)
       via  f3bc1238a2bf7bc0dbb653d747279292cf3e2c99 (commit)
       via  6f99ed797c0f8f0d23bdcc6ad5a971cd398787cb (commit)
       via  0257fe2bd73ccf15f7bd91f4fe5cb9f74ea2e3b5 (commit)
       via  c930931b0583c63acb2a76c07605511a188ff0cb (commit)
       via  67ff27bfbaf15f2f893bc09428301f901ecf4328 (commit)
       via  9857fa27c4caf26b5179f3ee7ac65838b9536c02 (commit)
       via  2407b4f4721ab27a41e70962feb80acbc0346936 (commit)
       via  b2c11cab6a246646593bf221a1f5106adc62e2fa (commit)
       via  88e771c06217192892c69aa08be1a018b353af42 (commit)
       via  a67bae7de76620d3252eb6520da7e184e802de1f (commit)
       via  4e96add969af692bbb80629992cc7ff0905cd84a (commit)
       via  69baf49aae5c0411ce37c0d4ca29307bb6c03871 (commit)
       via  4708382b3801114596b51af664efcca7b90f6ba5 (commit)
       via  c1cdbb7ae53ef47d8310e43637ee5dd16d5f5a8c (commit)
       via  fef1a7cda126c6c2316c11e422bc2552670a5182 (commit)
       via  8c00d78e16ba0ef8b92fbf26f27e11f42b0530d6 (commit)
       via  93f8b1c2d86351abcac457664dbecbc943dea47c (commit)
       via  bb4522265f6fc14cb29454ec006a7c02b1a1ee35 (commit)
       via  f79054bc061934a77d63cb1e6f4405b5e49494c1 (commit)
       via  2418d923477cc1d14fe8f5200209058e47c335d6 (commit)
       via  61d133c552e7128b3fb0b127adab131ab3587e8d (commit)
       via  9b385e6f6aedaf59123d731e7b2ae4ec12f11157 (commit)
       via  1713e71c07ed763c96ed41a18f18509ab8e9a3b4 (commit)
       via  ea74c22fc681d80633fa850c55ac540d25716d6f (commit)
       via  feecc099a671f5a38c8a8c3bfb7d12fd1edc0a6d (commit)
       via  3f56e1833ecaf89d77fc91c7b135eb6954e105f7 (commit)
       via  503c122f9cf7ddbc6c005eb5c5dc4330a1099f0e (commit)
       via  0f1e5b2c7e4d5e9bcc4054d654d8e174166ba412 (commit)
       via  0aa751d0a8e6a1e58fffe88f633e4edf4b474597 (commit)
       via  c02577b03056bc0c2258f6cb3370a9a43a227fb8 (commit)
       via  d8452f0fae71a19cd0b47071fea7ca266936085f (commit)
       via  42dbde8cebbb26891942f58c42e341bc11142a3a (commit)
       via  ed3b171a1c346edd204b68438e942cada87262a0 (commit)
       via  37a85989d32dde089727fd1bac2766b9c039e670 (commit)
       via  6a36e08d01b58495fec09fd962fac0f1e7f52e97 (commit)
       via  811c725064803d8bfd16ec5eb18c8379f59052af (commit)
       via  722979ff3ca50785805c0e8f52e947210281c550 (commit)
       via  c99776a5525453dcae6e320731350659c68f5ab6 (commit)
      from  bcae09146ddb5c5c8b9fa52942a20a0629bf6241 (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 08f7c5f7388289de0235a479751073b86f61471e
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Thu Aug 28 16:14:29 2014 +0200

    deb: generate debian/control from unified plugins description

diff --git a/src/GNUmakefile b/src/GNUmakefile
index 6b704a8..80d830d 100644
--- a/src/GNUmakefile
+++ b/src/GNUmakefile
@@ -115,7 +115,7 @@ post-install-core:  # common+db+web
 post-install-shell:
 	$(fgc_source_path)/post-install.d/shell/shell.sh configure
 
-PLUGINS_INSTALLED:=$(shell ls $(fgc_source_path)/plugins 2>/dev/null)
+PLUGINS_INSTALLED:=$(wildcard $(fgc_source_path)/plugins)
 PLUGINS_POST_INSTALL_TARGETS=$(addprefix post-install-plugin-,$(PLUGINS_INSTALLED))
 post-install-plugins: $(PLUGINS_POST_INSTALL_TARGETS)
 post-install-plugin-%: $(fgc_source_path)/plugins/%/
diff --git a/src/common/include/PluginManager.class.php b/src/common/include/PluginManager.class.php
index bc7c6e8..a018d34 100644
--- a/src/common/include/PluginManager.class.php
+++ b/src/common/include/PluginManager.class.php
@@ -157,7 +157,6 @@ class PluginManager extends Error {
 	function LoadPlugin($p_name) {
 		global $gfplugins, $gfcommon, $gfwww;
 
-		$plugins_data = $this->GetPlugins();
 		$include_path = forge_get_config('plugins_path');
 		$filename = $include_path . '/'. $p_name . "/common/".$p_name."-init.php";
 		if (file_exists($filename)) {
@@ -168,20 +167,6 @@ class PluginManager extends Error {
 				require_once($filename);
 				$p_class = $p_name.'Plugin';
 				register_plugin (new $p_class);
-			} else { //if we didn't find it in common/ it may be an old plugin that has its files in include/
-				$filename = $include_path . '/' . $p_name . "/include/".$p_name."-init.php";
-				if (file_exists($filename)) {
-					require_once ($filename);
-				} else {
-					// we can't find the plugin so we remove it from the array
-					foreach ($plugins_data as $i => $n) {
-						if ($n == $p_name) {
-							$p_id = $i;
-						}
-					}
-					unset($this->plugins_data[$p_id]);
-					return false;
-				}
 			}
 		}
 		return true;
diff --git a/src/debian/control b/src/debian/control
index bd1178a..3fef5f8 100644
--- a/src/debian/control
+++ b/src/debian/control
@@ -131,11 +131,10 @@ Description: collaborative development tool - mail tools (using Exim 4)
  This package configures the Exim 4 mail transfer agent to run
  FusionForge.
 
-
 Package: fusionforge-plugin-scmgit
+Depends: fusionforge-common (=${source:Version}), git, gitweb, ${misc:Depends}
 Architecture: all
-Depends: fusionforge-web (=${source:Version}), git, gitweb, php5-cli, ${misc:Depends}
-Description: collaborative development tool - Git plugin
+Description: collaborative development tool - Git
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper,
@@ -146,11 +145,10 @@ Description: collaborative development tool - Git plugin
  FusionForge project to have its own Git repository, and gives some
  control over it to the project's administrator.
 
-
 Package: fusionforge-plugin-scmsvn
+Depends: fusionforge-common (=${source:Version}), subversion, subversion-tools, openbsd-inetd | inet-superserver, update-inetd, ${misc:Depends}
 Architecture: all
-Depends: fusionforge-web (=${source:Version}), subversion, subversion-tools, php5-cli, openbsd-inetd | inet-superserver, update-inetd, ${misc:Depends}
-Description: collaborative development tool - Subversion plugin
+Description: collaborative development tool - Subversion
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper,
@@ -161,11 +159,10 @@ Description: collaborative development tool - Subversion plugin
  each FusionForge project to have its own Subversion repository, and gives
  some control over it to the project's administrator.
 
-
 Package: fusionforge-plugin-scmbzr
+Depends: fusionforge-common (=${source:Version}), bzr, libapache2-mod-wsgi, loggerhead (>= 1.19~bzr477~), python-pastedeploy, ${misc:Depends}
 Architecture: all
-Depends: fusionforge-web (=${source:Version}), bzr, php5-cli, libapache2-mod-wsgi, loggerhead (>= 1.19~bzr477~), python-pastedeploy, ${misc:Depends}
-Description: collaborative development tool - Bazaar plugin
+Description: collaborative development tool - Bazaar
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper,
@@ -176,11 +173,118 @@ Description: collaborative development tool - Bazaar plugin
  FusionForge project to have its own Bazaar repository, and gives some control
  over it to the project's administrator.
 
+Package: fusionforge-plugin-scmarch
+Depends: fusionforge-common (=${source:Version}), tla, ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - Arch
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin contains the GNU Arch subsystem of FusionForge. It allows
+ each FusionForge project to have its own Arch repository, and gives
+ some control over it to the project's administrator.
+
+Package: fusionforge-plugin-scmcvs
+Depends: fusionforge-common (=${source:Version}), php5-cli, libipc-run-perl, rcs, liburi-perl, cvs, python, libphp-snoopy, openbsd-inetd | inet-superserver, update-inetd, ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - CVS
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin contains the CVS subsystem of FusionForge. It allows each
+ FusionForge project to have its own CVS repository, and gives some control
+ over it to the project's administrator.
+
+Package: fusionforge-plugin-scmdarcs
+Depends: fusionforge-common (=${source:Version}), fusionforge-shell, darcs, darcsweb, ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - Darcs
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin contains the Darcs subsystem of FusionForge. It allows each
+ FusionForge project to have its own Darcs repository, and gives some control
+ over it to the project's administrator.
+
+Package: fusionforge-plugin-scmhg
+Depends: fusionforge-common (=${source:Version}), fusionforge-shell-postgresql, mercurial, ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - Mercurial
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin contains the Mercurial (Hg) subsystem of FusionForge. It
+ allows each FusionForge project to have its own Mercurial repository,
+ and gives some control over it to the project's administrator.
+
+Package: fusionforge-plugin-mediawiki
+Depends: fusionforge-common (=${source:Version}), php5-cli, mediawiki (>= 1:1.19.1-2~exp2), ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - Mediawiki
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin allows each project to embed Mediawiki under a tab.
+
+Package: fusionforge-plugin-moinmoin
+Depends: fusionforge-common (=${source:Version}), php5-cli, python-moinmoin, python-psycopg2, libapache2-mod-wsgi, ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - MoinMoinWiki
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin allows each project to embed MoinMoinWiki under a tab.
+
+Package: fusionforge-plugin-admssw
+Depends: fusionforge-common (=${source:Version}), php-http, fusionforge-plugin-doaprdf, libgraphite-php, ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - ADMS.SW
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin provides ADMS.SW additions to the DOAP RDF documents for
+ projects on /projects URLs with content-negociation
+ (application/rdf+xml).
+
+Package: fusionforge-plugin-authcas
+Depends: fusionforge-common (=${source:Version}), php-cas, ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - CAS authentication
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin contains a CAS authentication mechanism for
+ FusionForge. It allows users to authenticate against an external CAS
+ server.
 
 Package: fusionforge-plugin-authhttpd
+Depends: fusionforge-common (=${source:Version}),, ${misc:Depends}
 Architecture: all
-Depends: fusionforge-web (=${source:Version}), ${misc:Depends}
-Description: collaborative development tool - HTTPD authentication plugin
+Description: collaborative development tool - HTTPD authentication
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper,
@@ -191,11 +295,25 @@ Description: collaborative development tool - HTTPD authentication plugin
  FusionForge. It allows Apache authentication to be reused for
  FusionForge, for instance where Kerberos is used.
 
+Package: fusionforge-plugin-authldap
+Depends: fusionforge-common (=${source:Version}), php5-ldap, ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - LDAP authentication
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin contains an LDAP authentication mechanism for
+ FusionForge. It allows users to authenticate against an external LDAP
+ directory, and syncs some of their personal information from LDAP
+ into the FusionForge database.
 
 Package: fusionforge-plugin-blocks
+Depends: fusionforge-common (=${source:Version}),, ${misc:Depends}
 Architecture: all
-Depends: fusionforge-web (=${source:Version}), ${misc:Depends}
-Description: collaborative development tool - Blocks plugin
+Description: collaborative development tool - Blocks
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper,
@@ -206,28 +324,178 @@ Description: collaborative development tool - Blocks plugin
  FusionForge project to have its own Blocks, and gives some
  control over it to the project's administrator.
 
+Package: fusionforge-plugin-compactpreview
+Depends: fusionforge-common (=${source:Version}),, ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - CompactPreview!
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin adds support for user and project compact-preview
+ (popups) compatible with the OSLC specifications.
 
-Package: fusionforge-plugin-mediawiki
+Package: fusionforge-plugin-contribtracker
+Depends: fusionforge-common (=${source:Version}),, ${misc:Depends}
 Architecture: all
-Depends: fusionforge-web (=${source:Version}), mediawiki (>= 1:1.19.1-2~exp2), php5-cli, ${misc:Depends}
-Description: collaborative development tool - Mediawiki plugin
+Description: collaborative development tool - Contribution Tracker
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper,
  web/FTP hosting, release management, etc. All these services are
  integrated into one web site and managed through a web interface.
  .
- This plugin allows each project to embed Mediawiki under a tab.
+ This plugin allows each project to display a list of significant
+ contributions, along with their authors.
 
+Package: fusionforge-plugin-doaprdf
+Depends: fusionforge-common (=${source:Version}), php-http, libarc-php, ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - DoaPRDF!
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin provides DOAP RDF documents for projects on /projects URLs 
+ with content-negociation (application/rdf+xml).
 
-Package: fusionforge-plugin-moinmoin
+Package: fusionforge-plugin-extsubproj
+Depends: fusionforge-common (=${source:Version}), libarc-php, fusionforge-plugin-compactpreview, ${misc:Depends}
 Architecture: all
-Depends: fusionforge-web (=${source:Version}), python-moinmoin, python-psycopg2, libapache2-mod-wsgi, ${misc:Depends}
-Description: collaborative development tool - MoinMoinWiki plugin
+Description: collaborative development tool - External SubProjects
  FusionForge provides many tools to aid collaboration in a
  development project, such as bug-tracking, task management,
  mailing-lists, SCM repository, forums, support request helper,
  web/FTP hosting, release management, etc. All these services are
  integrated into one web site and managed through a web interface.
  .
- This plugin allows each project to embed MoinMoinWiki under a tab.
+ This plugin contains the extsubproj subsystem of FusionForge. It allows each
+ FusionForge project to have its own extsubproj, and gives some
+ control over it to the project's administrator.
+
+Package: fusionforge-plugin-foafprofiles
+Depends: fusionforge-common (=${source:Version}),, ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - User FOAF Profiles
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin provides FOAF profiles for users on /users URLs 
+ with content-negociation (application/rdf+xml).
+
+Package: fusionforge-plugin-globalsearch
+Depends: fusionforge-common (=${source:Version}), libxml-rss-perl, libgetopt-mixed-perl, libdbi-perl, libwww-perl, libcrypt-ssleay-perl, libunicode-string-perl, ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - Globalsearch
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin contains a cross-FusionForge search engine.  You can
+ declare a list of other FusionForge sites, and search for projects
+ hosted on these forges from your own.
+
+Package: fusionforge-plugin-gravatar
+Depends: fusionforge-common (=${source:Version}), , ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - Gravatar Plugin
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin contains the gravatar plugin of FusionForge. It allows each
+ FusionForge user to have its gravatar icon displayed.
+
+Package: fusionforge-plugin-headermenu
+Depends: fusionforge-common (=${source:Version}),, ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - Menu Tabs Manager
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin allows each project to define extra tabs with arbitrary
+ titles and links.
+
+Package: fusionforge-plugin-hudson
+Depends: fusionforge-common (=${source:Version}), php5-cli, ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - Hudson/Jenkins
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin contains the Hudson subsystem of FusionForge. It allows each
+ FusionForge project to have its own Hudson, and gives some
+ control over it to the project's administrator.
+
+Package: fusionforge-plugin-message
+Depends: fusionforge-common (=${source:Version}),, ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - Message
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin allows the site administrator to display a message banner
+ on all pages, e.g. for maintenance announcements.
+
+Package: fusionforge-plugin-projectlabels
+Depends: fusionforge-common (=${source:Version}),, ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - Project labels
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This can be used to highlight some projects on a forge, for instance
+ for a "project of the month".
+
+Package: fusionforge-plugin-scmhook
+Depends: fusionforge-common (=${source:Version}), php5-cli, libphp-snoopy, ${misc:Depends}
+Architecture: all
+Description: collaborative development tool - Scmhook
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin contains a set of commit hooks (e-mail notifications,
+ tracker integration, conformity...) that can be enabled for each
+ project independently.
+
+Package: fusionforge-plugin-sysauthldap
+Depends: fusionforge-common (=${source:Version}), php5-ldap, ${misc:Depends}
+Recommends: slapd, ldap-utils
+Architecture: all
+Description: collaborative development tool - System authentication via PostgreLDAP
+ FusionForge provides many tools to aid collaboration in a
+ development project, such as bug-tracking, task management,
+ mailing-lists, SCM repository, forums, support request helper,
+ web/FTP hosting, release management, etc. All these services are
+ integrated into one web site and managed through a web interface.
+ .
+ This plugin maintains data about users, groups and memberships in an
+  LDAP directory that can be used for NSS/PAM system authentication (or
+  for other uses).
+
diff --git a/src/debian/control b/src/debian/control.in
similarity index 54%
copy from src/debian/control
copy to src/debian/control.in
index bd1178a..9077971 100644
--- a/src/debian/control
+++ b/src/debian/control.in
@@ -130,104 +130,3 @@ Description: collaborative development tool - mail tools (using Exim 4)
  .
  This package configures the Exim 4 mail transfer agent to run
  FusionForge.
-
-
-Package: fusionforge-plugin-scmgit
-Architecture: all
-Depends: fusionforge-web (=${source:Version}), git, gitweb, php5-cli, ${misc:Depends}
-Description: collaborative development tool - Git plugin
- FusionForge provides many tools to aid collaboration in a
- development project, such as bug-tracking, task management,
- mailing-lists, SCM repository, forums, support request helper,
- web/FTP hosting, release management, etc. All these services are
- integrated into one web site and managed through a web interface.
- .
- This plugin contains the Git subsystem of FusionForge. It allows each
- FusionForge project to have its own Git repository, and gives some
- control over it to the project's administrator.
-
-
-Package: fusionforge-plugin-scmsvn
-Architecture: all
-Depends: fusionforge-web (=${source:Version}), subversion, subversion-tools, php5-cli, openbsd-inetd | inet-superserver, update-inetd, ${misc:Depends}
-Description: collaborative development tool - Subversion plugin
- FusionForge provides many tools to aid collaboration in a
- development project, such as bug-tracking, task management,
- mailing-lists, SCM repository, forums, support request helper,
- web/FTP hosting, release management, etc. All these services are
- integrated into one web site and managed through a web interface.
- .
- This plugin contains the Subversion subsystem of FusionForge. It allows
- each FusionForge project to have its own Subversion repository, and gives
- some control over it to the project's administrator.
-
-
-Package: fusionforge-plugin-scmbzr
-Architecture: all
-Depends: fusionforge-web (=${source:Version}), bzr, php5-cli, libapache2-mod-wsgi, loggerhead (>= 1.19~bzr477~), python-pastedeploy, ${misc:Depends}
-Description: collaborative development tool - Bazaar plugin
- FusionForge provides many tools to aid collaboration in a
- development project, such as bug-tracking, task management,
- mailing-lists, SCM repository, forums, support request helper,
- web/FTP hosting, release management, etc. All these services are
- integrated into one web site and managed through a web interface.
- .
- This plugin contains the Bazaar subsystem of FusionForge. It allows each
- FusionForge project to have its own Bazaar repository, and gives some control
- over it to the project's administrator.
-
-
-Package: fusionforge-plugin-authhttpd
-Architecture: all
-Depends: fusionforge-web (=${source:Version}), ${misc:Depends}
-Description: collaborative development tool - HTTPD authentication plugin
- FusionForge provides many tools to aid collaboration in a
- development project, such as bug-tracking, task management,
- mailing-lists, SCM repository, forums, support request helper,
- web/FTP hosting, release management, etc. All these services are
- integrated into one web site and managed through a web interface.
- .
- This plugin contains an HTTPD authentication mechanism for
- FusionForge. It allows Apache authentication to be reused for
- FusionForge, for instance where Kerberos is used.
-
-
-Package: fusionforge-plugin-blocks
-Architecture: all
-Depends: fusionforge-web (=${source:Version}), ${misc:Depends}
-Description: collaborative development tool - Blocks plugin
- FusionForge provides many tools to aid collaboration in a
- development project, such as bug-tracking, task management,
- mailing-lists, SCM repository, forums, support request helper,
- web/FTP hosting, release management, etc. All these services are
- integrated into one web site and managed through a web interface.
- .
- This plugin contains the Blocks subsystem of FusionForge. It allows each
- FusionForge project to have its own Blocks, and gives some
- control over it to the project's administrator.
-
-
-Package: fusionforge-plugin-mediawiki
-Architecture: all
-Depends: fusionforge-web (=${source:Version}), mediawiki (>= 1:1.19.1-2~exp2), php5-cli, ${misc:Depends}
-Description: collaborative development tool - Mediawiki plugin
- FusionForge provides many tools to aid collaboration in a
- development project, such as bug-tracking, task management,
- mailing-lists, SCM repository, forums, support request helper,
- web/FTP hosting, release management, etc. All these services are
- integrated into one web site and managed through a web interface.
- .
- This plugin allows each project to embed Mediawiki under a tab.
-
-
-Package: fusionforge-plugin-moinmoin
-Architecture: all
-Depends: fusionforge-web (=${source:Version}), python-moinmoin, python-psycopg2, libapache2-mod-wsgi, ${misc:Depends}
-Description: collaborative development tool - MoinMoinWiki plugin
- FusionForge provides many tools to aid collaboration in a
- development project, such as bug-tracking, task management,
- mailing-lists, SCM repository, forums, support request helper,
- web/FTP hosting, release management, etc. All these services are
- integrated into one web site and managed through a web interface.
- .
- This plugin allows each project to embed MoinMoinWiki under a tab.
diff --git a/src/debian/fusionforge-plugin-scmhook.lintian-overrides b/src/debian/fusionforge-plugin-scmhook.lintian-overrides
new file mode 100644
index 0000000..e19e850
--- /dev/null
+++ b/src/debian/fusionforge-plugin-scmhook.lintian-overrides
@@ -0,0 +1,5 @@
+# Templates, not real executables
+fusionforge-plugin-scmhook: script-not-executable usr/share/fusionforge/plugins/scmhook/library/scmgit/skel/post-receive/head
+fusionforge-plugin-scmhook: script-not-executable usr/share/fusionforge/plugins/scmhook/library/scmsvn/skel/post-commit/head
+fusionforge-plugin-scmhook: script-not-executable usr/share/fusionforge/plugins/scmhook/library/scmsvn/skel/pre-commit/head
+fusionforge-plugin-scmhook: script-not-executable usr/share/fusionforge/plugins/scmhook/library/scmsvn/skel/pre-revprop-change/head
diff --git a/src/debian/gen_control.sh b/src/debian/gen_control.sh
new file mode 100755
index 0000000..0537d2e
--- /dev/null
+++ b/src/debian/gen_control.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -e
+(
+    cat debian/control.in
+    echo
+    for i in $(sed -n 's/^Package: fusionforge-plugin-//p' debian/plugins); do
+	sed -n -e '/^#/d' -e "/^Package: fusionforge-plugin-$i/,/^$/p" debian/plugins \
+	    | grep -v ^$ \
+	    | sed 's/Depends:\(.*\)/Depends: fusionforge-common (=${source:Version}),\1, ${misc:Depends}/'
+	echo "Architecture: all"
+	php utils/plugin_pkg_desc.php $i deb
+	echo
+    done
+) > debian/control
diff --git a/src/debian/plugins b/src/debian/plugins
new file mode 100644
index 0000000..b9a2c18
--- /dev/null
+++ b/src/debian/plugins
@@ -0,0 +1,81 @@
+Package: fusionforge-plugin-scmgit
+Depends: git, gitweb
+
+Package: fusionforge-plugin-scmsvn
+Depends: subversion, subversion-tools, openbsd-inetd | inet-superserver, update-inetd
+
+Package: fusionforge-plugin-scmbzr
+Depends: bzr, libapache2-mod-wsgi, loggerhead (>= 1.19~bzr477~), python-pastedeploy
+
+Package: fusionforge-plugin-scmarch
+Depends: tla
+
+Package: fusionforge-plugin-scmcvs
+Depends: php5-cli, libipc-run-perl, rcs, liburi-perl, cvs, python, libphp-snoopy, openbsd-inetd | inet-superserver, update-inetd
+
+Package: fusionforge-plugin-scmdarcs
+Depends: fusionforge-shell, darcs, darcsweb
+
+Package: fusionforge-plugin-scmhg
+Depends: fusionforge-shell-postgresql, mercurial
+
+Package: fusionforge-plugin-mediawiki
+Depends: php5-cli, mediawiki (>= 1:1.19.1-2~exp2)
+
+Package: fusionforge-plugin-moinmoin
+Depends: php5-cli, python-moinmoin, python-psycopg2, libapache2-mod-wsgi
+
+Package: fusionforge-plugin-admssw
+Depends: php-http, fusionforge-plugin-doaprdf, libgraphite-php
+
+Package: fusionforge-plugin-authcas
+Depends: php-cas
+
+Package: fusionforge-plugin-authhttpd
+Depends:
+
+Package: fusionforge-plugin-authldap
+Depends: php5-ldap
+
+Package: fusionforge-plugin-blocks
+Depends:
+
+Package: fusionforge-plugin-compactpreview
+Depends:
+
+Package: fusionforge-plugin-contribtracker
+Depends:
+
+Package: fusionforge-plugin-doaprdf
+Depends: php-http, libarc-php
+
+Package: fusionforge-plugin-extsubproj
+Depends: libarc-php, fusionforge-plugin-compactpreview
+
+Package: fusionforge-plugin-foafprofiles
+Depends:
+
+Package: fusionforge-plugin-globalsearch
+Depends: libxml-rss-perl, libgetopt-mixed-perl, libdbi-perl, libwww-perl, libcrypt-ssleay-perl, libunicode-string-perl
+
+Package: fusionforge-plugin-gravatar
+Depends: 
+
+Package: fusionforge-plugin-headermenu
+Depends:
+
+Package: fusionforge-plugin-hudson
+Depends: php5-cli
+
+Package: fusionforge-plugin-message
+Depends:
+
+Package: fusionforge-plugin-projectlabels
+Depends:
+
+Package: fusionforge-plugin-scmhook
+Depends: php5-cli, libphp-snoopy
+
+Package: fusionforge-plugin-sysauthldap
+Depends: php5-ldap
+Recommends: slapd, ldap-utils
diff --git a/src/debian/rules b/src/debian/rules
index f9441d0..44a61d3 100755
--- a/src/debian/rules
+++ b/src/debian/rules
@@ -28,10 +28,10 @@ override_dh_auto_install:
 	make install-shell       prefix=/usr DESTDIR=$(CURDIR)/debian/fusionforge-shell
 	make install-mta-postfix prefix=/usr DESTDIR=$(CURDIR)/debian/fusionforge-mta-postfix
 	make install-mta-exim4   prefix=/usr DESTDIR=$(CURDIR)/debian/fusionforge-mta-exim4
-	make install-plugin-scmgit    prefix=/usr DESTDIR=$(CURDIR)/debian/fusionforge-plugin-scmgit
-	make install-plugin-scmsvn    prefix=/usr DESTDIR=$(CURDIR)/debian/fusionforge-plugin-scmsvn
-	make install-plugin-scmbzr    prefix=/usr DESTDIR=$(CURDIR)/debian/fusionforge-plugin-scmbzr
-	make install-plugin-authhttpd   prefix=/usr DESTDIR=$(CURDIR)/debian/fusionforge-plugin-authhttpd
-	make install-plugin-blocks      prefix=/usr DESTDIR=$(CURDIR)/debian/fusionforge-plugin-blocks
-	make install-plugin-mediawiki   prefix=/usr DESTDIR=$(CURDIR)/debian/fusionforge-plugin-mediawiki
-	make install-plugin-moinmoin    prefix=/usr DESTDIR=$(CURDIR)/debian/fusionforge-plugin-moinmoin
+	for i in $$(sed -n 's/^Package: fusionforge-plugin-//p' debian/plugins); do \
+		make install-plugin-$$i prefix=/usr DESTDIR=$(CURDIR)/debian/fusionforge-plugin-$$i; \
+	done
+
+# Needs to be done before 'dpkg-source'
+debian/control: debian/gen_control.sh debian/plugins
+	debian/gen_control.sh
diff --git a/src/plugins/admssw/common/RDFedFRSPackage.class.php b/src/plugins/admssw/common/RDFedFRSPackage.class.php
index 99101f6..99319e2 100644
--- a/src/plugins/admssw/common/RDFedFRSPackage.class.php
+++ b/src/plugins/admssw/common/RDFedFRSPackage.class.php
@@ -23,6 +23,8 @@
 // This class overloads FRSPackage to add RDF representation, based on ADMS.SW, using ARC2 and Graphite
 
 include_once 'RDFedFRSRelease.class.php';
+require_once $gfcommon.'frs/FRSRelease.class.php';
+require_once $gfcommon.'frs/FRSPackage.class.php';
 
 /**
  *	  Factory method which creates a RDFedFRSPackage from an project/group
diff --git a/src/plugins/admssw/common/RDFedFRSRelease.class.php b/src/plugins/admssw/common/RDFedFRSRelease.class.php
index 166a90b..8cd10f4 100644
--- a/src/plugins/admssw/common/RDFedFRSRelease.class.php
+++ b/src/plugins/admssw/common/RDFedFRSRelease.class.php
@@ -23,6 +23,7 @@
 // This class overloads FRSRelease to add RDF representation, based on ADMS.SW, using ARC2 and Graphite
 
 include_once 'RDFedFRSFile.class.php';
+require_once $gfcommon.'frs/FRSRelease.class.php';
 
 /**
  *	  Factory method which creates a RDFedFRSRelease from an release id
diff --git a/src/plugins/admssw/include/admsswPlugin.class.php b/src/plugins/admssw/include/admsswPlugin.class.php
index 662e729..3fc86c6 100644
--- a/src/plugins/admssw/include/admsswPlugin.class.php
+++ b/src/plugins/admssw/include/admsswPlugin.class.php
@@ -48,7 +48,11 @@ class admsswPlugin extends Plugin {
 	public function __construct($id=0) {
 		$this->Plugin($id) ;
 		$this->name = "admssw";
-		$this->text = "ADMS.SW"; // To show in the tabs, use...
+		$this->text = _("ADMS.SW"); // To show in the tabs, use...
+		$this->pkg_desc =
+_("This plugin provides ADMS.SW additions to the DOAP RDF documents for
+projects on /projects URLs with content-negociation
+(application/rdf+xml).");
 
 		// The standard RDF namespaces that will be used in the plugin
 		$this->ns = array(
diff --git a/src/plugins/authcas/include/AuthCASPlugin.class.php b/src/plugins/authcas/common/AuthCASPlugin.class.php
similarity index 93%
rename from src/plugins/authcas/include/AuthCASPlugin.class.php
rename to src/plugins/authcas/common/AuthCASPlugin.class.php
index 076b200..991ef96 100644
--- a/src/plugins/authcas/include/AuthCASPlugin.class.php
+++ b/src/plugins/authcas/common/AuthCASPlugin.class.php
@@ -19,10 +19,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-require_once $GLOBALS['gfcommon'].'include/User.class.php';
-
-// from phpCAS (https://wiki.jasig.org/display/CASC/phpCAS)
-require_once 'CAS.php';
+require_once $gfcommon.'include/User.class.php';
+require_once $gfcommon.'include/AuthPlugin.class.php';
 
 /**
  * Authentication manager for FusionForge CASification
@@ -33,8 +31,11 @@ class AuthCASPlugin extends ForgeAuthPlugin {
 		global $gfconfig;
 		$this->ForgeAuthPlugin() ;
 		$this->name = "authcas";
-		$this->text = "CAS authentication";
-
+		$this->text = _("CAS authentication");
+		$this->pkg_desc =
+_("This plugin contains a CAS authentication mechanism for
+FusionForge. It allows users to authenticate against an external CAS
+server.");
 		$this->_addHook('display_auth_form');
 		$this->_addHook("check_auth_session");
 		$this->_addHook("fetch_authenticated_user");
@@ -49,6 +50,9 @@ class AuthCASPlugin extends ForgeAuthPlugin {
 	private static $init = false;
 
 	function initCAS() {
+		// from phpCAS (https://wiki.jasig.org/display/CASC/phpCAS)
+		require_once 'CAS.php';
+
 		if (self::$init) {
 			return;
 		}
diff --git a/src/plugins/authcas/include/authcas-init.php b/src/plugins/authcas/common/authcas-init.php
similarity index 94%
rename from src/plugins/authcas/include/authcas-init.php
rename to src/plugins/authcas/common/authcas-init.php
index 505be8f..0512061 100644
--- a/src/plugins/authcas/include/authcas-init.php
+++ b/src/plugins/authcas/common/authcas-init.php
@@ -20,7 +20,7 @@
  */
 
 global $gfplugins;
-require_once $gfplugins.'authcas/include/AuthCASPlugin.class.php' ;
+require_once $gfplugins.'authcas/common/AuthCASPlugin.class.php' ;
 
 $AuthCASPluginObject = new AuthCASPlugin ;
 
diff --git a/src/plugins/authhttpd/include/AuthHTTPDPlugin.class.php b/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
similarity index 91%
rename from src/plugins/authhttpd/include/AuthHTTPDPlugin.class.php
rename to src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
index 7bee727..f9bef9c 100644
--- a/src/plugins/authhttpd/include/AuthHTTPDPlugin.class.php
+++ b/src/plugins/authhttpd/common/AuthHTTPDPlugin.class.php
@@ -18,7 +18,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-require_once $GLOBALS['gfcommon'].'include/User.class.php';
+require_once $gfcommon.'include/User.class.php';
+require_once $gfcommon.'include/AuthPlugin.class.php';
 
 /**
  * Authentication manager for FusionForge
@@ -29,8 +30,11 @@ class AuthHTTPDPlugin extends ForgeAuthPlugin {
 		global $gfconfig;
 		$this->ForgeAuthPlugin() ;
 		$this->name = "authhttpd";
-		$this->text = "HTTPD authentication";
-
+		$this->text = _("HTTPD authentication");
+		$this->pkg_desc =
+_("This plugin contains an HTTPD authentication mechanism for
+FusionForge. It allows Apache authentication to be reused for
+FusionForge, for instance where Kerberos is used.");
 		$this->_addHook('display_auth_form');
 		$this->_addHook("check_auth_session");
 		$this->_addHook("fetch_authenticated_user");
diff --git a/src/plugins/authhttpd/include/authhttpd-init.php b/src/plugins/authhttpd/common/authhttpd-init.php
similarity index 93%
rename from src/plugins/authhttpd/include/authhttpd-init.php
rename to src/plugins/authhttpd/common/authhttpd-init.php
index fbc9cdd..4c81248 100644
--- a/src/plugins/authhttpd/include/authhttpd-init.php
+++ b/src/plugins/authhttpd/common/authhttpd-init.php
@@ -20,7 +20,7 @@
  */
 
 global $gfplugins;
-require_once $gfplugins.'authhttpd/include/AuthHTTPDPlugin.class.php' ;
+require_once $gfplugins.'authhttpd/common/AuthHTTPDPlugin.class.php' ;
 
 $AuthHTTPDPluginObject = new AuthHTTPDPlugin ;
 
diff --git a/src/plugins/authldap/include/AuthLDAPPlugin.class.php b/src/plugins/authldap/common/AuthLDAPPlugin.class.php
similarity index 96%
rename from src/plugins/authldap/include/AuthLDAPPlugin.class.php
rename to src/plugins/authldap/common/AuthLDAPPlugin.class.php
index 5f93dab..7da8108 100644
--- a/src/plugins/authldap/include/AuthLDAPPlugin.class.php
+++ b/src/plugins/authldap/common/AuthLDAPPlugin.class.php
@@ -24,7 +24,8 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-require_once $GLOBALS['gfcommon'].'include/User.class.php';
+require_once $gfcommon.'include/User.class.php';
+require_once $gfcommon.'include/AuthPlugin.class.php';
 
 class AuthLDAPPlugin extends ForgeAuthPlugin {
 	protected $saved_login;
@@ -35,8 +36,12 @@ class AuthLDAPPlugin extends ForgeAuthPlugin {
 		global $gfconfig;
 		$this->ForgeAuthPlugin();
 		$this->name = "authldap";
-		$this->text = "LDAP authentication";
-
+		$this->text = _("LDAP authentication");
+		$this->pkg_desc =
+_("This plugin contains an LDAP authentication mechanism for
+FusionForge. It allows users to authenticate against an external LDAP
+directory, and syncs some of their personal information from LDAP
+into the FusionForge database.");
 		$this->_addHook('display_auth_form');
 		$this->_addHook("check_auth_session");
 		$this->_addHook("fetch_authenticated_user");
diff --git a/src/plugins/authldap/include/authldap-init.php b/src/plugins/authldap/common/authldap-init.php
similarity index 94%
rename from src/plugins/authldap/include/authldap-init.php
rename to src/plugins/authldap/common/authldap-init.php
index 394aee0..6ddcc62 100644
--- a/src/plugins/authldap/include/authldap-init.php
+++ b/src/plugins/authldap/common/authldap-init.php
@@ -22,7 +22,7 @@
  */
 
 global $gfplugins;
-require_once $gfplugins.'authldap/include/AuthLDAPPlugin.class.php' ;
+require_once $gfplugins.'authldap/common/AuthLDAPPlugin.class.php' ;
 
 $AuthLDAPPluginObject = new AuthLDAPPlugin ;
 
diff --git a/src/plugins/blocks/common/blocksPlugin.class.php b/src/plugins/blocks/common/blocksPlugin.class.php
index a263f04..763d031 100644
--- a/src/plugins/blocks/common/blocksPlugin.class.php
+++ b/src/plugins/blocks/common/blocksPlugin.class.php
@@ -51,6 +51,10 @@ class blocksPlugin extends Plugin {
 		$this->Plugin() ;
 		$this->name = "blocks" ;
 		$this->text = _("Blocks"); // To show in the tabs, use...
+		$this->pkg_desc =
+_("This plugin contains the Blocks subsystem of FusionForge. It allows each
+FusionForge project to have its own Blocks, and gives some
+control over it to the project's administrator.");
 		$this->hooks[] = "groupisactivecheckbox" ; // The "use ..." checkbox in editgroupinfo
 		$this->hooks[] = "groupisactivecheckboxpost" ; //
 		$this->hooks[] = "project_admin_plugins"; // to show up in the admin page fro group
diff --git a/src/plugins/compactpreview/include/CompactPreviewPlugin.class.php b/src/plugins/compactpreview/include/CompactPreviewPlugin.class.php
index 204929e..23ca6d5 100644
--- a/src/plugins/compactpreview/include/CompactPreviewPlugin.class.php
+++ b/src/plugins/compactpreview/include/CompactPreviewPlugin.class.php
@@ -26,7 +26,10 @@ class CompactPreviewPlugin extends Plugin {
 	public function __construct($id=0) {
 		$this->Plugin($id) ;
 		$this->name = "compactpreview";
-		$this->text = "CompactPreview!"; // To show in the tabs, use...
+		$this->text = _("CompactPreview!"); // To show in the tabs, use...
+		$this->pkg_desc =
+_("This plugin adds support for user and project compact-preview
+(popups) compatible with the OSLC specifications.");
 		$this->_addHook("user_link_with_tooltip"); // override the way user links are done (for user compact preview support)
 		$this->_addHook("project_link_with_tooltip");
 		$this->_addHook("javascript_file"); // Add js files for oslc plugin
diff --git a/src/plugins/contribtracker/common/ContribTrackerPlugin.class.php b/src/plugins/contribtracker/common/ContribTrackerPlugin.class.php
index e96ce8b..81f8d1b 100644
--- a/src/plugins/contribtracker/common/ContribTrackerPlugin.class.php
+++ b/src/plugins/contribtracker/common/ContribTrackerPlugin.class.php
@@ -26,7 +26,10 @@ class ContribTrackerPlugin extends Plugin {
 	function ContribTrackerPlugin() {
 		$this->Plugin() ;
 		$this->name = "contribtracker";
-		$this->text = "Contribution Tracker"; // To show in the tabs, use...
+		$this->text = _("Contribution Tracker"); // To show in the tabs, use...
+		$this->pkg_desc =
+_("This plugin allows each project to display a list of significant
+contributions, along with their authors.");
 		$this->_addHook("groupmenu");	// To put into the project tabs
 		$this->_addHook("groupisactivecheckbox"); // The "use ..." checkbox in editgroupinfo
 		$this->_addHook("groupisactivecheckboxpost"); //
diff --git a/src/plugins/doaprdf/include/doaprdfPlugin.class.php b/src/plugins/doaprdf/include/doaprdfPlugin.class.php
index 2492d79..53c1c37 100644
--- a/src/plugins/doaprdf/include/doaprdfPlugin.class.php
+++ b/src/plugins/doaprdf/include/doaprdfPlugin.class.php
@@ -32,7 +32,10 @@ class doaprdfPlugin extends Plugin {
 	public function __construct($id=0) {
 		$this->Plugin($id) ;
 		$this->name = "doaprdf";
-		$this->text = "DoaPRDF!"; // To show in the tabs, use...
+		$this->text = _("DoaPRDF!"); // To show in the tabs, use...
+		$this->pkg_desc =
+_("This plugin provides DOAP RDF documents for projects on /projects URLs 
+with content-negociation (application/rdf+xml).");
 		$this->_addHook("script_accepted_types");
 		$this->_addHook("content_negociated_project_home");
 		$this->_addHook("alt_representations");
diff --git a/src/plugins/extsubproj/include/extsubprojPlugin.class.php b/src/plugins/extsubproj/include/extsubprojPlugin.class.php
index 012df1b..32540de 100644
--- a/src/plugins/extsubproj/include/extsubprojPlugin.class.php
+++ b/src/plugins/extsubproj/include/extsubprojPlugin.class.php
@@ -25,7 +25,11 @@ class extsubprojPlugin extends Plugin {
 	public function __construct($id=0) {
 		$this->Plugin($id) ;
 		$this->name = "extsubproj";
-		$this->text = "External SubProjects"; // To show in the tabs, use...
+		$this->text = _("External SubProjects"); // To show in the tabs, use...
+		$this->pkg_desc =
+_("This plugin contains the extsubproj subsystem of FusionForge. It allows each
+FusionForge project to have its own extsubproj, and gives some
+control over it to the project's administrator.");
 		/*
 		$this->_addHook("user_personal_links");//to make a link to the user's personal part of the plugin
 		$this->_addHook("usermenu");
diff --git a/src/plugins/foafprofiles/include/foafprofilesPlugin.class.php b/src/plugins/foafprofiles/include/foafprofilesPlugin.class.php
index 1a6d3c2..933bda6 100644
--- a/src/plugins/foafprofiles/include/foafprofilesPlugin.class.php
+++ b/src/plugins/foafprofiles/include/foafprofilesPlugin.class.php
@@ -31,7 +31,10 @@ class foafprofilesPlugin extends Plugin {
 	public function __construct($id=0) {
 		$this->Plugin($id) ;
 		$this->name = "foafprofiles";
-		$this->text = "User FOAF Profiles"; // To show in the tabs, use...
+		$this->text = _("User FOAF Profiles"); // To show in the tabs, use...
+		$this->pkg_desc =
+_("This plugin provides FOAF profiles for users on /users URLs 
+with content-negociation (application/rdf+xml).");
 		$this->_addHook("script_accepted_types");
 		$this->_addHook("content_negociated_user_home");
 
diff --git a/src/plugins/globalsearch/common/GlobalsearchPlugin.class.php b/src/plugins/globalsearch/common/GlobalsearchPlugin.class.php
index d77890e..db34261 100644
--- a/src/plugins/globalsearch/common/GlobalsearchPlugin.class.php
+++ b/src/plugins/globalsearch/common/GlobalsearchPlugin.class.php
@@ -27,6 +27,11 @@ class globalSearchPlugin extends Plugin {
 	function globalSearchPlugin() {
 		$this->Plugin();
 		$this->name = "globalsearch";
+		$this->text = _("Globalsearch");
+		$this->pkg_desc =
+_("This plugin contains a cross-FusionForge search engine.  You can
+declare a list of other FusionForge sites, and search for projects
+hosted on these forges from your own.");
 		$this->_addHook('site_admin_option_hook');
 		$this->_addHook('features_boxes_top');
 	}
diff --git a/src/plugins/gravatar/common/gravatarPlugin.class.php b/src/plugins/gravatar/common/gravatarPlugin.class.php
index b503d02..088ab00 100644
--- a/src/plugins/gravatar/common/gravatarPlugin.class.php
+++ b/src/plugins/gravatar/common/gravatarPlugin.class.php
@@ -28,6 +28,9 @@ class gravatarPlugin extends Plugin {
 		$this->Plugin() ;
 		$this->name = "gravatar" ;
 		$this->text = _('Gravatar Plugin');
+		$this->pkg_desc =
+_("This plugin contains the gravatar plugin of FusionForge. It allows each
+FusionForge user to have its gravatar icon displayed.");
 		$this->hooks[] = 'user_logo';
 	}
 
diff --git a/src/plugins/headermenu/common/headermenuPlugin.class.php b/src/plugins/headermenu/common/headermenuPlugin.class.php
index 8e533e3..0721d7a 100644
--- a/src/plugins/headermenu/common/headermenuPlugin.class.php
+++ b/src/plugins/headermenu/common/headermenuPlugin.class.php
@@ -30,6 +30,9 @@ class headermenuPlugin extends Plugin {
 		$this->Plugin();
 		$this->name = 'headermenu';
 		$this->text = _('Menu Tabs Manager');
+		$this->pkg_desc =
+_("This plugin allows each project to define extra tabs with arbitrary
+titles and links.");
 		$this->_addHook('headermenu');
 		$this->_addHook('site_admin_option_hook');
 		$this->_addHook('outermenu');
diff --git a/src/plugins/hudson/include/hudsonPlugin.class.php b/src/plugins/hudson/include/hudsonPlugin.class.php
index b0324e3..2b4ab8f 100644
--- a/src/plugins/hudson/include/hudsonPlugin.class.php
+++ b/src/plugins/hudson/include/hudsonPlugin.class.php
@@ -31,6 +31,10 @@ class hudsonPlugin extends Plugin {
 		$this->Plugin($id);
 		$this->name = "hudson";
 		$this->text = _('Hudson/Jenkins'); // To show in the tabs, use...
+		$this->pkg_desc =
+_("This plugin contains the Hudson subsystem of FusionForge. It allows each
+FusionForge project to have its own Hudson, and gives some
+control over it to the project's administrator.");
 		$this->_addHook("user_personal_links"); //to make a link to the user's personal part of the plugin
 		//$this->_addHook("usermenu") ;
 		$this->_addHook("groupmenu");	// To put into the project tabs
diff --git a/src/plugins/mediawiki/NAME b/src/plugins/mediawiki/NAME
index d61f2cf..a029750 100644
--- a/src/plugins/mediawiki/NAME
+++ b/src/plugins/mediawiki/NAME
@@ -1 +1 @@
-Mediawiki
+MediaWiki
diff --git a/src/plugins/mediawiki/include/mediawikiPlugin.class.php b/src/plugins/mediawiki/common/mediawikiPlugin.class.php
similarity index 98%
rename from src/plugins/mediawiki/include/mediawikiPlugin.class.php
rename to src/plugins/mediawiki/common/mediawikiPlugin.class.php
index 083bc84..7576104 100644
--- a/src/plugins/mediawiki/include/mediawikiPlugin.class.php
+++ b/src/plugins/mediawiki/common/mediawikiPlugin.class.php
@@ -37,7 +37,9 @@ class MediaWikiPlugin extends Plugin {
 	function __construct ($id=0) {
 		$this->Plugin($id) ;
 		$this->name = "mediawiki" ;
-		$this->text = "Mediawiki" ; // To show in the tabs, use...
+		$this->text = _("Mediawiki") ; // To show in the tabs, use...
+		$this->pkg_desc =
+_("This plugin allows each project to embed Mediawiki under a tab.");
 		$this->_addHook("groupmenu") ;	// To put into the project tabs
 		$this->_addHook("groupisactivecheckbox") ; // The "use ..." checkbox in editgroupinfo
 		$this->_addHook("groupisactivecheckboxpost") ; //
diff --git a/src/plugins/message/common/messagePlugin.class.php b/src/plugins/message/common/messagePlugin.class.php
index 322fe92..edff0bb 100644
--- a/src/plugins/message/common/messagePlugin.class.php
+++ b/src/plugins/message/common/messagePlugin.class.php
@@ -33,6 +33,9 @@ class messagePlugin extends Plugin {
 		$this->Plugin() ;
 		$this->name = "message" ;
 		$this->text = _('Message');
+		$this->pkg_desc =
+_("This plugin allows the site administrator to display a message banner
+on all pages, e.g. for maintenance announcements.");
 		$this->hooks[] = 'message';
 		$this->hooks[] = 'htmlhead';
 		$this->hooks[] = 'site_admin_option_hook';
diff --git a/src/plugins/moinmoin/common/MoinMoinPlugin.class.php b/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
index 1de2eb2..4649052 100644
--- a/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
+++ b/src/plugins/moinmoin/common/MoinMoinPlugin.class.php
@@ -29,7 +29,9 @@ class MoinMoinPlugin extends Plugin {
 	function MoinMoinPlugin () {
 		$this->Plugin() ;
 		$this->name = "moinmoin" ;
-		$this->text = "MoinMoinWiki" ; // To show in the tabs, use...
+		$this->text = _("MoinMoinWiki") ; // To show in the tabs, use...
+		$this->pkg_desc =
+_("This plugin allows each project to embed MoinMoinWiki under a tab.");
 		$this->hooks[] = "groupmenu" ;	// To put into the project tabs
 		$this->hooks[] = "groupisactivecheckbox" ; // The "use ..." checkbox in editgroupinfo
 		$this->hooks[] = "groupisactivecheckboxpost" ; //
diff --git a/src/plugins/projectlabels/common/ProjectLabelsPlugin.class.php b/src/plugins/projectlabels/common/ProjectLabelsPlugin.class.php
index eea3a9a..fb182a6 100644
--- a/src/plugins/projectlabels/common/ProjectLabelsPlugin.class.php
+++ b/src/plugins/projectlabels/common/ProjectLabelsPlugin.class.php
@@ -4,7 +4,10 @@ class ProjectLabelsPlugin extends Plugin {
 	function ProjectLabelsPlugin () {
 		$this->Plugin() ;
 		$this->name = "projectlabels" ;
-		$this->text = "Project labels";
+		$this->text = _("Project labels");
+		$this->pkg_desc =
+_("This can be used to highlight some projects on a forge, for instance
+for a \"project of the month\".");
 		$this->hooks[] = "project_before_widgets" ;
 		$this->hooks[] = "site_admin_option_hook" ;
 	}
diff --git a/src/plugins/scmarch/common/ArchPlugin.class.php b/src/plugins/scmarch/common/ArchPlugin.class.php
index 7ea541e..196681a 100644
--- a/src/plugins/scmarch/common/ArchPlugin.class.php
+++ b/src/plugins/scmarch/common/ArchPlugin.class.php
@@ -28,7 +28,11 @@ class ArchPlugin extends SCMPlugin {
 		global $gfconfig;
 		$this->SCMPlugin () ;
 		$this->name = 'scmarch';
-		$this->text = 'Arch';
+		$this->text = _('Arch');
+		$this->pkg_desc =
+_("This plugin contains the GNU Arch subsystem of FusionForge. It allows
+each FusionForge project to have its own Arch repository, and gives
+some control over it to the project's administrator.");
 		$this->hooks[] = 'scm_generate_snapshots' ;
 
 		$this->register () ;
diff --git a/src/plugins/scmbzr/common/BzrPlugin.class.php b/src/plugins/scmbzr/common/BzrPlugin.class.php
index f7ec3b0..9a26cc5 100644
--- a/src/plugins/scmbzr/common/BzrPlugin.class.php
+++ b/src/plugins/scmbzr/common/BzrPlugin.class.php
@@ -30,7 +30,11 @@ class BzrPlugin extends SCMPlugin {
 		global $gfconfig;
 		$this->SCMPlugin () ;
 		$this->name = 'scmbzr';
-		$this->text = 'Bazaar';
+		$this->text = _('Bazaar');
+		$this->pkg_desc =
+_("This plugin contains the Bazaar subsystem of FusionForge. It allows each
+FusionForge project to have its own Bazaar repository, and gives some control
+over it to the project's administrator.");
 		$this->hooks[] = 'scm_generate_snapshots' ;
                 $this->hooks[] = 'scm_browser_page';
                 $this->hooks[] = 'scm_update_repolist' ;
diff --git a/src/plugins/scmcvs/COPYING b/src/plugins/scmcvs/COPYING
deleted file mode 100644
index d159169..0000000
--- a/src/plugins/scmcvs/COPYING
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/src/plugins/scmcvs/common/CVSPlugin.class.php b/src/plugins/scmcvs/common/CVSPlugin.class.php
index 1834d87..9e664c1 100644
--- a/src/plugins/scmcvs/common/CVSPlugin.class.php
+++ b/src/plugins/scmcvs/common/CVSPlugin.class.php
@@ -32,7 +32,11 @@ class CVSPlugin extends SCMPlugin {
 		global $cvsdir_prefix ;
 		$this->SCMPlugin () ;
 		$this->name = 'scmcvs';
-		$this->text = 'CVS';
+		$this->text = _('CVS');
+		$this->pkg_desc =
+_("This plugin contains the CVS subsystem of FusionForge. It allows each
+FusionForge project to have its own CVS repository, and gives some control
+over it to the project's administrator.");
 		$this->hooks[] = 'scm_browser_page';
 		$this->hooks[] = 'scm_generate_snapshots' ;
 		$this->hooks[] = 'scm_gather_stats' ;
diff --git a/src/plugins/scmcvs/sbin/cvs-pserver b/src/plugins/scmcvs/sbin/cvs-pserver
old mode 100644
new mode 100755
diff --git a/src/plugins/scmdarcs/common/DarcsPlugin.class.php b/src/plugins/scmdarcs/common/DarcsPlugin.class.php
index 2cff0cd..0e13401 100644
--- a/src/plugins/scmdarcs/common/DarcsPlugin.class.php
+++ b/src/plugins/scmdarcs/common/DarcsPlugin.class.php
@@ -30,7 +30,11 @@ class DarcsPlugin extends SCMPlugin {
 		global $gfconfig;
 		$this->SCMPlugin () ;
 		$this->name = 'scmdarcs';
-		$this->text = 'Darcs';
+		$this->text = _('Darcs');
+		$this->pkg_desc =
+_("This plugin contains the Darcs subsystem of FusionForge. It allows each
+FusionForge project to have its own Darcs repository, and gives some control
+over it to the project's administrator.");
 		$this->hooks[] = 'scm_generate_snapshots' ;
 		$this->hooks[] = 'scm_update_repolist' ;
 		$this->hooks[] = 'scm_browser_page' ;
diff --git a/src/plugins/scmgit/NAME b/src/plugins/scmgit/NAME
deleted file mode 100644
index 7c89aff..0000000
--- a/src/plugins/scmgit/NAME
+++ /dev/null
@@ -1 +0,0 @@
-Git
diff --git a/src/plugins/scmgit/common/GitPlugin.class.php b/src/plugins/scmgit/common/GitPlugin.class.php
index e217858..ecf198d 100644
--- a/src/plugins/scmgit/common/GitPlugin.class.php
+++ b/src/plugins/scmgit/common/GitPlugin.class.php
@@ -39,7 +39,11 @@ class GitPlugin extends SCMPlugin {
 	function GitPlugin() {
 		$this->SCMPlugin();
 		$this->name = 'scmgit';
-		$this->text = 'Git';
+		$this->text = _('Git');
+		$this->pkg_desc =
+_("This plugin contains the Git subsystem of FusionForge. It allows each
+FusionForge project to have its own Git repository, and gives some
+control over it to the project's administrator.");
 		$this->_addHook('scm_browser_page');
 		$this->_addHook('scm_update_repolist');
 		$this->_addHook('scm_generate_snapshots');
diff --git a/src/plugins/scmhg/common/HgPlugin.class.php b/src/plugins/scmhg/common/HgPlugin.class.php
index e257322..450d1ac 100644
--- a/src/plugins/scmhg/common/HgPlugin.class.php
+++ b/src/plugins/scmhg/common/HgPlugin.class.php
@@ -30,7 +30,11 @@ class HgPlugin extends SCMPlugin {
 	function HgPlugin() {
 		$this->SCMPlugin();
 		$this->name = 'scmhg';
-		$this->text = 'Mercurial';
+		$this->text = _('Mercurial');
+		$this->pkg_desc =
+_("This plugin contains the Mercurial (Hg) subsystem of FusionForge. It
+allows each FusionForge project to have its own Mercurial repository,
+and gives some control over it to the project's administrator.");
 		$this->_addHook('scm_browser_page');
 		$this->_addHook('scm_update_repolist');
 		$this->_addHook('scm_generate_snapshots');
diff --git a/src/plugins/scmhook/common/scmhookPlugin.class.php b/src/plugins/scmhook/common/scmhookPlugin.class.php
index 38b37b4..f0d7a84 100644
--- a/src/plugins/scmhook/common/scmhookPlugin.class.php
+++ b/src/plugins/scmhook/common/scmhookPlugin.class.php
@@ -27,7 +27,11 @@ class scmhookPlugin extends Plugin {
 	function __construct() {
 		$this->Plugin();
 		$this->name = 'scmhook';
-		$this->text = 'Scmhook'; // To show in the tabs, use...
+		$this->text = _('Scmhook'); // To show in the tabs, use...
+		$this->pkg_desc =
+_("This plugin contains a set of commit hooks (e-mail notifications,
+tracker integration, conformity...) that can be enabled for each
+project independently.");
 		$this->_addHook('groupmenu');	// To put into the project tabs
 		$this->_addHook('groupisactivecheckbox'); // The "use ..." checkbox in editgroupinfo
 		$this->_addHook('groupisactivecheckboxpost'); //
diff --git a/src/plugins/scmsvn/common/SVNPlugin.class.php b/src/plugins/scmsvn/common/SVNPlugin.class.php
index f2f224d..42af7f3 100644
--- a/src/plugins/scmsvn/common/SVNPlugin.class.php
+++ b/src/plugins/scmsvn/common/SVNPlugin.class.php
@@ -41,7 +41,11 @@ class SVNPlugin extends SCMPlugin {
 	function SVNPlugin() {
 		$this->SCMPlugin();
 		$this->name = 'scmsvn';
-		$this->text = 'Subversion';
+		$this->text = _('Subversion');
+		$this->pkg_desc =
+_("This plugin contains the Subversion subsystem of FusionForge. It allows
+each FusionForge project to have its own Subversion repository, and gives
+some control over it to the project's administrator.");
 		$this->svn_root_fs = '/scmrepos/svn';
 		if (!file_exists($this->svn_root_fs.'/.')) {
 			$this->svn_root_fs = forge_get_config('repos_path',
diff --git a/src/plugins/sysauthldap/bin/install.sh b/src/plugins/sysauthldap/bin/install.sh
old mode 100644
new mode 100755
diff --git a/src/plugins/sysauthldap/bin/schema2ldif.pl b/src/plugins/sysauthldap/bin/schema2ldif.pl
old mode 100644
new mode 100755
diff --git a/src/plugins/sysauthldap/common/SysAuthLDAPPlugin.class.php b/src/plugins/sysauthldap/common/SysAuthLDAPPlugin.class.php
index 28bb891..851fa66 100644
--- a/src/plugins/sysauthldap/common/SysAuthLDAPPlugin.class.php
+++ b/src/plugins/sysauthldap/common/SysAuthLDAPPlugin.class.php
@@ -34,12 +34,17 @@ forge_define_config_item('password', 'sysauthldap', '');
 setconfigfromenv ('sysauthldap', 'ldap_password',
 			 'GForgePluginSysAuthLdapPasswd', NULL) ;
 
+require_once $gfcommon.'include/SysAuthPlugin.class.php';
+
 class SysAuthLDAPPlugin extends SysAuthPlugin {
 	function SysAuthLDAPPlugin () {
 		$this->SysAuthPlugin() ;
 		$this->name = "sysauthldap" ;
-		$this->text = "System authentication via PostgreLDAP";
-
+		$this->text = _("System authentication via PostgreLDAP");
+		$this->pkg_desc =
+_("This plugin maintains data about users, groups and memberships in an
+ LDAP directory that can be used for NSS/PAM system authentication (or
+ for other uses).");
 		$this->ldap_conn = NULL;
 		$this->user_suffix = "Users";
 		$this->group_suffix = "Projects";
diff --git a/src/bin/upgrade-db.php b/src/post-install.d/db/upgrade.php
similarity index 100%
rename from src/bin/upgrade-db.php
rename to src/post-install.d/db/upgrade.php
diff --git a/src/utils/plugin_pkg_desc.php b/src/utils/plugin_pkg_desc.php
new file mode 100644
index 0000000..f4915eb
--- /dev/null
+++ b/src/utils/plugin_pkg_desc.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * Plugin stanza for use in .deb or .rpm packages
+ *
+ * Copyright (C) 2014  Inria (Sylvain Beucler)
+ *
+ * This file is part of FusionForge. FusionForge is free software;
+ * you can redistribute it and/or modify it under the terms of the
+ * GNU General Public License as published by the Free Software
+ * Foundation; either version 2 of the Licence, or (at your option)
+ * any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with FusionForge; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+// Don't try to connect to the DB, just reading plugin metadata
+putenv('FUSIONFORGE_NO_DB=true');
+
+require (dirname(__FILE__).'/../common/include/env.inc.php');
+require_once $gfcommon.'include/pre.php';
+
+require_once dirname(__FILE__).'/../common/include/PluginManager.class.php';
+require_once dirname(__FILE__).'/../common/include/Plugin.class.php';
+require_once dirname(__FILE__).'/../common/include/SCMPlugin.class.php';
+
+if (count($argv) != 3) {
+  file_put_contents('php://stderr', "Usage: {$argv[0]} plugin_name {deb|rpm}\n");
+  exit(1);
+}
+$pluginname = $argv[1];
+$method = $argv[2];
+
+forge_reset_config_item('plugins_path', 'core', dirname(__FILE__).'/../plugins');
+$pm = plugin_manager_get_object();
+$pm->LoadPlugin($pluginname);
+$plugin = $pm->GetPluginObject($pluginname);
+if ($plugin == null) {
+  file_put_contents('php://stderr', "Couldn't load plugin $pluginname.\n");
+  exit(1);
+}
+
+$shortdesc_prefix = _("collaborative development tool");
+$desc_prefix =
+_("FusionForge provides many tools to aid collaboration in a
+development project, such as bug-tracking, task management,
+mailing-lists, SCM repository, forums, support request helper,
+web/FTP hosting, release management, etc. All these services are
+integrated into one web site and managed through a web interface.");
+
+
+if ($method == 'deb') {
+
+  $desc_prefix = implode("\n ", preg_split('/\R/', $desc_prefix));
+  $desc = implode("\n ", preg_split('/\R/', $plugin->pkg_desc));
+  echo "Description: {$shortdesc_prefix} - {$plugin->text}\n";
+  echo " $desc_prefix\n";
+  echo " .\n";
+  echo " $desc\n";
+
+} else if ($method == 'rpm') {
+
+  echo "Summary: {$shortdesc_prefix} - {$plugin->text}\n";
+  echo "%description plugin-{$plugin->name}\n";
+  echo "$desc_prefix\n";
+  echo "\n";
+  echo "{$plugin->pkg_desc}\n";
+
+}

commit d190317e5f60a2c1b5bdf0640cff60c6b6912524
Merge: bcae091 f3bc123
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Thu Aug 28 10:59:15 2014 +0200

    Merge remote-tracking branch 'origin/master' into GUM


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

Summary of changes:
 src/CHANGES                                        |    3 +
 src/GNUmakefile                                    |    2 +-
 src/common/docman/views/listfile.php               |    2 +-
 src/common/frs/actions/deletepackage.php           |   38 +-
 src/common/frs/views/admin.php                     |   25 +-
 src/common/include/PluginManager.class.php         |   15 -
 src/common/tracker/ArtifactExtraField.class.php    |    3 +-
 src/common/tracker/actions/format_csv.php          |   12 +-
 src/debian/control                                 |  310 ++++++++++++++--
 src/debian/{control => control.in}                 |  101 -----
 .../fusionforge-plugin-scmhook.lintian-overrides   |    5 +
 src/debian/gen_control.sh                          |   13 +
 src/debian/plugins                                 |   81 ++++
 src/debian/rules                                   |   14 +-
 .../admssw/common/RDFedFRSPackage.class.php        |    2 +
 .../admssw/common/RDFedFRSRelease.class.php        |    1 +
 src/plugins/admssw/include/admsswPlugin.class.php  |    6 +-
 .../{include => common}/AuthCASPlugin.class.php    |   16 +-
 .../authcas/{include => common}/authcas-init.php   |    2 +-
 .../{include => common}/AuthHTTPDPlugin.class.php  |   10 +-
 .../{include => common}/authhttpd-init.php         |    2 +-
 .../{include => common}/AuthLDAPPlugin.class.php   |   11 +-
 .../authldap/{include => common}/authldap-init.php |    2 +-
 src/plugins/blocks/common/blocksPlugin.class.php   |    4 +
 .../include/CompactPreviewPlugin.class.php         |    5 +-
 .../common/ContribTrackerPlugin.class.php          |    5 +-
 .../doaprdf/include/doaprdfPlugin.class.php        |    5 +-
 .../extsubproj/include/extsubprojPlugin.class.php  |    6 +-
 .../include/foafprofilesPlugin.class.php           |    5 +-
 .../common/GlobalsearchPlugin.class.php            |    5 +
 .../gravatar/common/gravatarPlugin.class.php       |    3 +
 .../headermenu/common/headermenuPlugin.class.php   |    3 +
 .../view/admin/viewProjectConfiguration.php        |    7 +-
 src/plugins/hudson/include/hudsonPlugin.class.php  |    4 +
 src/plugins/mantisbt/view/addIssue.php             |    5 +-
 src/plugins/mediawiki/NAME                         |    2 +-
 .../{include => common}/mediawikiPlugin.class.php  |    4 +-
 src/plugins/message/common/messagePlugin.class.php |    3 +
 .../moinmoin/common/MoinMoinPlugin.class.php       |    4 +-
 .../common/ProjectLabelsPlugin.class.php           |    5 +-
 src/plugins/scmarch/common/ArchPlugin.class.php    |    6 +-
 src/plugins/scmbzr/common/BzrPlugin.class.php      |    6 +-
 src/plugins/scmcvs/COPYING                         |  339 -----------------
 src/plugins/scmcvs/common/CVSPlugin.class.php      |    6 +-
 src/plugins/scmdarcs/common/DarcsPlugin.class.php  |    6 +-
 src/plugins/scmgit/NAME                            |    1 -
 src/plugins/scmgit/common/GitPlugin.class.php      |    6 +-
 src/plugins/scmhg/common/HgPlugin.class.php        |    6 +-
 src/plugins/scmhook/common/scmhookPlugin.class.php |    6 +-
 src/plugins/scmsvn/common/SVNPlugin.class.php      |   43 +--
 .../sysauthldap/common/SysAuthLDAPPlugin.class.php |    9 +-
 src/plugins/wiki/www/INSTALL                       |   14 +-
 src/plugins/wiki/www/README                        |    2 +-
 src/plugins/wiki/www/TODO                          |    4 -
 src/plugins/wiki/www/configurator.php              |    2 +-
 src/plugins/wiki/www/lib/EditToolbar.php           |   27 +-
 src/plugins/wiki/www/lib/PageType.php              |    2 +-
 src/plugins/wiki/www/lib/RssWriter.php             |    2 +-
 src/plugins/wiki/www/lib/RssWriter2.php            |    3 +-
 src/plugins/wiki/www/lib/WikiDB/ADODB.php          |    4 +-
 .../lib/WikiDB/adodb/adodb-active-record.inc.php   |    2 +-
 .../lib/WikiDB/adodb/adodb-active-recordx.inc.php  |    2 +-
 .../wiki/www/lib/WikiDB/adodb/adodb-csvlib.inc.php |    2 +-
 .../www/lib/WikiDB/adodb/adodb-datadict.inc.php    |    2 +-
 .../wiki/www/lib/WikiDB/adodb/adodb-error.inc.php  |    2 +-
 .../lib/WikiDB/adodb/adodb-errorhandler.inc.php    |    2 +-
 .../www/lib/WikiDB/adodb/adodb-errorpear.inc.php   |    2 +-
 .../www/lib/WikiDB/adodb/adodb-exceptions.inc.php  |    6 +-
 .../www/lib/WikiDB/adodb/adodb-iterator.inc.php    |    2 +-
 .../wiki/www/lib/WikiDB/adodb/adodb-lib.inc.php    |    2 +-
 .../lib/WikiDB/adodb/adodb-memcache.lib.inc.php    |    4 +-
 .../wiki/www/lib/WikiDB/adodb/adodb-pager.inc.php  |    2 +-
 .../wiki/www/lib/WikiDB/adodb/adodb-pear.inc.php   |    2 +-
 .../wiki/www/lib/WikiDB/adodb/adodb-perf.inc.php   |    2 +-
 .../wiki/www/lib/WikiDB/adodb/adodb-php4.inc.php   |    2 +-
 .../wiki/www/lib/WikiDB/adodb/adodb-time.inc.php   |    2 +-
 .../wiki/www/lib/WikiDB/adodb/adodb.inc.php        |   59 ++-
 .../WikiDB/adodb/datadict/datadict-access.inc.php  |    2 +-
 .../lib/WikiDB/adodb/datadict/datadict-db2.inc.php |    2 +-
 .../adodb/datadict/datadict-firebird.inc.php       |    2 +-
 .../WikiDB/adodb/datadict/datadict-generic.inc.php |    2 +-
 .../WikiDB/adodb/datadict/datadict-ibase.inc.php   |    2 +-
 .../adodb/datadict/datadict-informix.inc.php       |    2 +-
 .../WikiDB/adodb/datadict/datadict-mssql.inc.php   |    2 +-
 .../adodb/datadict/datadict-mssqlnative.inc.php    |    2 +-
 .../WikiDB/adodb/datadict/datadict-mysql.inc.php   |    2 +-
 .../WikiDB/adodb/datadict/datadict-oci8.inc.php    |    8 +-
 .../adodb/datadict/datadict-postgres.inc.php       |    2 +-
 .../WikiDB/adodb/datadict/datadict-sapdb.inc.php   |    2 +-
 .../WikiDB/adodb/datadict/datadict-sqlite.inc.php  |    2 +-
 .../WikiDB/adodb/datadict/datadict-sybase.inc.php  |    2 +-
 .../wiki/www/lib/WikiDB/adodb/docs/docs-adodb.htm  |   11 +-
 .../www/lib/WikiDB/adodb/docs/docs-datadict.htm    |    2 +-
 .../wiki/www/lib/WikiDB/adodb/docs/docs-perf.htm   |    2 +-
 .../www/lib/WikiDB/adodb/docs/docs-session.htm     |    2 +-
 .../www/lib/WikiDB/adodb/docs/docs-session.old.htm |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-access.inc.php  |    2 +-
 .../www/lib/WikiDB/adodb/drivers/adodb-ado.inc.php |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-ado5.inc.php    |    2 +-
 .../WikiDB/adodb/drivers/adodb-ado_access.inc.php  |    2 +-
 .../WikiDB/adodb/drivers/adodb-ado_mssql.inc.php   |    2 +-
 .../adodb/drivers/adodb-borland_ibase.inc.php      |    2 +-
 .../www/lib/WikiDB/adodb/drivers/adodb-csv.inc.php |    2 +-
 .../www/lib/WikiDB/adodb/drivers/adodb-db2.inc.php |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-db2oci.inc.php  |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-db2ora.inc.php  |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-fbsql.inc.php   |    2 +-
 .../WikiDB/adodb/drivers/adodb-firebird.inc.php    |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-ibase.inc.php   |    2 +-
 .../WikiDB/adodb/drivers/adodb-informix.inc.php    |    2 +-
 .../WikiDB/adodb/drivers/adodb-informix72.inc.php  |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-ldap.inc.php    |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-mssql.inc.php   |    2 +-
 .../WikiDB/adodb/drivers/adodb-mssqlnative.inc.php |   82 ++---
 .../lib/WikiDB/adodb/drivers/adodb-mssqlpo.inc.php |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-mysql.inc.php   |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-mysqli.inc.php  |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-mysqlpo.inc.php |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-mysqlt.inc.php  |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-netezza.inc.php |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-oci8.inc.php    |   49 +--
 .../lib/WikiDB/adodb/drivers/adodb-oci805.inc.php  |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-oci8po.inc.php  |    2 +-
 .../WikiDB/adodb/drivers/adodb-oci8quercus.inc.php |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-odbc.inc.php    |    2 +-
 .../WikiDB/adodb/drivers/adodb-odbc_db2.inc.php    |    2 +-
 .../WikiDB/adodb/drivers/adodb-odbc_mssql.inc.php  |    2 +-
 .../WikiDB/adodb/drivers/adodb-odbc_oracle.inc.php |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-odbtp.inc.php   |    2 +-
 .../adodb/drivers/adodb-odbtp_unicode.inc.php      |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-oracle.inc.php  |    2 +-
 .../www/lib/WikiDB/adodb/drivers/adodb-pdo.inc.php |    2 +-
 .../WikiDB/adodb/drivers/adodb-pdo_mssql.inc.php   |    2 +-
 .../WikiDB/adodb/drivers/adodb-pdo_mysql.inc.php   |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-pdo_oci.inc.php |    2 +-
 .../WikiDB/adodb/drivers/adodb-pdo_pgsql.inc.php   |    2 +-
 .../WikiDB/adodb/drivers/adodb-pdo_sqlite.inc.php  |    2 +-
 .../WikiDB/adodb/drivers/adodb-postgres.inc.php    |    2 +-
 .../WikiDB/adodb/drivers/adodb-postgres64.inc.php  |   22 +-
 .../WikiDB/adodb/drivers/adodb-postgres7.inc.php   |  260 +++++++------
 .../WikiDB/adodb/drivers/adodb-postgres8.inc.php   |    2 +-
 .../WikiDB/adodb/drivers/adodb-postgres9.inc.php   |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-proxy.inc.php   |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-sapdb.inc.php   |    2 +-
 .../WikiDB/adodb/drivers/adodb-sqlanywhere.inc.php |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-sqlite.inc.php  |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-sqlite3.inc.php |    2 +-
 .../WikiDB/adodb/drivers/adodb-sqlitepo.inc.php    |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-sybase.inc.php  |    2 +-
 .../WikiDB/adodb/drivers/adodb-sybase_ase.inc.php  |    2 +-
 .../lib/WikiDB/adodb/drivers/adodb-text.inc.php    |  387 ++++++++++++++++++++
 .../www/lib/WikiDB/adodb/drivers/adodb-vfp.inc.php |    2 +-
 .../www/lib/WikiDB/adodb/lang/adodb-ar.inc.php     |   32 ++
 .../{adodb-bgutf8.inc.php => adodb-bg.inc.php}     |    2 +-
 .../www/lib/WikiDB/adodb/lang/adodb-ca.inc.php     |   33 ++
 .../www/lib/WikiDB/adodb/lang/adodb-cn.inc.php     |   33 ++
 .../www/lib/WikiDB/adodb/lang/adodb-cz.inc.php     |   35 ++
 .../www/lib/WikiDB/adodb/lang/adodb-da.inc.php     |   12 +-
 .../www/lib/WikiDB/adodb/lang/adodb-de.inc.php     |   24 +-
 .../{adodb-esperanto.inc.php => adodb-eo.inc.php}  |   10 +-
 .../www/lib/WikiDB/adodb/lang/adodb-fr.inc.php     |   26 +-
 .../www/lib/WikiDB/adodb/lang/adodb-hu.inc.php     |   33 ++
 .../www/lib/WikiDB/adodb/lang/adodb-it.inc.php     |    2 +-
 .../www/lib/WikiDB/adodb/lang/adodb-pl.inc.php     |   34 ++
 .../www/lib/WikiDB/adodb/lang/adodb-pt-br.inc.php  |   34 ++
 .../www/lib/WikiDB/adodb/lang/adodb-ru.inc.php     |   34 ++
 .../www/lib/WikiDB/adodb/lang/adodb-sv.inc.php     |   32 ++
 .../www/lib/WikiDB/adodb/lang/adodb-th.inc.php     |   32 ++
 .../www/lib/WikiDB/adodb/lang/adodb-uk.inc.php     |   34 ++
 .../lib/WikiDB/adodb/pear/Auth/Container/ADOdb.php |    2 +-
 .../www/lib/WikiDB/adodb/perf/perf-db2.inc.php     |    2 +-
 .../lib/WikiDB/adodb/perf/perf-informix.inc.php    |    2 +-
 .../www/lib/WikiDB/adodb/perf/perf-mssql.inc.php   |    2 +-
 .../lib/WikiDB/adodb/perf/perf-mssqlnative.inc.php |    2 +-
 .../www/lib/WikiDB/adodb/perf/perf-mysql.inc.php   |    2 +-
 .../www/lib/WikiDB/adodb/perf/perf-oci8.inc.php    |    2 +-
 .../lib/WikiDB/adodb/perf/perf-postgres.inc.php    |    2 +-
 .../wiki/www/lib/WikiDB/adodb/pivottable.inc.php   |    2 +-
 .../wiki/www/lib/WikiDB/adodb/rsfilter.inc.php     |    2 +-
 src/plugins/wiki/www/lib/WikiDB/adodb/server.php   |    2 +-
 .../WikiDB/adodb/session/adodb-compress-bzip2.php  |    2 +-
 .../WikiDB/adodb/session/adodb-compress-gzip.php   |    2 +-
 .../WikiDB/adodb/session/adodb-cryptsession.php    |    2 +-
 .../WikiDB/adodb/session/adodb-cryptsession2.php   |    2 +-
 .../WikiDB/adodb/session/adodb-encrypt-mcrypt.php  |    2 +-
 .../lib/WikiDB/adodb/session/adodb-encrypt-md5.php |    2 +-
 .../WikiDB/adodb/session/adodb-encrypt-secret.php  |    2 +-
 .../WikiDB/adodb/session/adodb-session-clob.php    |    2 +-
 .../WikiDB/adodb/session/adodb-session-clob2.php   |    2 +-
 .../www/lib/WikiDB/adodb/session/adodb-session.php |    2 +-
 .../lib/WikiDB/adodb/session/adodb-session2.php    |    2 +-
 .../adodb/session/old/adodb-cryptsession.php       |    2 +-
 .../adodb/session/old/adodb-session-clob.php       |    2 +-
 .../lib/WikiDB/adodb/session/old/adodb-session.php |    2 +-
 .../wiki/www/lib/WikiDB/adodb/tests/benchmark.php  |    2 +-
 .../wiki/www/lib/WikiDB/adodb/tests/client.php     |    2 +-
 .../www/lib/WikiDB/adodb/tests/test-datadict.php   |    2 +-
 .../wiki/www/lib/WikiDB/adodb/tests/test-php5.php  |    2 +-
 .../wiki/www/lib/WikiDB/adodb/tests/test.php       |    2 +-
 .../wiki/www/lib/WikiDB/adodb/tests/test3.php      |    2 +-
 .../wiki/www/lib/WikiDB/adodb/tests/test4.php      |    2 +-
 .../wiki/www/lib/WikiDB/adodb/tests/test5.php      |    2 +-
 .../wiki/www/lib/WikiDB/adodb/tests/testcache.php  |    2 +-
 .../lib/WikiDB/adodb/tests/testdatabases.inc.php   |    2 +-
 .../wiki/www/lib/WikiDB/adodb/tests/testmssql.php  |    2 +-
 .../wiki/www/lib/WikiDB/adodb/tests/testoci8.php   |    2 +-
 .../www/lib/WikiDB/adodb/tests/testoci8cursor.php  |    2 +-
 .../wiki/www/lib/WikiDB/adodb/tests/testpaging.php |    2 +-
 .../wiki/www/lib/WikiDB/adodb/tests/testpear.php   |    2 +-
 .../www/lib/WikiDB/adodb/tests/testsessions.php    |    2 +-
 .../wiki/www/lib/WikiDB/adodb/toexport.inc.php     |    2 +-
 .../wiki/www/lib/WikiDB/adodb/tohtml.inc.php       |    2 +-
 src/plugins/wiki/www/lib/WikiDB/backend.php        |    1 -
 src/plugins/wiki/www/lib/WikiPluginCached.php      |    2 +-
 src/plugins/wiki/www/lib/editpage.php              |   23 +-
 src/plugins/wiki/www/lib/plugin/AppendText.php     |    6 +-
 src/plugins/wiki/www/lib/plugin/CreateToc.php      |    9 +-
 .../wiki/www/lib/plugin/DynamicIncludePage.php     |    2 +-
 src/plugins/wiki/www/lib/plugin/GoTo.php           |    2 +-
 src/plugins/wiki/www/lib/plugin/PageHistory.php    |    2 +-
 src/plugins/wiki/www/lib/plugin/PhotoAlbum.php     |    2 +-
 src/plugins/wiki/www/lib/plugin/RandomPage.php     |    2 +-
 src/plugins/wiki/www/lib/plugin/RateIt.php         |   15 +-
 src/plugins/wiki/www/lib/plugin/RecentChanges.php  |   15 +-
 src/plugins/wiki/www/lib/plugin/TitleSearch.php    |    2 +-
 src/plugins/wiki/www/lib/plugin/WatchPage.php      |    3 +-
 src/plugins/wiki/www/lib/plugin/WikiAdminUtils.php |    2 +-
 src/plugins/wiki/www/lib/plugin/WikiPoll.php       |    2 +-
 .../wiki/www/lib/plugin/WikiTranslation.php        |    4 +-
 src/plugins/wiki/www/locale/Makefile               |    1 -
 .../wiki/www/locale/de/LC_MESSAGES/phpwiki.mo      |  Bin 102022 -> 101769 bytes
 .../wiki/www/locale/es/LC_MESSAGES/phpwiki.mo      |  Bin 43041 -> 43041 bytes
 .../wiki/www/locale/fr/LC_MESSAGES/phpwiki.mo      |  Bin 109773 -> 109547 bytes
 .../wiki/www/locale/it/LC_MESSAGES/phpwiki.mo      |  Bin 17614 -> 17614 bytes
 .../wiki/www/locale/ja/LC_MESSAGES/phpwiki.mo      |  Bin 13868 -> 13805 bytes
 .../wiki/www/locale/nl/LC_MESSAGES/phpwiki.mo      |  Bin 8537 -> 8537 bytes
 src/plugins/wiki/www/locale/po/de.po               |   48 +--
 src/plugins/wiki/www/locale/po/es.po               |   33 +-
 src/plugins/wiki/www/locale/po/fr.po               |   46 +--
 src/plugins/wiki/www/locale/po/it.po               |   36 +-
 src/plugins/wiki/www/locale/po/ja.po               |  372 ++++++-------------
 src/plugins/wiki/www/locale/po/nl.po               |   37 +-
 src/plugins/wiki/www/locale/po/phpwiki.pot         |   23 +-
 src/plugins/wiki/www/locale/po/sv.po               |   41 +--
 src/plugins/wiki/www/locale/po/zh.po               |  371 ++++++-------------
 .../wiki/www/locale/sv/LC_MESSAGES/phpwiki.mo      |  Bin 8307 -> 8307 bytes
 .../wiki/www/locale/zh/LC_MESSAGES/phpwiki.mo      |  Bin 48556 -> 49811 bytes
 src/plugins/wiki/www/pgsrc/Help%2FCreateTocPlugin  |    4 +-
 src/plugins/wiki/www/pgsrc/Help%2FRssFeedPlugin    |    6 +-
 .../wiki/www/themes/Crao/templates/editpage.tmpl   |    9 +-
 .../wiki/www/themes/Crao/templates/wikiblog.tmpl   |    8 +-
 .../www/themes/Portland/templates/editpage.tmpl    |    9 +-
 .../www/themes/Portland/templates/viewsource.tmpl  |    6 +-
 .../www/themes/Wordpress/templates/editpage.tmpl   |    7 +-
 .../www/themes/Wordpress/templates/viewsource.tmpl |    8 +-
 .../wiki/www/themes/blog/templates/wikiblog.tmpl   |    1 -
 .../www/themes/default/templates/blogform.tmpl     |    2 +-
 .../www/themes/default/templates/categorypage.tmpl |    6 +-
 .../www/themes/default/templates/editpage.tmpl     |   33 +-
 .../www/themes/default/templates/frameset.tmpl     |    8 +-
 .../www/themes/default/templates/nochanges.tmpl    |    6 -
 .../www/themes/default/templates/userprefs.tmpl    |   12 +-
 .../www/themes/default/templates/viewsource.tmpl   |    2 +-
 .../www/themes/default/templates/wikiblog.tmpl     |    2 +-
 src/plugins/wiki/www/themes/default/toolbar.js     |   41 ++-
 .../www/themes/fusionforge/templates/editpage.tmpl |    8 +-
 .../themes/fusionforge/templates/userprefs.tmpl    |   14 +-
 .../themes/wikilens/templates/categorypage.tmpl    |   23 +-
 .../db/upgrade.php}                                |    0
 src/utils/plugin_pkg_desc.php                      |   75 ++++
 src/vendor/jquery-auto-height/jquery.browser.js    |   39 ++
 ...s => jquery.iframe-auto-height.plugin.1.9.5.js} |   30 +-
 src/www/account/change_email-complete.php          |   19 +-
 src/www/account/change_email.php                   |   47 +--
 src/www/account/change_pw.php                      |   58 +--
 src/www/account/editsshkeys.php                    |   26 +-
 src/www/account/first.php                          |   11 +-
 src/www/account/index.php                          |   55 +--
 src/www/account/pending-resend.php                 |   30 +-
 src/www/account/register.php                       |    7 +-
 src/www/account/verify.php                         |   41 +--
 src/www/admin/index.php                            |  101 +++--
 src/www/docman/scripts/DocManController.js         |   10 +-
 src/www/frs/scripts/FRSController.js               |   94 ++++-
 src/www/include/Layout.class.php                   |   32 +-
 src/www/include/filechecks.php                     |  185 ----------
 src/www/include/html.php                           |    3 +-
 src/www/include/trove.php                          |    5 +-
 288 files changed, 2661 insertions(+), 2349 deletions(-)
 copy src/debian/{control => control.in} (54%)
 create mode 100644 src/debian/fusionforge-plugin-scmhook.lintian-overrides
 create mode 100755 src/debian/gen_control.sh
 create mode 100644 src/debian/plugins
 rename src/plugins/authcas/{include => common}/AuthCASPlugin.class.php (93%)
 rename src/plugins/authcas/{include => common}/authcas-init.php (94%)
 rename src/plugins/authhttpd/{include => common}/AuthHTTPDPlugin.class.php (91%)
 rename src/plugins/authhttpd/{include => common}/authhttpd-init.php (93%)
 rename src/plugins/authldap/{include => common}/AuthLDAPPlugin.class.php (96%)
 rename src/plugins/authldap/{include => common}/authldap-init.php (94%)
 rename src/plugins/mediawiki/{include => common}/mediawikiPlugin.class.php (98%)
 delete mode 100644 src/plugins/scmcvs/COPYING
 mode change 100644 => 100755 src/plugins/scmcvs/sbin/cvs-pserver
 delete mode 100644 src/plugins/scmgit/NAME
 mode change 100644 => 100755 src/plugins/sysauthldap/bin/install.sh
 mode change 100644 => 100755 src/plugins/sysauthldap/bin/schema2ldif.pl
 create mode 100644 src/plugins/wiki/www/lib/WikiDB/adodb/drivers/adodb-text.inc.php
 create mode 100644 src/plugins/wiki/www/lib/WikiDB/adodb/lang/adodb-ar.inc.php
 rename src/plugins/wiki/www/lib/WikiDB/adodb/lang/{adodb-bgutf8.inc.php => adodb-bg.inc.php} (97%)
 create mode 100644 src/plugins/wiki/www/lib/WikiDB/adodb/lang/adodb-ca.inc.php
 create mode 100644 src/plugins/wiki/www/lib/WikiDB/adodb/lang/adodb-cn.inc.php
 create mode 100644 src/plugins/wiki/www/lib/WikiDB/adodb/lang/adodb-cz.inc.php
 rename src/plugins/wiki/www/lib/WikiDB/adodb/lang/{adodb-esperanto.inc.php => adodb-eo.inc.php} (85%)
 create mode 100644 src/plugins/wiki/www/lib/WikiDB/adodb/lang/adodb-hu.inc.php
 create mode 100644 src/plugins/wiki/www/lib/WikiDB/adodb/lang/adodb-pl.inc.php
 create mode 100644 src/plugins/wiki/www/lib/WikiDB/adodb/lang/adodb-pt-br.inc.php
 create mode 100644 src/plugins/wiki/www/lib/WikiDB/adodb/lang/adodb-ru.inc.php
 create mode 100644 src/plugins/wiki/www/lib/WikiDB/adodb/lang/adodb-sv.inc.php
 create mode 100644 src/plugins/wiki/www/lib/WikiDB/adodb/lang/adodb-th.inc.php
 create mode 100644 src/plugins/wiki/www/lib/WikiDB/adodb/lang/adodb-uk.inc.php
 delete mode 100644 src/plugins/wiki/www/themes/default/templates/nochanges.tmpl
 rename src/{bin/upgrade-db.php => post-install.d/db/upgrade.php} (100%)
 create mode 100644 src/utils/plugin_pkg_desc.php
 create mode 100644 src/vendor/jquery-auto-height/jquery.browser.js
 rename src/vendor/jquery-auto-height/{jquery.iframe-auto-height.plugin.1.9.3.js => jquery.iframe-auto-height.plugin.1.9.5.js} (90%)
 delete mode 100644 src/www/include/filechecks.php


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list