summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorChristian Perrier <bubulle@debian.org>2005-09-23 18:12:46 +0000
committerChristian Perrier <bubulle@debian.org>2005-09-23 18:12:46 +0000
commit7224c2f669664c224d707f4e4c1a866bfe7371c7 (patch)
tree2cb7376696b3e5c7b3931fc9860e6f8e47d6e837 /debian
parent0d2db5387192a18eb8ee601c05003ca90604d31f (diff)
parentbae108264e918e6f256d36bfce2a6c79b4b2a3ed (diff)
Merge with mvo
Patches applied: * 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 * 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 'debian')
-rw-r--r--debian/changelog9
1 files changed, 7 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 9194b8a13..ac1e0e663 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,8 +5,13 @@ apt (0.6.41.1) unstable; urgency=low
* allow cdrom failures and fallback to other sources in that case
(closes: #44135)
* better error text when dpkg-source fails
-
- -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 12 Sep 2005 13:45:53 +0200
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-104:
+ - patch-99: Added Galician translation
+ - patch-100: Completed Danish translation (Closes: #325686)
+ - patch-104: French translation completed
+ * applied frensh man-page update (thanks to Philippe Batailler)
+
+ --
apt (0.6.41) unstable; urgency=low