From 7fb1cfa38dea0a14257fad3796ffdca58a1bba9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 27 Apr 2016 21:12:13 +0200 Subject: [PATCH] We need to divert to /usr/bin/phar.php5 to prevent clash with updated php5 packages --- debian/php-common.postrm | 4 ++-- debian/php-common.preinst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/php-common.postrm b/debian/php-common.postrm index 27f6e99..47414a3 100644 --- a/debian/php-common.postrm +++ b/debian/php-common.postrm @@ -11,10 +11,10 @@ fi if [ "$1" = remove ] ; then dpkg-divert --remove --package php-common --rename \ - --divert /usr/bin/phar5 \ + --divert /usr/bin/phar.php5 \ /usr/bin/phar dpkg-divert --remove --package php-common --rename \ - --divert /usr/share/man/man1/phar5.1.gz \ + --divert /usr/share/man/man1/phar.php5.1.gz \ /usr/share/man/man1/phar.1.gz fi diff --git a/debian/php-common.preinst b/debian/php-common.preinst index c5fc913..91d4623 100644 --- a/debian/php-common.preinst +++ b/debian/php-common.preinst @@ -4,10 +4,10 @@ set -e if [ "$1" = install ] || [ "$1" = upgrade ] ; then dpkg-divert --add --package php-common --rename \ - --divert /usr/bin/phar5 \ + --divert /usr/bin/phar.php5 \ /usr/bin/phar dpkg-divert --add --package php-common --rename \ - --divert /usr/share/man/man1/phar5.1.gz \ + --divert /usr/share/man/man1/phar.php5.1.gz \ /usr/share/man/man1/phar.1.gz fi