diff --git a/helpers/DATA/update-manager/prevent-autoconnection.patch b/helpers/DATA/update-manager/prevent-autoconnection.patch
index 9484ccd..b617a7f 100644
--- a/helpers/DATA/update-manager/prevent-autoconnection.patch
+++ b/helpers/DATA/update-manager/prevent-autoconnection.patch
@@ -25,14 +25,14 @@ diff -ru source.orig/UpdateManager/Dialogs.py source/UpdateManager/Dialogs.py
diff -ru source.orig/UpdateManager/UpdateManager.py source/UpdateManager/UpdateManager.py
--- source.orig/UpdateManager/UpdateManager.py 2018-02-12 20:44:33.317329071 -0500
+++ source/UpdateManager/UpdateManager.py 2018-02-12 20:45:28.133249491 -0500
-@@ -50,6 +50,7 @@
+@@ -52,6 +52,7 @@
ErrorDialog,
+ HWEUpgradeDialog,
NeedRestartDialog,
- NoUpdatesDialog,
+ ShouldUpdateDialog,
- StoppedUpdatesDialog,
+ NoUpdatesDialog,
PartialUpgradeDialog,
- UnsupportedDialog,
+ StoppedUpdatesDialog,
@@ -205,6 +206,17 @@
self.start_available()
diff --git a/helpers/DATA/update-manager/remove-livepatch.patch b/helpers/DATA/update-manager/remove-livepatch.patch
new file mode 100644
index 0000000..2b840dd
--- /dev/null
+++ b/helpers/DATA/update-manager/remove-livepatch.patch
@@ -0,0 +1,66 @@
+diff --git a/UpdateManager/Dialogs.py b/UpdateManager/Dialogs.py
+index b100c3a..d604f54 100644
+--- a/UpdateManager/Dialogs.py
++++ b/UpdateManager/Dialogs.py
+@@ -149,61 +149,6 @@ class InternalDialog(BuilderDialog):
+ self.main_container.add(content_widget)
+ self.main_container.set_visible(bool(content_widget))
+
+- def _is_livepatch_supported(self):
+- di = distro_info.UbuntuDistroInfo()
+- codename = get_dist()
+- return di.is_lts(codename)
+-
+- def on_livepatch_status_ready(self, active, cs, ps, fixes):
+- self.set_desc(None)
+-
+- if not active:
+- if self._is_livepatch_supported() and \
+- self.settings_button and \
+- self.settings.get_int('launch-count') >= 4:
+- self.set_desc(_("Tip: You can use Livepatch to "
+- "keep your computer more secure between "
+- "restarts."))
+- self.settings_button.set_label(_("Settings & Livepatch…"))
+- return
+-
+- needs_reschedule = False
+-
+- if cs == "needs-check":
+- needs_reschedule = True
+- elif cs == "check-failed":
+- pass
+- elif cs == "checked":
+- if ps == "unapplied" or ps == "applying":
+- needs_reschedule = True
+- elif ps == "applied":
+- fixes = [fix for fix in fixes if fix.patched]
+- d = ngettext("%d Livepatch update applied since the last "
+- "restart.",
+- "%d Livepatch updates applied since the last "
+- "restart.",
+- len(fixes)) % len(fixes)
+- self.set_desc(d)
+- elif ps == "applied-with-bug" or ps == "apply-failed":
+- fixes = [fix for fix in fixes if fix.patched]
+- d = ngettext("%d Livepatch update failed to apply since the "
+- "last restart.",
+- "%d Livepatch updates failed to apply since the "
+- "last restart.",
+- len(fixes)) % len(fixes)
+- self.set_desc(d)
+- elif ps == "nothing-to-apply":
+- pass
+- elif ps == "unknown":
+- pass
+-
+- if needs_reschedule:
+- self.lp_socket.get_status(self.on_livepatch_status_ready)
+-
+- def check_livepatch_status(self):
+- self.lp_socket = LivePatchSocket()
+- self.lp_socket.get_status(self.on_livepatch_status_ready)
+-
+
+ class StoppedUpdatesDialog(InternalDialog):
+ def __init__(self, window_main):
diff --git a/helpers/make-ubuntu-release-upgrader b/helpers/make-ubuntu-release-upgrader
index aa2075f..52572c3 100644
--- a/helpers/make-ubuntu-release-upgrader
+++ b/helpers/make-ubuntu-release-upgrader
@@ -2,6 +2,7 @@
#
# Copyright (C) 2008-2018 Ruben Rodriguez
# Copyright (C) 2014 Santiago Rodriguez
+# Copyright (C) 2019 Mason Hock
#
# 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
@@ -23,7 +24,7 @@
# Also, don't forget to update the meta-release files at archive and packages.t.i
# The "obsoletes" list from ubuntu has been removed
-VERSION=3
+VERSION=4
. ./config
@@ -33,7 +34,6 @@ rm ./DistUpgrade/NvidiaDetector
sed s/self.checkForNvidia/#self.checkForNvidia/ DistUpgrade/DistUpgradeCache.py -i
sed '/_add_extras_repository/,/adding extras.ubuntu.com/d' -i DistUpgrade/DistUpgradeQuirks.py
sed 's/01ubuntu/01backports/' -i DistUpgrade/DistUpgradeController.py
-sed '/nvidia/d' DistUpgrade/build-tarball.sh -i
rm tests/test-data/xorg.conf.fglrx
#https://bugs.launchpad.net/ubuntu/+source/python-defaults/+bug/990740
@@ -268,6 +268,9 @@ replace '14.04' '7.0' . -R
rpl 16\.04 8\.0 po/* -R
rpl 16\.04 8\.0 DistUpgrade/*.ui -R
replace '16.04' '8.0' . -R
+rpl 18\.04 9\.0 po/* -R
+rpl 18\.04 9\.0 DistUpgrade/*.ui -R
+replace '18.04' '9.0' . -R
rpl $UPSTREAM $CODENAME . -R
rpl oneiric brigantia . -R
rpl natty dagda . -R
@@ -279,6 +282,8 @@ rpl hardy robur . -R
rpl lucid taranis . -R
rpl precise toutatis . -R
rpl trusty belenos . -R
+rpl xenial flidas . -R
+rpl bionic etiona . -R
rm ./data/demoted.cfg ./DistUpgrade/demoted.cfg.trusty utils/demoted.cfg.trusty data/demoted.cfg.trusty
echo "notification-daemon" > data/demoted.cfg
@@ -333,9 +338,7 @@ for i in core gtk qt; do
sed "/Package: trisquel-release-upgrader-$i/ s/$/\nProvides: ubuntu-release-upgrader-$i/" -i debian/control
done
-#ubuntu-drivers-common is not a build-dep, nor avaliable in trisquel.
-sed -i 's/cp \/usr\/share\/ubuntu-drivers-common\/obsolete/touch/g' DistUpgrade/build-tarball.sh
-
+sed 's/ubuntu-release-upgrader-core/ubuntu-release-upgrader-core (= ${source:Version})/' -i debian/control
changelog "Compiled for Trisquel"
diff --git a/helpers/make-update-manager b/helpers/make-update-manager
index f7c63da..5141c7f 100644
--- a/helpers/make-update-manager
+++ b/helpers/make-update-manager
@@ -1,6 +1,7 @@
#!/bin/sh
#
# Copyright (C) 2008-2018 Ruben Rodriguez
+# Copyright (C) 2019 Mason Hock
#
# 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,10 +18,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
@@ -44,13 +51,16 @@ replace internet Internet .
replace Ubuntu Trisquel .
replace "Trisquel-Gettext" "Ubuntu-Gettext" .
+sed -i 's/Trisquel 16.04 LTS to Trisquel 18.04 LTS/Trisquel 8.0 LTS to Trisquel 9.0 LTS/' HweSupportStatus/consts.py
+sed -i 's/TrisquelDistroInfo/UbuntuDistroInfo/' UpdateManager/UpdateManager.py
+
replace ubuntu-desktop trisquel .
replace kubuntu-desktop triskel .
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"