summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2013-11-23 09:18:03 +0100
committerMichael Vogt <mvo@debian.org>2013-11-23 09:18:03 +0100
commit17ab57f41a249fabb15cdbeeff5a5c0942ccf4ac (patch)
treefa34f700d7558d7eb6603a01748eb104ba0e8f34
parent7d2428e03c1fdae79488b9ecd53cc5257b2a0c13 (diff)
merge uploads from ubuntu/trusty into git0.9.13.exp1ubuntu1
-rw-r--r--debian/apt.cron.daily4
-rw-r--r--debian/changelog13
2 files changed, 15 insertions, 2 deletions
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 3ef92e9af..3b3133b57 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -197,11 +197,11 @@ check_size_constraints()
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
diff --git a/debian/changelog b/debian/changelog
index 6e2c61869..6dece999f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -334,6 +334,19 @@ apt (0.9.9.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 11 Jul 2013 20:44:31 +0200
+apt (0.9.9.1~ubuntu5) trusty; urgency=low
+
+ * Changed MinAgeSec to MinAge in /etc/cron.daily/apt:200,204
+ LP: #1206047
+
+ -- TJ Guthrie (TJ) <TJ.Guthrie@mail.wvu.edu> Mon, 18 Nov 2013 03:06:36 -0500
+
+apt (0.9.9.1~ubuntu4) trusty; urgency=low
+
+ * No change rebuild against db 5.3.
+
+ -- Dmitrijs Ledkovs <xnox@ubuntu.com> Sat, 02 Nov 2013 14:02:38 +0000
+
apt (0.9.9.1~ubuntu3) saucy; urgency=low
* Keep linux-tools packages matching installed kernels (LP: #1205284)