[Pkg-giraffe-discuss] [PATCH 2/3] debian/control: move php package to default packages

[c.schoenert at t-online.de]

From: Carsten Schoenert <c.schoenert at t-online.de>

With Debian Stretch upwards the only PHP version will be PHP7. The
maintainer of the PHP packages are using virtual packages wich depend on
the real binary packages, that are currently based on PHP7.

Switching all PHP related packages to the default virtual packages.
---
 debian/control | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/control b/debian/control
index d0e68f8..339d4e1 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Depends:
  ${misc:Depends},
 Recommends:
  apache2 | lighttpd | httpd-cgi,
- libapache2-mod-php5,
+ libapache2-mod-php,
 Provides: d-push
 Replaces: d-push (<< 2.1.0~M2-1.1~)
 Breaks: d-push (<< 2.1.0~M2-1.1~)
@@ -55,8 +55,8 @@ Provides: d-push-common
 Replaces: d-push-common (<< 2.1.0~M2-1.1~)
 Breaks: d-push-common (<< 2.1.0~M2-1.1~)
 Depends:
- php5 (>= 5.4) | php7,
- php5-cli,
+ php,
+ php-cli,
  php-soap,
  ${misc:Depends},
 Description: open source implementation of the ActiveSync protocol - common files
@@ -121,7 +121,7 @@ Description: open source implementation of the ActiveSync protocol
 Package: z-push-backend-imap
 Architecture: all
 Depends:
- php-imap | php5-imap,
+ php-imap,
  z-push-common (= ${binary:Version}),
  ${misc:Depends},
 Recommends:
@@ -215,7 +215,7 @@ Package: z-push-backend-caldav
 Architecture: all
 Depends:
  libawl-php,
- php-curl | php5-curl,
+ php-curl,
  z-push-common (= ${binary:Version}),
  ${misc:Depends},
 Description: open source implementation of the ActiveSync protocol - CalDav backend
@@ -230,8 +230,8 @@ Description: open source implementation of the ActiveSync protocol - CalDav back
 Package: z-push-backend-carddav
 Architecture: all
 Depends:
- php-curl | php5-curl,
- php5-xsl | php7.0-xsl,
+ php-curl,
+ php7.0-xsl,
  z-push-common (= ${binary:Version}),
  ${misc:Depends},
 Description: open source implementation of the ActiveSync protocol - CardDav backend
@@ -246,7 +246,7 @@ Description: open source implementation of the ActiveSync protocol - CardDav bac
 Package: z-push-backend-galsearch-ldap
 Architecture: all
 Depends:
- php-ldap | php5-ldap,
+ php-ldap,
  z-push-common (= ${binary:Version}),
  ${misc:Depends},
 Provides: d-push-searchldap
@@ -282,7 +282,7 @@ Description: open source implementation of the ActiveSync protocol
 Package: z-push-backend-ldap
 Architecture: all
 Depends:
- php-ldap | php5-ldap,
+ php-ldap,
  z-push-common (= ${binary:Version}),
  ${misc:Depends},
 Recommends:
@@ -299,7 +299,7 @@ Description: open source implementation of the ActiveSync protocol - LDAP backen
 Package: z-push-backend-kopano
 Architecture: all
 Depends:
- php5-cli,
+ php-cli,
  php5-mapi | php7-mapi,
  z-push-common (= ${binary:Version}),
  ${misc:Depends},
@@ -316,7 +316,7 @@ Description: open source implementation of the ActiveSync protocol - Kopano back
 Package: z-push-ipc-memcached
 Architecture: all
 Depends:
- php-memcached | php5-memcached,
+ php-memcached,
  z-push-common (= ${binary:Version}),
  ${misc:Depends},
 Description: open source implementation of the ActiveSync protocol - IPC memory management
@@ -346,7 +346,7 @@ Description: open source implementation of the ActiveSync protocol - IPC shared
 Package: z-push-kopano-gabsync
 Architecture: all
 Depends:
- php5-cli,
+ php-cli,
  php5-mapi | php7-mapi,
  ${misc:Depends},
 Description: open source implementation of the ActiveSync protocol - Kopano GAB sync
@@ -361,8 +361,8 @@ Description: open source implementation of the ActiveSync protocol - Kopano GAB
 Package: z-push-state-sql
 Architecture: all
 Depends:
- php5-cli,
- php-mysql | php5-mysql,
+ php-cli,
+ php-mysql,
  z-push-common (= ${binary:Version}),
  ${misc:Depends},
 Description: open source implementation of the ActiveSync protocol - MySQL state backend
-- 
2.11.0