Remove extra diversion for Ubuntu Wily (no longer supported)
This commit is contained in:
parent
87f0c9270d
commit
88692cd9b8
8
debian/php-common.postrm.divert
vendored
8
debian/php-common.postrm.divert
vendored
|
@ -1,8 +0,0 @@
|
|||
if [ "$1" = remove ] ; then
|
||||
dpkg-divert --remove --package php-common --rename \
|
||||
--divert /usr/bin/phar.php5 \
|
||||
/usr/bin/phar
|
||||
dpkg-divert --remove --package php-common --rename \
|
||||
--divert /usr/share/man/man1/phar.php5.1.gz \
|
||||
/usr/share/man/man1/phar.1.gz
|
||||
fi
|
8
debian/php-common.preinst.divert
vendored
8
debian/php-common.preinst.divert
vendored
|
@ -1,8 +0,0 @@
|
|||
if [ "$1" = install ] || [ "$1" = upgrade ] ; then
|
||||
dpkg-divert --add --package php-common --rename \
|
||||
--divert /usr/bin/phar.php5 \
|
||||
/usr/bin/phar
|
||||
dpkg-divert --add --package php-common --rename \
|
||||
--divert /usr/share/man/man1/phar.php5.1.gz \
|
||||
/usr/share/man/man1/phar.1.gz
|
||||
fi
|
15
debian/rules
vendored
15
debian/rules
vendored
|
@ -24,13 +24,6 @@ SED=sed
|
|||
|
||||
export DH_OPTIONS
|
||||
|
||||
DIVERT=sed -e '/\#DIVERT\#/ d'
|
||||
ifeq (Ubuntu,$(DEB_VENDOR))
|
||||
ifeq ($(DEB_DISTRIBUTION),wily)
|
||||
DIVERT=sed -e "/\#DIVERT\#/ r debian/php-common.$${script}.divert"
|
||||
endif
|
||||
endif
|
||||
|
||||
%:
|
||||
dh $@ --with systemd
|
||||
|
||||
|
@ -73,14 +66,6 @@ override_dh_fixperms:
|
|||
dh_fixperms -i -pphp-common -X/var/lib/php/sessions
|
||||
dh_fixperms -i --remaining-packages
|
||||
|
||||
override_dh_installdeb:
|
||||
for script in preinst postrm; do \
|
||||
$(DIVERT) \
|
||||
< debian/php-common.$${script}.in \
|
||||
> debian/php-common.$${script}; \
|
||||
done
|
||||
dh_installdeb -i
|
||||
|
||||
override_dh_gencontrol:
|
||||
dh_gencontrol -pphp-common -- -v$(PHP_COMMON_DEB_VERSION)
|
||||
dh_gencontrol -pphp-all-dev -- -v$(PHP_COMMON_DEB_VERSION)
|
||||
|
|
Loading…
Reference in a new issue