Public bug reported:
dh-php 4.8 fixes an issue with dh-php injecting a non-existing php-curl-
all-dev package as a Dependency for packages depending on php-curl. This
is the case for php-solr, which currently fails to migrate since it
ships a dummy package that depends on php-curl-all-dev.
While dh-php 4.8 and 4.9 were bug fixing releases, 4.7 introduces a
change on how pkg-pecl.mk filters versions. Therefore, I am filing a FFe
request for this sync. Note that these changes improve this new (4.x)
version of dh-php, which may ease php packages migrations before jammy
is out (as it is the case with php-solr).
diff -r dh-php-4.6/debian/changelog dh-php-4.9/debian/changelog
0a1,19
> dh-php (4.9) unstable; urgency=medium
>
> * Fix PHP_VERSIONS -> DH_PHP_VERSIONS missing rename
>
> -- Ondřej Surý <ond...@debian.org> Thu, 03 Mar 2022 10:33:09 +0100
>
> dh-php (4.8) unstable; urgency=medium
>
> * Filter-out curl from -all-dev packages (Closes: #1006428)
>
> -- Ondřej Surý <ond...@debian.org> Thu, 03 Mar 2022 05:01:10 +0100
>
> dh-php (4.7) unstable; urgency=medium
>
> * Also filter the retrieved version with available versions in
> pkg-pecl.mk
>
> -- Ondřej Surý <ond...@debian.org> Sun, 23 Jan 2022 19:53:03 +0100
>
diff -r dh-php-4.6/pkg-pecl.mk dh-php-4.9/pkg-pecl.mk
24a25,26
> AVAILABLE_PHP_VERSIONS := $(shell /usr/sbin/phpquery -V)
>
31c33,40
< PHP_DEFAULT_VERSION := $(if
$(PHP_DEFAULT_VERSION_OVERRIDE),$(PHP_DEFAULT_VERSION_OVERRIDE),$(shell
php-config --version | sed -e 's,\.[^.]*$$,,'))
---
> PHP_DEFAULT_VERSION_DEFAULT := $(shell php-config --version | sed -e
> 's,\.[^.]*$$,,')
> export PHP_DEFAULT_VERSION := $(filter $(AVAILABLE_PHP_VERSIONS),$(if
> $(PHP_DEFAULT_VERSION_OVERRIDE),$(PHP_DEFAULT_VERSION_OVERRIDE),$(PHP_DEFAULT_VERSION_DEFAULT)))
> ifeq (,$(PHP_DEFAULT_VERSION))
> $(info PHP_DEFAULT_VERSION_DEFAULT := "$(PHP_DEFAULT_VERSION_DEFAULT)")
> $(info PHP_DEFAULT_VERSION_OVERRIDE := "$(PHP_DEFAULT_VERSION_OVERRIDE)")
> $(info AVAILABLE_PHP_VERSIONS := "$(AVAILABLE_PHP_VERSIONS)")
> $(error PHP_DEFAULT_VERSION cannot be empty)
> endif
35,36c44,51
< PHP_VERSIONS := $(shell /usr/share/dh-php/php-versions)
< export DH_PHP_VERSIONS := $(if
$(DH_PHP_VERSIONS_OVERRIDE),$(DH_PHP_VERSIONS_OVERRIDE),$(PHP_VERSIONS))
---
> DH_PHP_VERSIONS_DEFAULT := $(shell /usr/share/dh-php/php-versions)
> export DH_PHP_VERSIONS := $(filter $(AVAILABLE_PHP_VERSIONS),$(if
> $(DH_PHP_VERSIONS_OVERRIDE),$(DH_PHP_VERSIONS_OVERRIDE),$(DH_PHP_VERSIONS_DEFAULT)))
> ifeq (,$(DH_PHP_VERSIONS))
> $(info DH_PHP_VERSIONS_DEFAULT := "$(DH_PHP_VERSIONS_DEFAULT)")
> $(info DH_PHP_VERSIONS_OVERRIDE := "$(DH_PHP_VERSIONS_OVERRIDE)")
> $(info AVAILABLE_PHP_VERSIONS := "$(AVAILABLE_PHP_VERSIONS)")
> $(error DH_PHP_VERSIONS cannot be empty)
> endif
39c54
< $(foreach ver,$(PHP_VERSIONS),$(eval PACKAGE_XML_$(ver) := $(word
1,$(wildcard package-$(ver).xml package-$(basename $(ver)).xml package.xml))))
---
> $(foreach ver,$(DH_PHP_VERSIONS),$(eval PACKAGE_XML_$(ver) := $(word
> 1,$(wildcard package-$(ver).xml package-$(basename $(ver)).xml package.xml))))
52c67
< PECL_DEV_DEPENDS := php-all-dev, $(addsuffix -all-dev$(,),$(addprefix
php-,$(filter-out xml mbstring,$(PECL_EXTS))))
---
> PECL_DEV_DEPENDS := php-all-dev, $(addsuffix -all-dev$(,),$(addprefix
> php-,$(filter-out xml mbstring curl,$(PECL_EXTS))))
** Affects: dh-php (Ubuntu)
Importance: Undecided
Status: New
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1963695
Title:
[FFe] Please sync dh-php from Debian unstable
To manage notifications about this bug go to:
https://bugs.launchpad.net/ubuntu/+source/dh-php/+bug/1963695/+subscriptions
--
ubuntu-bugs mailing list
ubuntu-bugs@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
