diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2005-12-09 15:26:52 +0000 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2005-12-09 15:26:52 +0000 |
| commit | 9905f88f9f9189e6a268ecd4fbd70b16a45edbe7 (patch) | |
| tree | 25be8ed2c7b911e4c87adb95c1d5d9a9bd2ea79a /share/debian-archive.gpg | |
| parent | a3e5f77bc1cbd7fcf911782bb264e67b753aef71 (diff) | |
| parent | bae108264e918e6f256d36bfce2a6c79b4b2a3ed (diff) | |
* "normal" merge, resolved lots of conflicts
Patches applied:
* bubulle@debian.org--2005/apt--main--0--patch-96
Sync with Matt
* bubulle@debian.org--2005/apt--main--0--patch-97
Merge with Matt
* bubulle@debian.org--2005/apt--main--0--patch-98
Update PO files with the POT
* bubulle@debian.org--2005/apt--main--0--patch-99
Added Galician translation
* bubulle@debian.org--2005/apt--main--0--patch-100
Completed Danish translation
* bubulle@debian.org--2005/apt--main--0--patch-101
Merge with Matt
* bubulle@debian.org--2005/apt--main--0--patch-102
Merge with Michael Vogt's archive
* bubulle@debian.org--2005/apt--main--0--patch-103
Update the POT files and all PO files to resync with recent code
* bubulle@debian.org--2005/apt--main--0--patch-104
French translation completed
* michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-5
* merged with apt--main--0
* michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-6
* fixed a incorrect po/he.po merge
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-9
* we only need to check once for xmlto
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-10
* fix a bug in a man-page, fix a problem with overly long lines in apt-cdrom
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-11
* merged with apt--main--0
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-12
* fix a incorrect error message (it always added .gz regardless what was downloaded)
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-13
* merged with main
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-15
* added README.arch
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-16
* merged with main
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-17
* move the changelog to the right place
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-19
* added a default constructor for PrvIterator
* michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-20
* applied otavios patch to reread the statusFile on debSystem::Initialize
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-33
* merged with matt's tree
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-34
* merged with matts tree
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-35
* build debian and ubuntu package from the same source
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-36
* added debian/patches dir
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-37
* fix the breakage from my last commit (note to self: always, _always_ run baz diff before a commit)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-38
* removed the lsb_release build patch (nobody except me seems to like it)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-39
* merged from main
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-40
* merged the apt--sane-handle-timeout--0 branch
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-41
* merged apt--bts225947--0
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-42
* merged with apt--main
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-43
* added patch that adds a apt-secure man-page (thanks to jfs@computer.org)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-44
* added author credits
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-45
* added apt-ftparchive.conf example
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-46
* corrected the utf8 of javier fernandes pena
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-48
* merged with apt--fixes--0
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-49
* README.arch updates, comment in apt-pkg/algorithm.h added, apt-pkg/cacheiterators.h order in initlist changed to remove warning
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-52
* finalizing changelog
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-54
* fix a stupid typo in apt.cron.daily
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-57
* changelog update
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-58
* better error string for a failed dpkg-source
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-59
* make sure that the pkgRecords D'tor does not segfault
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-60
* merged updated french man-page
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-61
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-3
* merged with main
* otavio@debian.org--2005/apt--fixes--0--patch-28
Reread status configuration, needed for clients using independent apt ...
* philippe.batailler@free.fr--2005/VOGTapt--mvo--0--patch-1
French L10N update
* philippe.batailler@free.fr--2005/VOGTapt--mvo--0--patch-2
Generate correctly french manpages
Diffstat (limited to 'share/debian-archive.gpg')
| -rw-r--r-- | share/debian-archive.gpg | bin | 0 -> 2717 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg Binary files differnew file mode 100644 index 000000000..bb5ed5033 --- /dev/null +++ b/share/debian-archive.gpg |