diff -Nru apt-proxy-1.9.36.3ubuntu1/apt_proxy/cache.py apt-proxy-1.9.36.3+nmu1ubuntu1/apt_proxy/cache.py
--- apt-proxy-1.9.36.3ubuntu1/apt_proxy/cache.py	2007-06-04 10:54:39.000000000 +0100
+++ apt-proxy-1.9.36.3+nmu1ubuntu1/apt_proxy/cache.py	2008-06-30 10:36:57.000000000 +0100
@@ -503,7 +503,7 @@
 
     FileType(r"(?:^|/)Packages.gz$", "text/plain", 1, decompressor=clients.GzUncompressClient),
     FileType(r"(?:^|/)Packages.bz2$", "text/plain", 1, decompressor=clients.Bz2UncompressClient),
-    FileType(r"(?:^|/)(?:Packages|Release(?:\.gpg)?|Sources|(?:Contents|Translation)-[a-z0-9]+)"
+    FileType(r"(?:^|/)(?:Packages|Release(?:\.gpg)?|Sources|(?:Contents|Translation)-[a-z0-9_]+)"
                         r"(?:\.(?:gz|bz2))?$",
              "text/plain", 1),
     FileType(r"(?:^|/)(?:Packages|Sources|Contents-[a-z0-9]+)\.diff/Index$",
diff -Nru apt-proxy-1.9.36.3ubuntu1/debian/changelog apt-proxy-1.9.36.3+nmu1ubuntu1/debian/changelog
--- apt-proxy-1.9.36.3ubuntu1/debian/changelog	2008-05-28 16:36:13.000000000 +0100
+++ apt-proxy-1.9.36.3+nmu1ubuntu1/debian/changelog	2008-06-30 10:32:26.000000000 +0100
@@ -1,3 +1,19 @@
+apt-proxy (1.9.36.3+nmu1ubuntu1) intrepid; urgency=low
+
+  * Merge from Debian unstable. Remaining Ubuntu changes:
+    - debian/install: Install into python2.5 dirs instead of python2.3.
+    - Modify Maintainer value to match Debian-Maintainer-Field Spec
+
+ -- David Futcher <bobbocanfly@gmail.com>  Mon, 30 Jun 2008 10:32:16 +0100
+
+apt-proxy (1.9.36.3+nmu1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Change regexp for translated package description files to accept '_'
+    (Closes: #484331).  Patch by Yuri Kozlov <kozlov.y@gmail.com>.
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sat, 28 Jun 2008 18:31:31 +0000
+
 apt-proxy (1.9.36.3ubuntu1) intrepid; urgency=low
 
   * Merge from debian unstable (LP: #226423), remaining changes: