diff -u calamaris-2.99.4.0/debian/changelog calamaris-2.99.4.0/debian/changelog
--- calamaris-2.99.4.0/debian/changelog
+++ calamaris-2.99.4.0/debian/changelog
@@ -1,3 +1,9 @@
+calamaris (2.99.4.0-11ubuntu0.1) natty-proposed; urgency=low
+
+  * Add in a patch to use squid3 log files if they are present (LP: #569514)
+
+ -- Vibhav Pant <vibhavp@gmail.com>  Fri, 25 May 2012 10:01:59 +0530
+
 calamaris (2.99.4.0-11) unstable; urgency=low
 
   * Resolve a 'dir-or-file-in-var-www' RC-bug. (Closes: #553532)
only in patch2:
unchanged:
--- calamaris-2.99.4.0.orig/debian/patches/use-squid3-log.diff
+++ calamaris-2.99.4.0/debian/patches/use-squid3-log.diff
@@ -0,0 +1,23 @@
+From: Brian Murray <brian@ubuntu.com>
+Description: If a squid3 log file is present use that instead of a squid log file
+Bug-Ubuntu: http://launchpad.net/bugs/569514
+Origin: ubuntu, http://launchpad.net/bugs/569514
+Forwarded: yes
+Author: Brian Murray <brian@ubuntu.com>
+
+Index: calamaris-2.99.4.0/calamaris-cron-script
+===================================================================
+--- calamaris-2.99.4.0.orig/calamaris-cron-script	2012-03-30 10:44:09.000000000 -0700
++++ calamaris-2.99.4.0/calamaris-cron-script	2012-03-30 10:46:07.000000000 -0700
+@@ -74,6 +74,10 @@
+ 
+ # look for cache log files
+ if [ "$CACHE" = "auto" ]; then
++    if [ -r /var/log/squid3/$CACHEFILE ]; then
++	CACHE=squid
++	CACHELOGDIR=/var/log/squid3
++    fi
+     if [ -r /var/log/squid/$CACHEFILE ]; then
+ 	CACHE=squid
+ 	CACHELOGDIR=/var/log/squid
+
only in patch2:
unchanged:
--- calamaris-2.99.4.0.orig/debian/patches/series
+++ calamaris-2.99.4.0/debian/patches/series
@@ -0,0 +1 @@
+use-squid3-log.diff