diff -u python-pqueue-0.2/debian/changelog python-pqueue-0.2/debian/changelog
--- python-pqueue-0.2/debian/changelog
+++ python-pqueue-0.2/debian/changelog
@@ -1,3 +1,12 @@
+python-pqueue (0.2-7.1) unstable; urgency=low
+
+  * NMU
+  * Merge from Ubuntu:
+    - Fix build failure with python2.5. Closes: #460359.
+    - Fixes for python2.5 memory management.
+
+ -- Matthias Klose <doko@debian.org>  Thu, 31 Jan 2008 22:30:29 +0000
+
 python-pqueue (0.2-7) unstable; urgency=low
 
   * Update to new Python policy.  (Closes: #373339)
diff -u python-pqueue-0.2/debian/rules python-pqueue-0.2/debian/rules
--- python-pqueue-0.2/debian/rules
+++ python-pqueue-0.2/debian/rules
@@ -21,6 +21,7 @@
 
 	# Add here commands to clean up after the build process.
 	-(for v in $(PYVERS); do cd build-$$v; $(MAKE) distclean; cd ..; rm -rf build-$$v; done)
+	rm -f *.pyc
 
 	dh_clean
 
@@ -57,7 +58,6 @@
 	dh_fixperms
 #	dh_makeshlibs
 	dh_pycentral
-	dh_python
 	dh_installdeb
 #	dh_perl
 	dh_shlibdeps
diff -u python-pqueue-0.2/Makefile.pre.in python-pqueue-0.2/Makefile.pre.in
--- python-pqueue-0.2/Makefile.pre.in
+++ python-pqueue-0.2/Makefile.pre.in
@@ -118,6 +118,7 @@
 MACHDEP=	@MACHDEP@
 SO=		@SO@
 LDSHARED=	@LDSHARED@
+BLDSHARED=	@LDSHARED@
 CCSHARED=	@CCSHARED@
 LINKFORSHARED=	@LINKFORSHARED@
 @SET_CCC@
diff -u python-pqueue-0.2/pqueuemodule.c python-pqueue-0.2/pqueuemodule.c
--- python-pqueue-0.2/pqueuemodule.c
+++ python-pqueue-0.2/pqueuemodule.c
@@ -255,7 +255,7 @@
 	Py_DECREF(pqp->dict);
 	if(pqp->min != NULL)
 		children_dealloc(pqp->min);
-	PyMem_DEL(pqp);
+	PyObject_Del(pqp);
 }
 
 static PyObject *