Package: release.debian.org Severity: normal Tags: bullseye User: release.debian....@packages.debian.org Usertags: pu
Dear Release Managers:I'd like to fix FTBFS bug #991067 in stable using the attached debdiff (not uploaded yet).
The way the FTBFS is fixed is the same I used in upload 1.2-5 which I did today for unstable (this upload replaces a previous workaround which merely fixed the ftbfs problem by dropping the eps files and thus losing functionality).
You will notice that I have decided to raise debhelper compatibility level. I am well aware that this should not be done lightly and without a good reason.
In this case I'm using the debhelper feature which (during build) creates a temporary $HOME directory in which we need to write a config file for imagemagick which overrides the one in /etc. This feature allows to fix the problem in a simple and effective way, so I believe this is justified (to be frank, I don't know how could it be fixed easily without this debhelper feature, so the ftbfs bug would probably remain unfixed in stable).
Thanks.
diff -Nru x4d-icons-1.2/debian/changelog x4d-icons-1.2/debian/changelog --- x4d-icons-1.2/debian/changelog 2019-03-12 05:38:09.000000000 +0100 +++ x4d-icons-1.2/debian/changelog 2022-12-06 17:50:00.000000000 +0100 @@ -1,3 +1,12 @@ +x4d-icons (1.2-2+deb11u1) bullseye; urgency=medium + + * QA upload. + * Fix FTBFS problem with new imagemagick. Closes: #991067. + * The above patch requires raising debhelper compatibility level to 13, + which should not be a problem because debhelper 13 is in bullseye. + + -- Santiago Vila <sanv...@debian.org> Tue, 06 Dec 2022 17:50:00 +0100 + x4d-icons (1.2-2) unstable; urgency=medium * QA upload. diff -Nru x4d-icons-1.2/debian/compat x4d-icons-1.2/debian/compat --- x4d-icons-1.2/debian/compat 2014-05-03 07:01:56.000000000 +0200 +++ x4d-icons-1.2/debian/compat 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -9 diff -Nru x4d-icons-1.2/debian/control x4d-icons-1.2/debian/control --- x4d-icons-1.2/debian/control 2019-03-12 05:37:54.000000000 +0100 +++ x4d-icons-1.2/debian/control 2022-12-06 17:50:00.000000000 +0100 @@ -2,7 +2,7 @@ Section: graphics Priority: optional Maintainer: Debian QA Group <packa...@qa.debian.org> -Build-Depends: debhelper (>= 9), imagemagick, faketime, librsvg2-bin, fonts-dejavu-core +Build-Depends: debhelper-compat (= 13), imagemagick, faketime, librsvg2-bin, fonts-dejavu-core Standards-Version: 3.9.5 Homepage: http://x4d.surgut.co.uk Vcs-Git: https://github.com/xnox/x4d.git diff -Nru x4d-icons-1.2/debian/patches/020_fix_policy.patch x4d-icons-1.2/debian/patches/020_fix_policy.patch --- x4d-icons-1.2/debian/patches/020_fix_policy.patch 1970-01-01 01:00:00.000000000 +0100 +++ x4d-icons-1.2/debian/patches/020_fix_policy.patch 2022-12-06 17:50:00.000000000 +0100 @@ -0,0 +1,29 @@ +Description: Override overly strict ImageMagick coder policy (#987504) + This creates a more permissive version of + /etc/ImageMagick-6/policy.xml and ensures it gets loaded after the + one from /etc. + . + It is done by means of a patch to make use of the debhelper-provided + $HOME visible by dh_auto_*. + . + The relevant code is at: + https://sources.debian.org/src/imagemagick/8:6.9.11.60+dfsg-1.3/magick/configure.c/#L860 +Author: Dennis Filder <d.fil...@web.de> +Last-Updated: 2022-12-06 + +--- a/generate.sh ++++ b/generate.sh +@@ -33,6 +33,13 @@ + generate XML '1.0' xml10 + generate XML '1.1' xml11 + ++# this relies on debhelper providing a $HOME directory for us to write to ++imversion=$(convert -version|sed -n '/^Version: /s@Version: ImageMagick \([[:digit:]]\+\)\..*@ImageMagick-\1@p') ++polfile="/etc/${imversion}/policy.xml" ++mkdir "$HOME"/.magick ++sed -e '/<policy domain="coder" rights="none" pattern="EPS" .>/s@"none"@"read|write"@' "$polfile" \ ++ > "$HOME"/.magick/policy.xml ++ + /bin/ls Icons/*.svg | sed 's/-v\.svg//' | xargs -L1 -I{} convert -background none {}-v.svg {}.png + /bin/ls Icons/*.svg | sed 's/-v\.svg//' | xargs -L1 -I{} convert -background none {}-v.svg {}.gif + /bin/ls Icons/*.svg | sed 's/-v\.svg//' | xargs -L1 -I{} convert -background none {}-v.svg {}-v.eps diff -Nru x4d-icons-1.2/debian/patches/series x4d-icons-1.2/debian/patches/series --- x4d-icons-1.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ x4d-icons-1.2/debian/patches/series 2022-12-06 17:50:00.000000000 +0100 @@ -0,0 +1 @@ +020_fix_policy.patch
