Mercurial > evolve
changeset 6136:95500f2f0966
debian: changes to build only for Python 3
| author | Faheem Mitha <faheem@faheem.info> |
|---|---|
| date | Sun, 09 Jan 2022 23:05:28 +0530 |
| parents | 0fa9cc8075aa |
| children | 0562705ae984 |
| files | debian/control debian/rules |
| diffstat | 2 files changed, 3 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/debian/control Fri Feb 18 16:05:45 2022 +0300 +++ b/debian/control Sun Jan 09 23:05:28 2022 +0530 @@ -8,11 +8,10 @@ Standards-Version: 4.3.0 Build-Depends: mercurial (>= 4.8), - python, python3, debhelper (>= 10), dh-python, - python-sphinx, + python3-sphinx, imagemagick, librsvg2-bin, graphviz, @@ -24,7 +23,6 @@ Package: mercurial-evolve Architecture: all Depends: - ${python:Depends}, ${python3:Depends}, ${misc:Depends}, ${sphinxdoc:Depends},
--- a/debian/rules Fri Feb 18 16:05:45 2022 +0300 +++ b/debian/rules Sun Jan 09 23:05:28 2022 +0530 @@ -2,13 +2,13 @@ #export DH_VERBOSE=1 %: - dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild + dh $@ --with python3,sphinxdoc --buildsystem=pybuild ifeq (,$(filter nodoc, $(DEB_BUILD_OPTIONS))) override_dh_auto_build: dh_auto_build # Workaround for Sphinx in Debian Buster defaulting to Python 3 - SPHINXBUILD="python -m sphinx -bhtml" $(MAKE) -C docs + SPHINXBUILD="python3 -m sphinx -bhtml" $(MAKE) -C docs endif hgsrc_defined: @@ -20,11 +20,6 @@ cd tests && python $(HGSRC)/tests/run-tests.py --with-hg=$(HGSRC)/hg --blacklist=$(CURDIR)/debian/test-blacklist endif -override_dh_python2: - # avoid conflict with mercurial's own hgext3rd/__init__.py - find debian -path '*/hgext3rd/__init__.py' -delete - dh_python2 - override_dh_python3: # avoid conflict with mercurial's own hgext3rd/__init__.py find debian -path '*/hgext3rd/__init__.py' -delete