Created
January 9, 2022 11:44
-
-
Save fmitha/acaccc4136f1072f62bb7c1a351e6ec2 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/debian/control b/debian/control | |
--- a/debian/control | |
+++ b/debian/control | |
@@ -8,11 +8,10 @@ Uploaders: | |
Standards-Version: 4.3.0 | |
Build-Depends: | |
mercurial (>= 4.7), | |
- python, | |
python3, | |
debhelper (>= 10), | |
dh-python, | |
- python-sphinx, | |
+ python3-sphinx, | |
imagemagick, | |
librsvg2-bin, | |
graphviz, | |
@@ -24,7 +23,6 @@ Vcs-Hg: https://www.mercurial-scm.org/re | |
Package: mercurial-evolve | |
Architecture: all | |
Depends: | |
- ${python:Depends}, | |
${python3:Depends}, | |
${misc:Depends}, | |
${sphinxdoc:Depends}, | |
diff --git a/debian/rules b/debian/rules | |
--- a/debian/rules | |
+++ b/debian/rules | |
@@ -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,10 +20,10 @@ override_dh_auto_test: hgsrc_defined | |
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_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 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment