* apt-pkg/algorithms.cc:

  - merged from apt--auto-mark (preserve auto-install information in InstallProtect
* cmdline/apt-get.cc:
  - fix typo
* cmdline/makefile:
  - install apt-mark as well

diff --cc apt-pkg/algorithms.cc
Simple merge

diff --cc cmdline/apt-get.cc
index 7b70de3bd8bd768a6e986dffbbb0bc8285510f26,5e1ccb0c0bd150ad0e8355d545c58bc5353a0217..05a256ec4b40c0f3b2f064d82a8ffef070c509f3
--- 1/cmdline/apt-get.cc
--- 2/cmdline/apt-get.cc
+++ b/cmdline/apt-get.cc
@@@ -1451,7 -1424,7 +1451,7 @@@ bool DoAutomaticRemove(CacheFile &Cache
         }
        }
     }
--   ShowList(c1out, _("The following packages where automatically installed and are no longer required:"), autoremovelist, autoremoveversions);
++   ShowList(c1out, _("The following packages were automatically installed and are no longer required:"), autoremovelist, autoremoveversions);
     if (!_config->FindB("APT::Get::AutomaticRemove") && 
         autoremovelist.size() > 0)
        c1out << _("Use 'apt-get autoremove' to remove them.") << std::endl;

diff --cc debian/changelog
index c76ca0f693248a70b2ef29eab0099af1818b535b,d0719db91fcc1e2d8ab0caaa339eaa12dad7382a..8ae6e13814c8b8a6509ae1a8accb24cd5e2f40ef
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,66 -1,4 +1,76 @@@
 -apt (0.6.45.1) unstable; urgency=low
++apt (0.6.45ubuntu8) edgy; urgency=low
++
++  * apt-pkg/algorithm.cc:
++    - fix pkgProblemResolver.InstallProtect() to preserve the auto-install
++      information (lp: #59457)
++  * cmdline/apt-get.cc:
++    - fix typo in autoremove information (lp: #59420)
++
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri,  8 Sep 2006 20:07:22 +0200
++
 +apt (0.6.45ubuntu7) edgy; urgency=low
 +
 +  * apt-pkg/depcache.cc:
 +    - fix a bug in the install-recommends-section code
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Sep 2006 18:22:38 +0200
 +
 +apt (0.6.45ubuntu6) edgy; urgency=low
 +
 +  [Michael Vogt]
 +  * cmdline/apt-get.cc:
 +    - always show auto-removable packages and give a hint how to remove 
 +      them
 +  * debian/apt.conf.ubuntu:
 +    - exlucde linux-image and linux-restricted-modules from ever being 
 +      auto-removed
 +    - added "metapackages" as the section we want to install recommends
 +      by default
 +  * apt-pkg/depcache.cc:
 +    - added support to turn install-recommends selectively on/off by
 +      section
 +  [Ian Jackson]
 +  * Tests pass without code changes!  Except that we need this:
 +  * Bump cache file major version to force rebuild so that Breaks
 +    dependencies are included.
 +  * Don't depend on or suggest any particular dpkg or dpkg-dev versions;
 +    --auto-deconfigure is very very old and dpkg-dev's Breaks support
 +    is more or less orthogonal.
 +  * Initial draft of `Breaks' implementation.  Appears to compile,
 +    but as yet *completely untested*.
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Thu,  7 Sep 2006 11:50:52 +0200
 +
 +apt (0.6.45ubuntu5) edgy; urgency=low
 +
 +  * apt-pkg/pkgcachegen.cc:
 +    - increase the APT::Cache-Limit to deal with the increased demand due
 +      to the translated descriptions
 +  * apt-pkg/deb/dpkgpm.cc:
 +    - pass "--auto-deconfigure" to dpkg on install to support the
 +      new "breaks" in dpkg
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 15 Aug 2006 12:06:26 +0200
 +
 +apt (0.6.45ubuntu4) edgy; urgency=low
 +
 +  * cmdline/apt-get.cc:
 +    - fix in the new --fix-polciy code
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Mon, 14 Aug 2006 21:08:11 +0200
 +
 +apt (0.6.45ubuntu3) edgy; urgency=low
 +
 +  * ABI break
 +  * merged latest apt--install-recommends (closes: #559000)
 +  * added "--fix-policy" option to can be used as "--fix-broken" and
 +    will install missing weak depends (recommends, and/or suggests 
 +    depending on the settings)
 +  * merged the apt--ddtp branch
 +
 + -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 11 Aug 2006 12:53:23 +0200
 +
 +apt (0.6.45ubuntu2) edgy; urgency=low
  
    * debian/control:
      - switched to libdb4.4 for building (closes: #381019)