diff -urN python-smbpasswd-1.0.1.old/debian/changelog python-smbpasswd-1.0.1/debian/changelog
--- python-smbpasswd-1.0.1.old/debian/changelog	2006-04-20 08:43:11.000000000 +0200
+++ python-smbpasswd-1.0.1/debian/changelog	2006-04-20 08:42:06.000000000 +0200
@@ -1,3 +1,12 @@
+python-smbpasswd (1.0.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Add support for python 2.4, add python2.x-smbpasswd
+    packages. Closes: #337424.
+  * Add clean target into debian/rules.
+
+ -- Arnaud Fontaine <arnaud@andesi.org>  Thu, 20 Apr 2006 08:40:11 +0200
+
 python-smbpasswd (1.0.1-1) unstable; urgency=low
 
   * Cleaned up two minor compile warnings
diff -urN python-smbpasswd-1.0.1.old/debian/control python-smbpasswd-1.0.1/debian/control
--- python-smbpasswd-1.0.1.old/debian/control	2006-04-20 08:43:11.000000000 +0200
+++ python-smbpasswd-1.0.1/debian/control	2006-04-20 08:38:06.000000000 +0200
@@ -2,14 +2,40 @@
 Section: python
 Priority: optional
 Maintainer: Bjorn Ove Grotan <bgrotan@grotan.com> 
-Build-Depends: debhelper (>= 4.1.67), python-dev (>= 2.3), python (>= 2.3), cdbs (>= 0.4.5)
+Build-Depends: debhelper (>= 4.1.67), python-dev (>= 2.3), python2.3-dev, python2.4-dev, cdbs (>= 0.4.5)
 Standards-Version: 3.6.1.1
 
 Package: python-smbpasswd
 Architecture: any
+Depends: python2.3-smbpasswd
+Recommends: luma
+Description: This module can generate both LANMAN and NT password hashes
+ smbpasswd was written to generate password hashes suitable for use with samba,
+ and possibly other places which uses LANMAN and/or NT hashes - such as
+ samba with ldap-backend, or even as hash in some radius implementations.
+ .
+ This is a "dummy" package that will cause the python-smbpasswd
+ package for Debian's default Python version to always be present on
+ your system.
+
+Package: python2.3-smbpasswd
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Recommends: luma
+Description: This module can generate both LANMAN and NT password hashes
+ smbpasswd was written to generate password hashes suitable for use with samba,
+ and possibly other places which uses LANMAN and/or NT hashes - such as
+ samba with ldap-backend, or even as hash in some radius implementations.
+ .
+ This package is for Python 2.3.
+
+Package: python2.4-smbpasswd
+Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
 Recommends: luma
 Description: This module can generate both LANMAN and NT password hashes
  smbpasswd was written to generate password hashes suitable for use with samba,
  and possibly other places which uses LANMAN and/or NT hashes - such as
  samba with ldap-backend, or even as hash in some radius implementations.
+ .
+ This package is for Python 2.4.
diff -urN python-smbpasswd-1.0.1.old/debian/rules python-smbpasswd-1.0.1/debian/rules
--- python-smbpasswd-1.0.1.old/debian/rules	2006-04-20 08:43:11.000000000 +0200
+++ python-smbpasswd-1.0.1/debian/rules	2006-04-20 08:39:56.000000000 +0200
@@ -1,7 +1,10 @@
 #!/usr/bin/make -f
 # -*- mode: makefile; coding: utf-8 -*-
-#  # Copyright © 2002,2003 Colin Walters <walters@debian.org>
+#  # Copyright © 2002,2003 Colin Walters <walters@debian.org>
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
+clean::
+	# Hack (CDBS bug -- see #300149)
+	-rm -rf build