[Fusionforge-commits] FusionForge branch master updated. v6.0.2-215-g7a57284

Sylvain Beucler beuc-inria at libremir.placard.fr.eu.org
Tue Sep 8 18:09:14 CEST 2015


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, master has been updated
       via  7a572843971d5ec6f61fe1ce1b4b64defc4a452f (commit)
       via  7f6eacf23bef06b59b78449adb02daa7b1fe2ba3 (commit)
       via  e41f2800f279a3a91c1772a07f5d3ccbff1b8aea (commit)
       via  23b2744afa7449331e41dd7b782a8d918c1d2d36 (commit)
       via  6029573fc4fd53d4176817dd62270c49cdcf0c2c (commit)
       via  1057fd6e7a381120fc1fb862c81205cfa095f5fe (commit)
       via  a82ce44786c4b53847312af3628198a568865138 (commit)
       via  5830b32125b26b43857f904163b1db7e69bcc818 (commit)
       via  331eeee98a1c9fd2db43909d20a58bafe65c7de1 (commit)
       via  8d4295cc623ff51f45e35dd648ada31885384a5f (commit)
      from  633d00be08a7097254b2f64c219200369ec36eec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=7a572843971d5ec6f61fe1ce1b4b64defc4a452f

commit 7a572843971d5ec6f61fe1ce1b4b64defc4a452f
Merge: 633d00b 7f6eacf
Author: Sylvain Beucler <sylvain.beucler at inria.fr>
Date:   Tue Sep 8 18:09:00 2015 +0200

    Merge branch '6.0'

diff --cc src/debian/changelog
index 81dad5e,111f7bc..d075be8
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@@ -1,9 -1,12 +1,18 @@@
 +fusionforge (6.0.50-0) UNRELEASED; urgency=medium
 +
 +  * New snapshot from master branch.
 +
 + -- Roland Mas <lolando at debian.org>  Wed, 24 Jun 2015 11:32:26 +0200
 +
+ fusionforge (6.0.2+20150908-1) unstable; urgency=medium
+ 
+   * New upstream snapshot following the 6.0 stable branch
+   * fusionforge-web: add dependency to 'openssl' for the hypothetical case
+     somebody installs fusionforge without postgresql, postfix nor unoconv
+     (closes: #798363)
+ 
+  -- Sylvain Beucler <beuc at debian.org>  Tue, 08 Sep 2015 16:50:55 +0200
+ 
  fusionforge (6.0.2+20150901-1) unstable; urgency=medium
  
    * New upstream snapshot following the 6.0 stable branch

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

Summary of changes:
 autoinstall/install-gui.sh                               | 16 ++++++++++++----
 src/debian/changelog                                     |  9 +++++++++
 src/debian/control.in                                    |  2 +-
 src/rpm/fusionforge.spec.in                              |  2 +-
 .../upgrade-conf.sh => tests/code_and_unit_tests.sh      | 15 +++++++--------
 tests/func/fixtures.sh                                   | 15 +++++++++------
 tests/func/fixtures/projecta.php                         |  4 ++++
 tests/func_tests.sh                                      |  5 +++--
 vm/packer/file/Desktop/build-and-install.desktop         |  0
 vm/packer/file/Desktop/run-testsuite.desktop             |  2 +-
 vm/packer/fusionforge-dev-centos.json                    | 15 ++++++++++-----
 vm/packer/scripts/cleanup-centos.sh                      |  4 ----
 12 files changed, 57 insertions(+), 32 deletions(-)
 copy src/post-install.d/shell/upgrade-conf.sh => tests/code_and_unit_tests.sh (73%)
 mode change 100644 => 100755 vm/packer/file/Desktop/build-and-install.desktop
 mode change 100644 => 100755 vm/packer/file/Desktop/run-testsuite.desktop


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list