* 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

4 files changed, 16 insertions, 3 deletions

diff --git a/debian/apt.manpages b/debian/apt.manpages
index 7a15245d4..e621e1c49 100644
--- a/debian/apt.manpages
+++ b/debian/apt.manpages
@@ -10,6 +10,7 @@ doc/fr/apt-cache.fr.8
 doc/fr/apt-cdrom.fr.8
 doc/fr/apt-config.fr.8
 doc/fr/apt-get.fr.8
+doc/fr/apt-key.fr.8
 doc/fr/apt.conf.fr.5
 doc/fr/apt_preferences.fr.5
 doc/fr/sources.list.fr.5
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
 
diff --git a/debian/control b/debian/control
index 9dd271619..6d9418a46 100644
--- a/debian/control
+++ b/debian/control
@@ -53,7 +53,7 @@ Description: Documentation for APT development
 Package: apt-utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Priority: optional
+Priority: important
 Provides: ${libapt-inst:provides}
 Replaces: apt (<< 0.5.9)
 Section: admin
diff --git a/debian/rules b/debian/rules
index d6ae540ee..b3f72bb7f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -209,7 +209,7 @@ apt: build debian/shlibs.local
 
 	cp debian/bugscript debian/$@/usr/share/bug/apt/script
 
-	cp share/*.gpg debian/$@/usr/share/$@
+	cp share/debian-archive.gpg debian/$@/usr/share/$@
 
 #	head -n 500 ChangeLog > debian/ChangeLog