diff options
| author | Andrew Morgan <andrew@amorgan.xyz> | 2024-01-16 16:11:23 +0000 |
|---|---|---|
| committer | Andrew Morgan <andrew@amorgan.xyz> | 2024-01-16 16:11:23 +0000 |
| commit | 2927008e48ecb6ea5d24e622d7b2fffe94c45c44 (patch) | |
| tree | 2bb081f43a6105f926cb99c10a6ce1674d08f9cb /debian | |
| parent | Revert changes to README (diff) | |
| parent | Fix text and add second link (diff) | |
| download | synapse-2927008e48ecb6ea5d24e622d7b2fffe94c45c44.tar.xz | |
Merge branch 'release-v1.99'
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/copyright | 6 | ||||
| -rw-r--r-- | debian/po/templates.pot | 2 | ||||
| -rw-r--r-- | debian/templates | 2 |
5 files changed, 21 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog index abcfedf6d6..8f1f7bb4ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +matrix-synapse-py3 (1.99.0) stable; urgency=medium + + * Fix copyright file with new licensing + * New Synapse release 1.99.0. + + -- Synapse Packaging team <packages@matrix.org> Tue, 16 Jan 2024 11:58:34 +0000 + +matrix-synapse-py3 (1.99.0~rc1) stable; urgency=medium + + * New Synapse release 1.99.0rc1. + + -- Synapse Packaging team <packages@matrix.org> Tue, 09 Jan 2024 13:43:56 +0000 + matrix-synapse-py3 (1.98.0) stable; urgency=medium * New Synapse release 1.98.0. diff --git a/debian/control b/debian/control index 2ff55db5de..3065142e7a 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,7 @@ Build-Depends: python3-venv, tar, Standards-Version: 3.9.8 -Homepage: https://github.com/matrix-org/synapse +Homepage: https://github.com/element-hq/synapse Package: matrix-synapse-py3 Architecture: any diff --git a/debian/copyright b/debian/copyright index 902b18fa41..9e407ce425 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,11 +1,15 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: synapse -Source: https://github.com/matrix-org/synapse +Source: https://github.com/element-hq/synapse Files: * Copyright: 2014-2017, OpenMarket Ltd, 2017-2018 New Vector Ltd License: Apache-2.0 +Files: * +Copyright: 2023 New Vector Ltd +License: AGPL-3.0-or-later + Files: synapse/config/saml2.py Copyright: 2015, Ericsson License: Apache-2.0 diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 445e4aac81..bf320a5ff6 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -30,7 +30,7 @@ msgid "" "The name that this homeserver will appear as, to clients and other servers " "via federation. This is normally the public hostname of the server running " "synapse, but can be different if you set up delegation. Please refer to the " -"delegation documentation in this case: https://github.com/matrix-org/synapse/" +"delegation documentation in this case: https://github.com/element-hq/synapse/" "blob/master/docs/delegate.md." msgstr "" diff --git a/debian/templates b/debian/templates index 23e24e1059..cab05715d0 100644 --- a/debian/templates +++ b/debian/templates @@ -5,7 +5,7 @@ _Description: Name of the server: servers via federation. This is normally the public hostname of the server running synapse, but can be different if you set up delegation. Please refer to the delegation documentation in this case: - https://github.com/matrix-org/synapse/blob/master/docs/delegate.md. + https://github.com/element-hq/synapse/blob/master/docs/delegate.md. Template: matrix-synapse/report-stats Type: boolean |