* doc/files.sgml:

  - sync documentation with status quo, regarding files/directories in
    use, extended_states and uri schemes.
* doc/cache.sgml:
  - drop the file in favor of inplace documentation with doxygen
* apt-pkg/pkgcache.h:
  - enhance the Groups ABI by providing a ID as the other structs does
  - check also the size of the Group struct then checking for the others

diff --combined apt-pkg/depcache.cc
index 423161b1376f27729aa3eaab345d619c912facc9,659c4227e3f9245e8df6abafa573c285caed7ebf..4d1a08eb628da10d00a6f4c379dda58c07afc243
--- 1/apt-pkg/depcache.cc
--- 2/apt-pkg/depcache.cc
+++ b/apt-pkg/depcache.cc
@@@ -192,7 -192,7 +192,7 @@@ bool pkgDepCache::readStateFile(OpProgr
         {
            PkgState[pkg->ID].Flags |= Flag::Auto;
            if (unlikely(debug_autoremove))
 -             std::cout << "Auto-Installed : " << pkg.FullName() << std::endl;
 +             std::clog << "Auto-Installed : " << pkg.FullName() << std::endl;
            if (pkgarch == "any")
            {
               pkgCache::GrpIterator G = pkg.Group();
@@@ -848,7 -848,7 +848,7 @@@ void pkgDepCache::Update(OpProgress *Pr
         unsigned long const G = *g;
         recheck.erase(g);
         if (unlikely(ReInstallPseudoForGroup(G, recheck) == false))
-           _error->Warning(_("Internal error, group »%s« has no installable pseudo package"), GrpIterator(*Cache, Cache->GrpP + *g).Name());
+           _error->Warning(_("Internal error, group '%s' has no installable pseudo package"), GrpIterator(*Cache, Cache->GrpP + *g).Name());
        }
     }
  
@@@ -1819,7 -1819,7 +1819,7 @@@ bool pkgDepCache::Sweep()                                               /*{{{*
       {
        state.Garbage=true;
        if(debug_autoremove)
 -         std::cout << "Garbage: " << p.FullName() << std::endl;
 +         std::clog << "Garbage: " << p.FullName() << std::endl;
       }
    }   
  

diff --combined apt-pkg/pkgcache.cc
index 351702240bec85418f5025f2a42758811d54a8d8,ba3c5cbf8b54fa6f9418e6db692c90a6ba4ea1e3..a59a06d65411375cad6ceebeea33bc08290d2d9f
--- 1/apt-pkg/pkgcache.cc
--- 2/apt-pkg/pkgcache.cc
+++ b/apt-pkg/pkgcache.cc
@@@ -55,6 -55,7 +55,7 @@@ pkgCache::Header::Header(
     Dirty = false;
     
     HeaderSz = sizeof(pkgCache::Header);
+    GroupSz = sizeof(pkgCache::Group);
     PackageSz = sizeof(pkgCache::Package);
     PackageFileSz = sizeof(pkgCache::PackageFile);
     VersionSz = sizeof(pkgCache::Version);
@@@ -64,6 -65,7 +65,7 @@@
     VerFileSz = sizeof(pkgCache::VerFile);
     DescFileSz = sizeof(pkgCache::DescFile);
     
+    GroupCount = 0;
     PackageCount = 0;
     VersionCount = 0;
     DescriptionCount = 0;
@@@ -90,6 -92,7 +92,7 @@@
  bool pkgCache::Header::CheckSizes(Header &Against) const
  {
     if (HeaderSz == Against.HeaderSz &&
+        GroupSz == Against.GroupSz &&
         PackageSz == Against.PackageSz &&
         PackageFileSz == Against.PackageFileSz &&
         VersionSz == Against.VersionSz &&
@@@ -218,7 -221,7 +221,7 @@@ pkgCache::PkgIterator pkgCache::FindPkg
  /* Returns 0 on error, pointer to the package otherwise */
  pkgCache::PkgIterator pkgCache::FindPkg(const string &Name, string const &Arch) {
        if (MultiArchCache() == false) {
 -              if (Arch == "native" || Arch == "all" ||
 +              if (Arch == "native" || Arch == "all" || Arch == "any" ||
                    Arch == _config->Find("APT::Architecture"))
                        return SingleArchFindPkg(Name);
                else

diff --combined debian/changelog
index 28de4dc8aa479d0407d179225e1aed7deb290c08,3fd3f0a33592facc112bdd9259818177ba7d979d..07fc0845353cd244b55ff9b3fbaa177f94b6fb6e
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,4 -1,4 +1,4 @@@
 -apt (0.7.26~exp4) experimental; urgency=low
 +apt (0.7.26~exp4) UNRELEASEDexperimental; urgency=low
  
    [ David Kalnischkies ]
    * apt-pkg/depcache.cc:
@@@ -30,6 -30,7 +30,6 @@@
    * cmdline/apt-cache.cc:
      - align Installed and Candidate Version in policy so they can be compared
        easier, thanks Ralf Gesellensetter for the pointer! (Closes: #578657)
 -    - use GroupCount for package names in stats and add a package struct line
    * doc/apt.ent:
      - Add a note about APT_CONFIG in the -c description (Closes: #578267)
    * doc/po/de.po:
@@@ -38,6 -39,14 +38,14 @@@
      - be less strict and accept [option=value] as well
    * apt-pkg/contrib/configuration.cc:
      - error out if #clear directive has no argument
+   * doc/files.sgml:
+     - sync documentation with status quo, regarding files/directories in
+       use, extended_states and uri schemes.
+   * doc/cache.sgml:
+     - drop the file in favor of inplace documentation with doxygen
+   * apt-pkg/pkgcache.h:
+     - enhance the Groups ABI by providing a ID as the other structs does
+     - check also the size of the Group struct then checking for the others
  
    [ Jari Aalto ]
    * cmdline/apt-get.cc:
@@@ -47,29 -56,6 +55,29 @@@
      - modernize if-statements not to use 'x' (Closes: #577117)
      - replace backticks with POSIX $() (Closes: #577116)
  
 +  [ Michael Vogt ]
 +  * [ Abi break ] apt-pkg/acquire-item.{cc,h}:
 +    - add "IsIndexFile" to constructor of pkgAcqFile so that it sends
 +      the right cache control headers
 +  * cmdline/apt-get.cc:
 +    - fix crash when pkg.VersionList() is empty
 +  * apt-pkg/depcache.cc:
 +    - fix incorrect std::cout usage for debug output
 +  * test/libapt/getlanguages_test.cc:
 +    - Add test for Esperanto that has nocounty associated with them
 +      (LP: #560956)
 +
 +  [ Julian Andres Klode ]
 +  * apt-pkg/contrib/weakptr.h:
 +    - add a class WeakPointable which allows one to register weak pointers to
 +      an object which will be set to NULL when the object is deallocated.
 +  * [ABI break] apt-pkg/acquire{-worker,-item,}.h:
 +    - subclass pkgAcquire::{Worker,Item,ItemDesc} from WeakPointable.
 +  * apt-pkg/pkgcache.cc:
 +    - Merge fix from David to correct handling in single-arch environments.
 +  * cmdline/apt-get.cc:
 +    - Add apt-get markauto, showauto and unmarkauto commands.
 +
   -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 03 Apr 2010 14:58:39 +0200
  
  apt (0.7.26~exp3) experimental; urgency=low