summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOndřej Surý <ondrej@debian.org>2026-01-02 11:22:22 +0100
committergit-ubuntu importer <ubuntu-devel-discuss@lists.ubuntu.com>2026-01-02 16:28:31 +0000
commit39ab791f15a88ed50eaae13edabf74af06724e71 (patch)
treebb071a30f02343def81aca4e832724c0759a4ce5
parent2e6845a823dcf2aa43e9688c25ac6a0de2ca4891 (diff)
parent2b2e6ca1bf3211193a8a202bafdb4f835b50affb (diff)
Imported using git-ubuntu import.
-rw-r--r--debian/changelog8
-rwxr-xr-xphp-versions4
2 files changed, 10 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 48b642b..a5c9b59 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dh-php (5.20) unstable; urgency=medium
+
+ [ Joe Nahmias ]
+ * Update regex to capture php versions with only two components
+ (Closes: #1124008)
+
+ -- Ondřej Surý <ondrej@debian.org> Fri, 02 Jan 2026 11:22:22 +0100
+
dh-php (5.19) unstable; urgency=medium
* Fix an error when min_ver would be never empty
diff --git a/php-versions b/php-versions
index 197ab2c..1d64202 100755
--- a/php-versions
+++ b/php-versions
@@ -20,8 +20,8 @@ for ver in $(/usr/sbin/phpquery -V); do
done
if [ -n "${package_xml}" ]; then
- min_ver=$(xml2 <"${package_xml}" | sed -ne "s,^/package/dependencies/required/php/min=\([0-9]\+\.[0-9]\+\.[0-9]\+\),\1,p")
- max_ver=$(xml2 <"${package_xml}" | sed -ne "s,^/package/dependencies/required/php/max=\([0-9]\+\.[0-9]\+\.[0-9]\+\).*,\1,p")
+ min_ver=$(xml2 <"${package_xml}" | sed -ne "s,^/package/dependencies/required/php/min=\([0-9]\+\(\.[0-9]\+\)\+\),\1,p")
+ max_ver=$(xml2 <"${package_xml}" | sed -ne "s,^/package/dependencies/required/php/max=\([0-9]\+\(\.[0-9]\+\)\+\),\1,p")
else
min_ver=$(sed -ne 's/X-PHP-Versions: //p' debian/control | tr -s " " "\n" | sort -n | head -1)
if [ -n "$min_ver" ]; then