Import python3.7 (3.7.5-2)debian/3.7.5-2debian

1 files changed, 129 insertions, 102 deletions

diff --git a/debian/rules b/debian/rules
index 6669a0b..95c4887 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,12 +4,7 @@ unexport LANG LC_ALL LC_CTYPE LC_COLLATE LC_TIME LC_NUMERIC LC_MESSAGES
 unexport CFLAGS CXXFLAGS LDFLAGS CPPFLAGS
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=-pie
-export DEB_BUILD_MAINT_OPTIONS=hardening=-pie
-DEB_BUILD_MAINT_OPTIONS := hardening=-pie
-export DEB_BUILD_MAINT_OPTIONS
-
-#DEB_MAINT_BUILD_OPTIONS := hardening=-pie
-#export DEB_MAINT_BUILD_OPTIONS
+dpkg_buildflags = DEB_BUILD_MAINT_OPTIONS=$(DEB_BUILD_MAINT_OPTIONS) dpkg-buildflags
 
 export SHELL = /bin/bash
 
@@ -29,7 +24,7 @@ DEB_HOST_MULTIARCH	?= $(call vafilt,$(DPKG_VARS),DEB_HOST_MULTIARCH)
 ifeq ($(DEB_HOST_ARCH_OS),linux)
   PLAT = linux
 else ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
-  PLAT = gnukfreebsd10
+  PLAT = gnukfreebsd11
 else ifeq ($(DEB_HOST_ARCH_OS),hurd)
   PLAT = gnu0
 else
@@ -67,13 +62,11 @@ ifeq ($(on_buildd),yes)
   endif
   ifneq (,$(filter $(DEB_HOST_ARCH), armel hppa mips mipsel mips64 mips64el s390 hurd-i386 kfreebsd-amd64 kfreebsd-i386))
     WITHOUT_BENCH := yes
-    WITHOUT_STONE := yes
   endif
 endif
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
   WITHOUT_BENCH := yes
   WITHOUT_CHECK := yes
-  WITHOUT_STONE := yes
 endif
 
 COMMA = ,
@@ -83,13 +76,14 @@ endif
 
 distribution := $(shell lsb_release -is)
 distrelease  := $(shell lsb_release -cs)
-derivative := $(shell if dpkg-vendor --derives-from Ubuntu; then echo Ubuntu; \
-		elif dpkg-vendor --derives-from Debian; then echo Debian; \
-		else echo Unknown; fi)
-
-VER=3.6
-SVER=3.6.0~b2
-NVER=3.7
+derivative      := $(shell \
+	if dpkg-vendor --derives-from Ubuntu; then echo Ubuntu; \
+	elif dpkg-vendor --derives-from Debian; then echo Debian; \
+	else echo Unknown; fi)
+
+VER=3.7
+SVER=3.7.0
+NVER=3.8
 PVER=python$(VER)
 EXT_VER=$(subst .,,$(VER))
 PRIORITY=$(shell echo $(VER) | tr -d '.')0
@@ -144,36 +138,31 @@ ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy lucid maverick natty on
 else
   ma_filter = grep -v '^Multi-Arch:'
 endif
-ifneq (,$(filter $(distrelease),sid experimental))
-  bd_gcc =
-endif
 ifeq (,$(filter $(distrelease),lenny etch squeeze wheezy lucid maverick natty oneiric precise quantal raring saucy trusty))
   bd_dpkgdev = dpkg-dev (>= 1.17.11),
 endif
 
 CC=$(DEB_HOST_GNU_TYPE)-gcc
 CXX=$(DEB_HOST_GNU_TYPE)-g++
+ifneq (,$(filter $(distrelease),bionic))
+  CC=$(DEB_HOST_GNU_TYPE)-gcc-8
+  CXX=$(DEB_HOST_GNU_TYPE)-g++-8
+  bd_gcc = g++-8,
+endif
 
 AR=$(DEB_HOST_GNU_TYPE)-ar
 RANLIB=$(DEB_HOST_GNU_TYPE)-ranlib
 
