* enable installation of recommends by default

* debian/apt.conf.ubuntu:
  - remove APT::Install-Recommends-Sections (no longer needed)
* merged from debian/sid, remaining changes:
  - authentication-reliable branch (to be merged into debian soon)
  - mirror:// uri branch (breaks ABI in debian, not merged yet)
  - apport failure reporting
  - show warning on apt-get source with 'Vcs-' header
  - proxy detection from gconf in apt.cron

diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index dc6b7e976806dae0edc2cc2f75ec0b2851fc0f21..c0384cd45ca82707fe8f4efa702c0938470ff38a 100644 (file)
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -35,7 +35,7 @@ bool pkgInitConfig(Configuration &Cnf)
    // General APT things
    Cnf.Set("APT::Architecture", COMMON_ARCH);
    Cnf.Set("APT::Build-Essential::", "build-essential");
-   Cnf.Set("APT::Install-Recommends", false);
+   Cnf.Set("APT::Install-Recommends", true);
    Cnf.Set("APT::Install-Suggests", false);
    Cnf.Set("Dir","/");
    

diff --git a/debian/apt.conf.ubuntu b/debian/apt.conf.ubuntu
index 0489faf987e48295d3e32bbca1db7645072f2428..d295aee2553432c2d52307ed7b1d22979e75aa7d 100644 (file)
--- a/debian/apt.conf.ubuntu
+++ b/debian/apt.conf.ubuntu
@@ -1,10 +1,3 @@
 APT
 {
-  Install-Recommends-Sections
-  { 
-       "metapackages"; 
-       "restricted/metapackages";
-       "universe/metapackages";
-       "multiverse/metapackages";
-  };
 };

diff --git a/debian/changelog b/debian/changelog
index 1bf5cc9538ff77bc3f2c2df02baf76de2d1af1d8..8c48f5f902b75582869b7212f295cce4e95b1e74 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,15 @@
 apt (0.7.14ubuntu1) intrepid; urgency=low
 
   [ Michael Vogt ]
-  * merged from debian/sid
+  * enable installation of recommends by default
+  * debian/apt.conf.ubuntu:
+    - remove APT::Install-Recommends-Sections (no longer needed)
+  * merged from debian/sid, remaining changes:
+    - authentication-reliable branch (to be merged into debian soon)
+    - mirror:// uri branch (breaks ABI in debian, not merged yet)
+    - apport failure reporting
+    - show warning on apt-get source with 'Vcs-' header
+    - proxy detection from gconf in apt.cron
   
   [ Christian Perrier ]
   * Mark a message from dselect backend as translatable