Remove the dpkg check for debootstrap version before passing the

--no-check-gpg option; we're not going to support debootstrap versions
so old that they don't support this flag, *and* the dpkg-query call
doesn't give us the right version anyway - we're using an extracted
copy from the archive, not the one that (might be) installed on our
build machine.

Makefile

@@ -63,10 +63,8 @@ ifneq (${ARCH_MKISOFS_OPTS},)
     MKISOFS_OPTS = ${ARCH_MKISOFS_OPTS}
 endif
 ifndef DEBOOTSTRAP_OPTS
-ifeq (yes,$(shell dpkg --compare-versions `dpkg-query -f'$${Version}' -W debootstrap` ge 1.0.30 && echo -n yes))
 DEBOOTSTRAP_OPTS=--no-check-gpg
 endif
-endif
 
 ## Internal variables  
 apt=$(BASEDIR)/tools/apt-selection

debian/changelog

@@ -11,6 +11,12 @@ debian-cd (3.1.13) UNRELEASED; urgency=low
   [ Steve McIntyre ]
   * Tweak handling of {udeb,base}_{include,exclude} files so multi-arch
     builds should work better. Closes: #703436
+  * Remove the dpkg check for debootstrap version before passing the
+    --no-check-gpg option; we're not going to support debootstrap versions
+    so old that they don't support this flag, *and* the dpkg-query call
+    doesn't give us the right version anyway - we're using an extracted
+    copy from the archive, not the one that (might be) installed on our
+    build machine.
 
  -- Raphaël Hertzog <hertzog@debian.org>  Fri, 12 Apr 2013 10:32:56 +0200