diff options
| author | Christian Perrier <bubulle@debian.org> | 2005-06-26 20:46:41 +0000 |
|---|---|---|
| committer | Christian Perrier <bubulle@debian.org> | 2005-06-26 20:46:41 +0000 |
| commit | b6fbb08776d7837f9f43c0238b30c8392c276d2c (patch) | |
| tree | 43981f61b1f4bf09316e5484738c74ddb52134f2 /share | |
| parent | 97720af361b9f208f72ee31749f69f3800265923 (diff) | |
Merge with Matt
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-89
Branch for Debian
* apt@packages.debian.org/apt--main--0--patch-90
Update version in configure
* apt@packages.debian.org/apt--main--0--patch-91
Fix French man page build
* apt@packages.debian.org/apt--main--0--patch-92
Add the current Debian archive signing key
* apt@packages.debian.org/apt--main--0--patch-93
Merge with mvo
* apt@packages.debian.org/apt--main--0--patch-94
Update changelog
* apt@packages.debian.org/apt--main--0--patch-95
Merge Christian's branch
* apt@packages.debian.org/apt--main--0--patch-96
Update changelog
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6
* build fix for apt--main--0
* 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 'share')
| -rw-r--r-- | share/debian-archive.gpg | bin | 477 -> 1303 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg Binary files differindex 0db59e674..c391d8fa1 100644 --- a/share/debian-archive.gpg +++ b/share/debian-archive.gpg |