summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMichael Vogt <mvo@debian.org>2006-01-18 23:14:34 +0000
committerMichael Vogt <mvo@debian.org>2006-01-18 23:14:34 +0000
commit011d9176844e1817f1dc64cf61c375ab77646d0e (patch)
tree5739bcf32d2c7bee58bc235f97c894bc157c501f /debian
parentac2c9fa03c9786da44320d59b3ad66f474c4634a (diff)
parent9f168dd5006886ad8725339322a61c1c9a907f32 (diff)
* merged with apt--mvo
Patches applied: * bubulle@debian.org--2005/apt--main--0--patch-160 Italian translation update * bubulle@debian.org--2005/apt--main--0--patch-161 Galician translation completed * bubulle@debian.org--2005/apt--main--0--patch-162 Spanish translation update * bubulle@debian.org--2005/apt--main--0--patch-163 Two strings corrected in the British translation * bubulle@debian.org--2005/apt--main--0--patch-164 Danish translation update * bubulle@debian.org--2005/apt--main--0--patch-165 Completed Greek translation * bubulle@debian.org--2005/apt--main--0--patch-166 Fix some permissions * 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
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog17
-rw-r--r--debian/control1
2 files changed, 13 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 020fe9813..3c3fbb4a9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,25 @@
apt (0.6.43.2) unstable; urgency=low
- * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
- - en_GB.po, de.po: fix spaces errors in "Ign " translations
- Closes: #347258
+ * 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
+ 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 <michael.vogt@ubuntu.com> Tue, 10 Jan 2006 17:09:31 +0100
+ -- Michael Vogt <mvo@debian.org> Thu, 19 Jan 2006 00:06:33 +0100
apt (0.6.43.1) unstable; urgency=low
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