Merge branch 'fix-ubiquity' into 'etiona'

fix ubiquity

See merge request trisquel/package-helpers!256

helpers/make-ubiquity

 #!/bin/sh
 #
 #    Copyright (C) 2011-2018  Ruben Rodriguez <ruben@trisquel.info>
+#    Copyright (C)      2019  Mason Hock <mason@masonhock.com>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -17,14 +18,12 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=8
+VERSION=9
 
 . ./config
 
 # Enable full disk encryption by default
 patch -p1 < $DATA/encrypt_by_default.patch
-# Disable ecryptfs, it is confusing to offer both and full disk encryption is safer
-sed '/login_encrypt/,/visible/s/True/False/' -i ./gui/gtk/stepUserInfo.ui
 
 cp $DATA/trisquel_installed.png pixmaps
 rm pixmaps/ubuntu_installed.png
@@ -32,6 +31,7 @@ replace ubuntu_installed trisquel_installed .
 
 replace linux-signed linux-lowlatency .
 replace shim-signed shim .
+mv d-i/source/shim-signed d-i/source/shim
 replace grub-efi-amd64-signed grub-efi-amd64 .
 
 /bin/sed '/canonical/d' -i debian/ubiquity.install*
@@ -178,7 +178,7 @@ replace $UPSTREAM $CODENAME .
 replace Ubuntu Trisquel .
 replace Kubuntu Triskel .
 replace kubuntu triskel .
-find |grep kubuntu.*png | xargs rename s/kubuntu/triskel/
+find | grep kubuntu.*svg | xargs rename s/kubuntu/triskel/
 replace Trisquel-Gettext-Domain Ubuntu-Gettext-Domain
 #replace triskel-ubiquity kubuntu-ubiquity
 replace "launchpad.net/ubuntu/+source/ubiquity/+filebug" "trisquel.info/project/issues" .
@@ -265,5 +265,5 @@ changelog "Adapted for Trisquel"
 
 rm -rf debian/source
 
-PARALLEL=false compile
+compile