diff --git a/debian/changelog b/debian/changelog index e38ce8d3d..129170bdb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,7 @@ freedombox (22.21) unstable; urgency=medium * janus: Allow AF_UNIX and AF_NETLINK * locale: Update translation strings * doc: Fetch latest manual + * setup.py: Move distutils import after setuptools import [ nbenedek ] * wordpress: disable readme.html, xmlrpc.php, wp-cron.php diff --git a/setup.py b/setup.py index 0cbc71e0a..ced8e8412 100755 --- a/setup.py +++ b/setup.py @@ -11,6 +11,9 @@ import pathlib import re import shutil import subprocess +import setuptools +from setuptools.command.install import install + from distutils import log from distutils.command.build import build from distutils.command.clean import clean @@ -19,9 +22,6 @@ from distutils.core import Command from distutils.dir_util import remove_tree from distutils.util import change_root -import setuptools -from setuptools.command.install import install - from plinth import __version__ DIRECTORIES_TO_CREATE = [