Your message dated Wed, 26 May 2021 21:24:42 +0000 with message-id <E1lm118-00070M-Mo@respighi.debian.org> and subject line unblock hexchat has caused the Debian Bug report #989135, regarding unblock: hexchat/2.14.3-6 to be marked as done. This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact owner@bugs.debian.org immediately.) -- 989135: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=989135 Debian Bug Tracking System Contact owner@bugs.debian.org with problems
--- Begin Message ---
- To: Debian Bug Tracking System <submit@bugs.debian.org>
- Subject: unblock: hexchat/2.14.3-6
- From: Mattia Rizzolo <mattia@debian.org>
- Date: Wed, 26 May 2021 15:03:23 +0200
- Message-id: <[🔎] YK5HGyJwi82giFvh@mapreri.org>
Package: release.debian.org Severity: normal User: release.debian.org@packages.debian.org Usertags: unblock Please unblock package hexchat [ Reason ] Moving away from Freenode to Libera.chat. [ Impact ] Probably little changes for debian, since the default network has been OFTC for a while, but I still think it's relevant to add Libera.Chat to the available networks, at the very least. [ Tests ] manually tested all the changes. [ Risks ] none, probably. [ 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 testing [ Other info ] It's quite relevant for ubuntu, as you can guess from the diff, but that part is in a patch that is not built in debian, so… unblock hexchat/2.14.3-6 -- regards, Mattia Rizzolo GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`. More about me: https://mapreri.org : :' : Launchpad user: https://launchpad.net/~mapreri `. `'` Debian QA page: https://qa.debian.org/developer.php?login=mattia `-diffstat for hexchat-2.14.3 hexchat-2.14.3 changelog | 11 ++++ control | 1 default_servers/debian | 4 - default_servers/ubuntu | 15 +++--- patches/a25f2381689d2c2279a0e43b33f6c0ec8305a096.patch | 20 ++++++++ patches/d3545f37cd5f551ed8bc0ab7b20e5c8140adc0a6.patch | 39 +++++++++++++++++ patches/series | 4 + 7 files changed, 85 insertions(+), 9 deletions(-) diff -Nru hexchat-2.14.3/debian/changelog hexchat-2.14.3/debian/changelog --- hexchat-2.14.3/debian/changelog 2021-01-02 16:31:39.000000000 +0100 +++ hexchat-2.14.3/debian/changelog 2021-05-26 14:55:10.000000000 +0200 @@ -1,3 +1,14 @@ +hexchat (2.14.3-6) unstable; urgency=medium + + * Add Recommends:ca-certificates. + * Add patches from upstream to add Libera.Chat to the network list. + * Adapt default servers patches for the upstream changes. + * Ubuntu default server: + + Change from Freenode to Libera.Chat. + + Ore-select the "join channel" button, like we do in Debian. + + -- Mattia Rizzolo <mattia@debian.org> Wed, 26 May 2021 14:55:10 +0200 + hexchat (2.14.3-5) unstable; urgency=medium * Bump copyright for 2021. diff -Nru hexchat-2.14.3/debian/control hexchat-2.14.3/debian/control --- hexchat-2.14.3/debian/control 2020-12-16 21:56:22.000000000 +0100 +++ hexchat-2.14.3/debian/control 2021-05-26 14:54:00.000000000 +0200 @@ -34,6 +34,7 @@ ${misc:Depends}, ${shlibs:Depends}, Recommends: + ca-certificates, hexchat-perl, hexchat-plugins, hexchat-python3, diff -Nru hexchat-2.14.3/debian/default_servers/debian hexchat-2.14.3/debian/default_servers/debian --- hexchat-2.14.3/debian/default_servers/debian 2018-12-03 14:24:00.000000000 +0100 +++ hexchat-2.14.3/debian/default_servers/debian 2021-05-26 14:23:45.000000000 +0200 @@ -17,7 +17,7 @@ { int i = 0, j = 0; ircnet *net = NULL; -- guint def_hash = g_str_hash ("freenode"); +- guint def_hash = g_str_hash ("Libera.Chat"); + guint def_hash = g_str_hash ("OFTC"); while (1) @@ -36,7 +36,7 @@ + gtk_entry_set_text (GTK_ENTRY (entry1), "#debian"); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(radiobutton2), TRUE); + } - if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "freenode") == 0) + if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "Libera.Chat") == 0) { - gtk_entry_set_text (GTK_ENTRY (entry1), "#hexchat"); + gtk_entry_set_text (GTK_ENTRY (entry1), "#debian"); diff -Nru hexchat-2.14.3/debian/default_servers/ubuntu hexchat-2.14.3/debian/default_servers/ubuntu --- hexchat-2.14.3/debian/default_servers/ubuntu 2020-01-02 09:39:26.000000000 +0100 +++ hexchat-2.14.3/debian/default_servers/ubuntu 2021-05-26 14:51:19.000000000 +0200 @@ -17,8 +17,8 @@ /* irc. points to chat. but many users and urls still reference it */ {0, "irc.freenode.net"}, -+ {"Ubuntu Servers (freenode)", 0, 0, 0, LOGIN_SASL, 0, TRUE}, -+ {0, "chat.freenode.net"}, ++ {"Ubuntu Servers (Libera.Chat)", 0, 0, 0, LOGIN_SASL, 0, TRUE}, ++ {0, "irc.libera.chat"}, + {"GalaxyNet", 0}, {0, "irc.galaxynet.org"}, @@ -27,8 +27,8 @@ { int i = 0, j = 0; ircnet *net = NULL; -- guint def_hash = g_str_hash ("freenode"); -+ guint def_hash = g_str_hash ("Ubuntu Servers (freenode)"); +- guint def_hash = g_str_hash ("Libera.Chat"); ++ guint def_hash = g_str_hash ("Ubuntu Servers (Libera.Chat)"); while (1) { @@ -36,15 +36,16 @@ index f1d3da5..6172795 100644 --- a/src/fe-gtk/joind.c +++ b/src/fe-gtk/joind.c -@@ -247,9 +247,9 @@ joind_show_dialog (server *serv) +@@ -247,9 +247,10 @@ joind_show_dialog (server *serv) G_CALLBACK (joind_ok_cb), serv); if (serv->network) -- if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "freenode") == 0) -+ if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "Ubuntu Servers (freenode)") == 0) +- if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "Libera.Chat") == 0) ++ if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "Ubuntu Servers (Libera.Chat)") == 0) { - gtk_entry_set_text (GTK_ENTRY (entry1), "#hexchat"); + gtk_entry_set_text (GTK_ENTRY (entry1), "#ubuntu"); ++ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(radiobutton2), TRUE); } gtk_widget_grab_focus (okbutton1); diff -Nru hexchat-2.14.3/debian/patches/a25f2381689d2c2279a0e43b33f6c0ec8305a096.patch hexchat-2.14.3/debian/patches/a25f2381689d2c2279a0e43b33f6c0ec8305a096.patch --- hexchat-2.14.3/debian/patches/a25f2381689d2c2279a0e43b33f6c0ec8305a096.patch 1970-01-01 01:00:00.000000000 +0100 +++ hexchat-2.14.3/debian/patches/a25f2381689d2c2279a0e43b33f6c0ec8305a096.patch 2021-05-26 14:19:12.000000000 +0200 @@ -0,0 +1,20 @@ +commit a25f2381689d2c2279a0e43b33f6c0ec8305a096 +Author: Panagiotis Vasilopoulos <hello@alwayslivid.com> +AuthorDate: Wed May 19 16:25:16 2021 +0300 +Commit: Patrick <tingping@tingping.se> +CommitDate: Wed May 19 12:08:03 2021 -0500 + + Add Libera Chat to network list + +--- a/src/common/servlist.c ++++ b/src/common/servlist.c +@@ -237,6 +237,9 @@ + /* Self signed */ + {0, "irc.librairc.net"}, + ++ {"Libera Chat", 0, 0, 0, LOGIN_SASL, 0, TRUE}, ++ {0, "irc.libera.chat"}, ++ + #ifdef USE_OPENSSL + {"LinkNet", 0}, + {0, "irc.link-net.org/+7000"}, diff -Nru hexchat-2.14.3/debian/patches/d3545f37cd5f551ed8bc0ab7b20e5c8140adc0a6.patch hexchat-2.14.3/debian/patches/d3545f37cd5f551ed8bc0ab7b20e5c8140adc0a6.patch --- hexchat-2.14.3/debian/patches/d3545f37cd5f551ed8bc0ab7b20e5c8140adc0a6.patch 1970-01-01 01:00:00.000000000 +0100 +++ hexchat-2.14.3/debian/patches/d3545f37cd5f551ed8bc0ab7b20e5c8140adc0a6.patch 2021-05-26 14:19:16.000000000 +0200 @@ -0,0 +1,39 @@ +commit d3545f37cd5f551ed8bc0ab7b20e5c8140adc0a6 +Author: Patrick Griffis <pgriffis@igalia.com> +AuthorDate: Sun May 23 21:15:43 2021 -0500 +Commit: Patrick Griffis <pgriffis@igalia.com> +CommitDate: Sun May 23 21:15:52 2021 -0500 + + Change default network to Libera.Chat + +--- a/src/common/servlist.c ++++ b/src/common/servlist.c +@@ -237,7 +237,7 @@ + /* Self signed */ + {0, "irc.librairc.net"}, + +- {"Libera Chat", 0, 0, 0, LOGIN_SASL, 0, TRUE}, ++ {"Libera.Chat", 0, 0, 0, LOGIN_SASL, 0, TRUE}, + {0, "irc.libera.chat"}, + + #ifdef USE_OPENSSL +@@ -933,7 +933,7 @@ + { + int i = 0, j = 0; + ircnet *net = NULL; +- guint def_hash = g_str_hash ("freenode"); ++ guint def_hash = g_str_hash ("Libera.Chat"); + + while (1) + { +--- a/src/fe-gtk/joind.c ++++ b/src/fe-gtk/joind.c +@@ -247,7 +247,7 @@ + G_CALLBACK (joind_ok_cb), serv); + + if (serv->network) +- if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "freenode") == 0) ++ if (g_ascii_strcasecmp(((ircnet*)serv->network)->name, "Libera.Chat") == 0) + { + gtk_entry_set_text (GTK_ENTRY (entry1), "#hexchat"); + } diff -Nru hexchat-2.14.3/debian/patches/series hexchat-2.14.3/debian/patches/series --- hexchat-2.14.3/debian/patches/series 2021-01-02 16:30:02.000000000 +0100 +++ hexchat-2.14.3/debian/patches/series 2021-05-26 14:17:31.000000000 +0200 @@ -21,5 +21,9 @@ fix-pango-font-height.patch +# Move to Libera.Chat +a25f2381689d2c2279a0e43b33f6c0ec8305a096.patch +d3545f37cd5f551ed8bc0ab7b20e5c8140adc0a6.patch + # apply this later to avoid conflicts 0001-Rename-the-python-module-to-python3-to-keep-backward.patchAttachment: signature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---
- To: 989135-done@bugs.debian.org
- Subject: unblock hexchat
- From: Sebastian Ramacher <sramacher@respighi.debian.org>
- Date: Wed, 26 May 2021 21:24:42 +0000
- Message-id: <E1lm118-00070M-Mo@respighi.debian.org>
Unblocked.
--- End Message ---