-DPKG_CPPFLAGS:= $(shell dpkg-buildflags --get CPPFLAGS)
-DPKG_CFLAGS  = $(shell DEB_BUILD_MAINT_OPTIONS=hardening=-pie dpkg-buildflags --get CFLAGS)
-DPKG_LDFLAGS := $(shell DEB_BUILD_MAINT_OPTIONS=hardening=-pie dpkg-buildflags --get LDFLAGS)
+DPKG_CPPFLAGS= $(shell $(dpkg_buildflags) --get CPPFLAGS)
+DPKG_CFLAGS  := $(shell $(dpkg_buildflags) --get CFLAGS)
+DPKG_CFLAGS  := $(subst -fstack-protector-strong,-fstack-protector,$(DPKG_CFLAGS))
+DPKG_LDFLAGS = $(shell $(dpkg_buildflags) --get LDFLAGS)
 OPT_CFLAGS   := $(filter-out -O%,$(DPKG_CFLAGS)) # default is -O3
 DEBUG_CFLAGS := $(patsubst -O%,-Og,$(DPKG_CFLAGS))
 
-$(warning XXXXX CFLAGS: $(DPKG_CFLAGS))
-$(warning XXXXX LDFLAGS: $(DPKG_LDFLAGS))
-
-# on alpha, use -O2 only, use -mieee
-ifeq ($(DEB_HOST_ARCH),alpha)
-    OPT_CFLAGS += -mieee
-    DEBUG_CFLAGS += -mieee
-    EXTRA_OPT_FLAGS += -O2
-endif
-ifeq ($(DEB_HOST_ARCH),m68k)
-    EXTRA_OPT_FLAGS += -O2
+# on ia64, disable -O3 until gcc bug #85412 is fixed
+ifeq ($(DEB_HOST_ARCH),ia64)
+    EXTRA_OPT_CFLAGS += -O2
 endif
 ifneq (,$(filter $(DEB_HOST_ARCH), ppc64 ppc64el))
     OPT_CFLAGS += -fexceptions
@@ -182,13 +171,13 @@ endif
 
 ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
   ifeq ($(DEB_HOST_ARCH_OS),linux)
-    ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 armel armhf i386 powerpc ppc64 ppc64el s390x))
+    ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 armel armhf arm64 i386 powerpc ppc64 ppc64el s390x))
       with_pgo := yes
     endif
   endif
 endif
 
-ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 armel armhf i386 powerpc ppc64 ppc64el s390x))
+ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 armel armhf arm64 i386 powerpc ppc64 ppc64el s390x))
   with_lto := yes
 endif
 
@@ -199,11 +188,9 @@ ifneq (,$(findstring noopt, $(DEB_BUILD_OPTIONS)))
     with_lto =
 endif
 
-    with_pgo =
-    with_lto =
-
+BASE_LTO_CFLAGS = -g -fwrapv -O3
 ifeq ($(with_lto),yes)
-    LTO_CFLAGS = -g -flto -fuse-linker-plugin
+    LTO_CFLAGS = $(BASE_LTO_CFLAGS) -flto -fuse-linker-plugin
     with_fat_lto := $(shell dpkg --compare-versions $$($(CC) --version \
 			| sed -n '/^$(CC)/s,.* ,,p') ge 4.9 && echo yes)
     ifeq ($(with_fat_lto),yes)
@@ -214,6 +201,24 @@ ifeq ($(with_lto),yes)
     RANLIB=$(DEB_HOST_GNU_TYPE)-gcc-ranlib
 endif
 
+sysconfig_substflags = \
+	-e 's,gcc-8,gcc,;s,g++-8,g++,' \
+	$(if $(with_lto),$(foreach i,-flto -fuse-linker-plugin -ffat-lto-objects,-e 's/$(i)//g')) \
+	-e '/^OPT/s,-O3,-O2,' \
+	-e 's/-O3/-O2/g' \
+	-e 's/-fprofile-use *-fprofile-correction//g' \
+	-e 's/-fstack-protector /-fstack-protector-strong /g' \
+	-e 's/-specs=[^ ]*//g' \
+	-e 's/-fdebug-prefix-map=[^ ]*//g' \
+	-e 's,^RUNSHARED *=.*,RUNSHARED=,' \
+	-e '/BLDLIBRARY/s/-L\. //'
+
+ifeq ($(derivative),Ubuntu)
+  arch_substvars =
+else ifeq ($(derivative),Debian)
+  arch_substvars =  '-Vpython37:Breaks=$(shell tr '\n' ' ' < debian/py37-breaks.$(derivative))'
+endif
+
 make_build_target = $(if $(with_pgo),profile-opt)
 
 buildd_static	:= $(CURDIR)/build-static
