[debian-edu-commits] debian-edu/pkg-team/ 01/02: debian/patches: Add 0001_php-7-compat-fix-parent-constructor-calls.patch. Fix parent constructor calls.

[Mike Gabriel]

This is an automated email from the git hooks/post-receive script.

sunweaver pushed a commit to branch debian/stretch/updates
in repository gosa-plugin-mailaddress.

commit 1d4e0beae072f87bf34aa16d2b6ab0eb9ca4a846
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jul 28 10:50:50 2017 +0200

    debian/patches: Add 0001_php-7-compat-fix-parent-constructor-calls.patch. Fix parent constructor calls.
---
 ...php-7-compat-fix-parent-constructor-calls.patch | 39 ++++++++++++++++++++++
 debian/patches/README                              |  3 ++
 debian/patches/series                              |  1 +
 3 files changed, 43 insertions(+)

diff --git a/debian/patches/0001_php-7-compat-fix-parent-constructor-calls.patch b/debian/patches/0001_php-7-compat-fix-parent-constructor-calls.patch
new file mode 100644
index 0000000..142ad96
--- /dev/null
+++ b/debian/patches/0001_php-7-compat-fix-parent-constructor-calls.patch
@@ -0,0 +1,39 @@
+From eb5651ef45b776b1c2d87e2ac6d13365bb353456 Mon Sep 17 00:00:00 2001
+From: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
+Date: Fri, 28 Jul 2017 10:30:48 +0200
+Subject: [PATCH] PHP 7 compatibility: Fix parent constructor calls.
+
+ Fixes gosa-project/gosa-plugin-mailaddress#1.
+
+ Thanks to Vincent Danjean for spotting this and notifying us.
+---
+ admin/groups/mailaddress/class_groupMail.inc | 2 +-
+ personal/mailaddress/class_mailAccount.inc   | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/admin/groups/mailaddress/class_groupMail.inc b/admin/groups/mailaddress/class_groupMail.inc
+index c291de9..e477fc4 100644
+--- a/admin/groups/mailaddress/class_groupMail.inc
++++ b/admin/groups/mailaddress/class_groupMail.inc
+@@ -70,7 +70,7 @@ class mailgroup extends plugin {
+     var $cn="";
+ 
+     function __construct (&$config,$dn=NULL,$base_object=NULL) {
+-        plugin::plugin ($config,$dn);
++        plugin::__construct ($config,$dn);
+ 
+         /* Get attributes from parent object
+          */
+diff --git a/personal/mailaddress/class_mailAccount.inc b/personal/mailaddress/class_mailAccount.inc
+index 398b1de..0efaea1 100644
+--- a/personal/mailaddress/class_mailAccount.inc
++++ b/personal/mailaddress/class_mailAccount.inc
+@@ -62,7 +62,7 @@ class mailAccount extends plugin {
+     /*! \brief  Initialize the mailAccount
+      */
+     function __construct (&$config,$dn=NULL) {
+-        plugin::plugin ($config,$dn);
++        plugin::__construct ($config,$dn);
+ 
+         /* Get attributes from parent object
+          */
diff --git a/debian/patches/README b/debian/patches/README
new file mode 100644
index 0000000..80c1584
--- /dev/null
+++ b/debian/patches/README
@@ -0,0 +1,3 @@
+0xxx: Grabbed from upstream development.
+1xxx: Possibly relevant for upstream adoption.
+2xxx: Only relevant for official Debian release.
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1d2e167
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001_php-7-compat-fix-parent-constructor-calls.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/pkg-team/gosa-plugin-mailaddress.git