From c5734bad6fde191ff67054878cf494906082027b Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Thu, 10 Mar 2011 15:57:50 +0100
Subject: [PATCH] * debian/zzapt.cron.daily:   - move cron job to the end of
 execution (LP: #727685) * methods/rsh.cc   - fix rsh/ssh option parsing (LP:
 #678080), thanks to     Ville Mattila

---
 debian/changelog                            | 11 +++++++++++
 debian/{apt.cron.daily => zzapt.cron.daily} |  0
 methods/rsh.cc                              |  3 ++-
 3 files changed, 13 insertions(+), 1 deletion(-)
 rename debian/{apt.cron.daily => zzapt.cron.daily} (100%)

diff --git a/debian/changelog b/debian/changelog
index 051bfc5da..f288c1b56 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+apt (0.8.13) unstable; urgency=low
+
+  [ Thorsten Spindler ]
+  * debian/zzapt.cron.daily:
+    - move cron job to the end of execution (LP: #727685)
+  * methods/rsh.cc
+    - fix rsh/ssh option parsing (LP: #678080), thanks to
+      Ville Mattila 
+
+ -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 10 Mar 2011 15:56:54 +0100
+
 apt (0.8.12) unstable; urgency=low
 
   [ Michael Vogt ]
diff --git a/debian/apt.cron.daily b/debian/zzapt.cron.daily
similarity index 100%
rename from debian/apt.cron.daily
rename to debian/zzapt.cron.daily
diff --git a/methods/rsh.cc b/methods/rsh.cc
index 97b4ef151..21f0d0a22 100644
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -110,6 +110,8 @@ bool RSHConn::Connect(string Host, string User)
       // Probably should do
       // dup2(open("/dev/null",O_RDONLY),STDERR_FILENO);
 
+      Args[i++] = Prog;
+
       // Insert user-supplied command line options
       Configuration::Item const *Opts = RshOptions;
       if (Opts != 0)
@@ -123,7 +125,6 @@ bool RSHConn::Connect(string Host, string User)
          }
       }
 
-      Args[i++] = Prog;
       if (User.empty() == false) {
          Args[i++] = "-l";
 	 Args[i++] = User.c_str();
-- 
2.45.2