diff options
Diffstat (limited to '')
| -rwxr-xr-x | debian/build_virtualenv | 1 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 1 insertions, 4 deletions
diff --git a/debian/build_virtualenv b/debian/build_virtualenv index d892fd5c9d..4c9aabcac3 100755 --- a/debian/build_virtualenv +++ b/debian/build_virtualenv @@ -36,7 +36,6 @@ esac dh_virtualenv \ --install-suffix "matrix-synapse" \ --builtin-venv \ - --setuptools \ --python "$SNAKE" \ --upgrade-pip \ --preinstall="lxml" \ diff --git a/debian/changelog b/debian/changelog index 8641571986..2db94ee609 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,14 @@ -<<<<<<< HEAD matrix-synapse-py3 (1.12.3ubuntu1) UNRELEASED; urgency=medium * Add information about .well-known files to Debian installation scripts. -- Patrick Cloke <patrickc@matrix.org> Mon, 06 Apr 2020 10:10:38 -0400 -======= + matrix-synapse-py3 (1.12.4) stable; urgency=medium * New synapse release 1.12.4. -- Synapse Packaging team <packages@matrix.org> Thu, 23 Apr 2020 10:58:14 -0400 ->>>>>>> master matrix-synapse-py3 (1.12.3) stable; urgency=medium |