Package: fusiondirectory Version: 1.0.8.8-3 Followup-For: Bug #821485 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu yakkety ubuntu-patch
Dear Maintainer, In Ubuntu, the attached patch was applied to achieve the following: * Further PHP7.0 fixes (LP: #1549942) + src: update to PHP7.0 package naming and apache module path (https://github.com/fusiondirectory/fusiondirectory/issues/12) + src: fix typo in pt_BR translation (https://github.com/fusiondirectory/fusiondirectory/issues/13) Thanks for considering the patch. *** /tmp/tmpwtTF7s/fusiondirectory_1.0.8.8-3ubuntu2.debdiff diff -Nru fusiondirectory-1.0.8.8/debian/patches/1001-Update-to-php7-package-names.patch fusiondirectory-1.0.8.8/debian/patches/1001-Update-to-php7-package-names.patch --- fusiondirectory-1.0.8.8/debian/patches/1001-Update-to-php7-package-names.patch 1969-12-31 16:00:00.000000000 -0800 +++ fusiondirectory-1.0.8.8/debian/patches/1001-Update-to-php7-package-names.patch 2016-03-08 15:09:23.000000000 -0800 @@ -0,0 +1,357 @@ +Description: php5- -> php- in all package name references +Author: Nishanth Aravamudan <nish.aravamu...@canonical.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1549942 +Bug: https://github.com/fusiondirectory/fusiondirectory/issues/12 + +--- fusiondirectory-1.0.8.8.orig/core/contrib/apache/fusiondirectory-apache.conf ++++ fusiondirectory-1.0.8.8/core/contrib/apache/fusiondirectory-apache.conf +@@ -1,7 +1,7 @@ + # Include FusionDirectory to your web service + Alias /fusiondirectory /usr/share/fusiondirectory/html + +-<IfModule mod_php5.c> ++<IfModule mod_php.c> + <Location /fusiondirectory> + php_admin_flag engine on + php_admin_flag register_globals off +--- fusiondirectory-1.0.8.8.orig/core/html/progress.php ++++ fusiondirectory-1.0.8.8/core/html/progress.php +@@ -51,8 +51,8 @@ if ($y < 3 || $y > 700) { + } + + if (!function_exists("imagecreate")) { +- syslog(LOG_ERR, "FusionDirectory is missing the gd library, please install php5-gd to be able to see progress images."); +- echo "Please install the php5-gd library, FusionDirectory can't create images without it."; ++ syslog(LOG_ERR, "FusionDirectory is missing the gd library, please install php-gd to be able to see progress images."); ++ echo "Please install the php-gd library, FusionDirectory can't create images without it."; + exit(); + } else { + +--- fusiondirectory-1.0.8.8.orig/core/include/class_config.inc ++++ fusiondirectory-1.0.8.8/core/include/class_config.inc +@@ -1142,7 +1142,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'."), "php5-zip / php5-gzip"), ERROR_DIALOG); ++ sprintf(_("The snapshot functionality is enabled, but the required compression module is missing. Please install '%s'."), "php-zip / php-gzip"), ERROR_DIALOG); + } + return FALSE; + } +--- fusiondirectory-1.0.8.8.orig/core/include/simpleplugin/class_attribute.inc ++++ fusiondirectory-1.0.8.8/core/include/simpleplugin/class_attribute.inc +@@ -1696,7 +1696,7 @@ class ImageAttribute extends FileAttribu + } + } else { + msg_dialog::display(_("Error"), +- _("Cannot save user picture, FusionDirectory requires the package 'php5-imagick' to be installed!"), ++ _("Cannot save user picture, FusionDirectory requires the package 'php-imagick' to be installed!"), + ERROR_DIALOG); + } + } +--- fusiondirectory-1.0.8.8.orig/core/locale/ar/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/ar/fusiondirectory.po +@@ -1392,7 +1392,7 @@ msgstr "" + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" ++"'php-imagick' to be installed!" + msgstr "" + + #: plugins/personal/generic/class_user.inc:985 +--- fusiondirectory-1.0.8.8.orig/core/locale/ca/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/ca/fusiondirectory.po +@@ -1393,7 +1393,7 @@ msgstr "" + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" ++"'php-imagick' to be installed!" + msgstr "" + + #: plugins/personal/generic/class_user.inc:985 +--- fusiondirectory-1.0.8.8.orig/core/locale/cs_CZ/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/cs_CZ/fusiondirectory.po +@@ -1395,8 +1395,8 @@ msgstr "Zvolený způsob uložení hesla + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" +-msgstr "Portrét uživatele nelze uložit – FusionDirectory k tomu potřebuje, aby byl nainstalován balíček php5-imagick!" ++"'php-imagick' to be installed!" ++msgstr "Portrét uživatele nelze uložit – FusionDirectory k tomu potřebuje, aby byl nainstalován balíček php-imagick!" + + #: plugins/personal/generic/class_user.inc:985 + msgid "Cannot build RDN: no + allowed to build sub RDN!" +--- fusiondirectory-1.0.8.8.orig/core/locale/de/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/de/fusiondirectory.po +@@ -1398,8 +1398,8 @@ msgstr "Die gewählte Passwort-Methode i + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" +-msgstr "Kann das Benutzerbild nicht speichern, FusionDirectory benötigt das Paket 'php5-imagick'!" ++"'php-imagick' to be installed!" ++msgstr "Kann das Benutzerbild nicht speichern, FusionDirectory benötigt das Paket 'php-imagick'!" + + #: plugins/personal/generic/class_user.inc:985 + msgid "Cannot build RDN: no + allowed to build sub RDN!" +--- fusiondirectory-1.0.8.8.orig/core/locale/el_GR/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/el_GR/fusiondirectory.po +@@ -1393,7 +1393,7 @@ msgstr "" + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" ++"'php-imagick' to be installed!" + msgstr "" + + #: plugins/personal/generic/class_user.inc:985 +--- fusiondirectory-1.0.8.8.orig/core/locale/en/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/en/fusiondirectory.po +@@ -1392,7 +1392,7 @@ msgstr "" + #: plugins/personal/generic/class_user.inc:873 + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" +-"Cannot save user picture, FusionDirectory requires the package 'php5-" ++"Cannot save user picture, FusionDirectory requires the package 'php-" + "imagick' to be installed!" + msgstr "" + +--- fusiondirectory-1.0.8.8.orig/core/locale/es/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/es/fusiondirectory.po +@@ -1394,8 +1394,8 @@ msgstr "El método de contraseña selecc + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" +-msgstr "No se puede guardar la foto del usuario, FusionDirectory requiere que este instalado el paquete 'php5-imagick'" ++"'php-imagick' to be installed!" ++msgstr "No se puede guardar la foto del usuario, FusionDirectory requiere que este instalado el paquete 'php-imagick'" + + #: plugins/personal/generic/class_user.inc:985 + msgid "Cannot build RDN: no + allowed to build sub RDN!" +--- fusiondirectory-1.0.8.8.orig/core/locale/es_VE/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/es_VE/fusiondirectory.po +@@ -1394,8 +1394,8 @@ msgstr "El método de contraseña selecc + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" +-msgstr "No se puede guardar la foto del usuario, FusionDirectory requiere que este instalado el paquete 'php5-imagick'" ++"'php-imagick' to be installed!" ++msgstr "No se puede guardar la foto del usuario, FusionDirectory requiere que este instalado el paquete 'php-imagick'" + + #: plugins/personal/generic/class_user.inc:985 + msgid "Cannot build RDN: no + allowed to build sub RDN!" +--- fusiondirectory-1.0.8.8.orig/core/locale/fa_IR/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/fa_IR/fusiondirectory.po +@@ -1395,7 +1395,7 @@ msgstr "" + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" ++"'php-imagick' to be installed!" + msgstr "" + + #: plugins/personal/generic/class_user.inc:985 +--- fusiondirectory-1.0.8.8.orig/core/locale/fr/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/fr/fusiondirectory.po +@@ -1406,8 +1406,8 @@ msgstr "Le format de stockage sélection + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" +-msgstr "Impossible de sauver la photo de l'utilisateur, FusionDirectory a besoin que la bibliothèque 'php5-imagick' soit installée pour cela." ++"'php-imagick' to be installed!" ++msgstr "Impossible de sauver la photo de l'utilisateur, FusionDirectory a besoin que la bibliothèque 'php-imagick' soit installée pour cela." + + #: plugins/personal/generic/class_user.inc:985 + msgid "Cannot build RDN: no + allowed to build sub RDN!" +--- fusiondirectory-1.0.8.8.orig/core/locale/it/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/it/fusiondirectory.po +@@ -1398,8 +1398,8 @@ msgstr "Il formato scelto per la memoriz + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" +-msgstr "Impossibile salvare la foto dell'utente, FusionDirectory richiede che il pacchetto 'php5-imagick' sia installato!" ++"'php-imagick' to be installed!" ++msgstr "Impossibile salvare la foto dell'utente, FusionDirectory richiede che il pacchetto 'php-imagick' sia installato!" + + #: plugins/personal/generic/class_user.inc:985 + msgid "Cannot build RDN: no + allowed to build sub RDN!" +--- fusiondirectory-1.0.8.8.orig/core/locale/lv/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/lv/fusiondirectory.po +@@ -1392,7 +1392,7 @@ msgstr "" + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" ++"'php-imagick' to be installed!" + msgstr "" + + #: plugins/personal/generic/class_user.inc:985 +--- fusiondirectory-1.0.8.8.orig/core/locale/nb/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/nb/fusiondirectory.po +@@ -1392,7 +1392,7 @@ msgstr "" + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" ++"'php-imagick' to be installed!" + msgstr "" + + #: plugins/personal/generic/class_user.inc:985 +--- fusiondirectory-1.0.8.8.orig/core/locale/nl/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/nl/fusiondirectory.po +@@ -1396,8 +1396,8 @@ msgstr "De geselecteerde paswoord method + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" +-msgstr "Kan gebruikersfoto niet opslaan, FusionDirectory heeft het pakket 'php5-imagick' nodig" ++"'php-imagick' to be installed!" ++msgstr "Kan gebruikersfoto niet opslaan, FusionDirectory heeft het pakket 'php-imagick' nodig" + + #: plugins/personal/generic/class_user.inc:985 + msgid "Cannot build RDN: no + allowed to build sub RDN!" +--- fusiondirectory-1.0.8.8.orig/core/locale/pl/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/pl/fusiondirectory.po +@@ -1392,7 +1392,7 @@ msgstr "" + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" ++"'php-imagick' to be installed!" + msgstr "" + + #: plugins/personal/generic/class_user.inc:985 +--- fusiondirectory-1.0.8.8.orig/core/locale/pt/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/pt/fusiondirectory.po +@@ -1393,7 +1393,7 @@ msgstr "" + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" ++"'php-imagick' to be installed!" + msgstr "" + + #: plugins/personal/generic/class_user.inc:985 +--- fusiondirectory-1.0.8.8.orig/core/locale/pt_BR/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/pt_BR/fusiondirectory.po +@@ -1399,8 +1399,8 @@ msgstr "O método de senha selecionado n + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" +-msgstr "Não foi possível salvar esta imagem, FusionDirectory requer o pacote 'php5-omagick' instalado" ++"'php-imagick' to be installed!" ++msgstr "Não foi possível salvar esta imagem, FusionDirectory requer o pacote 'php-omagick' instalado" + + #: plugins/personal/generic/class_user.inc:985 + msgid "Cannot build RDN: no + allowed to build sub RDN!" +--- fusiondirectory-1.0.8.8.orig/core/locale/ru/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/ru/fusiondirectory.po +@@ -1398,8 +1398,8 @@ msgstr "Выбранный пароль� + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" +-msgstr "Не могу сохранить фотографию пользователя, FusionDirectory нужен установленный пакета 'php5-imagick'!" ++"'php-imagick' to be installed!" ++msgstr "Не могу сохранить фотографию пользователя, FusionDirectory нужен установленный пакета 'php-imagick'!" + + #: plugins/personal/generic/class_user.inc:985 + msgid "Cannot build RDN: no + allowed to build sub RDN!" +--- fusiondirectory-1.0.8.8.orig/core/locale/ru@petr1708/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/ru@petr1708/fusiondirectory.po +@@ -1392,7 +1392,7 @@ msgstr "" + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" ++"'php-imagick' to be installed!" + msgstr "" + + #: plugins/personal/generic/class_user.inc:985 +--- fusiondirectory-1.0.8.8.orig/core/locale/sv/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/sv/fusiondirectory.po +@@ -1393,7 +1393,7 @@ msgstr "Den valda lösenordsmetoden är + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" ++"'php-imagick' to be installed!" + msgstr "Kan inte spara användarbild, FusionDirectory kräver att paketet 'php-imagick' är installerat!" + + #: plugins/personal/generic/class_user.inc:985 +--- fusiondirectory-1.0.8.8.orig/core/locale/ug/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/ug/fusiondirectory.po +@@ -1392,7 +1392,7 @@ msgstr "" + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" ++"'php-imagick' to be installed!" + msgstr "" + + #: plugins/personal/generic/class_user.inc:985 +--- fusiondirectory-1.0.8.8.orig/core/locale/vi_VN/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/vi_VN/fusiondirectory.po +@@ -1393,7 +1393,7 @@ msgstr "Phương pháp lập mật khẩ + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" ++"'php-imagick' to be installed!" + msgstr "" + + #: plugins/personal/generic/class_user.inc:985 +--- fusiondirectory-1.0.8.8.orig/core/locale/zh/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/zh/fusiondirectory.po +@@ -1393,7 +1393,7 @@ msgstr "" + #: include/simpleplugin/class_attribute.inc:1699 + msgid "" + "Cannot save user picture, FusionDirectory requires the package " +-"'php5-imagick' to be installed!" ++"'php-imagick' to be installed!" + msgstr "" + + #: plugins/personal/generic/class_user.inc:985 +--- fusiondirectory-1.0.8.8.orig/core/plugins/personal/generic/class_user.inc ++++ fusiondirectory-1.0.8.8/core/plugins/personal/generic/class_user.inc +@@ -870,7 +870,7 @@ class user extends plugin + } + } else { + msg_dialog::display(_("Error"), +- _("Cannot save user picture, FusionDirectory requires the package 'php5-imagick' to be installed!"), ++ _("Cannot save user picture, FusionDirectory requires the package 'php-imagick' to be installed!"), + ERROR_DIALOG); + } + } +--- fusiondirectory-1.0.8.8.orig/core/setup/class_setupStep_Checks.inc ++++ fusiondirectory-1.0.8.8/core/setup/class_setupStep_Checks.inc +@@ -84,10 +84,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 = _("FusionDirectory 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 ); +@@ -137,7 +137,7 @@ class Step_Checks extends setup_step + + $N = msgPool::checkingFor(_("imagick")); + $D = _("FusionDirectory requires this extension to handle images."); +- $S = msgPool::installPhpModule("php5-imagick"); ++ $S = msgPool::installPhpModule("php-imagick"); + + $IMGVER = phpversion('imagick'); + diff -Nru fusiondirectory-1.0.8.8/debian/patches/1002-fix-typo-in-pt_BR-translation.patch fusiondirectory-1.0.8.8/debian/patches/1002-fix-typo-in-pt_BR-translation.patch --- fusiondirectory-1.0.8.8/debian/patches/1002-fix-typo-in-pt_BR-translation.patch 1969-12-31 16:00:00.000000000 -0800 +++ fusiondirectory-1.0.8.8/debian/patches/1002-fix-typo-in-pt_BR-translation.patch 2016-03-08 15:12:01.000000000 -0800 @@ -0,0 +1,16 @@ +Description: php-omagick -> php-imagick +Author: Nishanth Aravamudan <nish.aravamu...@canonical.com> +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1549942 +Bug: https://github.com/fusiondirectory/fusiondirectory/issues/13 + +--- fusiondirectory-1.0.8.8.orig/core/locale/pt_BR/fusiondirectory.po ++++ fusiondirectory-1.0.8.8/core/locale/pt_BR/fusiondirectory.po +@@ -1400,7 +1400,7 @@ msgstr "O método de senha selecionado n + msgid "" + "Cannot save user picture, FusionDirectory requires the package " + "'php-imagick' to be installed!" +-msgstr "Não foi possível salvar esta imagem, FusionDirectory requer o pacote 'php-omagick' instalado" ++msgstr "Não foi possível salvar esta imagem, FusionDirectory requer o pacote 'php-imagick' instalado" + + #: plugins/personal/generic/class_user.inc:985 + msgid "Cannot build RDN: no + allowed to build sub RDN!" diff -Nru fusiondirectory-1.0.8.8/debian/patches/series fusiondirectory-1.0.8.8/debian/patches/series --- fusiondirectory-1.0.8.8/debian/patches/series 2015-07-22 06:19:59.000000000 -0700 +++ fusiondirectory-1.0.8.8/debian/patches/series 2016-03-08 15:11:36.000000000 -0800 @@ -3,3 +3,5 @@ 2003_fusiondirectory-password.patch 2004_fusiondirectory-setup.patch 2005_relative-path-to-js.patch +1001-Update-to-php7-package-names.patch +1002-fix-typo-in-pt_BR-translation.patch -- System Information: Debian Release: stretch/sid APT prefers xenial-updates APT policy: (500, 'xenial-updates'), (500, 'xenial-security'), (500, 'xenial'), (100, 'xenial-backports') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 4.4.0-24-generic (SMP w/4 CPU cores) Locale: LANG=en_CA.UTF-8, LC_CTYPE=en_CA.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- Nishanth Aravamudan Ubuntu Server Canonical Ltd