Adds support for installing recommends from *metapackages, including universe/metapackages, so things like x/k/ubuntu-restricted-extras packages work. This currently doesnt build - but builds more than it did before!

configure.in

@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.7.2ubuntu3")
+AC_DEFINE_UNQUOTED(VERSION,"0.7.2ubuntu5")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)

debian/apt.conf.autoremove

@@ -7,6 +7,6 @@ APT
 	"^linux-ubuntu-modules-.*";
   };
 
-  Install-Recommends-Section "metapackages";
-  Never-MarkAuto-Section "metapackages";
+  Install-Recommends-Section "*metapackages";
+  Never-MarkAuto-Section "*metapackages";
 };

debian/changelog

@@ -1,5 +1,6 @@
-apt (0.7.2ubuntu4) unstable; urgency=low
+apt (0.7.2ubuntu5) UNRELEASED; urgency=low
 
+  [ Michael Vogt]
   * cmdline/apt-get.cc:
     - make the XS-Vcs-$foo warning more copy'n'paste
       friendly (thanks to Matt Zimmerman)
@@ -7,7 +8,21 @@ apt (0.7.2ubuntu4) unstable; urgency=low
   * 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 autoconf, xsltproc, docbook-xsl to fix FTBFS
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com>  Fri, 06 Jul 2007 17:44:45 +1000
+
+apt (0.7.2ubuntu4) gutsy; urgency=low
+
+  * Rebuild for the libcurl4 -> libcurl3 transition mess.
+
+ -- Steve Kowalik <stevenk@ubuntu.com>  Fri,  6 Jul 2007 12:44:05 +1000
 
 apt (0.7.2ubuntu3) gutsy; urgency=low
 

debian/control

@@ -5,9 +5,9 @@ Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
 XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
 Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@debian.org>, Michael Vogt <mvo@debian.org>
 Standards-Version: 3.7.2.2
-Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.15.5)
+Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev (>= 7.15.5), autoconf, xsltproc, docbook-xsl
 Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1)
-XS-Vcs-Bzr: http://bazaar.launchpad.net/~ubuntu-core-dev/apt/ubuntu
+XS-Vcs-Bzr: http://code.launchpad.net/~ubuntu-core-dev/apt/ubuntu
 
 Package: apt
 Architecture: any

doc/examples/configure-index

@@ -101,10 +101,10 @@ APT
   Install-Suggests "false";
 
   // install recommends automatically for packages in this section
-  Install-Recommends-Section "metapackages";
+  Install-Recommends-Section "*metapackages";
   
   // consider dependencies of packages in this section manual
-  Never-MarkAuto-Section "metapackages";
+  Never-MarkAuto-Section "*metapackages";
 
   // Write progress messages on this fd (for stuff like base-config)
   Status-Fd "-1";