summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorChristian Perrier <bubulle@debian.org>2005-11-01 17:25:04 +0000
committerChristian Perrier <bubulle@debian.org>2005-11-01 17:25:04 +0000
commit2cf1aee845ce86e6dba7a069ce6ad5edefae1331 (patch)
tree20c0290daa978b2f8926a1cfa7dd76fcc4412e8f /debian
parentefd1e3490c7fe2718d76f60ca0a83145b8289afa (diff)
parentc5198dc1d0edeb3999741f00a25ec946cd66d6b9 (diff)
Merge with Michael
Patches applied: * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-82 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-83 * cmdline/apt-get.cc: fix bug in FindSrc() (debian #335213) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-84 * added armeb to archtable
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog10
1 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 9716c3836..a4e403030 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apt (0.6.42.2) unstable; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-118:
+ - patch-118: Russian translation update by Yuri Kozlov (closes: #335164)
+ * cmdline/apt-get.cc:
+ - bufix in FindSrc (closes: #335213)
+ * added armeb to archtable (closes: #333599)
+
+ --
+
apt (0.6.42.1) unstable; urgency=low
* fix a incorrect example in the apt_prefrences man page