diff options
author | Christian Perrier <bubulle@debian.org> | 2006-01-20 12:51:36 +0000 |
---|---|---|
committer | Christian Perrier <bubulle@debian.org> | 2006-01-20 12:51:36 +0000 |
commit | dbe5505ecb4180bc3d850193aa2458bd04df1896 (patch) | |
tree | 5739bcf32d2c7bee58bc235f97c894bc157c501f /debian | |
parent | 9b7f38f18c97808022f15ce496479c94126bd169 (diff) | |
parent | 011d9176844e1817f1dc64cf61c375ab77646d0e (diff) |
Resync with Michael
Patches applied:
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-116
* changelog updates
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-117
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-118
* merged from bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-119
* fix http data corruption (#280844)
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-120
* added debian-archive-keyring to recommends
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-121
* merged with bubulle
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-122
* fix apt-key to ask for the correct package
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-123
* fix typo in apt-cache.8 manpage
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-124
* fixed another typo in doc/apt-secure.8.xml
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-125
* merged the debian-sid changes back
* michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-126
* fixed the changelog yet again
* mvo@debian.org--2005/apt--debian-experimental--0--patch-12
* added http data corruption fix patch (#280844)
* mvo@debian.org--2005/apt--debian-sid--0--patch-17
* merged with apt--mvo--0
* mvo@debian.org--2005/apt--debian-sid--0--patch-18
* merged with apt--mvo
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 23 | ||||
-rw-r--r-- | debian/control | 1 |
2 files changed, 24 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 694d91b68..3c3fbb4a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,26 @@ +apt (0.6.43.2) unstable; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-166: + - en_GB.po, de.po: fix spaces errors in "Ign " translations Closes: #347258 + - makefile: make update-po a pre-requisite of clean target so + that POT and PO files are always up-to-date + - sv.po: Completed to 511t. Closes: #346450 + - sk.po: Completed to 511t. Closes: #346369 + - fr.po: Completed to 511t + - *.po: Updated from sources (511 strings) + - el.po: Completed to 511 strings Closes: #344642 + - da.po: Completed to 511 strings Closes: #348574 + - es.po: Updated to 510t1f Closes: #348158 + - gl.po: Completed to 511 strings Closes: #347729 + - it.po: Yet another update Closes: #347435 + * added debian-archive-keyring to the Recommends (closes: #347970) + * fixed message in apt-key to install debian-archive-keyring + * typos fixed in apt-cache.8 (closes: #348348, #347349) + * add patch to fix http download corruption problem (thanks to + Petr Vandrovec, closes: #280844, #290694) + + -- Michael Vogt <mvo@debian.org> Thu, 19 Jan 2006 00:06:33 +0100 + apt (0.6.43.1) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148: diff --git a/debian/control b/debian/control index 5c76a90eb..3b8883f88 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Depends: ${shlibs:Depends} Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} +Recommends: debian-archive-keyring Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg Section: admin Description: Advanced front-end for dpkg |