# HG changeset patch # User Yuya Nishihara # Date 1701437797 -32400 # Fri Dec 01 22:36:37 2023 +0900 # Node ID d617b1e2a45b85062033d0c0848f6f17cb899530 # Parent 09d0bf64d4f4a9fcd9c37cf536542f4114defbf2 debian: set DEB_PYTHON_INSTALL_LAYOUT=deb to work around broken --prefix I don't know what's changed in distutils/setuptools, but --prefix=/usr is no longer respected without --install-layout=deb. diff --git a/contrib/debian-qt5/rules b/contrib/debian-qt5/rules --- a/contrib/debian-qt5/rules +++ b/contrib/debian-qt5/rules @@ -20,9 +20,10 @@ override_dh_auto_build: $(MAKE) release -j4 PREFIX=/usr QT_VERSION_MAJOR=5 +override_dh_auto_install: export DEB_PYTHON_INSTALL_LAYOUT = deb override_dh_auto_install: $(MAKE) install PREFIX=/usr DESTDIR="$(CURDIR)/debian/hgv" - cd "$(CURDIR)"/debian/hgv/usr/lib/python*.*/site-packages \ + cd "$(CURDIR)"/debian/hgv/usr/lib/python3/dist-packages \ && $(RM) hgext3rd/__init__.py \ && mkdir -p mercurial/defaultrc \ && mv hgext3rd/hgv.rc mercurial/defaultrc diff --git a/contrib/debian-qt6/rules b/contrib/debian-qt6/rules --- a/contrib/debian-qt6/rules +++ b/contrib/debian-qt6/rules @@ -20,9 +20,10 @@ override_dh_auto_build: $(MAKE) release -j4 PREFIX=/usr QT_VERSION_MAJOR=6 +override_dh_auto_install: export DEB_PYTHON_INSTALL_LAYOUT = deb override_dh_auto_install: $(MAKE) install PREFIX=/usr DESTDIR="$(CURDIR)/debian/hgv" - cd "$(CURDIR)"/debian/hgv/usr/lib/python*.*/site-packages \ + cd "$(CURDIR)"/debian/hgv/usr/lib/python3/dist-packages \ && $(RM) hgext3rd/__init__.py \ && mkdir -p mercurial/defaultrc \ && mv hgext3rd/hgv.rc mercurial/defaultrc