diff --git a/debian/changelog b/debian/changelog
index 113280795d4b1b3f44109fe591fde27671330536..52ee36b2e336db52e27eec5fa25fd579a393c671 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+python-defaults (2.3.5-3) unstable; urgency=low
+
+  * Add python-dbg package.
+  * debian/control.in: idle enhances python.
+
+ -- Matthias Klose <doko@debian.org>  Sun, 19 Jun 2005 13:49:16 +0200
+
 python-defaults (2.3.5-2) unstable; urgency=low
 
   * Add valgrind support file /usr/lib/valgrind/python.supp (closes: #291128).
diff --git a/debian/control b/debian/control
index 36c558504e9eb04b3e4b006414c4b7c7dca1b392..1ceee636caad4086278e9e7bc2e32cc685f66ba3 100644
--- a/debian/control
+++ b/debian/control
@@ -79,6 +79,7 @@ Description: Header files and a static library for Python (default)
 Package: idle
 Architecture: all
 Depends: python (>= 2.3), python (<< 2.4), idle-python2.3 (>= 2.3.4-18)
+Enhances: python
 Description: An IDE for Python using Tkinter (default version)
  IDLE is an Integrated Development Environment for Python.
  IDLE is written using Tkinter and therefore quite platform-independent.
@@ -110,3 +111,11 @@ Description: Documentation for the high-level object-oriented language Python
  .
  This package is a dependency package, which depends on Debian's default
  Python version (currently v2.3).
+
+Package: python-dbg
+Architecture: all
+Priority: extra
+Depends: python (>= 2.3), python2.3-dbg (>= 2.3.4-18)
+Description: Debug Build of the Python Interpreter (version 2.3)
+ Python interpreter configured with --pydebug. Dynamically loaded modules are
+ searched in /usr/lib/python2.3/lib-dynload/debug first.
diff --git a/debian/control.in b/debian/control.in
index 596e2ed8c40487374f7f8e20f93d87ee2ef9070b..5bb1e814c7257708717baa32acd24a4a62ed6fc4 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -79,6 +79,7 @@ Description: Header files and a static library for Python (default)
 Package: idle
 Architecture: all
 Depends: python (>= @VER@), python (<< @NVER@), idle-@PVER@ (>= @PREVVER@)
+Enhances: python
 Description: An IDE for Python using Tkinter (default version)
  IDLE is an Integrated Development Environment for Python.
  IDLE is written using Tkinter and therefore quite platform-independent.
@@ -110,3 +111,11 @@ Description: Documentation for the high-level object-oriented language Python
  .
  This package is a dependency package, which depends on Debian's default
  Python version (currently v@VER@).
+
+Package: python-dbg
+Architecture: all
+Priority: extra
+Depends: python (>= @VER@), python@VER@-dbg (>= @PREVVER@)
+Description: Debug Build of the Python Interpreter (version @VER@)
+ Python interpreter configured with --pydebug. Dynamically loaded modules are
+ searched in /usr/lib/python@VER@/lib-dynload/debug first.
diff --git a/debian/control.in.all b/debian/control.in.all
new file mode 100644
index 0000000000000000000000000000000000000000..66ae9264ba822548d892dcee7dda79cd44a6105a
--- /dev/null
+++ b/debian/control.in.all
@@ -0,0 +1,30 @@
+
+  * Add two dependency packages python-all and python-all-dev. These
+    packages are used as build dependencies to determine the set of
+    python version and implementations, which should be supported.
+    Currently it depends on python2.3 and python2.4.  Future versions
+    may add an updated version of jython and ironpython.
+
+Package: python-all
+Architecture: all
+Priority: optional
+Depends: python2.3, python2.4
+Description: Package depending on all supported Python runtime versions
+ The package currently depends on python2.3 and python2.4, in the future,
+ dependencies on jython (Python for a JVM) and ironpython (Python for Mono)
+ may be added.
+ .
+ This package is mostly used as a build dependency for other packages to
+ avoid hardcoded dependencies on specific Python runtimes.
+
+Package: python-all-dev
+Architecture: all
+Priority: optional
+Depends: python-all (>= @VER@), python2.3-dev, python2.4-dev
+Description: Package depending on all supported Python development packages
+ The package currently depends on python2.3-dev and python2.4-dev, in the
+ future, dependencies on jython (Python for a JVM) and ironpython (Python
+ for Mono) may be added.
+ .
+ This package is mostly used as a build dependency for other packages to
+ avoid hardcoded dependencies on specific Python development packages.
diff --git a/debian/rules b/debian/rules
index 8239f716a5a457daed1ceeaf0133ac35237f6f31..8f83fdfe39e9e6697a0dae2d0425a723058e0a02 100755
--- a/debian/rules
+++ b/debian/rules
@@ -160,6 +160,13 @@ binary-indep: build install stamp-doc
 	mkdir -p debian/python/usr/share/apps/konsole
 	cp -p debian/python.desktop debian/python/usr/share/apps/konsole/
 
+	: # provide the python-dbg and python-dbg.1 defaults
+	mkdir -p debian/python-dbg/usr/bin
+	ln -sf python$(VER)-dbg debian/python-dbg/usr/bin/python-dbg
+	mkdir -p debian/python-dbg/usr/share/man/man1
+	ln -sf python$(VER)-dbg.1.gz \
+		debian/python-dbg/usr/share/man/man1/python-dbg.1.gz
+
 	mkdir -p debian/python/usr/lib/valgrind
 	cp -p debian/valgrind-python.supp \
 		debian/python/usr/lib/valgrind/python.supp
@@ -179,6 +186,8 @@ binary-indep: build install stamp-doc
 	dh_installdocs -i --all debian/README.Debian
 	dh_installmenu -i
 	dh_installchangelogs -i
+#	rm -rf debian/python-all-dev/usr/share/doc/python-all-dev
+#	ln -sf python$(VER)-all debian/python-all-dev/usr/share/doc/python-all-dev
 	dh_compress -i
 	dh_fixperms -i
 	dh_installdeb -i