Bug#1025654: bullseye-pu: package x4d-icons/1.2-2+deb11u1
Control: tags -1 -moreinfo +confirmed
On Sun, 2023-04-02 at 01:14 +0200, Santiago Vila wrote:
> El 1/4/23 a las 21:58, Adam D. Barratt escribió:
> > Have you confirmed via a binary debdiff that there are no changes
> > to
> > the resulting packages?
>
> The package contents is the expected one:
>
> $ debdiff x4d-icons_1.2-2_all.deb x4d-icons_1.2-2+deb11u1_all.deb
> File lists identical (after any substitutions)
>
> Control files: lines which differ (wdiff format)
>
> Installed-Size: [-1188-] {+1187+}
> Version: [-1.2-2-] {+1.2-2+deb11u1+}
>
>
> The icons themselves are not bit-for-bit identical, but I think
> they can't really be expected to be, considering that the old package
> was built in 2019-03-12 with possibly different libraries.
>
> They look certainly the same to the eye when using a png/gif viewer
> or a eps viewer, so I believe everything is ok.
>
Thanks; please go ahead.
Regards,
Adam
Bug#1025654: bullseye-pu: package x4d-icons/1.2-2+deb11u1
El 1/4/23 a las 21:58, Adam D. Barratt escribió:
Have you confirmed via a binary debdiff that there are no changes to
the resulting packages?
The package contents is the expected one:
$ debdiff x4d-icons_1.2-2_all.deb x4d-icons_1.2-2+deb11u1_all.deb
File lists identical (after any substitutions)
Control files: lines which differ (wdiff format)
Installed-Size: [-1188-] {+1187+}
Version: [-1.2-2-] {+1.2-2+deb11u1+}
The icons themselves are not bit-for-bit identical, but I think
they can't really be expected to be, considering that the old package
was built in 2019-03-12 with possibly different libraries.
They look certainly the same to the eye when using a png/gif viewer
or a eps viewer, so I believe everything is ok.
Thanks.
Bug#1025654: bullseye-pu: package x4d-icons/1.2-2+deb11u1
Control: tags -1 + moreinfo On Tue, 2022-12-06 at 23:47 +0100, Santiago Vila wrote: > I'd like to fix FTBFS bug #991067 in stable using the attached > debdiff > (not uploaded yet). > Apologies for the delay in getting back to you on this. > 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. > Have you confirmed via a binary debdiff that there are no changes to the resulting packages? Regards, Adam
Bug#1025654: bullseye-pu: package x4d-icons/1.2-2+deb11u1
Hello. I'm providing the same information in "reportbug format", just
in case not having doing so in the initial report may have contributed
for this report not to be processed yet.
[ Reason ]
This upload fixes FTBFS Bug #991067 (an imagemagick update which was
done in bullseye late in the release cycle made several packages not
to build anymore from source).
[ Impact ]
Without this update the package would continue to FTBFS in bullseye.
[ Tests ]
I've checked that both the package builds again from source and also
I've carefully checked that the package contents is what it should be.
[ Risks ]
There is a small risk related with raising debhelper compat level.
I've decided to do that as the preferred technical solution because
it allows to reuse the same fix which was already done in bookworm,
and also because the package is simple enough that it was easy to check
that a debhelper bump does not have undesired effects.
[ Checklist ]
[X] *all* changes are documented in the d/changelog
[X] I reviewed all changes and I approve them
[X] attach debdiff against the package in (old)stable
[X] the issue is verified as fixed in unstable
[ Changes ]
The change is just a backport of the fix already applied in bookworm
three months ago.
[ Other info ]
I've reworded the changelog a little bit and updated the upload date
(since I'm waiting for approval), so I'm including the debdiff again.
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.0 +0100
+++ x4d-icons-1.2/debian/changelog 2023-03-21 13:50:00.0 +0100
@@ -1,3 +1,12 @@
+x4d-icons (1.2-2+deb11u1) bullseye; urgency=medium
+
+ * QA upload.
+ * Fix FTBFS problem with new imagemagick. The fix is the same which was
+already applied in bookworm. Closes: #991067.
+ * The above patch requires raising debhelper compatibility level to 13.
+
+ -- Santiago Vila Tue, 21 Mar 2023 13: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.0 +0200
+++ x4d-icons-1.2/debian/compat 1970-01-01 01:00:00.0 +0100
@@ -1 +0,0 @@
-9
diff -Nru x4d-icons-1.2/debian/control x4d-icons-1.2/debian/control
--- x4d-icons-1.2/debian/control2019-03-12 05:37:54.0 +0100
+++ x4d-icons-1.2/debian/control2023-03-21 13:48:49.0 +0100
@@ -2,7 +2,7 @@
Section: graphics
Priority: optional
Maintainer: Debian QA Group
-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.0 +0100
+++ x4d-icons-1.2/debian/patches/020_fix_policy.patch 2023-03-21
13:48:49.0 +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
+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 '//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.0 +0100
+++ x4d-icons-1.2/debian/patches/series 2023-03-21 13:48:49.0 +0100
@@ -0,0 +1 @@
+020_fix_policy.patch
Bug#1025654: bullseye-pu: package x4d-icons/1.2-2+deb11u1
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.0 +0100
+++ x4d-icons-1.2/debian/changelog 2022-12-06 17:50:00.0 +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 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.0 +0200
+++ x4d-icons-1.2/debian/compat 1970-01-01 01:00:00.0 +0100
@@ -1 +0,0 @@
-9
diff -Nru x4d-icons-1.2/debian/control x4d-icons-1.2/debian/control
--- x4d-icons-1.2/debian/control2019-03-12 05:37:54.0 +0100
+++ x4d-icons-1.2/debian/control2022-12-06 17:50:00.0 +0100
@@ -2,7 +2,7 @@
Section: graphics
Priority: optional
Maintainer: Debian QA Group
-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.0 +0100
+++ x4d-icons-1.2/debian/patches/020_fix_policy.patch 2022-12-06
17:50:00.0 +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
+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 '//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.0 +0100
+++ x4d-icons-1.2/debian/patches/series 2022-12-06 17:50:00.0 +0100
@@ -0,0 +1 @@
+020_fix_policy.patch
