debian: renamed key files to match same format as those in qubes-builder

scripts_debian/01_install_core.sh

@@ -26,7 +26,7 @@ buildStep "$0" "pre"
 if ! [ -f "${INSTALLDIR}/tmp/.prepared_debootstrap" ]; then
     debug "Installing base ${DEBIANVERSION} system"
     COMPONENTS="" debootstrap --arch=amd64 --include=ncurses-term \
-        --components=main --keyring="${SCRIPTSDIR}/keys/debian-${DEBIANVERSION}-archive-keyring.gpg" \
+        --components=main --keyring="${SCRIPTSDIR}/keys/${DEBIANVERSION}-debian-archive-keyring.gpg" \
         "${DEBIANVERSION}" "${INSTALLDIR}" "${DEBIAN_MIRROR}" || { error "Debootstrap failed!"; exit 1; }
     chroot "${INSTALLDIR}" chmod 0666 "/dev/null"
     touch "${INSTALLDIR}/tmp/.prepared_debootstrap"

scripts_debian/vars.sh

@@ -11,8 +11,8 @@
 DEBIANVERSION=${DIST}
 
 # Location to grab debian packages
-DEBIAN_MIRROR=http://ftp.us.debian.org/debian/
+DEBIAN_MIRROR=http://ftp.us.debian.org/debian
 #DEBIAN_MIRROR=http://http.debian.net/debian
-#DEBIAN_MIRROR=http://ftp.ca.debian.org/debian/
+#DEBIAN_MIRROR=http://ftp.ca.debian.org/debian
 
 APT_GET_OPTIONS="-o Dpkg::Options::="--force-confnew" --force-yes -y"