apt: sign Release with the old and new keys

packages/apt/Makefile.am

@@ -25,7 +25,7 @@ update-repository:
 	./update-repository.sh '$(PACKAGE_NAME)' '$(ARCHITECTURES)' '$(CODES)'
 
 sign-repository:
-	./sign-repository.sh '$(CODES)'
+	./sign-repository.sh '$(GPG_UID)' '$(CODES)'
 
 ensure-rsync-path:
 	@if test -z "$(RSYNC_PATH)"; then				\

packages/apt/sign-repository.sh

@@ -2,13 +2,14 @@
 
 script_base_dir=`dirname $0`
 
-if [ $# != 1 ]; then
-    echo "Usage: $0 CODES"
-    echo " e.g.: $0 'lenny unstable hardy karmic'"
+if [ $# != 2 ]; then
+    echo "Usage: $0 GPG_UID CODES"
+    echo " e.g.: $0 'F10399C0' 'lenny unstable hardy karmic'"
     exit 1
 fi
 
-CODES=$1
+GPG_UID=$1
+CODES=$2
 
 run()
 {
@@ -29,7 +30,17 @@ for code_name in ${CODES}; do
 	    ;;
     esac
 
-    release=${distribution}/dists/${code_name}/Release
+    release=packages/${distribution}/dists/${code_name}/Release
     rm -f ${release}.gpg
-    gpg --sign -ba -o ${release}.gpg ${release}
+    gpg2 --sign --detach-sign --armor \
+	--local-user ${GPG_UID} \
+	--local-user 1C837F31 \
+	--output ${release}.gpg \
+	${release} &
+
+    if [ "${PARALLEL}" != "yes" ]; then
+	wait
+    fi
 done
+
+wait