merged from the debian-sid branch

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

diff --cc apt-pkg/init.cc
index c9f954d2d19c5ae2f309423afe3d4d18a191df7d,38a0814e54ed52f0879c50ae79748b2f2610c546..2c350e0256e1a1917d20b582a940feaa4e0fe521
--- 1/apt-pkg/init.cc
--- 2/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@@ -47,49 -48,49 +48,52 @@@ bool pkgInitConfig(Configuration &Cnf
     struct stat St;   
     if (stat("/var/lib/apt/.",&St) != 0 &&
         stat("/var/state/apt/.",&St) == 0)
-       Cnf.Set("Dir::State","var/state/apt/");
+       Cnf.CndSet("Dir::State","var/state/apt/");
         
-    Cnf.Set("Dir::State::lists","lists/");
-    Cnf.Set("Dir::State::cdroms","cdroms.list");
-    Cnf.Set("Dir::State::mirrors","mirrors/");
+    Cnf.CndSet("Dir::State::lists","lists/");
+    Cnf.CndSet("Dir::State::cdroms","cdroms.list");
+    Cnf.CndSet("Dir::State::mirrors","mirrors/");
  
     // Cache
-    Cnf.Set("Dir::Cache","var/cache/apt/");
-    Cnf.Set("Dir::Cache::archives","archives/");
-    Cnf.Set("Dir::Cache::srcpkgcache","srcpkgcache.bin");
-    Cnf.Set("Dir::Cache::pkgcache","pkgcache.bin");
+    Cnf.CndSet("Dir::Cache","var/cache/apt/");
+    Cnf.CndSet("Dir::Cache::archives","archives/");
+    Cnf.CndSet("Dir::Cache::srcpkgcache","srcpkgcache.bin");
+    Cnf.CndSet("Dir::Cache::pkgcache","pkgcache.bin");
     
     // Configuration
-    Cnf.Set("Dir::Etc","etc/apt/");
-    Cnf.Set("Dir::Etc::sourcelist","sources.list");
-    Cnf.Set("Dir::Etc::sourceparts","sources.list.d");
-    Cnf.Set("Dir::Etc::vendorlist","vendors.list");
-    Cnf.Set("Dir::Etc::vendorparts","vendors.list.d");
-    Cnf.Set("Dir::Etc::main","apt.conf");
-    Cnf.Set("Dir::Etc::netrc", "auth.conf");
-    Cnf.Set("Dir::Etc::parts","apt.conf.d");
-    Cnf.Set("Dir::Etc::preferences","preferences");
-    Cnf.Set("Dir::Etc::preferencesparts","preferences.d");
-    Cnf.Set("Dir::Etc::trusted", "trusted.gpg");
-    Cnf.Set("Dir::Etc::trustedparts","trusted.gpg.d");
-    Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
-    Cnf.Set("Dir::Media::MountPath","/media/apt");
+    Cnf.CndSet("Dir::Etc","etc/apt/");
+    Cnf.CndSet("Dir::Etc::sourcelist","sources.list");
+    Cnf.CndSet("Dir::Etc::sourceparts","sources.list.d");
+    Cnf.CndSet("Dir::Etc::vendorlist","vendors.list");
+    Cnf.CndSet("Dir::Etc::vendorparts","vendors.list.d");
+    Cnf.CndSet("Dir::Etc::main","apt.conf");
+    Cnf.CndSet("Dir::Etc::netrc", "auth.conf");
+    Cnf.CndSet("Dir::Etc::parts","apt.conf.d");
+    Cnf.CndSet("Dir::Etc::preferences","preferences");
+    Cnf.CndSet("Dir::Etc::preferencesparts","preferences.d");
+    Cnf.CndSet("Dir::Etc::trusted", "trusted.gpg");
+    Cnf.CndSet("Dir::Etc::trustedparts","trusted.gpg.d");
+    Cnf.CndSet("Dir::Bin::methods","/usr/lib/apt/methods");
+    Cnf.CndSet("Dir::Media::MountPath","/media/apt");
  
     // State   
-    Cnf.Set("Dir::Log","var/log/apt");
-    Cnf.Set("Dir::Log::Terminal","term.log");
-    Cnf.Set("Dir::Log::History","history.log");
+    Cnf.CndSet("Dir::Log","var/log/apt");
+    Cnf.CndSet("Dir::Log::Terminal","term.log");
+    Cnf.CndSet("Dir::Log::History","history.log");
  
-    Cnf.Set("Dir::Ignore-Files-Silently::", "~$");
-    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$");
-    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
-    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
-    // ubuntu specific
-    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$");
-    Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$");
+    if (Cnf.Exists("Dir::Ignore-Files-Silently") == false)
+    {
+       Cnf.Set("Dir::Ignore-Files-Silently::", "~$");
+       Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$");
+       Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
+       Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
++      // ubuntu specific
++      Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$");
++      Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$");
+    }
  
     // Default cdrom mount point
-    Cnf.Set("Acquire::cdrom::mount", "/media/cdrom/");
+    Cnf.CndSet("Acquire::cdrom::mount", "/media/cdrom/");
  
     bool Res = true;
     

diff --cc cmdline/apt-get.cc
Simple merge

diff --cc debian/changelog
index cfb4094a657cc1661bfa5d54d0923b34a994a6c5,2e22e64d8611a76375fdfe6bbfc04d9359e54404..a620b091b1fd0cd95d5416f0b9a4ed7403fae8f3
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,28 +1,28 @@@
- apt (0.8.15.2ubuntu1) UNRELEASEDoneiric; urgency=low
 -apt (0.8.15.3) UNRELEASED; urgency=low
++apt (0.8.15.2ubuntu1) oneiric; urgency=low
  
+   [ Michael Vogt ]
    * apt-pkg/acquire-item.cc:
      - improve error message for a expired Release file
    * apt-pkg/algorithms.cc:
      - Hold back packages that would enter "policy-broken" state on upgrade
        when doing a "apt-get upgrade"
  
-  -- Michael Vogt <michael.vogt@ubuntu.com>  Thu, 14 Jul 2011 11:22:54 +0200
+   [ David Kalnischkies ]
+   * apt-pkg/pkgcachegen.cc:
+     - fallback to memory if file is not writeable even if access()
+       told us the opposite before (e.g. in fakeroot 1.16) (Closes: #630591)
+   * doc/sources.list.5.xml:
+     - document available [options] for sources.list entries (Closes: 632441)
+   * doc/apt.conf.5.xml:
+     - document APT::Architectures list (Closes: #612102)
+   * cmdline/apt-get.cc:
+     - restore all important dependencies for garbage packages (LP: #806274)
+   * apt-pkg/init.cc:
+     - use CndSet in pkgInitConfig (Closes: #629617)
+   * apt-pkg/depcache.cc:
+     - change default of APT::AutoRemove::SuggestsImportant to true
+ 
 - -- David Kalnischkies <kalnischkies@gmail.com>  Fri, 15 Jul 2011 09:29:37 +0200
++ -- Michael Vogt <michael.vogt@ubuntu.com>  Fri, 15 Jul 2011 10:16:45 +0200
  
  apt (0.8.15.2) unstable; urgency=high
  

diff --cc debian/rules
Simple merge