diff -Nru /tmp/f2R1k8yXNa/apt-proxy-1.9.36ubuntu2/debian/changelog /tmp/iICHLPxE5G/apt-proxy-1.9.36.1ubuntu1/debian/changelog
--- /tmp/f2R1k8yXNa/apt-proxy-1.9.36ubuntu2/debian/changelog	2007-08-11 11:57:27.000000000 -0500
+++ /tmp/iICHLPxE5G/apt-proxy-1.9.36.1ubuntu1/debian/changelog	2007-11-29 18:40:43.000000000 -0500
@@ -1,3 +1,22 @@
+apt-proxy (1.9.36.1ubuntu1) hardy; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - debian/init.d: Use LSB init-functions.
+    - debian/install: Install into python2.5 dirs instead of python2.3.
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+    - apt_proxy/packages.py (Closes LP: #131251):
+      + Comment out apt_pkg.CPU - apt_pkg no longer provides this
+
+ -- Nicolas Valcárcel Scerpella (aka nxvl) <nvalcarcel@gmail.com>  Thu, 29 Nov 2007 18:39:57 -0500
+
+apt-proxy (1.9.36.1) unstable; urgency=low
+
+    * Work around breakage caused by ABI change in python_apt. 
+    (Closes: #436011, #436112). This is also related to #285360, which is not
+    yet fixed
+
+ -- Chris Halls <halls@debian.org>  Tue, 14 Aug 2007 21:58:45 +0100
+
 apt-proxy (1.9.36ubuntu2) gutsy; urgency=low
 
   * apt_proxy/packages.py