[Fusionforge-commits] FusionForge branch Branch_5_3 updated. v5.3-rc4-3-gd6e2dd6

Sylvain Beucler beuc-inria at fusionforge.org
Sun Mar 23 16:32:53 CET 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, Branch_5_3 has been updated
       via  d6e2dd66a78e2e9e4f8105edcd25906c174a3f0b (commit)
       via  b022f26c806971ff477889cb4d30c85e4c9908b4 (commit)
      from  4e4f59e8aa574bc52c86119d96070e430d449edc (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 d6e2dd66a78e2e9e4f8105edcd25906c174a3f0b
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Sun Mar 23 16:15:03 2014 +0100

    Update cronjobs packaged install

diff --git a/src/packaging/install/common b/src/packaging/install/common
index 714ed97..89ccf47 100644
--- a/src/packaging/install/common
+++ b/src/packaging/install/common
@@ -19,8 +19,8 @@ deb-specific/sqlhelper.pm              @SOURCE_PATH@/lib/
 deb-specific/register-plugin           @BINARY_PATH@/
 deb-specific/unregister-plugin         @BINARY_PATH@/
 #
-deb-specific/user_dump_update.pl       @BINARY_PATH@/
-deb-specific/ssh_dump_update.pl        @BINARY_PATH@/
+#deb-specific/user_dump_update.pl       @BINARY_PATH@/
+#deb-specific/ssh_dump_update.pl        @BINARY_PATH@/
 deb-specific/mailfwd_update.pl         @BINARY_PATH@/
 #
 deb-specific/update-user-group-ssh.sh  @BINARY_PATH@/
@@ -29,7 +29,6 @@ common                                 @SOURCE_PATH@/
 cronjobs/create_scm_repos.php          @SOURCE_PATH@/cronjobs/
 cronjobs/gather_scm_stats.php          @SOURCE_PATH@/cronjobs/
 cronjobs/generate_scm_snapshots.php    @SOURCE_PATH@/cronjobs/
-cronjobs/homedirs.php                  @SOURCE_PATH@/cronjobs/
 utils/default_page.php                 @SOURCE_PATH@/utils/
 locales/*                              usr/share/locale/
 #
diff --git a/src/packaging/install/shell-postgresql b/src/packaging/install/shell-postgresql
index 93fedf7..cc2e7eb 100644
--- a/src/packaging/install/shell-postgresql
+++ b/src/packaging/install/shell-postgresql
@@ -1,2 +1,4 @@
 deb-specific/fusionforge.rsyslog etc/rsyslog.d/
-utils/install-nsspgsql.sh @BINARY_PATH@/
+utils/install-nsspgsql.sh        @BINARY_PATH@/
+cronjobs/homedirs.php            @SOURCE_PATH@/cronjobs/
+cronjobs/ssh_create.php          @SOURCE_PATH@/cronjobs/
diff --git a/src/packaging/install/web-apache2-vhosts b/src/packaging/install/web-apache2-vhosts
index 3bfeba4..36eb56e 100644
--- a/src/packaging/install/web-apache2-vhosts
+++ b/src/packaging/install/web-apache2-vhosts
@@ -1,3 +1,4 @@
 deb-specific/create-vhosts.sh       @BINARY_PATH@/
 deb-specific/prepare-vhosts-file.pl @BINARY_PATH@/
+cronjobs/create_vhosts.php          @SOURCE_PATH@/cronjobs/
 etc/templates/httpd.vhosts          @CONFIG_PATH@/templates/

commit b022f26c806971ff477889cb4d30c85e4c9908b4
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Sun Mar 23 15:31:00 2014 +0100

    Sync packaging with the Debian branch

diff --git a/src/packaging/control/000source b/src/packaging/control/000source
index 0945644..1e130fd 100644
--- a/src/packaging/control/000source
+++ b/src/packaging/control/000source
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Roland Mas <lolando at debian.org>
 Uploaders: Christian Bayle <bayle at debian.org>, Olivier Berger <obergix at debian.org>
 Build-Depends-Indep: sharutils, docbook-to-man, devscripts, gettext, isoquery, iso-codes
-Build-Depends: debhelper (>= 7), quilt (>= 0.40), perl, confget
+Build-Depends: debhelper (>= 7), quilt (>= 0.40), perl, confget, moreutils
 Standards-Version: 3.9.4
 Homepage: https://fusionforge.org/
 Vcs-Bzr: https://fusionforge.org/anonscm/bzr/deb-packaging/unstable/
diff --git a/src/packaging/control/012meta-full b/src/packaging/control/012meta-full
index 9b2f39d..0771117 100644
--- a/src/packaging/control/012meta-full
+++ b/src/packaging/control/012meta-full
@@ -3,5 +3,5 @@ Architecture: all
 Conflicts: sourceforge, @OLDPACKAGE at -cvs, @OLDPACKAGE at -common (<< ${source:Version}), @OLDPACKAGE@
 Replaces: @OLDPACKAGE@
 Provides: @OLDPACKAGE@
-Depends: debconf (>= 1.0.32) | debconf-2.0, ucf, @OLDPACKAGE at -common (=${source:Version}), @OLDPACKAGE at -web-apache2 | @OLDPACKAGE at -web, @OLDPACKAGE at -web-apache2-vhosts, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -mta-exim4 | @OLDPACKAGE at -mta, @OLDPACKAGE at -shell-postgresql | @OLDPACKAGE at -shell, @OLDPACKAGE at -lists-mailman | @OLDPACKAGE at -lists, @PACKAGE at -plugin-contribtracker, @PACKAGE at -plugin-extratabs, @PACKAGE at -plugin-globalsearch, @PACKAGE at -plugin-mediawiki, @PACKAGE at -plugin-moinmoin, @PACKAGE at -plugin-projectlabels, @PACKAGE at -plugin-scmarch, @PACKAGE at -plugin-scmbzr, @PACKAGE at -plugin-scmcvs, @PACKAGE at -plugin-scmdarcs, @PACKAGE at -plugin-scmgit, @PACKAGE at -plugin-scmhg, @PACKAGE at -plugin-scmsvn, @PACKAGE at -plugin-blocks, @PACKAGE at -plugin-hudson, ${misc:Depends}
+Depends: debconf (>= 1.0.32) | debconf-2.0, ucf, @OLDPACKAGE at -common (=${source:Version}), @OLDPACKAGE at -web-apache2 | @OLDPACKAGE at -web, @OLDPACKAGE at -web-apache2-vhosts, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -mta-exim4 | @OLDPACKAGE at -mta, @OLDPACKAGE at -shell-postgresql | @OLDPACKAGE at -shell, @OLDPACKAGE at -lists-mailman | @OLDPACKAGE at -lists, @PACKAGE at -plugin-contribtracker, @PACKAGE at -plugin-headermenu, @PACKAGE at -plugin-globalsearch, @PACKAGE at -plugin-mediawiki, @PACKAGE at -plugin-moinmoin, @PACKAGE at -plugin-projectlabels, @PACKAGE at -plugin-scmarch, @PACKAGE at -plugin-scmbzr, @PACKAGE at -plugin-scmcvs, @PACKAGE at -plugin-scmdarcs, @PACKAGE at -plugin-scmgit, @PACKAGE at -plugin-scmhg, @PACKAGE at -plugin-scmsvn, @PACKAGE at -plugin-blocks, @PACKAGE at -plugin-hudson, ${misc:Depends}
 Description: FusionForge collaborative development tool - full metapackage
diff --git a/src/packaging/control/120lists-mailman b/src/packaging/control/120lists-mailman
index fc333fc..c6a41fc 100644
--- a/src/packaging/control/120lists-mailman
+++ b/src/packaging/control/120lists-mailman
@@ -1,6 +1,6 @@
 Package: @OLDPACKAGE at -lists-mailman
 Architecture: all
-Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -mta-exim4 | @OLDPACKAGE at -mta, apache2 (>= 2.0.52), perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, mailman (>= 2.1-3), ${misc:Depends}
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -mta-exim4 | @OLDPACKAGE at -mta, apache2 (>= 2.0.52), perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, mailman (>= 2.1-3), php5-cli, ${misc:Depends}
 Provides: @OLDPACKAGE at -lists
 Conflicts: @OLDPACKAGE at -lists
 Description: collaborative development tool - mailing-lists (using Mailman)
diff --git a/src/packaging/control/999transitional b/src/packaging/control/999transitional
index 785738d..5533e8b 100644
--- a/src/packaging/control/999transitional
+++ b/src/packaging/control/999transitional
@@ -2,8 +2,8 @@ Package: @OLDPACKAGE at -plugin-extratabs
 Architecture: all
 Section: oldlibs
 Priority: extra
-Depends: @PACKAGE at -plugin-extratabs, ${misc:Depends}
-Description: Extratabs plugin for FusionForge (transitional package)
+Depends: @PACKAGE at -plugin-headermenu, ${misc:Depends}
+Description: Headermenu plugin for FusionForge (transitional package)
  This package is only present for transitional purposes and can be
  safely removed.
 
diff --git a/src/packaging/install/common b/src/packaging/install/common
index ef3e57c..714ed97 100644
--- a/src/packaging/install/common
+++ b/src/packaging/install/common
@@ -20,8 +20,6 @@ deb-specific/register-plugin           @BINARY_PATH@/
 deb-specific/unregister-plugin         @BINARY_PATH@/
 #
 deb-specific/user_dump_update.pl       @BINARY_PATH@/
-deb-specific/group_dump_update.pl      @BINARY_PATH@/
-#cronjobs/cvs-cron/default_page.php    @SOURCE_PATH@/cronjobs/
 deb-specific/ssh_dump_update.pl        @BINARY_PATH@/
 deb-specific/mailfwd_update.pl         @BINARY_PATH@/
 #
@@ -31,6 +29,8 @@ common                                 @SOURCE_PATH@/
 cronjobs/create_scm_repos.php          @SOURCE_PATH@/cronjobs/
 cronjobs/gather_scm_stats.php          @SOURCE_PATH@/cronjobs/
 cronjobs/generate_scm_snapshots.php    @SOURCE_PATH@/cronjobs/
+cronjobs/homedirs.php                  @SOURCE_PATH@/cronjobs/
+utils/default_page.php                 @SOURCE_PATH@/utils/
 locales/*                              usr/share/locale/
 #
 plugins/authbuiltin/common          @PLUGIN_PATH@/authbuiltin/
diff --git a/src/packaging/install/web-apache2 b/src/packaging/install/web-apache2
index bf66bf0..56a4c1f 100644
--- a/src/packaging/install/web-apache2
+++ b/src/packaging/install/web-apache2
@@ -4,4 +4,4 @@ utils/install-apache.sh             @BINARY_PATH@/
 utils/manage-apache-config.sh	    @BINARY_PATH@/
 etc/httpd.conf.d-fhs		    @SOURCE_PATH@/etc/
 etc/httpd.conf-fhs		    @SOURCE_PATH@/etc/
-lib/vendor			    @SOURCE_PATH@/lib/
+vendor		    	    	    @SOURCE_PATH@/
diff --git a/src/packaging/links/web-apache2 b/src/packaging/links/web-apache2
index 352a47f..d3c7fb3 100644
--- a/src/packaging/links/web-apache2
+++ b/src/packaging/links/web-apache2
@@ -1,15 +1 @@
 @SOURCE_PATH@/www/env.inc.php @PLUGIN_PATH@/env.inc.php
-usr/share/javascript/yui @SOURCE_PATH@/www/scripts/yui
-usr/share/javascript/prototype @SOURCE_PATH@/www/scripts/prototype
-usr/share/javascript/scriptaculous @SOURCE_PATH@/www/scripts/scriptaculous
-usr/share/javascript/jquery @SOURCE_PATH@/www/scripts/jquery
-usr/share/javascript/jquery-tipsy @SOURCE_PATH@/www/scripts/jquery-tipsy
-usr/share/javascript/jquery-ui @SOURCE_PATH@/www/scripts/jquery-ui
-usr/share/javascript/jquery-ui-themes @SOURCE_PATH@/www/scripts/jquery-ui-themes
-usr/share/javascript/yui @SOURCE_PATH@/vendor/yui
-usr/share/javascript/prototype @SOURCE_PATH@/vendor/prototype
-usr/share/javascript/scriptaculous @SOURCE_PATH@/vendor/scriptaculous
-usr/share/javascript/jquery @SOURCE_PATH@/vendor/jquery
-usr/share/javascript/jquery-tipsy @SOURCE_PATH@/vendor/jquery-tipsy
-usr/share/javascript/jquery-ui @SOURCE_PATH@/vendor/jquery-ui
-usr/share/javascript/jquery-ui-themes @SOURCE_PATH@/vendor/jquery-ui-themes

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

Summary of changes:
 src/packaging/control/000source          |    2 +-
 src/packaging/control/012meta-full       |    2 +-
 src/packaging/control/120lists-mailman   |    2 +-
 src/packaging/control/999transitional    |    4 ++--
 src/packaging/install/common             |    7 +++----
 src/packaging/install/shell-postgresql   |    4 +++-
 src/packaging/install/web-apache2        |    2 +-
 src/packaging/install/web-apache2-vhosts |    1 +
 src/packaging/links/web-apache2          |   14 --------------
 9 files changed, 13 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list