* merged dpkg-log branch

diff --combined apt-pkg/init.cc
index 0aff882b6f01433c0fe112a254a8b97616658823,cc3c1f01c94dc7405c091153e69e90f4e87491c0..676b66d382c41f2bc0f9a9b23f87bdd6a3b6fee2
--- 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);
@@@ -71,7 -77,7 +71,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;