diff -Nru gosa-2.7.4+reloaded2/debian/changelog gosa-2.7.4+reloaded2/debian/changelog --- gosa-2.7.4+reloaded2/debian/changelog 2016-02-15 04:17:36.000000000 -0800 +++ gosa-2.7.4+reloaded2/debian/changelog 2016-03-07 15:25:41.000000000 -0800 @@ -1,3 +1,10 @@ +gosa (2.7.4+reloaded2-9ubuntu1) xenial; urgency=medium + + * debian/control, debian/patches/006_update-to-php7.0-naming.patch: + + Update to PHP7.0 naming (LP: #1549942). + + -- Nishanth Aravamudan Fri, 12 Feb 2016 12:20:13 -0800 + gosa (2.7.4+reloaded2-9) unstable; urgency=medium * debian/gosa-desktop.dirs: diff -Nru gosa-2.7.4+reloaded2/debian/control gosa-2.7.4+reloaded2/debian/control --- gosa-2.7.4+reloaded2/debian/control 2016-02-15 04:15:50.000000000 -0800 +++ gosa-2.7.4+reloaded2/debian/control 2016-03-07 15:12:19.000000000 -0800 @@ -1,7 +1,8 @@ Source: gosa Section: web Priority: optional -Maintainer: Debian Edu Packaging Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Edu Packaging Team Uploaders: Mike Gabriel , Build-Depends: @@ -20,19 +21,19 @@ exim4 | mail-transport-agent, fonts-liberation, gettext, - libapache2-mod-php5 | php5-cgi | php5-fpm, + libapache2-mod-php | php-cgi | php-fpm, libcrypt-smbhash-perl, libjs-scriptaculous, - php5, - php5-cli, - php5-curl, - php5-gd, - php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, - php5-imap, - php5-ldap, - php5-mcrypt, - php5-mysqlnd | php5-mysql, - php5-recode, + php, + php-cli, + php-curl, + php-gd, + php-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, + php-imap, + php-ldap, + php-mcrypt, + php-mysqlnd | php-mysql, + php-recode, smarty-gettext, smarty3 (>= 3.1.10-1), ${misc:Depends}, @@ -42,7 +43,7 @@ gosa-si-server, php-apc, php-fpdf, - php5-suhosin, + php-suhosin, postfix-ldap, slapd, Conflicts: @@ -62,7 +63,7 @@ gosa (= ${binary:Version}), latex2html, lyx, - php5-cli, + php-cli, ${misc:Depends}, Description: GOsa² development utilities This package contains a couple of tools to generate online diff -Nru gosa-2.7.4+reloaded2/debian/gosa-apache.conf gosa-2.7.4+reloaded2/debian/gosa-apache.conf --- gosa-2.7.4+reloaded2/debian/gosa-apache.conf 2016-01-29 01:18:13.000000000 -0800 +++ gosa-2.7.4+reloaded2/debian/gosa-apache.conf 2016-03-07 15:11:33.000000000 -0800 @@ -1,7 +1,7 @@ # Include GOsa to your web service Alias /gosa /usr/share/gosa/html - + php_admin_flag engine on php_admin_flag register_globals off diff -Nru gosa-2.7.4+reloaded2/debian/patches/2006_update-to-php7.0-naming.patch gosa-2.7.4+reloaded2/debian/patches/2006_update-to-php7.0-naming.patch --- gosa-2.7.4+reloaded2/debian/patches/2006_update-to-php7.0-naming.patch 1969-12-31 16:00:00.000000000 -0800 +++ gosa-2.7.4+reloaded2/debian/patches/2006_update-to-php7.0-naming.patch 2016-03-07 15:19:21.000000000 -0800 @@ -0,0 +1,313 @@ +Description: Do not refer to php5-* but php-* in messages +Author: Nishanth Aravamudan +Bug-Ubuntu: https://launchpad.net/bugs/1549942 + +--- gosa-2.7.4+reloaded2.orig/gosa-core/include/class_SnapshotHandler.inc ++++ gosa-2.7.4+reloaded2/gosa-core/include/class_SnapshotHandler.inc +@@ -55,7 +55,7 @@ class SnapshotHandler { + if(!session::is_set("snapshotFailMessageSend")){ + session::set("snapshotFailMessageSend",TRUE); + msg_dialog::display(_("Configuration error"), +- sprintf(_("The snapshot functionality is enabled but the required PHP compression module is missing: %s!"), bold("php5-zip / php5-gzip")), ERROR_DIALOG); ++ sprintf(_("The snapshot functionality is enabled but the required PHP compression module is missing: %s!"), bold("php-zip / php-gzip")), ERROR_DIALOG); + } + return; + } +--- gosa-2.7.4+reloaded2.orig/gosa-core/include/class_config.inc ++++ gosa-2.7.4+reloaded2/gosa-core/include/class_config.inc +@@ -1199,7 +1199,7 @@ class config { + if(!session::is_set("snapshotFailMessageSend")){ + session::set("snapshotFailMessageSend",TRUE); + msg_dialog::display(_("Configuration error"), +- sprintf(_("The snapshot functionality is enabled, but the required compression module is missing. Please install %s."), bold("php5-zip / php5-gzip")), ERROR_DIALOG); ++ sprintf(_("The snapshot functionality is enabled, but the required compression module is missing. Please install %s."), bold("php-zip / php-gzip")), ERROR_DIALOG); + } + return(FALSE); + } +--- gosa-2.7.4+reloaded2.orig/gosa-core/locale/core/de/LC_MESSAGES/messages.po ++++ gosa-2.7.4+reloaded2/gosa-core/locale/core/de/LC_MESSAGES/messages.po +@@ -5147,11 +5147,11 @@ msgstr "Die gewählte Passwort-Methode i + + #: plugins/personal/generic/class_user.inc:1051 + msgid "" +-"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-" ++"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php-" + "imagick' to be installed!" + msgstr "" + "Das Benutzerbild kann nicht gespeichert werden: GOsa benötigt die Pakete " +-"'imagemagick' oder 'php5-imagick'!" ++"'imagemagick' oder 'php-imagick'!" + + #: plugins/personal/generic/class_user.inc:1177 + msgid "Cannot build RDN: no + allowed to build sub RDN!" +--- gosa-2.7.4+reloaded2.orig/gosa-core/locale/core/es/LC_MESSAGES/messages.po ++++ gosa-2.7.4+reloaded2/gosa-core/locale/core/es/LC_MESSAGES/messages.po +@@ -5150,7 +5150,7 @@ msgstr "El método de contraseña selecc + + #: plugins/personal/generic/class_user.inc:1051 + msgid "" +-"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-" ++"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php-" + "imagick' to be installed!" + msgstr "" + +@@ -8124,7 +8124,7 @@ msgstr "Eliminar" + #~ "No se puede conectar a LDAP: Por favor consulte con el administrador de " + #~ "sistemas." + +-#~ msgid "The mcrypt module was not found. Please install php5-mcrypt." ++#~ msgid "The mcrypt module was not found. Please install php-mcrypt." + #~ msgstr "" + #~ "El módulo mcrypt no ha sido encontrado. Por favor instale php-mcrypt." + +@@ -8872,11 +8872,11 @@ msgstr "Eliminar" + + #, fuzzy + #~ msgid "" +-#~ "The ldap extension (php5-ldap) is required to communicate with your LDAP " ++#~ "The ldap extension (php-ldap) is required to communicate with your LDAP " + #~ "server." + #~ msgstr "" +-#~ "La extensión LDAP (php4-ldap/php5-ldap) es necesaria para comunicarse con " +-#~ "el servidor LDAP." ++#~ "La extensión LDAP (php-ldap) es necesaria para comunicarse con el " ++#~ "servidor LDAP." + + #~ msgid "Checking for gettext support" + #~ msgstr "Comprobando soporte gettext" +@@ -8902,10 +8902,10 @@ msgstr "Eliminar" + + #, fuzzy + #~ msgid "" +-#~ "The mhash module for PHP 5 is not available.Please install php5-mhash." ++#~ "The mhash module for PHP 5 is not available.Please install php-mhash." + #~ msgstr "" + #~ "El módulo mhash para PHP 4/5 no está disponible. Por favor instale php4-" +-#~ "mhash/php5-mhash." ++#~ "mhash/php-mhash." + + #~ msgid "Checking for IMAP support" + #~ msgstr "Comprobando soporte IMAP" +@@ -8920,10 +8920,10 @@ msgstr "Eliminar" + #, fuzzy + #~ msgid "" + #~ "This module is used to communicate with your mail server. Please install " +-#~ "php5-imap." ++#~ "php-imap." + #~ msgstr "" + #~ "Este módulo se necesita para comunicarse con el servidor de correo. Por " +-#~ "favor instale php4-imap/php5-imap." ++#~ "favor instale php4-imap/php-imap." + + #, fuzzy + #~ msgid "Checking for multi byte support" +@@ -8948,10 +8948,10 @@ msgstr "Eliminar" + #, fuzzy + #~ msgid "" + #~ "This module is required to communicate with database servers (GOfax, " +-#~ "asterisk, GLPI, etc.). Please install php5-mysql" ++#~ "asterisk, GLPI, etc.). Please install php-mysql" + #~ msgstr "" + #~ "Este módulo es necesario para comunicarse con servicios de bases de datos " +-#~ "(GOfax, asterisk, GLPI, etc.). Por favor instale php4-mysql/php5-mysql" ++#~ "(GOfax, asterisk, GLPI, etc.). Por favor instale php4-mysql/php-mysql" + + #~ msgid "Checking for kadm5 support" + #~ msgstr "Comprobando soporte kadm5" +@@ -8982,10 +8982,10 @@ msgstr "Eliminar" + + #, fuzzy + #~ msgid "" +-#~ "This module is required for client monitoring. Please install php5-snmp." ++#~ "This module is required for client monitoring. Please install php-snmp." + #~ msgstr "" + #~ "El módulo es necesario para la monitorización de clientes. Por favor " +-#~ "instale php4-snmp/php5-snmp." ++#~ "instale php4-snmp/php-snmp." + + #~ msgid "Checking for CUPS support" + #~ msgstr "Comprobando soporte CUPS" +--- gosa-2.7.4+reloaded2.orig/gosa-core/locale/core/fr/LC_MESSAGES/messages.po ++++ gosa-2.7.4+reloaded2/gosa-core/locale/core/fr/LC_MESSAGES/messages.po +@@ -5073,11 +5073,11 @@ msgstr "" + + #: plugins/personal/generic/class_user.inc:1051 + msgid "" +-"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-" ++"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php-" + "imagick' to be installed!" + msgstr "" + "Impossible de sauvegarder l'image d'utilisateur: GOsa nécessite " +-"'imagemagick' ou 'php5-imagick' installé !" ++"'imagemagick' ou 'php-imagick' installé !" + + #: plugins/personal/generic/class_user.inc:1177 + msgid "Cannot build RDN: no + allowed to build sub RDN!" +--- gosa-2.7.4+reloaded2.orig/gosa-core/locale/core/it/LC_MESSAGES/messages.po ++++ gosa-2.7.4+reloaded2/gosa-core/locale/core/it/LC_MESSAGES/messages.po +@@ -5152,7 +5152,7 @@ msgstr "" + + #: plugins/personal/generic/class_user.inc:1051 + msgid "" +-"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-" ++"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php-" + "imagick' to be installed!" + msgstr "" + +--- gosa-2.7.4+reloaded2.orig/gosa-core/locale/core/messages.po ++++ gosa-2.7.4+reloaded2/gosa-core/locale/core/messages.po +@@ -4776,7 +4776,7 @@ msgstr "" + + #: plugins/personal/generic/class_user.inc:1051 + msgid "" +-"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-" ++"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php-" + "imagick' to be installed!" + msgstr "" + +--- gosa-2.7.4+reloaded2.orig/gosa-core/locale/core/nl/LC_MESSAGES/messages.po ++++ gosa-2.7.4+reloaded2/gosa-core/locale/core/nl/LC_MESSAGES/messages.po +@@ -5252,7 +5252,7 @@ msgstr "Dit programma is niet meer besch + + #: plugins/personal/generic/class_user.inc:1051 + msgid "" +-"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-" ++"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php-" + "imagick' to be installed!" + msgstr "" + +--- gosa-2.7.4+reloaded2.orig/gosa-core/locale/core/pl/LC_MESSAGES/messages.po ++++ gosa-2.7.4+reloaded2/gosa-core/locale/core/pl/LC_MESSAGES/messages.po +@@ -5072,7 +5072,7 @@ msgstr "Ta aplikacja nie jest już dost� + + #: plugins/personal/generic/class_user.inc:1051 + msgid "" +-"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-" ++"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php-" + "imagick' to be installed!" + msgstr "" + +--- gosa-2.7.4+reloaded2.orig/gosa-core/locale/core/pt/LC_MESSAGES/messages.po ++++ gosa-2.7.4+reloaded2/gosa-core/locale/core/pt/LC_MESSAGES/messages.po +@@ -4895,7 +4895,7 @@ msgstr "" + + #: plugins/personal/generic/class_user.inc:1051 + msgid "" +-"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-" ++"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php-" + "imagick' to be installed!" + msgstr "" + +@@ -7039,9 +7039,9 @@ msgstr "Remover" + #~ msgid "FAI summary" + #~ msgstr "Sumário FAI" + +-#~ msgid "The mcrypt module was not found. Please install php5-mcrypt." ++#~ msgid "The mcrypt module was not found. Please install php-mcrypt." + #~ msgstr "" +-#~ "O módulo mcrypt não foi encontrado. Por favor, instale o php5-mcrypt." ++#~ "O módulo mcrypt não foi encontrado. Por favor, instale o php-mcrypt." + + #~ msgid "Up" + #~ msgstr "Para cima" +--- gosa-2.7.4+reloaded2.orig/gosa-core/locale/core/pt_BR/LC_MESSAGES/messages.po ++++ gosa-2.7.4+reloaded2/gosa-core/locale/core/pt_BR/LC_MESSAGES/messages.po +@@ -5171,7 +5171,7 @@ msgstr "O método de senha selecionado n + + #: plugins/personal/generic/class_user.inc:1051 + msgid "" +-"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-" ++"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php-" + "imagick' to be installed!" + msgstr "" + +@@ -7429,8 +7429,8 @@ msgstr "Remover" + #~ "FATAL: O regiter_globals está ON. O GOsa irá recusar fazer o login, a " + #~ "menos esta seja corrigida pelo administrador." + +-#~ msgid "The mcrypt module was not found. Please install php5-mcrypt." +-#~ msgstr "O módulo mcrypt não foi encontrado. Por favor instale php5-mcrypt." ++#~ msgid "The mcrypt module was not found. Please install php-mcrypt." ++#~ msgstr "O módulo mcrypt não foi encontrado. Por favor instale php-mcrypt." + + #~ msgid "All categories" + #~ msgstr "Todas categorias" +--- gosa-2.7.4+reloaded2.orig/gosa-core/locale/core/ru/LC_MESSAGES/messages.po ++++ gosa-2.7.4+reloaded2/gosa-core/locale/core/ru/LC_MESSAGES/messages.po +@@ -5195,7 +5195,7 @@ msgstr "У выбранного прил + + #: plugins/personal/generic/class_user.inc:1051 + msgid "" +-"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-" ++"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php-" + "imagick' to be installed!" + msgstr "" + +--- gosa-2.7.4+reloaded2.orig/gosa-core/locale/core/vi/LC_MESSAGES/messages.po ++++ gosa-2.7.4+reloaded2/gosa-core/locale/core/vi/LC_MESSAGES/messages.po +@@ -5139,7 +5139,7 @@ msgstr "Phương pháp lập mật khẩ + + #: plugins/personal/generic/class_user.inc:1051 + msgid "" +-"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-" ++"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php-" + "imagick' to be installed!" + msgstr "" + +@@ -8099,8 +8099,8 @@ msgstr "Xóa bỏ" + #~ msgstr "" + #~ "Không thể nối kết với LDAP. Xin hãy liên lạc với với admin hệ thống." + +-#~ msgid "The mcrypt module was not found. Please install php5-mcrypt." +-#~ msgstr "Không tìm thấy Mô-đun mcrypt. Xin hãy cài đặt php5-mcrypt." ++#~ msgid "The mcrypt module was not found. Please install php-mcrypt." ++#~ msgstr "Không tìm thấy Mô-đun mcrypt. Xin hãy cài đặt php-mcrypt." + + #~ msgid "Password reset" + #~ msgstr "Xác lập lại mật khẩu" +--- gosa-2.7.4+reloaded2.orig/gosa-core/locale/core/zh/LC_MESSAGES/messages.po ++++ gosa-2.7.4+reloaded2/gosa-core/locale/core/zh/LC_MESSAGES/messages.po +@@ -5120,7 +5120,7 @@ msgstr "此应用程序不再可用。" + + #: plugins/personal/generic/class_user.inc:1051 + msgid "" +-"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-" ++"Cannot save user picture: GOsa requires the package 'imagemagick' or 'php-" + "imagick' to be installed!" + msgstr "" + +--- gosa-2.7.4+reloaded2.orig/gosa-core/plugins/personal/generic/class_user.inc ++++ gosa-2.7.4+reloaded2/gosa-core/plugins/personal/generic/class_user.inc +@@ -1061,7 +1061,7 @@ class user extends plugin + $this->attrs["jpegPhoto"] = $output; + }else{ + msg_dialog::display(_("Error"), +- _("Cannot save user picture: GOsa requires the package 'imagemagick' or 'php5-imagick' to be installed!"), ++ _("Cannot save user picture: GOsa requires the package 'imagemagick' or 'php-imagick' to be installed!"), + ERROR_DIALOG); + + } +--- gosa-2.7.4+reloaded2.orig/gosa-core/setup/class_setupStep_Checks.inc ++++ gosa-2.7.4+reloaded2/gosa-core/setup/class_setupStep_Checks.inc +@@ -86,10 +86,10 @@ class Step_Checks extends setup_step + $M = TRUE; + $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); + +- /* Check for php5-curl support */ ++ /* Check for php-curl support */ + $N = msgPool::checkingFor("curl"); + $D = _("GOsa requires this module to communicate with different types of servers and protocols."); +- $S = msgPool::installPhpModule("php5-curl"); ++ $S = msgPool::installPhpModule("php-curl"); + $R = is_callable("curl_init"); + $M = TRUE; + $this->basic_checks[] = array("NAME" => $N , "DESC" => $D , "RESULT" => $R , "SOLUTION" => $S , "MUST" => $M ); +@@ -170,7 +170,7 @@ class Step_Checks extends setup_step + + $N = msgPool::checkingFor(_("imagick")); + $D = _("GOsa requires this extension to handle images."); +- $S = msgPool::installPhpModule("php5-imagick"); ++ $S = msgPool::installPhpModule("php-imagick"); + + $IMGVER = phpversion('imagick'); + diff -Nru gosa-2.7.4+reloaded2/debian/patches/series gosa-2.7.4+reloaded2/debian/patches/series --- gosa-2.7.4+reloaded2/debian/patches/series 2016-01-31 03:52:30.000000000 -0800 +++ gosa-2.7.4+reloaded2/debian/patches/series 2016-03-07 15:19:51.000000000 -0800 @@ -34,3 +34,4 @@ 2003_fix-class-mapping.patch 2004_fix-locale-location.patch 2005_allow-Debian-blends-to-override-gosa-conf.patch +2006_update-to-php7.0-naming.patch