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 86410c442e1aeeb2aeb7332606a13f23c7cb4527 (commit)
via 12f2a4aab7acfd9a952b44acf79b28065f59415a (commit)
via b6a6610cc3b39c25c206f373ba095cffe95de898 (commit)
via 7a0f12269a0f7f1415ddd64dd0d6592b4a2f43f9 (commit)
from f11d48048f0cfca9d855cc97725cccd48b306624 (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 86410c442e1aeeb2aeb7332606a13f23c7cb4527
Merge: f11d480 12f2a4a
Author: Roland Mas <[email protected]>
Date: Fri May 29 14:39:27 2015 +0200
Merge branch '6.0'
-----------------------------------------------------------------------
Summary of changes:
src/CHANGES | 2 +-
src/VERSION | 2 +-
src/debian/changelog | 6 ++++++
src/locale/fusionforge.pot | 14 +++++++-------
src/rpm/fusionforge.spec.in | 6 +++---
5 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/CHANGES b/src/CHANGES
index 4747d28..0b44099 100644
--- a/src/CHANGES
+++ b/src/CHANGES
@@ -1,4 +1,4 @@
-FusionForge 6.0rc4:
+FusionForge 6.0:
* New install system [#710] (Inria)
* Reactivity: system replication is now performed immediately (rather than
waiting for cron jobs) [#147] (Inria)
* SCM: Concurrent SSH and HTTPS access, relying on Apache mod_itk [#519]
(Roland Mas and Inria)
diff --git a/src/VERSION b/src/VERSION
index 031062d..e0ea36f 100644
--- a/src/VERSION
+++ b/src/VERSION
@@ -1 +1 @@
-6.0rc4
+6.0
diff --git a/src/debian/changelog b/src/debian/changelog
index b0cf20e..49c4e3b 100644
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@ -1,3 +1,9 @@
+fusionforge (6.0-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Roland Mas <[email protected]> Fri, 29 May 2015 14:22:29 +0200
+
fusionforge (6.0~rc4-1) unstable; urgency=high
[ Sylvain Beucler ]
diff --git a/src/locale/fusionforge.pot b/src/locale/fusionforge.pot
index e1b5adc..5303e86 100644
--- a/src/locale/fusionforge.pot
+++ b/src/locale/fusionforge.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-28 11:39+0200\n"
+"POT-Creation-Date: 2015-05-29 13:52+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -1470,8 +1470,8 @@ msgstr ""
#: plugins/authbuiltin/common/AuthBuiltinPlugin.class.php:73
#: plugins/authbuiltin/common/AuthBuiltinPlugin.class.php:75
#: plugins/authbuiltin/common/AuthBuiltinPlugin.class.php:79
-#: plugins/authldap/common/AuthLDAPPlugin.class.php:214
-#: plugins/authldap/common/AuthLDAPPlugin.class.php:216
+#: plugins/authldap/common/AuthLDAPPlugin.class.php:215
+#: plugins/authldap/common/AuthLDAPPlugin.class.php:217
#: plugins/blocks/common/blocks_Widget_ProjectSummary.class.php:55
#: plugins/blocks/common/blocks_Widget_ProjectSummary.class.php:57
#: plugins/contribtracker/www/global_admin.php:379
@@ -5582,7 +5582,7 @@ msgstr ""
#: common/include/user_profile.php:85
#: plugins/authbuiltin/common/AuthBuiltinPlugin.class.php:75
-#: plugins/authldap/common/AuthLDAPPlugin.class.php:214
+#: plugins/authldap/common/AuthLDAPPlugin.class.php:215
#: www/account/index.php:146 www/account/lostpw.php:89
msgid "Login Name"
msgstr ""
@@ -9343,7 +9343,7 @@ msgstr ""
#: plugins/authbuiltin/common/AuthBuiltinPlugin.class.php:67
#: plugins/authcas/common/AuthCASPlugin.class.php:92
#: plugins/authhttpd/common/AuthHTTPDPlugin.class.php:65
-#: plugins/authldap/common/AuthLDAPPlugin.class.php:210
+#: plugins/authldap/common/AuthLDAPPlugin.class.php:211
#: plugins/authopenid/include/AuthOpenIDPlugin.class.php:78
#: plugins/authwebid/include/AuthWebIDPlugin.class.php:103
msgid "Cookies must be enabled past this point."
@@ -9355,13 +9355,13 @@ msgid "Login name or email address"
msgstr ""
#: plugins/authbuiltin/common/AuthBuiltinPlugin.class.php:79
-#: plugins/authldap/common/AuthLDAPPlugin.class.php:216
+#: plugins/authldap/common/AuthLDAPPlugin.class.php:217
#: www/account/verify.php:80
msgid "Password"
msgstr ""
#: plugins/authbuiltin/common/AuthBuiltinPlugin.class.php:82
-#: plugins/authldap/common/AuthLDAPPlugin.class.php:218
+#: plugins/authldap/common/AuthLDAPPlugin.class.php:219
#: www/account/verify.php:83 www/admin/userlist.php:81
#: www/include/login-form.php:64
msgid "Login"
diff --git a/src/rpm/fusionforge.spec.in b/src/rpm/fusionforge.spec.in
index b5dc5ef..6adcab0 100644
--- a/src/rpm/fusionforge.spec.in
+++ b/src/rpm/fusionforge.spec.in
@@ -8,7 +8,7 @@ BuildArch: noarch
# FusionForge is GPLv2+ and JQuery is MIT
License: GPLv2+ and MIT
URL: http://www.fusionforge.org/
-Source0:
http://fusionforge.org/frs/download.php/file/XX/%{name}-@[email protected]
+Source0:
http://fusionforge.org/frs/download.php/latestfile/2/%{name}-@[email protected]
Requires: %{name}-db-local = %{version}-%{release}, %{name}-web =
%{version}-%{release}, %{name}-scm = %{version}-%{release}
Provides: bundled(jquery) = 1.10.2, bundled(jquery-ui) = 1.10.4
@@ -278,8 +278,8 @@ This package controls the interaction between FusionForge
and Mailman.
%changelog
-* Thu May 28 2015 Sylvain Beucler <[email protected]> -
@[email protected]@rpm_snapshot@
-- New upstream snapshot following the stable branch
+* Fri May 30 2015 Roland Mas <[email protected]> -
@[email protected]@rpm_snapshot@
+- New upstream release
* Thu May 28 2015 Sylvain Beucler <[email protected]> - 6.0-0.2.rc4
- New upstream release candidate
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
