summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorMichael Vogt <michael.vogt@ubuntu.com>2005-08-01 15:52:18 +0000
committerMichael Vogt <michael.vogt@ubuntu.com>2005-08-01 15:52:18 +0000
commit339690e4250de4d3eb8e98a91223420c01a5af96 (patch)
treefb68b5f06efb992d9bb537b61e8ffae7d678ef2b /debian/changelog
parent3edd1b28a5169f534a89e2688c6af0b429c4c043 (diff)
* merged with matts tree
Patches applied: * apt@packages.debian.org/apt--main--0--patch-97 Update priority of apt-utils to important, to match the override file * apt@packages.debian.org/apt--main--0--patch-98 Install only one keyring on each branch (Closes: #316119) * apt@packages.debian.org/apt--main--0--patch-99 Finalize 0.6.39 * apt@packages.debian.org/apt--main--0--patch-100 Use debian.org address in mainline * apt@packages.debian.org/apt--main--0--patch-101 Update pot file * apt@packages.debian.org/apt--main--0--patch-102 Open 0.6.40 * apt@packages.debian.org/apt--main--0--patch-103 Patch from Jordi Mallach to mark some additional strings for translation * apt@packages.debian.org/apt--main--0--patch-104 Updated Catalan translation from Jordi Mallach * apt@packages.debian.org/apt--main--0--patch-105 Merge from bubulle@debian.org--2005/apt--main--0 * bubulle@debian.org--2005/apt--main--0--patch-90 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-91 Updated Slovak translation * bubulle@debian.org--2005/apt--main--0--patch-92 Add apt-key French man page * bubulle@debian.org--2005/apt--main--0--patch-93 Update Greek translations * bubulle@debian.org--2005/apt--main--0--patch-94 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-95 Sync PO files with the POT file/French translation update
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog14
1 files changed, 13 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index d1a804e80..78b400954 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+apt (0.6.40) unstable; urgency=low
+
+ * Patch from Jordi Mallach to mark some additional strings for translation
+ * Updated Catalan translation from Jordi Mallach
+ * Merge from bubulle@debian.org--2005/apt--main--0:
+ - Update pot and merge with *.po
+ - Updated French translation, including apt-key.fr.8
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Thu, 28 Jul 2005 11:57:32 -0700
+
apt (0.6.39) unstable; urgency=low
* Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6
@@ -5,8 +15,10 @@ apt (0.6.39) unstable; urgency=low
michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32
* Merge aggregated translation updates:
bubulle@debian.org--2005/apt--main--0
+ * Update priority of apt-utils to important, to match the override file
+ * Install only one keyring on each branch (Closes: #316119)
- --
+ -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:51:09 -0700
apt (0.6.38) unstable; urgency=low