Dear Release Team Please unblock jabber-muc 0.8-8.
This upload has the following modifications * debian/patches - fix for ftbfs with GCC10 (Closes: #957384). Thanks to Logan Rosen. * debian/control - bump standards to 4.5.1. - set debhelper-compat to level 13. * debian/compat - removed. The debdiff is attached. TIA Willem vdAkker
diff -Nru jabber-muc-0.8/debian/changelog jabber-muc-0.8/debian/changelog --- jabber-muc-0.8/debian/changelog 2021-02-09 07:56:50.000000000 +0100 +++ jabber-muc-0.8/debian/changelog 2019-05-12 10:15:20.000000000 +0200 @@ -1,16 +1,3 @@ -jabber-muc (0.8-8) unstable; urgency=medium - - * debian/patches - - fix for ftbfs with GCC10 (Closes: #957384). - Thanks to Logan Rosen. - * debian/control - - bump standards to 4.5.1. - - set debhelper-compat to level 13. - * debian/compat - - removed. - - -- Willem van den Akker <[email protected]> Tue, 09 Feb 2021 07:56:50 +0100 - jabber-muc (0.8-7) unstable; urgency=medium * debian/patch diff -Nru jabber-muc-0.8/debian/compat jabber-muc-0.8/debian/compat --- jabber-muc-0.8/debian/compat 1970-01-01 01:00:00.000000000 +0100 +++ jabber-muc-0.8/debian/compat 2018-01-17 13:23:36.000000000 +0100 @@ -0,0 +1 @@ +11 diff -Nru jabber-muc-0.8/debian/control jabber-muc-0.8/debian/control --- jabber-muc-0.8/debian/control 2021-02-09 07:56:50.000000000 +0100 +++ jabber-muc-0.8/debian/control 2018-02-05 17:16:56.000000000 +0100 @@ -3,11 +3,11 @@ Priority: optional Maintainer: Debian XMPP Maintainers <[email protected]> Uploaders: Willem van den Akker <[email protected]> -Build-Depends: debhelper-compat (=13), libglib2.0-dev, libexpat1-dev, libidn11-dev +Build-Depends: debhelper (>= 11), libglib2.0-dev, libexpat1-dev, libidn11-dev Vcs-Browser: https://salsa.debian.org/xmpp-team/jabber-muc Vcs-Git: https://salsa.debian.org/xmpp-team/jabber-muc.git Homepage: https://web.archive.org/web/https://download.gna.org/mu-conference/ -Standards-Version: 4.5.1 +Standards-Version: 4.1.3 Package: jabber-muc Architecture: any diff -Nru jabber-muc-0.8/debian/patches/gcc_10.diff jabber-muc-0.8/debian/patches/gcc_10.diff --- jabber-muc-0.8/debian/patches/gcc_10.diff 2021-02-09 07:52:16.000000000 +0100 +++ jabber-muc-0.8/debian/patches/gcc_10.diff 1970-01-01 01:00:00.000000000 +0100 @@ -1,51 +0,0 @@ ---- a/include/jcomp-compat.h -+++ b/include/jcomp-compat.h -@@ -66,6 +66,6 @@ - handel hds; - }; - --int deliver__flag; -+extern int deliver__flag; - - typedef void(*shutdown_func)(void *arg); ---- a/src/conference_user.c -+++ b/src/conference_user.c -@@ -19,7 +19,7 @@ - */ - - #include "conference.h" --extern int deliver__flag; -+int deliver__flag; - - cnu con_user_new(cnr room, jid id) - { ---- a/include/jcomp.h -+++ b/include/jcomp.h -@@ -98,7 +98,7 @@ - #define _STREAM_ERROR 4 - #define _STREAM_SHUTDOWN 5 - --jcr_instance jcr; -+extern jcr_instance jcr; - - void log_debug(char *, const char *, ...) G_GNUC_PRINTF(2, 3); - void log_warn(char *, const char *, ...) G_GNUC_PRINTF(2, 3); ---- a/src/conference.c -+++ b/src/conference.c -@@ -20,6 +20,8 @@ - - #include "conference.h" - -+jcr_instance jcr; -+ - void con_server_browsewalk(gpointer key, gpointer data, gpointer arg) - { - cnr room = (cnr)data; -@@ -1064,7 +1066,6 @@ - /*** everything starts here ***/ - void conference(instance i, xmlnode x) - { -- extern jcr_instance jcr; - cni master; - xmlnode cfg; - jid sadmin; diff -Nru jabber-muc-0.8/debian/patches/series jabber-muc-0.8/debian/patches/series --- jabber-muc-0.8/debian/patches/series 2021-02-09 07:52:16.000000000 +0100 +++ jabber-muc-0.8/debian/patches/series 2019-05-12 10:13:37.000000000 +0200 @@ -1,3 +1,2 @@ cflags_hardening.diff cross.diff -gcc_10.diff
