Merge branch 'fix-debian-installer' into 'etiona'

Fix debian installer

See merge request trisquel/package-helpers!264

helpers/make-debian-installer

@@ -17,7 +17,7 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=3
+VERSION=4
 NETINST=true
 . ./config
 
@@ -26,9 +26,6 @@ find build/pkg-lists -type f | xargs sed -i /media-retriever/d
 LASTKERNEL=$(apt-cache show linux-libc-dev|grep ^Version |head -n1|cut -d" " -f2|cut -d. -f1,2,3)
 /bin/sed -i "s/^BASEVERSION.*/BASEVERSION = $LASTKERNEL/g" ./build/config/i386.cfg ./build/config/amd64.cfg
 sed -i "s/^MEDIUM_SUPPORTED.*/MEDIUM_SUPPORTED = cdrom netboot/g" ./build/config/i386.cfg ./build/config/amd64.cfg
-sed -i "/signed/d" ./build/config/amd64.cfg
-
-sed 's/ubuntu-archive-keyring.gpg/trisquel-archive-keyring.gpg/' -i build/config/common
 
 sed -i 's/shim-signed/shim/g' debian/control
 
@@ -62,6 +59,9 @@ rpl "Trisquel Ltd, and Rosetta" "Canonical Ltd, and Rosetta" . -R
 rpl ubuntu-keyring trisquel-keyring . -R
 rpl ubuntu-archive-keyring trisquel-archive-keyring . -R
 
+sed -i 's/.*SIGNED_IMAGE="$(KERNELNAME_ALT_SUFFIX)".*/'$'\t''efi-image $(TEMP_GRUB_EFI) x86_64-efi x64/' build/config/x86.cfg build/config/arm64.cfg
+/bin/sed -i '/KERNELNAME_ALT_SUFFIX = -$(KERNELVERSION)/d' build/config/*.cfg build/config/*/*.cfg
+
 changelog "Rebranded and adapted for Trisquel"
 compile