[Fusionforge-commits] FusionForge branch 6.0 updated. v6.0.3-103-g00c9488

Roland Mas lolando at libremir.placard.fr.eu.org
Tue Apr 19 10:29:30 CEST 2016


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  00c9488ec63f297f8d1c6784910b5842489382a2 (commit)
      from  9a1f9be92be3d37f2e652b4cdd012837626b0aeb (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=00c9488ec63f297f8d1c6784910b5842489382a2

commit 00c9488ec63f297f8d1c6784910b5842489382a2
Author: Roland Mas <lolando at debian.org>
Date:   Tue Apr 19 10:29:17 2016 +0200

    Keep compatibility with Debian 8

diff --git a/src/debian/control.in b/src/debian/control.in
index 6882a72..cd0768e 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: php-cli, php-pgsql, php-htmlpurifier, cron, ucf, ${misc:Depends}
+Depends: php-cli | php5-cli, php-pgsql | php5-pgsql, php-htmlpurifier | php5-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, php-cli, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), postgresql, php-cli | php5-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, php-cli, libapache2-mod-php, 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 | php5-cli, libapache2-mod-php | libapache2-mod-php5, 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}), php-cli, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), php-cli | php5-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}), php-cli, libnss-pgsql2, openssh-server, unscd | nscd, libpam-modules, ucf, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), php-cli | php5-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, php-cli, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), fusionforge-shell (=${source:Version}), xinetd, rsync, php-cli | php5-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}), php-cli, fusionforge-mta-postfix | fusionforge-mta, mailman, ${misc:Depends}
+Depends: fusionforge-common (=${source:Version}), php-cli | php5-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/control.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list