* merged some more missing bits

diff --cc apt-pkg/depcache.cc
index ac667d51d6f3931c69306ba82d31b91203d71c79,4794d3503999ad1e15ae8f151023cc8f21cb54a1..af2fd54c7a10f7ad33cde8d8b70c7fb3d1c9d52b
--- 1/apt-pkg/depcache.cc
--- 2/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@@ -238,6 -243,6 +240,9 @@@ bool pkgDepCache::writeStateFile(OpProg
               std::clog << "Skipping already written " << pkg.Name() << std::endl;
            continue;
         }
++         // skip not installed ones if requested
++         if(InstalledOnly && pkg->CurrentVer == 0)
++            continue;
         if(_config->FindB("Debug::pkgAutoRemove",false))
            std::clog << "Writing new AutoInstall: " 
                      << pkg.Name() << std::endl;

diff --cc cmdline/apt-mark
index dadc0136600c834126c59c194a1ae079ce199d2f,728f083dcb3560e7f5898c03a68b0e81c80e9b3f..fdc3e1856c007b2af30e21d03ccc7e1039e57bd5
--- 1/cmdline/apt-mark
--- 2/cmdline/apt-mark
+++ b/cmdline/apt-mark
@@@ -60,5 -60,5 +60,6 @@@ if __name__ == "__main__"
              else:
                  outfile.write(str(tagfile.Section)+"\n")
          # all done, rename the tmpfile
 +        os.chmod(outfile.name, 0644)
          os.rename(outfile.name, STATE_FILE)
+         os.chmod(outfile.name, 0644)