@@ -263,14 +268,13 @@ d_ldev	:= debian/$(p_ldev)
 d_ldbg	:= debian/$(p_ldbg)
 d_ltst	:= debian/$(p_ltst)
 
-
 build-arch: stamps/stamp-build
 build-indep: stamps/stamp-build-doc
 build: build-arch
 stamps/stamp-build: stamps/stamp-build-static stamps/stamp-mincheck \
     stamps/stamp-build-shared stamps/stamp-build-debug \
     stamps/stamp-build-shared-debug \
-    stamps/stamp-check stamps/stamp-pystone stamps/stamp-pybench
+    stamps/stamp-check stamps/stamp-pybench
 	touch $@
 
 PROFILE_EXCLUDES = test_compiler test_distutils test_subprocess \
@@ -281,6 +285,10 @@ PROFILE_EXCLUDES = test_compiler test_distutils test_subprocess \
 	test_dbm_dumb test_dbm_ndbm test_pydoc test_sundry \
 	test_signal test_ioctl test_gdb test_ensurepip test_venv
 
+# TODO: these hang/fail with new OpenSSL
+PROFILE_EXCLUDES += \
+	test_asyncio test_ftplib test_httplib test_imaplib test_nntplib test_poplib test_ssl
+
 # TODO: these fail in the profile build
 PROFILE_EXCLUDES += \
 	test_cmd_line_script test_zipimport_support
@@ -304,6 +312,7 @@ ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
 	cd $(buildd_static) && ./python -c 'from _multiprocessing import SemLock'
   endif
 	cd $(buildd_static) && ./python -c 'import _decimal'
+	cd $(buildd_static) && ./python -c 'import math, cmath'
 endif
 
 	touch stamps/stamp-build-static
@@ -326,6 +335,12 @@ stamps/stamp-build-debug: stamps/stamp-configure-debug
 	dh_testdir
 	$(MAKE) $(NJOBS) -C $(buildd_debug) \
 		EXTRA_CFLAGS="$(DEBUG_CFLAGS)"
+
+ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+	cd $(buildd_static) && ./python -c 'import _decimal'
+	cd $(buildd_debug) && ./python -c 'import math, cmath'
+endif
+
 	touch stamps/stamp-build-debug
 
 stamps/stamp-build-shared-debug: stamps/stamp-configure-shared-debug
@@ -382,10 +397,6 @@ stamps/stamp-configure-shared: stamps/stamp-patch
 	touch $@
 
 stamps/stamp-configure-static: stamps/stamp-patch
-	env | grep DEB_
-	@echo XXXXX CFLAGS: $(DPKG_CFLAGS)
-	@echo XXXXX LDFLAGS: $(DPKG_LDFLAGS)
-
 	rm -rf $(buildd_static)
 	mkdir -p $(buildd_static)
 	cd $(buildd_static) && \
@@ -437,14 +448,14 @@ define __post_configure
 	: # unconditionally run makesetup
 	cd $(1) && \
 	  ../Modules/makesetup -c ../Modules/config.c.in -s Modules \
-	    Modules/Setup.config Modules/Setup.local Modules/Setup
+	    Modules/Setup.local Modules/Setup
 	mv $(1)/config.c $(1)/Modules/
 
 	: # and fix the timestamps
 	$(MAKE) -C $(1) Makefile Modules/config.c
 
 	: # this second rule doesn't build with -fPIC, remove it.
-	sed '/^Modules\/_math.o: .*PY_CORE_CFLAGS/d' $(1)/Makefile > $(1)/Makefile.fixed
+	sed '/^Modules\/_math.o: .*PY_STDMODULE_CFLAGS/d' $(1)/Makefile > $(1)/Makefile.fixed
 	touch -r $(1)/Makefile $(1)/Makefile.fixed
 	mv -f $(1)/Makefile.fixed $(1)/Makefile
 endef
