[Fusionforge-commits] FusionForge branch Branch_5_2 updated. 57da5ee7198fc20ab5901db9e0c091c4a93d20a5

Roland Mas lolando at fusionforge.org
Thu Jul 18 11:48:45 CEST 2013


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_2 has been updated
       via  57da5ee7198fc20ab5901db9e0c091c4a93d20a5 (commit)
      from  bde056003fdcbf3e33fdff083bebe537506e1307 (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 57da5ee7198fc20ab5901db9e0c091c4a93d20a5
Author: Roland Mas <lolando at debian.org>
Date:   Thu Jul 18 11:48:38 2013 +0200

    Removed file conflict between fusionforge-plugin-blocks and gforge-common

diff --git a/src/plugins/blocks/packaging/dirs/plugin-blocks b/src/plugins/blocks/packaging/dirs/plugin-blocks
index d154fbc..885b6c3 100644
--- a/src/plugins/blocks/packaging/dirs/plugin-blocks
+++ b/src/plugins/blocks/packaging/dirs/plugin-blocks
@@ -1,5 +1,4 @@
 etc/gforge/plugins/blocks
-etc/gforge/config.ini.d
-usr/share/gforge/plugins/blocks
-usr/share/gforge/plugins/blocks/common
-usr/share/gforge/plugins/blocks/www
+usr/share/@OLDPACKAGE@/plugins/blocks
+usr/share/@OLDPACKAGE@/plugins/blocks/common
+usr/share/@OLDPACKAGE@/plugins/blocks/www
diff --git a/src/plugins/blocks/packaging/links/plugin-blocks b/src/plugins/blocks/packaging/links/plugin-blocks
index 2a4d448..55765db 100644
--- a/src/plugins/blocks/packaging/links/plugin-blocks
+++ b/src/plugins/blocks/packaging/links/plugin-blocks
@@ -1 +1,2 @@
 /usr/share/@OLDPACKAGE@/plugins/blocks/www /usr/share/@OLDPACKAGE@/www/plugins/blocks
+/etc/@PACKAGE@/config.ini.d /etc/@OLDPACKAGE@/config.ini.d

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

Summary of changes:
 src/plugins/blocks/packaging/dirs/plugin-blocks  |    7 +++----
 src/plugins/blocks/packaging/links/plugin-blocks |    1 +
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list