diff options
| author | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-06-26 20:13:10 +0000 |
|---|---|---|
| committer | Matt Zimmerman <matt.zimmerman@canonical.com> | 2005-06-26 20:13:10 +0000 |
| commit | 20edfd5399dada2d10ad791336797c4118eb60a8 (patch) | |
| tree | 024dc03c6df21ec67eddfa2bafc80fddd9ce5588 /debian | |
| parent | c9fa6271e4813d88284771ff15050165eac38353 (diff) | |
Merge with mainline
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-93
Merge with mvo
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-22
* added myself to uploaders, changelog is signed with mvo@debian.org and in sync with the debian/experimental upload
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-23
* apt-cache show <virtual-pkg> shows all virtual packages instead of nothing (thanks to otavio)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-24
* changelog updated
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-25
* make pinning on component work again (we just use the section, as apt-0.6 don't use per-section Release files anymore)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-27
* updated the changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-28
* merged with my apt--fixes--0 branch
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-29
* added a missing OpProgress::Done() in depCache::Init(), removed the show-virtual-packages patch in apt-cache because matt does not like him :/
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-30
* fix a stupid bug in the depcache::Init() code
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-31
* merged/removed conflicts with apt--main--0
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32
* merged apt--main and make sure that the po files come from apt--main (because they are more recent)
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/control | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index a249d92f4..d71a78e71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,10 @@ apt (0.6.38) unstable; urgency=low - debian/rules: install all keyrings * Add the current Debian archive signing key (4F368D5D) to debian-archive.gpg - + * make pinning on the "component" work again (using the section of the + archive, we don't use per-section Release files anymore with apt-0.6) + (closes ubuntu #9935) + -- Matt Zimmerman <mdz@debian.org> Sat, 25 Jun 2005 09:51:00 -0700 apt (0.6.37) breezy; urgency=low diff --git a/debian/control b/debian/control index b7c430997..9dd271619 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: apt Section: admin Priority: important Maintainer: APT Development Team <deity@lists.debian.org> -Uploaders: Jason Gunthorpe <jgg@debian.org>, Adam Heath <doogie@debian.org>, Matt Zimmerman <mdz@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.6.1 Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) |