mirror of
https://github.com/element-hq/synapse.git
synced 2024-12-15 17:51:10 +00:00
Fix debian package triggers (#10481)
Replace the outdated list of dpkg triggers with an autogenerated one.
This commit is contained in:
parent
4b10880da3
commit
951648f26a
3 changed files with 17 additions and 9 deletions
15
debian/build_virtualenv
vendored
15
debian/build_virtualenv
vendored
|
@ -100,3 +100,18 @@ esac
|
||||||
# add a dependency on the right version of python to substvars.
|
# add a dependency on the right version of python to substvars.
|
||||||
PYPKG=`basename $SNAKE`
|
PYPKG=`basename $SNAKE`
|
||||||
echo "synapse:pydepends=$PYPKG" >> debian/matrix-synapse-py3.substvars
|
echo "synapse:pydepends=$PYPKG" >> debian/matrix-synapse-py3.substvars
|
||||||
|
|
||||||
|
|
||||||
|
# add a couple of triggers. This is needed so that dh-virtualenv can rebuild
|
||||||
|
# the venv when the system python changes (see
|
||||||
|
# https://dh-virtualenv.readthedocs.io/en/latest/tutorial.html#step-2-set-up-packaging-for-your-project)
|
||||||
|
#
|
||||||
|
# we do it here rather than the more conventional way of just adding it to
|
||||||
|
# debian/matrix-synapse-py3.triggers, because we need to add a trigger on the
|
||||||
|
# right version of python.
|
||||||
|
cat >>"debian/.debhelper/generated/matrix-synapse-py3/triggers" <<EOF
|
||||||
|
# triggers for dh-virtualenv
|
||||||
|
interest-noawait $SNAKE
|
||||||
|
interest dh-virtualenv-interpreter-update
|
||||||
|
|
||||||
|
EOF
|
||||||
|
|
2
debian/changelog
vendored
2
debian/changelog
vendored
|
@ -2,6 +2,8 @@ matrix-synapse-py3 (1.40.0~rc1) stable; urgency=medium
|
||||||
|
|
||||||
[ Richard van der Hoff ]
|
[ Richard van der Hoff ]
|
||||||
* Drop backwards-compatibility code that was required to support Ubuntu Xenial.
|
* Drop backwards-compatibility code that was required to support Ubuntu Xenial.
|
||||||
|
* Update package triggers so that the virtualenv is correctly rebuilt
|
||||||
|
when the system python is rebuilt, on recent Python versions.
|
||||||
|
|
||||||
[ Synapse Packaging team ]
|
[ Synapse Packaging team ]
|
||||||
* New synapse release 1.40.0~rc1.
|
* New synapse release 1.40.0~rc1.
|
||||||
|
|
9
debian/matrix-synapse-py3.triggers
vendored
9
debian/matrix-synapse-py3.triggers
vendored
|
@ -1,9 +0,0 @@
|
||||||
# Register interest in Python interpreter changes and
|
|
||||||
# don't make the Python package dependent on the virtualenv package
|
|
||||||
# processing (noawait)
|
|
||||||
interest-noawait /usr/bin/python3.5
|
|
||||||
interest-noawait /usr/bin/python3.6
|
|
||||||
interest-noawait /usr/bin/python3.7
|
|
||||||
|
|
||||||
# Also provide a symbolic trigger for all dh-virtualenv packages
|
|
||||||
interest dh-virtualenv-interpreter-update
|
|
Loading…
Reference in a new issue