From 56d4edca87f1a7fc24ba8c39dfa8f6f24ed839b1 Mon Sep 17 00:00:00 2001
From: Nishanth Aravamudan <nish.aravamudan@canonical.com>
Date: Wed, 11 May 2016 00:13:51 +0200
Subject: [PATCH] Update to PHP7.0 naming

---
 Makefile                  |  2 +-
 debian/patches/php7.patch | 25 -------------------------
 debian/patches/series     |  1 -
 inc/drivers_imap_pam.php  |  2 +-
 4 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 debian/patches/php7.patch
 delete mode 100644 debian/patches/series

diff --git a/Makefile b/Makefile
index ad59bd17..f65c2030 100755
--- a/Makefile
+++ b/Makefile
@@ -53,7 +53,7 @@ snapshot: release
 
 .PHONY: test
 test:
-	@for PHP in htdocs/*.php inc/*.php; do php5 -l $${PHP} | grep -v 'No syntax errors detected' >> test-syntax; done; \
+	@for PHP in htdocs/*.php inc/*.php; do php -l $${PHP} | grep -v 'No syntax errors detected' >> test-syntax; done; \
 	    if [ -s test-syntax ]; then \
 	    	cat test-syntax >&2; \
 		rm test-syntax; \
diff --git a/debian/patches/php7.patch b/debian/patches/php7.patch
deleted file mode 100644
index 6baa8c6d..00000000
--- a/debian/patches/php7.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Update to PHP7.0 naming
-Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
-
---- a/Makefile
-+++ b/Makefile
-@@ -53,7 +53,7 @@
- 
- .PHONY: test
- test:
--	@for PHP in htdocs/*.php inc/*.php; do php5 -l $${PHP} | grep -v 'No syntax errors detected' >> test-syntax; done; \
-+	@for PHP in htdocs/*.php inc/*.php; do php -l $${PHP} | grep -v 'No syntax errors detected' >> test-syntax; done; \
- 	    if [ -s test-syntax ]; then \
- 	    	cat test-syntax >&2; \
- 		rm test-syntax; \
---- a/inc/drivers_imap_pam.php
-+++ b/inc/drivers_imap_pam.php
-@@ -13,7 +13,7 @@
- 
- // The PHP interpreter will die quietly unless satisfied. This provides user feedback instead.
- if (!function_exists('imap_open')) {
--  die("drivers_imap_pam: php5-imap required.");
-+  die("drivers_imap_pam: php-imap required.");
- }
- 
- require_once("auth-functions.php");
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 65921cc5..00000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-php7.patch
diff --git a/inc/drivers_imap_pam.php b/inc/drivers_imap_pam.php
index cac06f1e..67a21d74 100644
--- a/inc/drivers_imap_pam.php
+++ b/inc/drivers_imap_pam.php
@@ -13,7 +13,7 @@
 
 // The PHP interpreter will die quietly unless satisfied. This provides user feedback instead.
 if (!function_exists('imap_open')) {
-  die("drivers_imap_pam: php5-imap required.");
+  die("drivers_imap_pam: php-imap required.");
 }
 
 require_once("auth-functions.php");