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  c4cd6db02e6d52acca114c3be01167e3154fad7e (commit)
       via  262977ef59d3719d85032e387110c3df867b0a4a (commit)
       via  a8dcae8712243cf0a3f6659199b15fc53498cf13 (commit)
       via  db05b619eb0a9e88dec47b6b920e40a3e0634f7c (commit)
       via  39dcd34072638ddcc528ea2c0786ea7ce66d3573 (commit)
       via  f9ee94d9cceb91615246cc2a1e02b0da9d4579c6 (commit)
       via  90c627a1e5534b7c352d41c1a2f6ca2de544db7b (commit)
      from  c2c575b09d2137f68012c8c090995b3fbdd7e345 (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=c4cd6db02e6d52acca114c3be01167e3154fad7e

commit c4cd6db02e6d52acca114c3be01167e3154fad7e
Merge: c2c575b 262977e
Author: Roland Mas <[email protected]>
Date:   Fri Apr 22 15:50:51 2016 +0200

    Merge branch '6.0'

diff --cc src/debian/changelog
index 5b2dd1f,2b852ff..d97b0bb
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@@ -1,14 -1,39 +1,45 @@@
 +fusionforge (6.0.50-0) UNRELEASED; urgency=medium
 +
 +  * New snapshot from master branch.
 +
 + -- Roland Mas <[email protected]>  Wed, 24 Jun 2015 11:32:26 +0200
 +
- fusionforge (6.0.3+20160419-0) UNRELEASED; urgency=medium
- 
+ fusionforge (6.0.4-1+) UNRELEASED; urgency=medium
+ 
+   * More packaging fixes for php7.0:
+   * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+     #821486).
+   * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+     #821487).
+   * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+     #821488).
+   * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+     #821489).
+   * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+     #821490).
+   * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+     #821491).
+   * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+     #821492).
+   * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+     #821493).
+   * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+     #821494).
+   * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+     #821495).
+   * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+     #821496).
+   * Bug fix: "PHP 7.0 Transition", thanks to Ondřej Surý (Closes:
+     #821497).
+ 
+  -- Roland Mas <[email protected]>  Fri, 22 Apr 2016 15:01:03 +0200
+ 
+ fusionforge (6.0.4-1) unstable; urgency=medium
+ 
+   * New upstream release.
    * Update packaging to work with php7.0 (not only php5).
  
-  -- Roland Mas <[email protected]>  Tue, 19 Apr 2016 10:01:27 +0200
+  -- Roland Mas <[email protected]>  Fri, 22 Apr 2016 13:49:15 +0200
  
  fusionforge (6.0.3+20151023-1) unstable; urgency=medium
  

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

Summary of changes:
 src/CHANGES                               |    2 +
 src/common/include/env.inc.php            |    1 +
 src/debian/changelog                      |   35 +-
 src/debian/plugins                        |   14 +-
 src/etc/httpd.conf.d/disable-scripts.inc  |    5 +
 src/locale/fusionforge.pot                | 1432 +++++++++++++++--------------
 src/post-install.d/common/plugin.sh       |    2 +-
 src/post-install.d/common/service.inc     |    2 +-
 src/post-install.d/common/systasksd.sh    |    2 +-
 src/post-install.d/db/populate.sh         |    2 +-
 src/post-install.d/db/server.sh           |    2 +-
 src/post-install.d/mta-exim4/mta-exim4.sh |    2 +-
 src/post-install.d/shell/shell.sh         |    2 +-
 src/post-install.d/web/web.sh             |    4 +-
 14 files changed, 785 insertions(+), 722 deletions(-)


hooks/post-receive
-- 
FusionForge

_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits

Reply via email to