Merge from Debian branch

Patches applied:

 * apt@packages.debian.org/apt--main--0--patch-89
   Branch for Debian

 * apt@packages.debian.org/apt--main--0--patch-90
   Update version in configure

 * apt@packages.debian.org/apt--main--0--patch-91
   Fix French man page build

 * apt@packages.debian.org/apt--main--0--patch-92
   Add the current Debian archive signing key

 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6
   * build fix for apt--main--0

8 files changed, 64 insertions, 10 deletions

diff --git a/cmdline/apt-key b/cmdline/apt-key
index be2b19a1a..0685e36f7 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -9,14 +9,14 @@ GPG_CMD="gpg --no-options --no-default-keyring --secret-keyring /etc/apt/secring
 GPG="$GPG_CMD --keyring /etc/apt/trusted.gpg"
 
 
-ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
-REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
+ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
+REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
 
 
 update() {
     if [ ! -f $ARCHIVE_KEYRING ]; then
 	echo >&2 "ERROR: Can't find the archive-keyring"
-	echo >&2 "Is the ubuntu-keyring package installed?"
+	echo >&2 "Is the debian-keyring package installed?"
 	exit 1
     fi
 
diff --git a/configure.in b/configure.in
index 767399b52..aa827cec1 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
 AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
 
 dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.6.37")
+AC_DEFINE_UNQUOTED(VERSION,"0.6.38")
 PACKAGE="apt"
 AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
 AC_SUBST(PACKAGE)
diff --git a/debian/apt.postinst b/debian/apt.postinst
index df0433057..ae1801198 100644
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -17,7 +17,7 @@ case "$1" in
     configure)
 
         if ! test -f /etc/apt/trusted.gpg; then
-                cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg
+                cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg
         fi
 
     ;;
diff --git a/debian/changelog b/debian/changelog
index 57b746a56..be201057c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+apt (0.6.38) unstable; urgency=low
+
+  * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround
+    for the French man pages' failure to build
+  * Branch Debian and Ubuntu
+    - apt.postinst, apt-key: use the appropriate keyring
+    - debian/rules: install all keyrings
+  * Add the current Debian archive signing key (4F368D5D) to
+    debian-archive.gpg
+
+ -- Matt Zimmerman <mdz@debian.org>  Sat, 25 Jun 2005 09:51:00 -0700
+
 apt (0.6.37) breezy; urgency=low
 
   * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81
diff --git a/debian/rules b/debian/rules
index e3254c2d2..d6ae540ee 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/ubuntu-archive.gpg debian/$@/usr/share/$@
+	cp share/*.gpg debian/$@/usr/share/$@
 
 #	head -n 500 ChangeLog > debian/ChangeLog
 
diff --git a/doc/fr/makefile b/doc/fr/makefile
index 6544ee9e0..c0e7fa7ed 100644
--- a/doc/fr/makefile
+++ b/doc/fr/makefile
@@ -8,6 +8,48 @@ include ../../buildlib/defaults.mak
 # Man pages
 SOURCE = apt-cache.fr.8 apt-get.fr.8 apt-cdrom.fr.8 apt.conf.fr.5 \
          sources.list.fr.5 apt-config.fr.8 apt-sortpkgs.fr.1 \
-	 apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1
+	 apt-ftparchive.fr.1 apt_preferences.fr.5 apt-extracttemplates.fr.1 \
+	 apt-key.fr.8
+
 INCLUDES = apt.ent.fr
-include $(XML_MANPAGE_H)
+
+doc: $(SOURCE) 
+
+$(SOURCE) ::  % : %.xml $(INCLUDES)
+	echo Creating man page $@
+	$(XMLTO) man $<
+
+apt-cache.fr.8:: apt-cache.8 
+	cp $< $@
+
+apt-get.fr.8:: apt-get.8
+	cp $< $@
+
+apt-cdrom.fr.8:: apt-cdrom.8 
+	cp $< $@
+
+apt.conf.fr.5:: apt.conf.5 
+	cp $< $@
+
+apt-config.fr.8:: apt-config.8 
+	cp $< $@
+
+sources.list.fr.5:: sources.list.5
+	cp $< $@
+
+apt-sortpkgs.fr.1:: apt-sortpkgs.1
+	cp $< $@
+
+apt-ftparchive.fr.1:: apt-ftparchive.1 
+	cp $< $@
+
+apt_preferences.fr.5:: apt_preferences.5
+	cp $< $@
+
+apt-extracttemplates.fr.1:: apt-extracttemplates.1
+	cp $< $@
+
+apt-key.fr.8:: apt-key.8 
+	cp $< $@
+
+
diff --git a/po/he.po b/po/he.po
index e2aea1c77..242155eff 100644
--- a/po/he.po
+++ b/po/he.po
@@ -639,8 +639,8 @@ msgstr "לא מצליח לתקן תלויות"
 #: cmdline/apt-get.cc:656
 msgid "Unable to minimize the upgrade set"
 msgstr ""
-+"א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n"
-+"על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!"
+"א ז ה ר ה: החבילות החיוניות הבאות יוסרו\n"
+"על הפעולה להעשות *רק* אם אתה יודע מה אתה עושה!"
 
 #: cmdline/apt-get.cc:658
 msgid " Done"
diff --git a/share/debian-archive.gpg b/share/debian-archive.gpg
index 0db59e674..c391d8fa1 100644
--- a/share/debian-archive.gpg
+++ b/share/debian-archive.gpg