From: Michael Vogt Date: Thu, 7 Sep 2006 09:52:58 +0000 (+0200) Subject: * apt-pkg/depcache.cc: X-Git-Tag: 0.7.24ubuntu1~235 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/3a089a0178ee7b3adff28dcc8749735898201e27 * apt-pkg/depcache.cc: - merged from install-recommends * debian/apt.conf.ubuntu: - added "APT::Install-Recommends-Section" to "metapackages" * renamed apt.conf.autoremove -> apt.conf.ubuntu --- 3a089a0178ee7b3adff28dcc8749735898201e27 diff --cc debian/apt.conf.ubuntu index 000000000,000000000..8d095f17e new file mode 100644 --- /dev/null +++ b/debian/apt.conf.ubuntu @@@ -1,0 -1,0 +1,10 @@@ ++APT ++{ ++ NeverAutoRemove ++ { ++ "^linux-image.*"; ++ "^linux-restricted-modules.*"; ++ }; ++ ++ Install-Recommends-Section "metapackages"; ++}; diff --cc debian/changelog index d8f90ba40,65ec82cc1..0bd5e4532 --- a/debian/changelog +++ b/debian/changelog @@@ -1,54 -1,11 +1,59 @@@ -apt (0.6.45.2) unstable; urgency=low +apt (0.6.45ubuntu6) edgy; urgency=low - * added "--install-recommends" to handle recommends as - dependencies (closes: #42266) + [Michael Vogt] + * cmdline/apt-get.cc: + - always show auto-removable packages and give a hint how to remove + them - * debian/apt.conf.autoremove: ++ * debian/apt.conf.ubuntu: + - exlucde linux-image and linux-restricted-modules from ever being + auto-removed ++ - added "metapackages" as the section we want to install recommends ++ by default ++ * apt-pkg/depcache.cc: ++ - added support to turn install-recommends selectively on/off by ++ section + [Ian Jackson] + * Tests pass without code changes! Except that we need this: + * Bump cache file major version to force rebuild so that Breaks + dependencies are included. + * Don't depend on or suggest any particular dpkg or dpkg-dev versions; + --auto-deconfigure is very very old and dpkg-dev's Breaks support + is more or less orthogonal. + * Initial draft of `Breaks' implementation. Appears to compile, + but as yet *completely untested*. + - -- ++ -- Michael Vogt Thu, 7 Sep 2006 11:50:52 +0200 + +apt (0.6.45ubuntu5) edgy; urgency=low + + * apt-pkg/pkgcachegen.cc: + - increase the APT::Cache-Limit to deal with the increased demand due + to the translated descriptions + * apt-pkg/deb/dpkgpm.cc: + - pass "--auto-deconfigure" to dpkg on install to support the + new "breaks" in dpkg + + -- Michael Vogt Tue, 15 Aug 2006 12:06:26 +0200 + +apt (0.6.45ubuntu4) edgy; urgency=low + + * cmdline/apt-get.cc: + - fix in the new --fix-polciy code + + -- Michael Vogt Mon, 14 Aug 2006 21:08:11 +0200 + +apt (0.6.45ubuntu3) edgy; urgency=low + + * ABI break + * merged latest apt--install-recommends (closes: #559000) + * added "--fix-policy" option to can be used as "--fix-broken" and + will install missing weak depends (recommends, and/or suggests + depending on the settings) + * merged the apt--ddtp branch - -- + -- Michael Vogt Fri, 11 Aug 2006 12:53:23 +0200 -apt (0.6.45.1) unstable; urgency=low +apt (0.6.45ubuntu2) edgy; urgency=low * debian/control: - switched to libdb4.4 for building (closes: #381019) diff --cc debian/rules index ffc23402e,a8bf88762..2007370c4 --- a/debian/rules +++ b/debian/rules @@@ -210,15 -210,10 +210,15 @@@ apt: build debian/shlibs.loca cp debian/bugscript debian/$@/usr/share/bug/apt/script - cp share/debian-archive.gpg debian/$@/usr/share/$@ - + cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ - cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove ++ cp debian/apt.conf.ubuntu debian/$@/etc/apt/apt.conf.d/01ubuntu # head -n 500 ChangeLog > debian/ChangeLog + # make rosetta happy and remove pot files in po/ (but leave stuff + # in po/domains/* untouched) and cp *.po into each domain dir + rm -f build/po/*.pot + rm -f po/*.pot + dh_installexamples -p$@ $(BLD)/docs/examples/* dh_installman -p$@ dh_installcron -p$@