From: Michael Vogt Date: Thu, 26 Jul 2007 08:43:07 +0000 (+0200) Subject: * merged from apt--mvo X-Git-Tag: 0.7.24ubuntu1~166 X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/94bdf40722a406f66383261d36e500213b0c2c38 * merged from apt--mvo --- 94bdf40722a406f66383261d36e500213b0c2c38 diff --cc debian/changelog index 15d92b9ce,8961a0257..09454d1cd --- a/debian/changelog +++ b/debian/changelog @@@ -1,25 -1,28 +1,28 @@@ - apt (0.7.2ubuntu9) unstable; urgency=low -apt (0.7.5) UNRELEASED; urgency=low ++apt (0.7.4ubuntu1) UNRELEASED; urgency=low - [Otavio Salvador] - * Simplified HttpMethod::Fetch on http.cc removing Tail variable; - * Fix pipeline handling on http.cc (closes: #413324) - * Fix building to properly support binNMUs. Thanks to Daniel Schepler - by the patch (closes: #359634) - * Fix example for Install-{Recommends,Suggests} options on - configure-index example file. Thanks to Peter Eisentraut - by the patch (closes: #432223) - * + [ Otavio Salvador ] + * Applied patch from Guillem Jover to use + dpkg-architecture to get the host architecture (closes: #407187) - -- + [ Michael Vogt ] + * apt-pkg/depcache.cc: + - support a list of sections for: + APT::Install-Recommends-Sections + APT::Never-MarkAuto-Sections - apt (0.7.2ubuntu8) gutsy; urgency=low - -- Otavio Salvador Wed, 25 Jul 2007 20:16:46 -0300 ++ -- Michael Vogt Thu, 26 Jul 2007 10:42:29 +0200 - [Michael Vogt] + apt (0.7.4) unstable; urgency=low + + [ Michael Vogt ] * cmdline/apt-get.cc: - fix in the task-install code regexp (thanks to Adam Conrad and - Colin Watson). This should bring the livecd build back into - shape - [Otavio Salvador] + Colin Watson) + - support task removal too: apt-get remove taskname^ + (thanks to Matt Zimmerman reporting this problem) + + [ Otavio Salvador ] + * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3) * Fix compilation warnings: - apt-pkg/contrib/configuration.cc: wrong argument type; - apt-pkg/deb/dpkgpm.cc: wrong signess; @@@ -28,54 -31,32 +31,62 @@@ - type conversion; - unused variable; - changed SetupProxy() method to void; - * Simplified HttpMethod::Fetch on http.cc removing Tail variable; - * Fix pipeline handling on http.cc (closes: #413324) - * Fix building to properly support binNMUs. Thanks to Daniel Schepler - by the patch (closes: #359634) - * Fix example for Install-{Recommends,Suggests} options on - configure-index example file. Thanks to Peter Eisentraut - by the patch (closes: #432223) - -- Michael Vogt Wed, 11 Jul 2007 23:20:15 +0100 + [ Christian Perrier ] + * Basque translation update. Closes: ##423766 + * Unfuzzy formerly complete translations + * French translation update + * Re-generate PO(T) files + * Spanish translation update + * Swedish translation update + + -- Otavio Salvador Tue, 24 Jul 2007 09:55:50 -0300 -apt (0.7.3) unstable; urgency=low +apt (0.7.2ubuntu7) gutsy; urgency=low - * fixed compile errors with g++ 4.3 (thanks to - Daniel Burrows, closes: #429378) + * fix build-dependencies * fixes in the auto-mark code (thanks to Daniel Burrows) - * fix FTFBFS by changing build-depends to - libcurl4-gnutls-dev (closes: #428363) + + -- Michael Vogt Mon, 9 Jul 2007 19:02:54 +0200 + +apt (0.7.2ubuntu6) gutsy; urgency=low + + [ Michael Vogt] + * cmdline/apt-get.cc: + - make the XS-Vcs-$foo warning more copy'n'paste + friendly (thanks to Matt Zimmerman) + - ignore the Vcs-Browser tag (Fixes LP: #121770) + * debian/apt.conf.autoremove: + - added "linux-ubuntu-modules" to APT::NeverAutoRemove + + [ Sarah Hobbs ] + * Change metapackages to *metapackages in Install-Recommends-Section + and Never-MarkAuto-Section of debian/apt.conf.autoremove, so that + the Recommends of metapackages in universe and multiverse will get + installed. + * Also make this change in doc/examples/configure-index. + * Added a Build Dependancies of automake, docbook-xsl, xsltproc, xmlto, + docbook to fix FTBFS. + * Added in previous changelog entries, as those who uploaded did not + actually commit to Bzr. + + -- Sarah Hobbs Mon, 09 Jul 2007 01:15:57 +1000 + +apt (0.7.2ubuntu5) gutsy; urgency=low + + * Rerun autoconf to fix the FTBFS. + + -- Michael Bienia Fri, 06 Jul 2007 19:17:33 +0200 + +apt (0.7.2ubuntu4) gutsy; urgency=low + + * Rebuild for the libcurl4 -> libcurl3 transition mess. + + -- Steve Kowalik Fri, 6 Jul 2007 12:44:05 +1000 + +apt (0.7.2ubuntu3) gutsy; urgency=low + * cmdline/apt-get.cc: - fix InstallTask code when a pkgRecord ends with a single '\n' (thanks to Soren Hansen for reporting) diff --cc debian/control index e2ab8ec4e,76e5b1a19..1c6d2f490 --- a/debian/control +++ b/debian/control @@@ -1,9 -1,8 +1,9 @@@ Source: apt Section: admin Priority: important -Maintainer: APT Development Team +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: APT Development Team - Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt + Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt , Otavio Salvador Standards-Version: 3.7.2.2 Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) diff --cc doc/examples/configure-index index ef2c10631,ab3657a58..bd70d61ac --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@@ -100,11 -100,8 +100,11 @@@ AP Install-Recommends "false"; Install-Suggests "false"; + // install recommends automatically for packages in this section + Install-Recommends-Section "*metapackages"; + // consider dependencies of packages in this section manual - Never-MarkAuto-Section "*metapackages"; + Never-MarkAuto-Sections {"metapackages"; "universe/metapackages"; }; // Write progress messages on this fd (for stuff like base-config) Status-Fd "-1";