summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorChristian Perrier <bubulle@debian.org>2005-10-25 15:43:35 +0000
committerChristian Perrier <bubulle@debian.org>2005-10-25 15:43:35 +0000
commit5ef2f78cb2506517e18554585106be6ed9eeb9b1 (patch)
treed879ed314cd59b1fe6f5502f0caf0dde4ecd4951 /debian
parent39454cbb10cc707adba05f78c87d32cdaec6a934 (diff)
parent7049e4e9ca6db15326d8a76f4f5f9ab592a925e3 (diff)
Merge with Michael and add update-po as a pre-req for binary
* po/makefile: Add update-po as a prerequisite of binary. Closes: #329910 Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-78 * fix a incorrect example * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-79 * revert patch from patch-59, causes all sorts of trouble * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-80 * fix changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-81 * be extra carefull in cmdline/apt-get.cc:FindSrc() and check VF.File() for NULL
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog12
1 files changed, 12 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 6b858cdcd..9716c3836 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+apt (0.6.42.1) unstable; urgency=low
+
+ * fix a incorrect example in the apt_prefrences man page
+ (thanks to Filipus Klutiero, closes: #282918)
+ * apt-pkg/pkgrecords.cc:
+ - revert patch from last version, it causes trouble on alpha
+ and ia64 (closes: #335102, #335103)
+ * cmdline/apt-get.cc:
+ - be extra carefull in FindSrc (closes: #335213)
+
+ -- Michael Vogt <mvo@debian.org> Sat, 22 Oct 2005 23:44:35 +0200
+
apt (0.6.42) unstable; urgency=low
* apt-pkg/cdrom.cc: