Merge lp:~racb/ubuntu/precise/squid-deb-proxy/cloud-archive into lp:ubuntu/precise-proposed/squid-deb-proxy

[Robie Basak]

[Michael Vogt (mvo)]

This is merged into squid-deb-proxy trunk now. I'm not sure if that should go into precise-updates though as there is a risk that this triggers a conffile prompt during the upgrade if the user has dropped files into it (and not used the .d directory).

[James Page (james-page)]

I've uploaded to precise-proposed; I think the conffile update is OK but I'll defer the final decision to the SRU team.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-19 14:46:24 +0000
+++ debian/changelog	2013-01-07 10:51:26 +0000
@@ -1,3 +1,9 @@
+squid-deb-proxy (0.6.3.1) precise-proposed; urgency=low
+
+  * Allow caching of Canonical's cloud archive (LP: #1087145).
+
+ -- Robie Basak <[e-mail]>  Mon, 07 Jan 2013 10:13:44 +0000
+
 squid-deb-proxy (0.6.3) precise-proposed; urgency=low
 
   [ Simon Déziel ]

=== modified file 'mirror-dstdomain.acl'
--- mirror-dstdomain.acl	2012-04-19 14:46:24 +0000
+++ mirror-dstdomain.acl	2013-01-07 10:51:26 +0000
@@ -10,7 +10,7 @@
 mirrors.ubuntu.com
 
 #official third party repositories
-archive.canonical.com
+.archive.canonical.com
 extras.ubuntu.com
 
 # default changelogs location, this includes changelogs and the meta-release