From 79e26d7b5e70d01a189702241df14bdee48c761a Mon Sep 17 00:00:00 2001
From: Mason Hock <mason@masonhock.com>
Date: Thu, 12 Sep 2019 23:47:00 -0700
Subject: [PATCH] remove livepatch, update for etiona

---
 helpers/make-update-manager | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/helpers/make-update-manager b/helpers/make-update-manager
index f7c63da3..7d9ddabd 100644
--- a/helpers/make-update-manager
+++ b/helpers/make-update-manager
@@ -17,10 +17,16 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 #
 
-VERSION=8
+VERSION=9
 
 . ./config
 
+rm UpdateManager/Core/LivePatchSocket.py
+rm tests/test_livepatch_socket.py
+patch -p1 < $DATA/remove-livepatch.patch
+sed -i '/import LivePatchSocket/d' UpdateManager/Dialogs.py
+sed -i '/self.check_livepatch_status/d' UpdateManager/Dialogs.py
+
 #Closes #12545
 patch -p0 < $DATA/trisquel-versions.patch
 
@@ -50,7 +56,7 @@ replace xubuntu-desktop trisquel-mini .
 replace edubuntu-desktop toast .
 
 sed '/%s base/ s/name.*/name = "Trisquel base"/' -i ./UpdateManager/Core/UpdateList.py
-sed 's_http://changelogs.ubuntu.com/changelogs/pool/_http://packages.trisquel.info/changelogs/pool/_' -i UpdateManager/Core/MyCache.py
+sed 's_https://changelogs.ubuntu.com/changelogs/pool/_https://packages.trisquel.info/changelogs/pool/_' -i UpdateManager/Core/MyCache.py
 sed '/len(changelog) == 0/,/"later."/d' -i UpdateManager/Core/MyCache.py
 
 changelog "Compiled for Trisquel"
-- 
GitLab