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, 6.0 has been updated
via 367820c954745615ac8a3dc633253d200049328e (commit)
via 17f2343e46dad53f992da35eda714726ab4aa34d (commit)
from cad06ef0f86e4d52a81adbbad547c6b45f4feff2 (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=367820c954745615ac8a3dc633253d200049328e
commit 367820c954745615ac8a3dc633253d200049328e
Author: Roland Mas <[email protected]>
Date: Tue Apr 19 10:07:50 2016 +0200
Also rename Error to FFError in testsuite too
diff --git a/tests/unit/utils/TextSanitizerTest.php
b/tests/unit/utils/TextSanitizerTest.php
index d71327d..c0ca850 100644
--- a/tests/unit/utils/TextSanitizerTest.php
+++ b/tests/unit/utils/TextSanitizerTest.php
@@ -1,7 +1,7 @@
<?php
require_once 'PHPUnit/Framework/TestCase.php';
-require_once dirname(__FILE__) .
'/../../../src/common/include/Error.class.php';
+require_once dirname(__FILE__) .
'/../../../src/common/include/FFError.class.php';
require_once dirname(__FILE__) .
'/../../../src/common/include/TextSanitizer.class.php';
/**
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=17f2343e46dad53f992da35eda714726ab4aa34d
commit 17f2343e46dad53f992da35eda714726ab4aa34d
Author: Roland Mas <[email protected]>
Date: Tue Apr 19 10:06:13 2016 +0200
Update Debian packaging for PHP 7.0 transition
diff --git a/src/debian/changelog b/src/debian/changelog
index 9d0e4e7..f91245c 100644
--- a/src/debian/changelog
+++ b/src/debian/changelog
@@ -1,3 +1,9 @@
+fusionforge (6.0.3+20160419-0) UNRELEASED; urgency=medium
+
+ * Update packaging to work with php7.0 (not only php5).
+
+ -- Roland Mas <[email protected]> Tue, 19 Apr 2016 10:01:27 +0200
+
fusionforge (6.0.3+20151023-1) unstable; urgency=medium
* New upstream snapshot following the 6.0 stable branch
diff --git a/src/debian/control.in b/src/debian/control.in
index a71a36e..6882a72 100644
--- a/src/debian/control.in
+++ b/src/debian/control.in
@@ -28,7 +28,7 @@ Description: collaborative development tool - standard
metapackage
Package: fusionforge-common
Architecture: all
-Depends: php5-cli, php5-pgsql, php-htmlpurifier, cron, ucf, ${misc:Depends}
+Depends: php-cli, php-pgsql, php-htmlpurifier, cron, ucf, ${misc:Depends}
# Handle conflicts with files in old packages:
# gforge-common -> /usr/share/locale/XX/LC_MESSAGES/fusionforge.mo
# gforge-db-postgresql -> /usr/bin/forge_make_admin & forge_set_password
@@ -48,7 +48,7 @@ Description: collaborative development tool - shared files
Package: fusionforge-db-local
Architecture: all
Provides: fusionforge-db
-Depends: fusionforge-common (=${source:Version}), postgresql, php5-cli,
${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), postgresql, php-cli,
${misc:Depends}
Description: collaborative development tool - database (using PostgreSQL)
FusionForge provides many tools to aid collaboration in a
development project, such as bug-tracking, task management,
@@ -79,7 +79,7 @@ Description: collaborative development tool - database
(remote)
Package: fusionforge-web
Architecture: all
-Depends: fusionforge-common (=${source:Version}), fusionforge-db,
libapache2-mpm-itk | apache2-mpm-itk, php5-cli, libapache2-mod-php5,
libphp-simplepie, php-http, php-http-webdav-server, libjs-jquery-livequery,
python, poppler-utils, openssl, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), fusionforge-db,
libapache2-mpm-itk | apache2-mpm-itk, php-cli, libapache2-mod-php,
libphp-simplepie, php-http, php-http-webdav-server, libjs-jquery-livequery,
python, poppler-utils, openssl, ${misc:Depends}
Recommends: locales-all, unoconv
Description: collaborative development tool - web part (using Apache)
FusionForge provides many tools to aid collaboration in a
@@ -94,7 +94,7 @@ Description: collaborative development tool - web part (using
Apache)
Package: fusionforge-web-vhosts
Architecture: all
-Depends: fusionforge-common (=${source:Version}), php5-cli, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), php-cli, ${misc:Depends}
Description: collaborative development tool - web vhosts (using Apache)
FusionForge provides many tools to aid collaboration in a
development project, such as bug-tracking, task management,
@@ -108,7 +108,7 @@ Description: collaborative development tool - web vhosts
(using Apache)
Package: fusionforge-shell
Architecture: all
-Depends: fusionforge-common (=${source:Version}), php5-cli, libnss-pgsql2,
openssh-server, unscd | nscd, libpam-modules, ucf, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), php-cli, libnss-pgsql2,
openssh-server, unscd | nscd, libpam-modules, ucf, ${misc:Depends}
Description: collaborative development tool - shell accounts (using PostgreSQL)
FusionForge provides many tools to aid collaboration in a
development project, such as bug-tracking, task management,
@@ -122,7 +122,7 @@ Description: collaborative development tool - shell
accounts (using PostgreSQL)
Package: fusionforge-scm
Architecture: all
-Depends: fusionforge-common (=${source:Version}), fusionforge-shell
(=${source:Version}), xinetd, rsync, php5-cli, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), fusionforge-shell
(=${source:Version}), xinetd, rsync, php-cli, ${misc:Depends}
Description: collaborative development tool - shell accounts (using PostgreSQL)
FusionForge provides many tools to aid collaboration in a
development project, such as bug-tracking, task management,
@@ -168,7 +168,7 @@ Description: collaborative development tool - mail tools
(using Exim 4)
Package: fusionforge-lists
Architecture: all
-Depends: fusionforge-common (=${source:Version}), php5-cli,
fusionforge-mta-postfix | fusionforge-mta, mailman, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), php-cli,
fusionforge-mta-postfix | fusionforge-mta, mailman, ${misc:Depends}
Description: collaborative development tool - mailing-lists (using Mailman)
FusionForge provides many tools to aid collaboration in a
development project, such as bug-tracking, task management,
-----------------------------------------------------------------------
Summary of changes:
src/debian/changelog | 6 ++++++
src/debian/control.in | 14 +++++++-------
tests/unit/utils/TextSanitizerTest.php | 2 +-
3 files changed, 14 insertions(+), 8 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
