From 563ef172ae92a6085f115263375f6238cb35f698 Mon Sep 17 00:00:00 2001 From: David Robertson Date: Mon, 30 May 2022 10:47:40 +0100 Subject: Remove contrib/jitsimeetbridge (#12909) --- debian/changelog | 7 +++++++ debian/copyright | 23 ----------------------- 2 files changed, 7 insertions(+), 23 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index b6a51d6903..b1e61e7c8a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +matrix-synapse-py3 (1.60.0~rc2+nmu1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * Remove unused `jitsimeetbridge` experiment from `contrib` directory. + + -- Synapse Packaging team Sun, 29 May 2022 14:44:45 +0100 + matrix-synapse-py3 (1.60.0~rc2) stable; urgency=medium * New Synapse release 1.60.0rc2. diff --git a/debian/copyright b/debian/copyright index 95c21ea12a..902b18fa41 100644 --- a/debian/copyright +++ b/debian/copyright @@ -22,29 +22,6 @@ Files: synapse/config/repository.py Copyright: 2014-2015, matrix.org License: Apache-2.0 -Files: contrib/jitsimeetbridge/unjingle/strophe/base64.js -Copyright: Public Domain (Tyler Akins http://rumkin.com) -License: public-domain - This code was written by Tyler Akins and has been placed in the - public domain. It would be nice if you left this header intact. - Base64 code from Tyler Akins -- http://rumkin.com - -Files: contrib/jitsimeetbridge/unjingle/strophe/md5.js -Copyright: 1999-2002, Paul Johnston & Contributors -License: BSD-3-clause - -Files: contrib/jitsimeetbridge/unjingle/strophe/strophe.js -Copyright: 2006-2008, OGG, LLC -License: Expat - -Files: contrib/jitsimeetbridge/unjingle/strophe/XMLHttpRequest.js -Copyright: 2010 passive.ly LLC -License: Expat - -Files: contrib/jitsimeetbridge/unjingle/*.js -Copyright: 2014 Jitsi -License: Apache-2.0 - Files: debian/* Copyright: 2016-2017, Erik Johnston 2017, Rahul De -- cgit 1.5.1