diff -Nru apt-cacher-1.6.9/apt-cacher-lib.pl apt-cacher-1.6.9ubuntu1/apt-cacher-lib.pl
--- apt-cacher-1.6.9/apt-cacher-lib.pl	2009-09-24 13:38:53.000000000 +0530
+++ apt-cacher-1.6.9ubuntu1/apt-cacher-lib.pl	2009-11-06 07:46:36.000000000 +0530
@@ -54,6 +54,9 @@
 						      'release\..*',
 						      'srclist.*\.bz2',
 						      'Translation-.+\.bz2',
+						      '[[:alpha:]]*\.tar\.gz\.gpg$',
+						      'ReleaseAnnouncement',
+						      'meta-release-.*',
 						     )
 						    ) . ')$',
 		  package_files_regexp => '(?:' . join('|',
diff -Nru /tmp/VX5217cgQy/apt-cacher-1.6.9/debian/changelog /tmp/mZC5hoSIdS/apt-cacher-1.6.9ubuntu1/debian/changelog
--- apt-cacher-1.6.9/debian/changelog	2009-09-24 13:38:54.000000000 +0530
+++ apt-cacher-1.6.9ubuntu1/debian/changelog	2009-11-17 11:12:44.000000000 +0530
@@ -1,3 +1,13 @@
+apt-cacher (1.6.9ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, remaining changes: LP: #484026
+    - apt-cacher-lib.pl:
+      + Cache *.tar.gz.gpg (e.g. jaunty.tar.gz.gpg)
+      + Cache ReleaseAnnouncement
+      + Cache meta-release-*
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Tue, 17 Nov 2009 11:11:50 +0530
+
 apt-cacher (1.6.9) unstable; urgency=low
 
   * Rescan cached files after checking for diff_Index parents (closes: #537189)
@@ -26,6 +36,16 @@
 
  -- Mark Hindley <mark@hindley.org.uk>  Tue, 22 Sep 2009 12:12:45 +0100
 
+apt-cacher (1.6.8ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #378158), remaining changes:
+    - apt-cacher-lib.pl:
+      + Cache *.tar.gz.gpg (e.g. intrepid.tar.gz.gpg)
+      + Cache ReleaseAnnouncement
+      + Cache meta-release-*
+
+ -- Michael Terry <michael.terry@canonical.com>  Tue, 02 Jun 2009 09:31:30 -0400
+
 apt-cacher (1.6.8) unstable; urgency=low
 
   * Fix typo (closes: #510602)
@@ -34,6 +54,39 @@
 
  -- Mark Hindley <mark@hindley.org.uk>  Mon, 16 Feb 2009 09:17:21 +0000
 
+apt-cacher (1.6.7ubuntu4) jaunty; urgency=low
+
+  * Resolve POSIX syntax error in apt-cacher-lib.pl for Ubuntu distribution
+    upgrades.  Thanks Mary Gardiner! (LP: #291606)
+  * Add regular expression to apt-cacher-lib.pl to allow meta-release files
+    to be cached thereby allowing update-manager to see new releases.  Ubuntu
+    specific, see Debian bug 502985.  (LP: #309827)
+
+ -- Brian Murray <brian@ubuntu.com>  Wed, 07 Jan 2009 19:48:22 -0800
+
+apt-cacher (1.6.7ubuntu3) jaunty; urgency=low
+
+  * Fix typo in apt-cacher2 (LP: 309858)
+
+ -- Martin Mai <martinmai1024@web.de>  Sat, 03 Jan 2009 07:42:33 -0500
+
+apt-cacher (1.6.7ubuntu2) jaunty; urgency=low
+
+  * Allow ReleaseAnnouncement files to be cached, as they are used by
+    update-manager -d and distribution upgrades will fail without 
+    them (LP: #308230)
+
+ -- Brian Murray <brian@ubuntu.com>  Mon, 15 Dec 2008 09:06:40 -0800
+
+apt-cacher (1.6.7ubuntu1) jaunty; urgency=low
+
+  * Merge from Debian unstable, remaining changes:
+    - Allow e.g. intrepid.tar.gz.gpg files to be cached, as they are used by
+      do-release-upgrade. Thanks to "shemgp" for the fix. (LP: #156070)
+      - http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=502985
+
+ -- James Westby <james.westby@canonical.com>  Fri, 07 Nov 2008 21:35:12 +0000
+
 apt-cacher (1.6.7) unstable; urgency=low
 
   * libcurl: reduce select->can_read timeout to 0 to restore throughput
@@ -67,6 +120,13 @@
 
  -- Mark Hindley <mark@hindley.org.uk>  Sun, 06 Jul 2008 19:50:53 +0100
 
+apt-cacher (1.6.4ubuntu1) intrepid; urgency=low
+
+  * Allow e.g. intrepid.tar.gz.gpg files to be cached, as they are used by
+    do-release-upgrade. Thanks to "shemgp" for the fix. (LP: #156070)
+
+ -- James Westby <james.westby@canonical.com>  Fri, 26 Sep 2008 20:30:58 +0100
+
 apt-cacher (1.6.4) unstable; urgency=low
 
   * Add interface option (closes: #483666)
+
diff -Nru /tmp/VX5217cgQy/apt-cacher-1.6.9/debian/control /tmp/mZC5hoSIdS/apt-cacher-1.6.9ubuntu1/debian/control
--- apt-cacher-1.6.9/debian/control	2009-09-24 13:38:54.000000000 +0530
+++ apt-cacher-1.6.9ubuntu1/debian/control	2009-11-06 07:46:36.000000000 +0530
@@ -1,7 +1,8 @@
 Source: apt-cacher
 Section: net
 Priority: optional
-Maintainer: Mark Hindley <mark@hindley.org.uk>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Mark Hindley <mark@hindley.org.uk>
 Uploaders: Eduard Bloch <blade@debian.org>, Jonathan Oxer <jon@debian.org>
 Build-Depends: debhelper (>= 7)
 Build-Depends-Indep: perl (>=5.6.0-16)