From 06680ace00c1f5987847ad7e1f94b5344b417e45 Mon Sep 17 00:00:00 2001
From: Scott Kitterman <scott@kitterman.com>
Date: Fri, 11 Jul 2014 16:58:11 -0400
Subject: [PATCH] Stop automatically regenerating static content (dh_python2
 man pages and Python FAQ) and drop build-dep on python-docutils to ease
 bootstrapping (Closes: #754060)

---
 Makefile         | 10 +---------
 debian/changelog |  3 +++
 debian/rules     | 10 +++++++++-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 135614d..db6268c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ clean:
 	make -C tests clean
 	make -C pydist clean
 	find . -name '*.py[co]' -delete
-	rm -f .coverage $(MANPAGES)
+	rm -f .coverage
 
 install-dev:
 	$(INSTALL) -m 755 -d $(DESTDIR)$(PREFIX)/bin \
@@ -28,14 +28,6 @@ install-runtime:
 
 install: install-dev install-runtime
 
-%.1: %.rst
-	rst2man $< > $@
-
-%.html: %.rst
-	rst2html $< > $@
-
-manpages: $(MANPAGES)
-
 dist_fallback:
 	make -C pydist $@
 
diff --git a/debian/changelog b/debian/changelog
index ed93313..69b840e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ python-defaults (2.7.7-1) UNRELEASED; urgency=medium
   * Clarify discussion of requirement to use python:Provides (Closes: #669346)
   * Add clarification of naming requirements for submocules (Closes: #701192)
   * Minor cleanups in debian/pyversions.py
+  * Stop automatically regenerating static content (dh_python2 man pages and
+    Python FAQ) and drop build-dep on python-docutils to ease bootstrapping
+    (Closes: #754060)
 
  -- Matthias Klose <doko@debian.org>  Mon, 02 Jun 2014 19:54:25 +0200
 
diff --git a/debian/rules b/debian/rules
index 7fca98e..f9a4981 100755
--- a/debian/rules
+++ b/debian/rules
@@ -81,6 +81,7 @@ endif
 
 faqs = index general programming library extending windows gui installed
 get-faq:
+	# Note: This rule is broken due to web site reorg at python.org
 	rm -rf faq
 	mkdir faq
 	cd faq && \
@@ -95,6 +96,14 @@ get-faq:
 	) >> faq/FAQ.ht
 	rm -f faq/index.ht
 
+MANPAGES ?= dh_python2.1 pycompile.1 pyclean.1
+
+%.1: %.rst
+	rst2man $< > $@
+
+# Manually run this rule if there is a need to update the dh_python2 man pages
+make-man: $(MANPAGES)
+
 clean: control-file
 	dh_testdir
 	dh_testroot
@@ -103,7 +112,6 @@ clean: control-file
 
 	rm -f debian/python-policy.txt
 	rm -rf debian/python-policy.html
-	rm -f faq/*.h2 faq/*.html
 
 	set -e;\
 	for f in debian/*.in; do \
-- 
GitLab