From 1293690d20949688551be1153cb52d6ce45e009d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Piotr=20O=C5=BCarowski?= <piotr@debian.org>
Date: Thu, 9 Sep 2010 19:40:35 +0200
Subject: [PATCH] update some docs

---
 README.derivatives   |  2 ++
 pydist/Makefile      |  4 ++--
 pydist/README.PyDist | 24 ++++++++++++------------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/README.derivatives b/README.derivatives
index 5f66d80..1c1968b 100644
--- a/README.derivatives
+++ b/README.derivatives
@@ -1,6 +1,7 @@
 How to change a list of supported Python versions?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+* Open debian/debian_defaults file and change `supported-versions` variable
 * Open debian/control.in file and edit python-all, python-all-dev and
   python-all-dbg's Depends line (add or remove pythonX.Y packages)
 * Open debian/pyversions.py file and edit `_supported_versions` list
@@ -12,6 +13,7 @@ How to change a list of supported Python versions?
 How to change default Python version?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+* Open debian/debian_defaults file and change `default-version` variable
 * Open debian/rules file and edit `VER` variable (default version), `NVER`
   (default + 1 version) and `PVER` (default version with "python" prefix)
 * Open debian/pyversions.py file and edit `debian_default` variable around
diff --git a/pydist/Makefile b/pydist/Makefile
index d7f7131..d4553bd 100644
--- a/pydist/Makefile
+++ b/pydist/Makefile
@@ -8,7 +8,7 @@ clean:
 dist_fallback:
 	python ./generate_fallback_list.py --skip-sensible-names
 
-README.PyDist.html:
-	rst2html README.PyDist README.PyDist.html
+README.PyDist.html: README.PyDist
+	rst2html README.PyDist $@
 
 .PHONY: clean
diff --git a/pydist/README.PyDist b/pydist/README.PyDist
index 36377ad..57ebace 100644
--- a/pydist/README.PyDist
+++ b/pydist/README.PyDist
@@ -2,8 +2,8 @@
 PyDist files
 ============
 
-DISTNAME [VRANGE] DEPENDENCY[; [PEP386] [RULES]]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+DISTNAME [VRANGE] [DEPENDENCY][; [PEP386] [RULES]]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 PyDist files help tools like dh_python2 to translate Python dependencies (from
 setup.py's install_requires or egg's requires.txt file) to Debian dependencies.
@@ -22,16 +22,6 @@ Examples:
  * Jinja2
  * numpy
 
-DEPENDENCY
-``````````
-Debian dependency, multiple packages or versions are allowed.
-If not set, given Python distribution name will be ignored.
-
-Examples:
- * python-mako
- * python-jinja2 | python (>= 2.6)
- * python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6)
-
 
 Optional fields:
 ~~~~~~~~~~~~~~~~
@@ -46,6 +36,16 @@ Examples:
  * 2.5-2.7	(Python 2.5 or 2.6)
  * -2.7		(Python 2.6 or older)
 
+DEPENDENCY
+``````````
+Debian dependency, multiple packages or versions are allowed.
+If not set, given Python distribution name will be ignored.
+
+Examples:
+ * python-mako
+ * python-jinja2 | python (>= 2.6)
+ * python-sqlalchemy (>= 0.5), python-sqlalchemy (<< 0.6)
+
 PEP386
 ``````
 Standards flag: upstream uses versioning schema described in PEP 386.
-- 
GitLab