summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorSarah Hobbs <hobbsee@kubuntu.org>2007-07-06 17:47:07 +1000
committerSarah Hobbs <hobbsee@kubuntu.org>2007-07-06 17:47:07 +1000
commitbe7f42304a5dd381f2ad82a921e9041df55b5ec9 (patch)
tree70942f1c091867aa810ea32c858ee98f17e57902 /debian
parent94d1fa98304a9aa1108daa765acbc4a90a0e17d2 (diff)
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!
Diffstat (limited to 'debian')
-rw-r--r--debian/apt.conf.autoremove4
-rw-r--r--debian/changelog19
-rw-r--r--debian/control4
3 files changed, 21 insertions, 6 deletions
diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove
index 4a3010208..f77e1cfbf 100644
--- a/debian/apt.conf.autoremove
+++ b/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";
};
diff --git a/debian/changelog b/debian/changelog
index 4f14b4131..c3afcf403 100644
--- a/debian/changelog
+++ b/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
diff --git a/debian/control b/debian/control
index ffb387b62..f0503f746 100644
--- a/debian/control
+++ b/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