Control: tags -1 - moreinfo On Sat, 20 Apr 2019 18:20:00 +0000, Niels Thykier <ni...@thykier.net> said:
> Please go ahead with the upload including the two extra changes you > mentioned above and remove the moreinfo tag when it is in unstable and > ready to be unblocked. Done. Thank you for approving the changes. > For future reference: We generally prefer seeing the debdiff before > approving the changes. Had the two extra changes not been obvious > from your description, then it would have been necessary for me to ask > you for the full debdiff. Please make it easier for us by always > including the changes you want us to consider (modulo filterdiff of > auto-generated files). Noted. I wasn't sure about the process, but will do so in the future. For reference, here is the complete debdiff. -- Hubert Chathi <uho...@debian.org> -- https://www.uhoreg.ca/ Jabber: hub...@uhoreg.ca -- Matrix: @uhoreg:matrix.org PGP/GnuPG key: 4096R/F24C F749 6C73 DDB8 DCB8 72DE B2DE 88D3 113A 1368
diff -Nru nheko-0.6.3/debian/changelog nheko-0.6.3/debian/changelog --- nheko-0.6.3/debian/changelog 2019-02-08 15:35:59.000000000 -0500 +++ nheko-0.6.3/debian/changelog 2019-04-22 14:42:00.000000000 -0400 @@ -1,3 +1,11 @@ +nheko (0.6.3-2) unstable; urgency=medium + + * Support v3 rooms (Closes: #926671) + * debian/rules: clean up fakehome (Closes: #926680) + * debian/README.source: fix filename (Closes: #926659) + + -- Hubert Chathi <uho...@debian.org> Mon, 22 Apr 2019 14:42:00 -0400 + nheko (0.6.3-1) unstable; urgency=medium * New upstream release. diff -Nru nheko-0.6.3/debian/patches/series nheko-0.6.3/debian/patches/series --- nheko-0.6.3/debian/patches/series 2019-02-08 15:35:01.000000000 -0500 +++ nheko-0.6.3/debian/patches/series 2019-04-08 17:57:30.000000000 -0400 @@ -1,2 +1,3 @@ no_rpath nlohmann-json +v3_support diff -Nru nheko-0.6.3/debian/patches/v3_support nheko-0.6.3/debian/patches/v3_support --- nheko-0.6.3/debian/patches/v3_support 1969-12-31 19:00:00.000000000 -0500 +++ nheko-0.6.3/debian/patches/v3_support 2019-04-08 17:56:34.000000000 -0400 @@ -0,0 +1,27 @@ +Author: redsky17 <joedono...@gmail.com> +Bug: https://github.com/Nheko-Reborn/mtxclient/issues/3 +Bug-Debian: https://bugs.debian.org/926671 +Description: Fix Room v3 Issue + This at least partially addresses #3. I have a feeling that + additional updates will be needed at some point, but this + fixes the issue where mtxclient would throw an exception for + unrecognized event id formats, which caused nheko to crash. +Origin: backport, https://github.com/Nheko-Reborn/mtxclient/commit/67d39691666bcdf3cc660db19ccc0d9941df13fd +Last-Update: 2019-04-08 + +diff --git a/mtxclient/include/mtx/identifiers.hpp b/mtxclient/include/mtx/identifiers.hpp +index 87acc43..7885885 100644 +--- a/mtxclient/include/mtx/identifiers.hpp ++++ b/mtxclient/include/mtx/identifiers.hpp +@@ -90,7 +90,10 @@ parse(const std::string &id) + identifier.hostname_ = id.substr(parts + 1); + identifier.id_ = id; + } else { +- throw std::invalid_argument(id + ": invalid format\n"); ++ // V3 event ids don't use ':' at all, don't parse them the same way. ++ identifier.localpart_ = id; ++ identifier.hostname_ = id; ++ identifier.id_ = id; + } + + return identifier; diff -Nru nheko-0.6.3/debian/README.source nheko-0.6.3/debian/README.source --- nheko-0.6.3/debian/README.source 1969-12-31 19:00:00.000000000 -0500 +++ nheko-0.6.3/debian/README.source 2019-02-08 15:35:01.000000000 -0500 @@ -0,0 +1,13 @@ +nheko for Debian +---------------- + +Since nheko is currently the only package that uses mtxclient, and nheko links +to it statically, we include the sources for mtxclient with nheko's source. If +you have separate tarballs for nheko and mtxclient, the tarball for nheko +should be named normally for an orig.tar.* file, and the tarball for +matrix-structs should be named nheko_<nhekoversion>.orig-mtxclient.tar.*. If +you have an unpacked source (with the appropriate version of mtxclient placed +in the mtxclient directory), then you can run "debian/rules make-orig-source" +to create the tarballs for nheko and mtxclient. + + -- Hubert Chathi <uho...@debian.org>, Wed, 26 Sep 2018 19:38:58 -0400 diff -Nru nheko-0.6.3/debian/README.sources nheko-0.6.3/debian/README.sources --- nheko-0.6.3/debian/README.sources 2019-02-08 15:35:01.000000000 -0500 +++ nheko-0.6.3/debian/README.sources 1969-12-31 19:00:00.000000000 -0500 @@ -1,13 +0,0 @@ -nheko for Debian ----------------- - -Since nheko is currently the only package that uses mtxclient, and nheko links -to it statically, we include the sources for mtxclient with nheko's source. If -you have separate tarballs for nheko and mtxclient, the tarball for nheko -should be named normally for an orig.tar.* file, and the tarball for -matrix-structs should be named nheko_<nhekoversion>.orig-mtxclient.tar.*. If -you have an unpacked source (with the appropriate version of mtxclient placed -in the mtxclient directory), then you can run "debian/rules make-orig-source" -to create the tarballs for nheko and mtxclient. - - -- Hubert Chathi <uho...@debian.org>, Wed, 26 Sep 2018 19:38:58 -0400 diff -Nru nheko-0.6.3/debian/rules nheko-0.6.3/debian/rules --- nheko-0.6.3/debian/rules 2019-02-08 15:35:01.000000000 -0500 +++ nheko-0.6.3/debian/rules 2019-04-22 14:38:01.000000000 -0400 @@ -31,7 +31,7 @@ # override_dh_auto_clean: - rm -rf .deps build + rm -rf .deps build fakehome make-orig-source: VERSION = `dpkg-parsechangelog | grep ^Version | sed 's/Version: \(.*\)-[^-]*/\1/'` make-orig-source:
