From e838ca08d2b2311931b2e41699fdaba5ec04b28c Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Sat, 23 Nov 2013 09:16:24 +0100
Subject: Changed MinAgeSec to MinAge in /etc/cron.daily/apt:200,204  LP:
 #1206047

---
 debian/apt.cron.daily | 4 ++--
 debian/changelog      | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'debian')

diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 3f9df9d7e..2616af1dd 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 e6bdcb1fa..ab5609278 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+apt (0.9.13) UNRELEASED; urgency=low
+
+  [ TJ Guthrie ]
+  * Changed MinAgeSec to MinAge in /etc/cron.daily/apt:200,204 
+    LP: #1206047
+
+ -- Michael Vogt <mvo@debian.org>  Sat, 23 Nov 2013 09:16:01 +0100
+
 apt (0.9.13~exp1) experimental; urgency=low
 
   * Improve the API for APT::Upgrade::Upgrade()
-- 
cgit v1.2.3


From ef102a0639ac994a5dc909a8ef40a826f7ebc056 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Sat, 23 Nov 2013 09:36:50 +0100
Subject: upload 0.9.13 to unstable

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index ab5609278..ebcc7399d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-apt (0.9.13) UNRELEASED; urgency=low
+apt (0.9.13) unstable; urgency=low
 
   [ TJ Guthrie ]
   * Changed MinAgeSec to MinAge in /etc/cron.daily/apt:200,204 
     LP: #1206047
 
- -- Michael Vogt <mvo@debian.org>  Sat, 23 Nov 2013 09:16:01 +0100
+ -- Michael Vogt <mvo@debian.org>  Sun, 24 Nov 2013 10:56:22 +0100
 
 apt (0.9.13~exp1) experimental; urgency=low
 
-- 
cgit v1.2.3


From e4e5d47b0e66ae7bedafbdbb685114c404381204 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Thu, 28 Nov 2013 16:50:20 +0100
Subject: fix "apt-get  --purge build-dep" (closes: #720597)

---
 debian/changelog | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index ebcc7399d..7447628db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.9.13.1) unstable; urgency=low
+
+  [ Colin Watson ]
+  * fix "apt-get  --purge build-dep" (closes: #720597)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 28 Nov 2013 16:49:31 +0100
+
 apt (0.9.13) unstable; urgency=low
 
   [ TJ Guthrie ]
-- 
cgit v1.2.3


From 96ae6de5d3d5ae31100079c78fffc5ebc4a0b81c Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Thu, 28 Nov 2013 17:08:53 +0100
Subject: fix regression that APT::Keep-Fds is not honored (closes: #730490)

---
 debian/changelog | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 7447628db..92b9635dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ apt (0.9.13.1) unstable; urgency=low
 
   [ Colin Watson ]
   * fix "apt-get  --purge build-dep" (closes: #720597)
+  * fix regression that APT::Keep-Fds is not honored (closes: #730490)
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 28 Nov 2013 16:49:31 +0100
+ -- Michael Vogt <mvo@debian.org>  Thu, 28 Nov 2013 16:49:31 +0100
 
 apt (0.9.13) unstable; urgency=low
 
-- 
cgit v1.2.3


From c872ac503156caff9d0e33306c4121dd667a6567 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Thu, 28 Nov 2013 19:45:44 +0100
Subject: add "-f" option to "build-dep" as sbuild is using it to fix 
 regression with cross-building (LP: #1255806)

---
 debian/changelog | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index 92b9635dd..ca6bb4406 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-apt (0.9.13.1) unstable; urgency=low
+apt (0.9.13.1) UNRELEASED; urgency=low
 
   [ Colin Watson ]
   * fix "apt-get  --purge build-dep" (closes: #720597)
   * fix regression that APT::Keep-Fds is not honored (closes: #730490)
+  
+  [ Michael Vogt ]
+  * add "-f" option to "build-dep" as sbuild is using it to fix 
+    regression with cross-building (LP: #1255806)
 
  -- Michael Vogt <mvo@debian.org>  Thu, 28 Nov 2013 16:49:31 +0100
 
-- 
cgit v1.2.3


From f832a745920c988188c64ba018d1e2b436627ad5 Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Thu, 28 Nov 2013 20:02:51 +0100
Subject: update changelog

---
 debian/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'debian')

diff --git a/debian/changelog b/debian/changelog
index ca6bb4406..8359438d1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apt (0.9.13.1) UNRELEASED; urgency=low
+apt (0.9.13.1) unstable; urgency=low
 
   [ Colin Watson ]
   * fix "apt-get  --purge build-dep" (closes: #720597)
@@ -7,8 +7,9 @@ apt (0.9.13.1) UNRELEASED; urgency=low
   [ Michael Vogt ]
   * add "-f" option to "build-dep" as sbuild is using it to fix 
     regression with cross-building (LP: #1255806)
+  * merge mvo/feature/short-list
 
- -- Michael Vogt <mvo@debian.org>  Thu, 28 Nov 2013 16:49:31 +0100
+ -- Michael Vogt <mvo@debian.org>  Thu, 28 Nov 2013 20:02:39 +0100
 
 apt (0.9.13) unstable; urgency=low
 
-- 
cgit v1.2.3