[Fusionforge-commits] FusionForge branch Branch_5_3 updated. 1a91c6725f3699bf87a082fb1bb69b5216dee030

Sylvain Beucler beuc-inria at fusionforge.org
Mon Mar 17 22:11:52 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  1a91c6725f3699bf87a082fb1bb69b5216dee030 (commit)
       via  7ed44edf0a2f48d9eb826c2750cb6b15fdf3144f (commit)
      from  fbe99ab432b1a71b1a6a00e21354a3ddcfa4a30a (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 1a91c6725f3699bf87a082fb1bb69b5216dee030
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Mon Mar 17 22:08:49 2014 +0100

    packaging: scmsvn: make web-apache2 dependency optional, so they can be installed on separate machines

diff --git a/src/plugins/scmsvn/packaging/control/131plugin-scmsvn b/src/plugins/scmsvn/packaging/control/131plugin-scmsvn
index 56d29f4..1f56f1e 100644
--- a/src/plugins/scmsvn/packaging/control/131plugin-scmsvn
+++ b/src/plugins/scmsvn/packaging/control/131plugin-scmsvn
@@ -1,7 +1,7 @@
 Package: @PACKAGE at -plugin-scmsvn
 Architecture: all
-Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 | @OLDPACKAGE at -web, @OLDPACKAGE at -shell-postgresql | @OLDPACKAGE at -shell, subversion, subversion-tools, python-subversion, python (>= 2.3), php5-cli, openbsd-inetd | inet-superserver, update-inetd, ${misc:Depends}
-Recommends: libapache2-svn
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -shell-postgresql | @OLDPACKAGE at -shell, subversion, subversion-tools, python-subversion, python (>= 2.3), php5-cli, openbsd-inetd | inet-superserver, update-inetd, ${misc:Depends}
+Recommends: libapache2-svn, @OLDPACKAGE at -web-apache2 | @OLDPACKAGE at -web
 Provides: @PACKAGE at -plugin-scm, @OLDPACKAGE at -plugin-scmsvn
 Conflicts: @OLDPACKAGE at -plugin-scmsvn
 Replaces: @OLDPACKAGE at -plugin-scmsvn

commit 7ed44edf0a2f48d9eb826c2750cb6b15fdf3144f
Author: Sylvain Beucler <beuc at beuc.net>
Date:   Mon Mar 17 22:05:53 2014 +0100

    Move register-plugin/unregister-plugin from db-postgresql to common, to use in with db-remote

diff --git a/src/packaging/install/common b/src/packaging/install/common
index 3e479fb..af8a952 100644
--- a/src/packaging/install/common
+++ b/src/packaging/install/common
@@ -13,6 +13,9 @@ utils/forge_run_job                    @BINARY_PATH@/
 utils/forge_run_plugin_job             @BINARY_PATH@/
 utils/migrate-to-ini-files.sh	       @BINARY_PATH@/
 #
+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/
diff --git a/src/packaging/install/db-postgresql b/src/packaging/install/db-postgresql
index 2fbe422..c639670 100644
--- a/src/packaging/install/db-postgresql
+++ b/src/packaging/install/db-postgresql
@@ -34,9 +34,6 @@ deb-specific/sf-add-skill               @BINARY_PATH@/
 deb-specific/register-theme             @BINARY_PATH@/
 deb-specific/unregister-theme           @BINARY_PATH@/
 #
-deb-specific/register-plugin            @BINARY_PATH@/
-deb-specific/unregister-plugin          @BINARY_PATH@/
-#
 deb-specific/view_bug.sql               @SOURCE_PATH@/db/
 deb-specific/view_patch.sql             @SOURCE_PATH@/db/
 #

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

Summary of changes:
 src/packaging/install/common                          |    3 +++
 src/packaging/install/db-postgresql                   |    3 ---
 src/plugins/scmsvn/packaging/control/131plugin-scmsvn |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list