@@ -507,6 +518,9 @@ ifneq (,$(filter $(DEB_HOST_ARCH), sparc sparc64))
   TEST_EXCLUDES += test_gdb
 endif
 
+# fail/hang with new OpenSSL
+TEST_EXCLUDES += test_asyncio test_ftplib test_httplib test_imaplib test_nntplib test_poplib test_ssl
+
 # TODO: re-enable once fixed, see #708652
 ifneq (,$(filter $(DEB_HOST_ARCH_OS), hurd))
   TEST_EXCLUDES += test_asyncore test_curses test_exceptions \
@@ -598,27 +612,6 @@ endif
 	cp -p $(buildd_static)/test_results debian/
 	touch stamps/stamp-check
 
-stamps/stamp-pystone:
-ifeq ($(WITHOUT_STONE),yes)
-	@echo "pystone run disabled for this build"
-else
-	@echo "BEGIN pystone static"
-	cd $(buildd_static) && ./python ../Lib/test/pystone.py
-	cd $(buildd_static) && ./python ../Lib/test/pystone.py
-	@echo "END pystone static"
-	@echo "BEGIN pystone shared"
-	cd $(buildd_shared) \
-		&& LD_LIBRARY_PATH=. ./python ../Lib/test/pystone.py
-	cd $(buildd_shared) \
-		&& LD_LIBRARY_PATH=. ./python ../Lib/test/pystone.py
-	@echo "END pystone shared"
-	@echo "BEGIN pystone debug"
-	cd $(buildd_debug) && ./python ../Lib/test/pystone.py
-	cd $(buildd_debug) && ./python ../Lib/test/pystone.py
-	@echo "END pystone debug"
-endif
-	touch stamps/stamp-pystone
-
 stamps/stamp-pybench:
 	echo "pybench run disabled for this build" > $(buildd_static)/pybench.log
 
@@ -683,8 +676,31 @@ stamps/stamp-doc-html:
 	@mkdir -p stamps
 	touch stamps/stamp-doc-html
 
+stamps/stamp-doc-info:
+	dh_testdir
+	rm -rf Doc/build/texinfo
+	$(MAKE) -C Doc texinfo
+# - Change name of info file (@setfilename) to include the version.
+# - Change the directory entry to include the version and point to the
+#   correct filename.
+# - Change image links (@image) to point to a subdirectory.
+# - Remove trailing whitespace.
+	sed -e 's/^@setfilename .*/@setfilename $(PVER).info/' \
+	    -e '/^@direntry/,/^@/s/^\*[^:]*: ([^)]*)/* Python $(VER): ($(PVER))/' \
+	    -e 's,@image{,@image{$(PVER)/,g' \
+	    -e 's/ *$$//' \
+	  < Doc/build/texinfo/python.texi \
+	  > Doc/build/texinfo/$(PVER).texi
+	rm -f Doc/build/texinfo/python.texi
+# - Create a symbolic link so that makeinfo will be able to find the
+#   image files.
+	ln -s . Doc/build/texinfo/$(PVER)
+	$(MAKE) -C Doc/build/texinfo
+	@mkdir -p stamps
+	touch stamps/stamp-doc-info
+
 build-doc: stamps/stamp-patch stamps/stamp-build-doc
-stamps/stamp-build-doc: stamps/stamp-doc-html
+stamps/stamp-build-doc: stamps/stamp-doc-html stamps/stamp-doc-info
 	@mkdir -p stamps
 	touch stamps/stamp-build-doc
 
@@ -697,7 +713,6 @@ control-file:
 	    -e "s/@bd_qual@/$(bd_qual)/g" \
 	    -e "s/@bd_gcc@/$(bd_gcc)/g" \
 	    -e "s/@bd_dpkgdev@/$(bd_dpkgdev)/g" \
-	    -e "s/PYFPE_BREAKS/$(if $(filter yes,$(with_fpectl)),,$$(tr '\n' ' ' < debian/pyfpe-breaks.$(derivative)))/g" \
 		debian/control.in \
 		$(if $(with_udeb),debian/control.udeb) \
 	      | $(ma_filter) \
@@ -733,9 +748,6 @@ clean: control-file
 	rm -f configure
 	rm -rf $(TEST_DIR) debian/testdir
 
