Drop (now unnecessary) workaround for #799485.

debian/changelog

@@ -3,6 +3,7 @@ dulwich (0.16.2-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Drop upstream applied patch 'older-git'.
   * Update homepage to www.dulwich.io.
+  * Drop (now unnecessary) workaround for #799485.
 
  -- Jelmer Vernooij <jelmer@debian.org>  Sun, 08 Jan 2017 02:12:51 +0000
 

debian/rules

@@ -14,8 +14,6 @@ pythonpath_dbg = $$(ls -d $(CURDIR)/build/lib_d.*-$(1) 2>/dev/null || ls -d $(CU
 
 override_dh_auto_build:
 	dh_auto_build
-	# Work around bug #799485
-	CFLAGS=-I/usr/lib/pypy pypy setup.py build -b build-pypy
 
 override_dh_auto_clean:
 	dh_auto_clean
@@ -26,13 +24,13 @@ override_dh_auto_test:
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	$(MAKE) check PYTHON=python
 	$(MAKE) check PYTHON=python3
-	PYTHONPATH=$(shell echo $(CURDIR)/build-pypy/lib*) pypy -m unittest dulwich.tests.test_suite
+	$(MAKE) check PYTHON=pypy
 endif
 
 override_dh_auto_install:
 	dh_auto_install
 	set -ex; for python in $(shell py3versions -r); do \
-		$$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
+	  $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \
 	done;
 	pypy setup.py build -b build-pypy install --root=$(CURDIR)/debian/tmp --install-layout deb
 	rm -rf debian/tmp/usr/lib/pypy/bin