Merge lp:~tjguthrie4600/ubuntu/trusty/apt/bug-1206047 into lp:ubuntu/trusty/apt

[TJ Guthrie]

In debian/apt.cron.daily

Changed line 200:
From: debug_echo "skip remove by archive size: $file, delta=$delta < $MinAgeSec"
To: debug_echo "skip remove by archive size: $file, delta=$delta < $MinAge"

Changed line 204:
From: debug_echo "remove by archive size: $file, delta=$delta >= $MinAgeSec (sec), size=$size >=$MaxSize"
To: debug_echo "remove by archive size: $file, delta=$delta >= $MinAge (sec), size=$size >= $MaxSize"

[Craig Hrabal (crhrabal)]

Looks good!

[lp:~tjguthrie4600/ubuntu/trusty/apt/bug-1206047]

208. By TJ Guthrie <tguthri1@wheezy> on 2013-11-18

Fixed debian change log version

[Michael Terry (mterry)]

Yup, looks good. Thanks so much!

I've uploaded to Ubuntu.

review: Approve

=== modified file 'debian/apt.cron.daily'
--- debian/apt.cron.daily	2013-07-10 17:03:52 +0000
+++ debian/apt.cron.daily	2013-11-18 22:54:02 +0000
@@ -197,11 +197,11 @@
 		    delta=$(($now-$ctime))
 		fi
 		if [ $delta -le $MinAge ]; then
-		    debug_echo "skip remove by archive size:  $file, delta=$delta < $MinAgeSec"
+		    debug_echo "skip remove by archive size:  $file, delta=$delta < $MinAge"
 		    break
 		else
 		    # delete oldest file
-		    debug_echo "remove by archive size: $file, delta=$delta >= $MinAgeSec (sec), size=$size >= $MaxSize"
+		    debug_echo "remove by archive size: $file, delta=$delta >= $MinAge (sec), size=$size >= $MaxSize"
 		    rm -f $file
 		fi
 	    fi
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-11-02 14:02:38 +0000
+++ debian/changelog	2013-11-18 22:54:02 +0000
@@ -1,3 +1,11 @@
+apt (0.9.9.1~ubuntu5) trusty; urgency=low
+
+  * Non-maintainer upload
+  * Changed MinAgeSec to MinAge in /etc/cron.daily/apt:200,204 
+  * LP: #1206047
+
+ -- TJ Guthrie (TJ) <[e-mail]>  Mon, 18 Nov 2013 03:06:36 -0500
+
 apt (0.9.9.1~ubuntu4) trusty; urgency=low
 
   * No change rebuild against db 5.3.