Sfoglia il codice sorgente

* 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

Michael Vogt 18 anni fa
parent
commit
113d2d69ce
3 ha cambiato i file con 10 aggiunte e 9 eliminazioni
  1. 1 1
      apt-pkg/init.cc
  2. 0 7
      debian/apt.conf.ubuntu
  3. 9 1
      debian/changelog

+ 1 - 1
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","/");
    

+ 0 - 7
debian/apt.conf.ubuntu

@@ -1,10 +1,3 @@
 APT
 {
-  Install-Recommends-Sections
-  { 
-	"metapackages"; 
-	"restricted/metapackages";
-	"universe/metapackages";
-	"multiverse/metapackages";
-  };
 };

+ 9 - 1
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