* 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

@@ -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 ]

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();