MANIFEST.in

@@ -2,7 +2,7 @@ recursive-include scripts *
 recursive-include test-data *
 recursive-include extensions *
 recursive-include docs *
-include runtests.py
-include waiter.py
+recursive-include mypy/typeshed *.py *.pyi
+recursive-include mypy/xml *.xsd *.xslt *.css
 include mypy_self_check.ini
 include LICENSE

PKG-INFO

 Metadata-Version: 2.1
 Name: mypy
-Version: 0.620
+Version: 0.630
 Summary: Optional static typing for Python
 Home-page: http://www.mypy-lang.org/
 Author: Jukka Lehtosalo

debian/changelog

+mypy (0.630-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Include mypy_extensions.
+
+ -- Michael R. Crusoe <michael.crusoe@gmail.com>  Mon, 17 Sep 2018 11:05:13 -0700
+
 mypy (0.620-1) unstable; urgency=medium
 
   * New upstream release.

debian/control

@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 11),
                python3-sphinx-rtd-theme,
                python3-typed-ast (>= 1.1.0),
                python3-psutil (>= 5.4.0)
-Standards-Version: 4.2.0
+Standards-Version: 4.2.1
 Vcs-Browser: https://salsa.debian.org/med-team/mypy
 Vcs-Git: https://salsa.debian.org/med-team/mypy.git
 Homepage: http://www.mypy-lang.org/

debian/patches/adjust-test-py-path

 From: Michael R. Crusoe <michael.crusoe@gmail.com>
 Subject: specify python3 for typeshed test
---- mypy.orig/typeshed/tests/pytype_test.py
-+++ mypy/typeshed/tests/pytype_test.py
+--- mypy.orig/mypy/typeshed/tests/pytype_test.py
++++ mypy/mypy/typeshed/tests/pytype_test.py
 @@ -1,4 +1,4 @@
 -#!/usr/bin/env python
 +#!/usr/bin/env python3

debian/rules

 #!/usr/bin/make -f
 SHELL=bash  # needed for the <(echo …) process subsitution temporary file
 # tricks with help2man
-
-export PYBUILD_NAME=mypy
-export PYBUILD_DESTDIR_python3=debian/python3-$(PYBUILD_NAME)
-
+export DH_VERBOSE=1
 export PYBUILD_DISABLE=test
-PPATH=$(CURDIR)
+export PYBUILD_DESTDIR_python3=debian/python3-mypy
+PPATH=$(CURDIR):$(CURDIR)/extensions
 PY3V=$(shell py3versions -dv)
 include /usr/share/dpkg/pkg-info.mk
 %:
+	PYBUILD_NAME=mypy_extensions \
+	PYBUILD_DIR=$(CURDIR)/extensions/ \
+	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
+	PYBUILD_NAME=mypy \
+	PYBUILD_DIR=$(CURDIR) \
 	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_build:
+	PYBUILD_NAME=mypy_extensions \
+	PYBUILD_DIR=$(CURDIR)/extensions/ \
+	dh_auto_build
+	PYBUILD_NAME=mypy \
+	PYBUILD_DIR=$(CURDIR) \
 	dh_auto_build
 	PYTHONPATH=$(PPATH) help2man 'python3 -m mypy' --no-info \
 		   --version-string="${DEB_VERSION_UPSTREAM}" \
@@ -72,5 +80,10 @@ override_dh_auto_clean:
 	$(MAKE) -C docs clean
 
 override_dh_auto_install:
+	PYBUILD_NAME=mypy_extensions \
+	PYBUILD_DIR=$(CURDIR)/extensions/ \
+	dh_auto_install
+	PYBUILD_NAME=mypy \
+	PYBUILD_DIR=$(CURDIR) \
 	dh_auto_install
-	dh_movefiles --package=mypy --sourcedir=$(PYBUILD_DESTDIR_python3) usr/bin
+	dh_movefiles --package=mypy --sourcedir=debian/python3-mypy usr/bin