-	rm -f Lib/test/185test.db
-	rm -f Tools/hg/hgtouch.py
-
 	for f in debian/*.in; do \
 	  f2=`echo $$f | sed "s,PVER,$(PVER),g;s/@VER@/$(VER)/g;s,\.in$$,,"`; \
 	  if [ $$f2 != debian/control ] && [ $$f2 != debian/source.lintian-overrides ]; then \
@@ -784,10 +796,7 @@ stamps/stamp-install: stamps/stamp-build control-file stamps/stamp-control
 ifeq ($(with_interp),static)
 	$(MAKE) -C $(buildd_static) install DESTDIR=$(CURDIR)/$(d)
 	ls -l $(d)/$(scriptdir)/_sysconfigdata*
-	sed -e '/^OPT/s,-O3,-O2,' \
-	    -e 's/$(LTO_CFLAGS)//g' \
-	    -e 's,^RUNSHARED *=.*,RUNSHARED=,' \
-	    -e '/BLDLIBRARY/s/-L\. //' \
+	sed $(sysconfig_substflags) \
 		$(buildd_shared)/$(shell cat $(buildd_shared)/pybuilddir.txt)/_sysconfigdata_m_$(PLAT)_$(DEB_HOST_MULTIARCH).py \
 		> $(d)/$(scriptdir)/_sysconfigdata_m_$(PLAT)_$(DEB_HOST_MULTIARCH).py
 else
@@ -798,7 +807,7 @@ endif
 		$(d)/usr/include/$(DEB_HOST_MULTIARCH)/$(PVER)m/.
 	rm -f $(d)/$(scriptdir)/lib-dynload/*.py
 	ls -l $(d)/$(scriptdir)/_sysconfigdata*
-	sed -i 's/ -O3 / -O2 /g;s/$(LTO_CFLAGS)//g;s/-fprofile-use *-fprofile-correction//g' \
+	sed -i $(sysconfig_substflags) \
 		$(d)/$(scriptdir)/_sysconfigdata_m_$(PLAT)_$(DEB_HOST_MULTIARCH).py
 
 	-find $(d)/usr/lib/python$(VER) -name '*_failed*.so'
@@ -816,7 +825,7 @@ endif
 	mkdir -p $(d)/usr/lib/python3
 	mv $(d)/usr/lib/python$(VER)/site-packages \
 		$(d)/usr/lib/python3/dist-packages
-	rm -f $(d)/usr/lib/python3/dist-packages/README
+	rm -f $(d)/usr/lib/python3/dist-packages/README*
 
 	: # remove files, which are not packaged
 	rm -rf $(d)/usr/lib/python$(VER)/ctypes/macholib
@@ -850,7 +859,6 @@ endif
 	: # Symlinks to /usr/bin for some tools
 	ln -sf ../lib/python$(VER)/pdb.py $(d)/usr/bin/pdb$(VER)
 	cp -p debian/pdb.1 $(d)/usr/share/man/man1/pdb$(VER).1
-	cp -p debian/2to3-3.1 $(d)/usr/share/man/man1/2to3-$(VER).1
 	cp -p debian/pysetup3.1 $(d)/usr/share/man/man1/pysetup$(VER).1
 	cp -p debian/pyvenv3.1 $(d)/usr/share/man/man1/pyvenv-$(VER).1
 
@@ -886,10 +894,7 @@ endif
 	cp -p debian/pygettext.1 $(d)/usr/share/man/man1/pygettext$(VER).1
 
 	: # install the Makefile of the shared python build
-	sed -e '/^OPT/s,-O3,-O2,' \
-	    -e 's/$(LTO_CFLAGS)//g' \
-	    -e 's,^RUNSHARED *=.*,RUNSHARED=,' \
-	    -e '/BLDLIBRARY/s/-L\. //' \
+	sed $(sysconfig_substflags) \
 		$(buildd_shared)/Makefile \
 		> $(d)/$(scriptdir)/config-$(VER)m-$(DEB_HOST_MULTIARCH)/Makefile
 
@@ -1014,7 +1019,7 @@ endif
 	ln -sf $(DEB_HOST_MULTIARCH)-$(PVER)-config.1.gz $(d_dev)/usr/share/man/man1/$(PVER)-config.1.gz
 
 ifeq ($(with_tk),yes)
-	: # Move the Tkinter files into $(p_tk).
+	: # Move the Tkinter extension files into $(p_tk).
 	dh_installdirs -p$(p_tk) \
 		$(scriptdir) \
 		usr/lib/python$(VER)/lib-dynload
@@ -1025,7 +1030,8 @@ endif
 	: # The test framework into $(p_lbase)
 	$(dh_compat2) dh_movefiles -p$(p_lbase) --sourcedir=$(d) \
 		$(scriptdir)/test/{libregrtest,support} \
-		$(scriptdir)/test/{regrtest,test_support,__init__,pystone}.py
+		$(scriptdir)/test/{ann_module,ann_module2,ann_module3}.py \
+		$(scriptdir)/test/{regrtest,test_support,__init__,__main__}.py
 
 	: # The complete testsuite into $(p_lbase)
 	$(dh_compat2) dh_movefiles -p$(p_ltst) --sourcedir=$(d) \
@@ -1045,6 +1051,21 @@ endif
 	: # fixed upstream ...
 	chmod -x $(d_ltst)/$(scriptdir)/test/{test_dbm_gnu,test_dbm_ndbm}.py
 
+	: # Tkinter library files shipped in python3-tk
+	rm -rf $(d)/usr/lib/python$(VER)/tkinter
+
+	: # distutils shipped in python3-distutils
+	rm -rf $(d)/usr/lib/python$(VER)/distutils/*
+	: # ... except for distutils.version
+	cp Lib/distutils/{__init__,version}.py \
+		$(d)/usr/lib/python$(VER)/distutils/.
+
+	: # lib2to3 shipped in python3-lib2to3
+	rm -rf \
+		$(d)/usr/bin/2to3-$(VER) \
+		$(d)/usr/share/man/man1/2to3-$(VER).1 \
+		$(d)/usr/lib/python$(VER)/lib2to3
+
 	: # Move the demos and tools into $(p_exam)'s doc directory
 	dh_installdirs -p$(p_exam) \
 		usr/share/doc/python$(VER)/examples
@@ -1063,17 +1084,21 @@ endif
 		usr/bin \
 		usr/share/man/man1
 	$(dh_compat2) dh_movefiles -p$(p_idle) --sourcedir=$(d) \
-		usr/bin/idle-python$(VER)
+		usr/bin/idle-python$(VER) \
+		usr/lib/python$(VER)/idlelib
 	cp -p debian/idle-$(PVER).1 $(d_idle)/usr/share/man/man1/
 
 	: # Replace all '#!' calls to python with $(PY_INTERPRETER)
 	: # and make them executable
-	for i in `find debian -mindepth 3 -type f ! -name '*.dpatch'`; do \
+	for i in `find debian -mindepth 3 -type f`; do \
 	  sed '1s,#!.*python[^ ]*\(.*\),#! $(PY_INTERPRETER)\1,' \
 		$$i > $$i.temp; \
 	  if cmp --quiet $$i $$i.temp; then \
 	    rm -f $$i.temp; \
 	  else \
+	    if [ ! -x $$i ]; then \
+	      echo "fixed x file permissions: $$i"; \
+	    fi; \
 	    mv -f $$i.temp $$i; \
 	    chmod 755 $$i; \
 	    echo "fixed interpreter: $$i"; \
@@ -1085,7 +1110,9 @@ endif
 	dh_installdocs -p$(p_base) \
 		README.rst Misc/NEWS Misc/ACKS
 	ln -sf NEWS.gz $(d_base)/usr/share/doc/$(p_base)/changelog.gz
-	dh_installdocs --all -N$(p_base) -N$(p_dev) -N$(p_dbg) -N$(p_lib) debian/README.Debian
+	dh_installdocs --all \
+		-N$(p_base) -N$(p_dev) -N$(p_dbg) -N$(p_lib) \
+		debian/README.Debian
 
 	: # IDLE has its own changelogs, docs...
 	dh_installchangelogs -p$(p_idle) Lib/idlelib/ChangeLog
@@ -1155,17 +1182,13 @@ endif
 	rm -rf $(d)-dbg
 	$(MAKE) -C $(buildd_debug) install DESTDIR=$(CURDIR)/$(d)-dbg
 	: # install the Makefile of the shared python debug build
-	sed -e '/^OPT/s,-O3,-O2,' \
-	    -e 's/$(LTO_CFLAGS)//g' \
-	    -e 's,^RUNSHARED *=.*,RUNSHARED=,' \
-	    -e '/BLDLIBRARY/s/-L\. //' \
+	sed $(sysconfig_substflags) \
 		$(buildd_shdebug)/Makefile \
 		> $(d)-dbg/$(scriptdir)/config-$(VER)dm-$(DEB_HOST_MULTIARCH)/Makefile
-	sed -e 's,^RUNSHARED *=.*,RUNSHARED=,' \
-	    -e '/BLDLIBRARY/s/-L\. //' \
+	sed $(sysconfig_substflags) \
 		$(buildd_shdebug)/$(shell cat $(buildd_shdebug)/pybuilddir.txt)/_sysconfigdata_dm_$(PLAT)_$(DEB_HOST_MULTIARCH).py \
 		> $(d)-dbg/$(scriptdir)/_sysconfigdata_dm_$(PLAT)_$(DEB_HOST_MULTIARCH).py
-	sed -i 's/ -O3 / -O2 /g;s/$(LTO_CFLAGS)//g;s/-fprofile-use *-fprofile-correction//g' \
+	sed -i $(sysconfig_substflags) \
 		$(d)-dbg/$(scriptdir)/_sysconfigdata_dm_$(PLAT)_$(DEB_HOST_MULTIARCH).py
 
 	mv $(d)-dbg/usr/lib/libpython*.a $(d)-dbg/usr/lib/$(DEB_HOST_MULTIARCH)/
@@ -1196,11 +1219,10 @@ endif
 		/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER)dm.so.1 \
 	    /usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER)dm.so.1 \
 		/usr/lib/$(DEB_HOST_MULTIARCH)/libpython$(VER)dm.so
-	sed -e '/^Libs:/s,-lpython$(VER),-lpython$(VER)dm,' \
-	  -e '/^Cflags:/s,$$, -I$${includedir}/$(DEB_HOST_MULTIARCH)/python$(VER)dm,' \
-	  -e '/^libdir=/d;s/-L\$${libdir} *//' \
-	  $(d)-dbg/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python-$(VER).pc \
-	  > $(d_ldbg)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python-$(VER)-dbg.pc
+	cp $(d)-dbg/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python-$(VER)dm.pc \
+	  $(d_ldbg)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/.
+	ln -s python-$(VER)dm.pc \
+	  $(d_ldbg)/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/python-$(VER)-dbg.pc
 
 	dh_installdirs -p$(p_dbg) \
 		usr/bin \
