* merged from dpkg-log

diff --combined apt-pkg/init.cc
index d68ec71ef3a2ae343f25a8860dd4acfea007dac8,cc3c1f01c94dc7405c091153e69e90f4e87491c0..73b3c83decd5ab544bd4a5d00b02998975c41ebf
--- 1/apt-pkg/init.cc
--- 2/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@@ -24,6 -24,8 +24,6 @@@ const char *pkgVersion = VERSION
  const char *pkgLibVersion = Stringfy(APT_PKG_MAJOR) "."
                              Stringfy(APT_PKG_MINOR) "." 
                              Stringfy(APT_PKG_RELEASE);
 -const char *pkgCPU = COMMON_CPU;
 -const char *pkgOS = COMMON_OS;
      
  // pkgInitConfig - Initialize the configuration class                 /*{{{*/
  // ---------------------------------------------------------------------
@@@ -33,7 -35,11 +33,7 @@@
  bool pkgInitConfig(Configuration &Cnf)
  {
     // General APT things
 -   if (strcmp(COMMON_OS,"linux") == 0 ||
 -       strcmp(COMMON_OS,"unknown") == 0)
 -      Cnf.Set("APT::Architecture",COMMON_CPU);
 -   else
 -      Cnf.Set("APT::Architecture",COMMON_OS "-" COMMON_CPU);
 +   Cnf.Set("APT::Architecture", COMMON_ARCH);
     Cnf.Set("APT::Build-Essential::", "build-essential");
     Cnf.Set("APT::Install-Recommends", false);
     Cnf.Set("APT::Install-Suggests", false);
@@@ -51,7 -57,6 +51,7 @@@
         
     Cnf.Set("Dir::State::lists","lists/");
     Cnf.Set("Dir::State::cdroms","cdroms.list");
 +   Cnf.Set("Dir::State::mirrors","mirrors/");
     
     // Cache
     Cnf.Set("Dir::Cache","var/cache/apt/");
@@@ -72,7 -77,7 +72,7 @@@
  
     // State   
     Cnf.Set("Dir::Log","var/log/apt");
-    Cnf.Set("Dir::Log::Name","term.log");
+    Cnf.Set("Dir::Log::Terminal","term.log");
     
     bool Res = true;
     
@@@ -104,6 -109,7 +104,6 @@@
        bindtextdomain(textdomain(0),Cnf.FindDir("Dir::Locale").c_str());
     }
  #endif
 -
     // Translation
     Cnf.Set("APT::Acquire::Translation", "environment");