diff --git a/debian/changelog b/debian/changelog
index 90c9b3e14576787d9361643d7e72a7179b383f04..e375ea4e221d32cf620112ab984e9d308c2e94ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-defaults (2.3.5-7) unstable; urgency=low
+
+  * Point to the draft of the reworked Python policy.
+  * Fiy 'pyversions -r current' (Raphael Hertzog).
+
+ -- Matthias Klose <doko@debian.org>  Mon, 12 Jun 2006 13:38:41 +0200
+
 python-defaults (2.3.5-6) unstable; urgency=low
 
   * Last 2.3.5 upload, 2.4.3 can be found in experimental.
diff --git a/debian/control b/debian/control
index 2cca9e1ed0de1ce6eedf94c6d9a5da0d75cab279..88f8e183f8a48db7642e59adea5af0910107a17f 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Package: python
 Architecture: all
 Priority: standard
 Depends: python2.3 (>= 2.3.5-1)
-Conflicts: python2.3 (<= 2.3.2-6), python2.1 (<= 2.1.2), python-xmlbase, python-csv, python-bz2, python-base
+Conflicts: python2.3 (<= 2.3.2-6), python2.1 (<= 2.1.2), python-xmlbase, python-csv, python-bz2, python-base, python-central (<< 0.4.8)
 Replaces: python2.3 (<= 2.3.2-6), python-xmlbase, python-base
 Provides: python-email, python-xmlbase
 Suggests: python-doc, python-tk, python-profiler
diff --git a/debian/control.in b/debian/control.in
index 5abbeb0cc3b2d03443733e6a007a8bdaaaf26cfa..9985d1b6c93e2d398477f2d077d6712715252bb8 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,7 +9,7 @@ Package: python
 Architecture: all
 Priority: standard
 Depends: @PVER@ (>= @PREVVER@)
-Conflicts: python2.3 (<= 2.3.2-6), python2.1 (<= 2.1.2), python-xmlbase, python-csv, python-bz2, python-base
+Conflicts: python2.3 (<= 2.3.2-6), python2.1 (<= 2.1.2), python-xmlbase, python-csv, python-bz2, python-base, python-central (<< 0.4.8)
 Replaces: python2.3 (<= 2.3.2-6), python-xmlbase, python-base
 Provides: python-email, python-xmlbase
 Suggests: python-doc, python-tk, python-profiler
diff --git a/debian/python-policy.sgml b/debian/python-policy.sgml
index 800e9b699f7445d9889228a8345fb1dd2b8ad71d..2f68ca954eb4e12fbaa6dec8129a9f03b7093fd7 100644
--- a/debian/python-policy.sgml
+++ b/debian/python-policy.sgml
@@ -23,6 +23,11 @@
       <version>version 0.3.7.2</version>
 
       <abstract>
+        The Python policy is currently in change; a draft
+         for the new policy can be found
+	  <url id="http://people.debian.org/~piman/python-policy/"
+	  name="here">.
+
 	This document describes the packaging of Python within the
 	Debian GNU/Linux distribution and the policy requirements for
 	packaged Python programs and modules.
diff --git a/debian/pyversions.py b/debian/pyversions.py
index 4817c71ecd7bc65478b5bfbfa767e46f20706855..5ba7d34a94a1b3a850f006ee2dc250f63d93c11c 100644
--- a/debian/pyversions.py
+++ b/debian/pyversions.py
@@ -50,9 +50,9 @@ def supported_versions(version_only=False):
     global _supported_versions
     if not _supported_versions:
         if os.path.exists('/usr/share/python/debian_defaults'):
-            import ConfigParser
-            config = ConfigParser.SafeConfigParser()
-            config.read('/usr/share/python/debian_defaults')
+            from ConfigParser import SafeConfigParser
+            config = SafeConfigParser()
+            config.readfp(file('/usr/share/python/debian_defaults'))
             value = config.get('DEFAULT', 'supported-versions')
             _supported_versions = [s.strip() for s in value.split(',')]
         else:
@@ -92,11 +92,10 @@ def requested_versions(vstring, version_only=False):
     vinfo = parse_versions(vstring)
     supported = supported_versions(version_only=True)
     if len(vinfo) == 1:
-        vkey = vinfo[vinfo.keys()[0]]
         if 'all' in vinfo:
             versions = supported
         elif 'current' in vinfo:
-            versions = [default_version()]
+            versions = [default_version(version_only=True)]
         else:
             versions = vinfo['versions'].intersection(supported)
     elif 'all' in vinfo and 'current' in vinfo:
diff --git a/debian/rules b/debian/rules
index 8276976ddc951e98d19be1a0bad315cd16565487..405fedf219f3d8182557ac86c59dfa5559cddf66 100755
--- a/debian/rules
+++ b/debian/rules
@@ -87,6 +87,7 @@ clean:
 	        rm -f $$f2; \
 	    fi; \
 	done
+	rm -f debian/*.py[co]
 	dh_clean
 
 stamp-control: