Bug#991319: unblock: qutebrowser/2.0.2-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: abe@debian.org, reichwald@b1-systems.de, mail@fritzreichwald.de, me@the-compiler.org
Dear Release Team,
please unblock package qutebrowser/2.0.2-2.
It is a pure documentation update related to the Freenode f*ckup.
[ Reason ]
The upload adds a patch which updates the pointers to qutebrowser's
IRC channel which — like many other projects — recently had to change
from Freenode to Libera.Chat due to a hostile takeover of the prject's
IRC channel on Freenode.
[ Impact ]
According to upstream, from time to time people still join the
project's old channel on Freenode. It is suspected that outdated links
in packaged versions of qutebrowser are one source for this.
So if we don't get this tiny documentation update into Bullseye, the
Freenode f*ckup will just last longer for this project and were
continue to feed the new, hostile Freenode owners.
[ Tests ]
* I started qutebrowser, opened qute://help/, checked the IRC links.
* I viewed the man page, searched for "freenode" (not present) and "IRC"
to verify that the IRC references are updated in there, too.
* I used qutebrowser as usually for about a day.
* A debdiff on the .changes file (i.e. the resulting .deb files only
showed version field changes"
$ debdiff /…/pbuilder/result/qutebrowser_2.0.2-{1,2}_amd64.changes
File lists identical (after any substitutions)
Control files of package qutebrowser: lines which differ (wdiff format)
-----------------------------------------------------------------------
Version: [-2.0.2-1-] {+2.0.2-2+}
Control files of package qutebrowser-qtwebengine: lines which differ (wdiff format)
-----------------------------------------------------------------------------------
Depends: libqt5webenginecore5 (>= 5.12), python3-pyqt5.qtwebengine (>= 5.12), qutebrowser (= [-2.0.2-1)-] {+2.0.2-2)+}
Version: [-2.0.2-1-] {+2.0.2-2+}
Control files of package qutebrowser-qtwebkit: lines which differ (wdiff format)
--------------------------------------------------------------------------------
Depends: python3-pyqt5.qtwebkit (>= 5.12), libqt5webkit5 (>= 5.212), qutebrowser (= [-2.0.2-1)-] {+2.0.2-2)+}
Version: [-2.0.2-1-] {+2.0.2-2+}
* diffoscope /…/pbuilder/result/qutebrowser_2.0.2-{1,2}_all.deb
(i.e. the .deb file where the changed files are in) only showed
expected changes:
* The updated parts of the documentation
* One new changelog entry (expected as well :-).
* Version number changes (qutebrowser and debhelper, the latter from
13.3.3 to 13.3.4, so no big gap either)
* Timestamps
[ Risks ]
Very low:
* Leaf package
* Only asciidoc source files (for the man page), one SVG vector image
(XML) and HTML files are touched by the added patch.
* It's a simple patch updating a few lines of documentation. The
standalone patch is attached as well as the full source debdiff.
[ Checklist ]
[√] all changes are documented in the d/changelog
[√] I reviewed all changes and I approve them
[√] attach debdiff against the package in testing
[ Other info ]
I deliberately _only_ patched the SVG/XML version of the cheatsheet
image, _not_ the PNG version of it as that would have added a 1.7 MB
binary patch or an additional file plus changes in e.g.
debian/qutebrowser.install. (Both variants were discussed between
Debian packagers and upstream. Given the time shortly before the
full-freeze, we've chosen the simplest variant with the drawback of
not patching each occurrence, but leaving out one deliberately.)
So please…
unblock qutebrowser/2.0.2-2
Thanks in advance!
diff -Nru qutebrowser-2.0.2/debian/changelog qutebrowser-2.0.2/debian/changelog
--- qutebrowser-2.0.2/debian/changelog 2021-02-05 04:27:06.000000000 +0100
+++ qutebrowser-2.0.2/debian/changelog 2021-07-14 02:38:48.000000000 +0200
@@ -1,3 +1,10 @@
+qutebrowser (2.0.2-2) unstable; urgency=medium
+
+ * Apply patch to update documentation with regards to the #qutebrowser
+ IRC channel having moved from Freenode to Libera.Chat.
+
+ -- Axel Beckert <abe@debian.org> Wed, 14 Jul 2021 02:38:48 +0200
+
qutebrowser (2.0.2-1) unstable; urgency=medium
* New upstream bugfix release.
diff -Nru qutebrowser-2.0.2/debian/patches/0001-Update-IRC-links-to-Libera-Chat.patch qutebrowser-2.0.2/debian/patches/0001-Update-IRC-links-to-Libera-Chat.patch
--- qutebrowser-2.0.2/debian/patches/0001-Update-IRC-links-to-Libera-Chat.patch 1970-01-01 01:00:00.000000000 +0100
+++ qutebrowser-2.0.2/debian/patches/0001-Update-IRC-links-to-Libera-Chat.patch 2021-07-14 02:38:48.000000000 +0200
@@ -0,0 +1,74 @@
+Author: Axel Beckert <abe@debian.org>
+Description: Update IRC links to Libera Chat
+ Based on a patch by Florian Bruhin <me@the-compiler.org>
+Forwarded: not-needed
+
+--- a/doc/qutebrowser.1.asciidoc
++++ b/doc/qutebrowser.1.asciidoc
+@@ -152,8 +152,8 @@
+ https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser
+ * Announce-only mailinglist: mailto:qutebrowser-announce@lists.qutebrowser.org[] /
+ https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser-announce
+-* IRC: irc://irc.freenode.org/#qutebrowser[`#qutebrowser`] on
+-https://freenode.net/[Freenode]
++* IRC: irc://irc.libera.chat/#qutebrowser[`#qutebrowser`] on
++https://libera.chat/[Libera Chat]
+ * Github: https://github.com/qutebrowser/qutebrowser
+
+ == AUTHOR
+--- a/misc/cheatsheet.svg
++++ b/misc/cheatsheet.svg
+@@ -2570,7 +2570,7 @@
+ id="flowPara5604"
+ style="font-size:13.8667px;line-height:1.25;font-family:sans-serif;stroke-width:1.06667">Website: https://www.qutebrowser.org/ </flowPara><flowPara
+ id="flowPara5595"
+- style="font-size:13.8667px;line-height:1.25;font-family:sans-serif;stroke-width:1.06667">IRC: #qutebrowser on Freenode</flowPara><flowPara
++ style="font-size:13.8667px;line-height:1.25;font-family:sans-serif;stroke-width:1.06667">IRC: #qutebrowser on Libera Chat</flowPara><flowPara
+ id="flowPara5597"
+ style="font-size:13.8667px;line-height:1.25;font-family:sans-serif;stroke-width:1.06667">Mailinglist: qutebrowser@lists.qutebrowser.org</flowPara></flowRoot>
+ <text
+--- a/qutebrowser/html/doc/contributing.html
++++ b/qutebrowser/html/doc/contributing.html
+@@ -890,9 +890,9 @@
+ </li>
+ <li>
+ <p>
+-Join the IRC channel <a href="irc://irc.freenode.org/#qutebrowser"><code>#qutebrowser</code></a> on
+-<a href="https://freenode.net/";>Freenode</a>
+-(<a href="https://webchat.freenode.net/?channels=#qutebrowser";>webchat</a>).
++Join the IRC channel <a href="ircs://irc.libera.chat:6697/#qutebrowser"><code>#qutebrowser</code></a> on
++<a href="https://libera.chat/";>Libera Chat</a>
++(<a href="https://web.libera.chat/#qutebrowser";>webchat</a>).
+ </p>
+ </li>
+ </ul></div>
+--- a/qutebrowser/html/doc/index.html
++++ b/qutebrowser/html/doc/index.html
+@@ -866,9 +866,9 @@
+ <h2 id="_getting_help">Getting help</h2>
+ <div class="sectionbody">
+ <div class="paragraph"><p>You can get help in the IRC channel
+-<a href="irc://irc.freenode.org/#qutebrowser"><code>#qutebrowser</code></a> on
+-<a href="http://freenode.net/";>Freenode</a>
+-(<a href="https://webchat.freenode.net/?channels=#qutebrowser";>webchat</a>), or by writing a
++<a href="ircs://irc.libera.chat:6697/#qutebrowser"><code>#qutebrowser</code></a> on
++<a href="https://libera.chat/";>Libera Chat</a>
++(<a href="https://web.libera.chat/#qutebrowser";>webchat</a>), or by writing a
+ message to the
+ <a href="https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser";>mailinglist</a> at
+ <a href="mailto:qutebrowser@lists.qutebrowser.org";>qutebrowser@lists.qutebrowser.org</a>.</p></div>
+--- a/qutebrowser/html/doc/quickstart.html
++++ b/qutebrowser/html/doc/quickstart.html
+@@ -939,9 +939,9 @@
+ </li>
+ <li>
+ <p>
+-Chat via the IRC channel: <a href="irc://irc.freenode.org/#qutebrowser"><code>#qutebrowser</code></a> on
+-<a href="https://freenode.net/";>Freenode</a>
+-(<a href="https://webchat.freenode.net/?channels=#qutebrowser";>webchat</a>)
++Chat via the IRC channel: <a href="ircs://irc.libera.chat:6697/#qutebrowser"><code>#qutebrowser</code></a> on
++<a href="https://libera.chat/";>Libera Chat</a>
++(<a href="https://web.libera.chat/#qutebrowser";>webchat</a>)
+ </p>
+ </li>
+ <li>
diff -Nru qutebrowser-2.0.2/debian/patches/series qutebrowser-2.0.2/debian/patches/series
--- qutebrowser-2.0.2/debian/patches/series 2021-02-05 00:50:57.000000000 +0100
+++ qutebrowser-2.0.2/debian/patches/series 2021-07-14 02:36:35.000000000 +0200
@@ -1 +1,2 @@
replace-external-merch-images-with-links.patch
+0001-Update-IRC-links-to-Libera-Chat.patch
Author: Axel Beckert <abe@debian.org>
Description: Update IRC links to Libera Chat
Based on a patch by Florian Bruhin <me@the-compiler.org>
Forwarded: not-needed
--- a/doc/qutebrowser.1.asciidoc
+++ b/doc/qutebrowser.1.asciidoc
@@ -152,8 +152,8 @@
https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser
* Announce-only mailinglist: mailto:qutebrowser-announce@lists.qutebrowser.org[] /
https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser-announce
-* IRC: irc://irc.freenode.org/#qutebrowser[`#qutebrowser`] on
-https://freenode.net/[Freenode]
+* IRC: irc://irc.libera.chat/#qutebrowser[`#qutebrowser`] on
+https://libera.chat/[Libera Chat]
* Github: https://github.com/qutebrowser/qutebrowser
== AUTHOR
--- a/misc/cheatsheet.svg
+++ b/misc/cheatsheet.svg
@@ -2570,7 +2570,7 @@
id="flowPara5604"
style="font-size:13.8667px;line-height:1.25;font-family:sans-serif;stroke-width:1.06667">Website: https://www.qutebrowser.org/ </flowPara><flowPara
id="flowPara5595"
- style="font-size:13.8667px;line-height:1.25;font-family:sans-serif;stroke-width:1.06667">IRC: #qutebrowser on Freenode</flowPara><flowPara
+ style="font-size:13.8667px;line-height:1.25;font-family:sans-serif;stroke-width:1.06667">IRC: #qutebrowser on Libera Chat</flowPara><flowPara
id="flowPara5597"
style="font-size:13.8667px;line-height:1.25;font-family:sans-serif;stroke-width:1.06667">Mailinglist: qutebrowser@lists.qutebrowser.org</flowPara></flowRoot>
<text
--- a/qutebrowser/html/doc/contributing.html
+++ b/qutebrowser/html/doc/contributing.html
@@ -890,9 +890,9 @@
</li>
<li>
<p>
-Join the IRC channel <a href="irc://irc.freenode.org/#qutebrowser"><code>#qutebrowser</code></a> on
-<a href="https://freenode.net/";>Freenode</a>
-(<a href="https://webchat.freenode.net/?channels=#qutebrowser";>webchat</a>).
+Join the IRC channel <a href="ircs://irc.libera.chat:6697/#qutebrowser"><code>#qutebrowser</code></a> on
+<a href="https://libera.chat/";>Libera Chat</a>
+(<a href="https://web.libera.chat/#qutebrowser";>webchat</a>).
</p>
</li>
</ul></div>
--- a/qutebrowser/html/doc/index.html
+++ b/qutebrowser/html/doc/index.html
@@ -866,9 +866,9 @@
<h2 id="_getting_help">Getting help</h2>
<div class="sectionbody">
<div class="paragraph"><p>You can get help in the IRC channel
-<a href="irc://irc.freenode.org/#qutebrowser"><code>#qutebrowser</code></a> on
-<a href="http://freenode.net/";>Freenode</a>
-(<a href="https://webchat.freenode.net/?channels=#qutebrowser";>webchat</a>), or by writing a
+<a href="ircs://irc.libera.chat:6697/#qutebrowser"><code>#qutebrowser</code></a> on
+<a href="https://libera.chat/";>Libera Chat</a>
+(<a href="https://web.libera.chat/#qutebrowser";>webchat</a>), or by writing a
message to the
<a href="https://lists.schokokeks.org/mailman/listinfo.cgi/qutebrowser";>mailinglist</a> at
<a href="mailto:qutebrowser@lists.qutebrowser.org";>qutebrowser@lists.qutebrowser.org</a>.</p></div>
--- a/qutebrowser/html/doc/quickstart.html
+++ b/qutebrowser/html/doc/quickstart.html
@@ -939,9 +939,9 @@
</li>
<li>
<p>
-Chat via the IRC channel: <a href="irc://irc.freenode.org/#qutebrowser"><code>#qutebrowser</code></a> on
-<a href="https://freenode.net/";>Freenode</a>
-(<a href="https://webchat.freenode.net/?channels=#qutebrowser";>webchat</a>)
+Chat via the IRC channel: <a href="ircs://irc.libera.chat:6697/#qutebrowser"><code>#qutebrowser</code></a> on
+<a href="https://libera.chat/";>Libera Chat</a>
+(<a href="https://web.libera.chat/#qutebrowser";>webchat</a>)
</p>
</li>
<li>
Reply to: