[SCM] live-build branch, debian, updated. debian/3.0_a21-1-22-gd7b042a

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 2312f18ef190e3d1ea997435a012b58551ba1459
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jun 15 21:21:41 2011 +0200

    Changing archives key suffix from .gpg to .key.

diff --git a/archives/live.debian.net.gpg b/archives/live.debian.net.key
similarity index 100%
rename from archives/live.debian.net.gpg
rename to archives/live.debian.net.key
diff --git a/scripts/build/lb_chroot_archives b/scripts/build/lb_chroot_archives
index d06581d..b85b708 100755
--- a/scripts/build/lb_chroot_archives
+++ b/scripts/build/lb_chroot_archives
@@ -236,12 +236,12 @@ EOF
 				if [ "${LB_APT_SECURE}" != false ]
 				then
 					# Adding archive signing keys (chroot)
-					if [ -e "${LB_BASE}/archives/${REPOSITORY}.chroot.gpg" ]
+					if [ -e "${LB_BASE}/archives/${REPOSITORY}.chroot.key" ]
 					then
-						cat "${LB_BASE}/archives/${REPOSITORY}.chroot.gpg" | Chroot chroot "apt-key add -"
-					elif [ -e "${LB_BASE}/archives/${REPOSITORY}.gpg" ]
+						cat "${LB_BASE}/archives/${REPOSITORY}.chroot.key" | Chroot chroot "apt-key add -"
+					elif [ -e "${LB_BASE}/archives/${REPOSITORY}.key" ]
 					then
-						cat "${LB_BASE}/archives/${REPOSITORY}.gpg" | Chroot chroot "apt-key add -"
+						cat "${LB_BASE}/archives/${REPOSITORY}.key" | Chroot chroot "apt-key add -"
 					fi
 				fi
 			done
@@ -457,10 +457,10 @@ EOF
 				Chroot chroot "apt-get ${APT_OPTIONS} install aptitude"
 			fi
 		else # Get fresh indices
-			# Check local gpg keys
-			if Find_files config/archives/*.chroot.gpg
+			# Check local archive keys
+			if Find_files config/archives/*.chroot.key
 			then
-				for FILE in config/archives/*.chroot.gpg
+				for FILE in config/archives/*.chroot.key
 				do
 					cp ${FILE} chroot/root
 					Chroot chroot "apt-key add /root/$(basename ${FILE})"
@@ -755,12 +755,12 @@ EOF
 				if [ "${LB_APT_SECURE}" != false ]
 				then
 					# Adding archive signing keys (binary)
-					if [ -e "${LB_BASE}/archives/${REPOSITORY}.binary.gpg" ]
+					if [ -e "${LB_BASE}/archives/${REPOSITORY}.binary.key" ]
 					then
-						cat "${LB_BASE}/archives/${REPOSITORY}.binary.gpg" | Chroot chroot "apt-key add -"
-					elif [ -e "${LB_BASE}/archives/${REPOSITORY}.gpg" ]
+						cat "${LB_BASE}/archives/${REPOSITORY}.binary.key" | Chroot chroot "apt-key add -"
+					elif [ -e "${LB_BASE}/archives/${REPOSITORY}.key" ]
 					then
-						cat "${LB_BASE}/archives/${REPOSITORY}.gpg" | Chroot chroot "apt-key add -"
+						cat "${LB_BASE}/archives/${REPOSITORY}.key" | Chroot chroot "apt-key add -"
 					fi
 				fi
 			done
@@ -779,10 +779,10 @@ EOF
 			done
 		fi
 
-		# Check local gpg keys
-		if Find_files config/archives/*.binary.gpg
+		# Check local archive keys
+		if Find_files config/archives/*.binary.key
 		then
-			for FILE in config/archives/*.binary.gpg
+			for FILE in config/archives/*.binary.key
 			do
 				cp ${FILE} chroot/root
 				Chroot chroot "apt-key add /root/$(basename ${FILE})"

-- 
live-build