summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/apt.conf.ubuntu7
-rw-r--r--debian/changelog10
2 files changed, 9 insertions, 8 deletions
diff --git a/debian/apt.conf.ubuntu b/debian/apt.conf.ubuntu
index 0489faf98..d295aee25 100644
--- 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 1bf5cc953..8c48f5f90 100644
--- 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