@@ -1322,6 +1344,11 @@ binary-indep: build-indep install stamps/stamp-control
 		/usr/share/doc/$(p_base)/html /usr/share/doc/$(p_doc)/html \
 		/usr/share/javascript/jquery/jquery.js /usr/share/doc/$(p_base)/html/_static/jquery.js \
 		/usr/share/javascript/underscore/underscore.js /usr/share/doc/$(p_base)/html/_static/underscore.js
+	dh_installinfo -p$(p_doc)
+	for f in $(d_doc)/usr/share/doc/$(p_base)/html/_images/*.png; do \
+	  b=$$(basename $$f); \
+	  dh_link -p$(p_doc) /usr/share/doc/$(p_base)/html/_images/$$b /usr/share/info/$(PVER)/$$b; \
+	done
 
 	: # devhelp docs
 	cd $(buildd_static) && ./python ../debian/pyhtml2devhelp.py \
@@ -1428,7 +1455,7 @@ endif
 	dep=`sed -n '/^shlibs:Depends/s/[^=]*=\(.*\)/\1/p' $(d_min).substvars | awk -v RS=', ' -v ORS=', ' '/^libc6/ { print }'`; \
 	echo "shlibs:Pre-Depends=$$dep" >> $(d_min).substvars
 	sed -i '/^shlibs:Depends/s/libc6[^,]*[, ]*//g' $(d_min).substvars
-	dh_gencontrol -a
+	dh_gencontrol -a -- $(arch_substvars)
 	dh_md5sums -a
 	dh_builddeb -a