Merge ~nteodosio/update-manager:bionic-ua into update-manager:ubuntu/bionic

[Nathan Teodosio]

PPA can be tested in https://launchpad.net/~nteodosio/+archive/ubuntu/ubuntu-pro.

Internal discussion in UDENG-361.

[Sebastien Bacher (seb128)]

Thanks, there are some merge conflicts to be resolved though

review: Needs Fixing

[Nathan Teodosio (nteodosio)]

Thanks, I rebased on ubuntu/bionic.

[Sebastien Bacher (seb128)]

Thanks!

review: Approve

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0370a5e
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+tags
+__pycache__
diff --git a/UpdateManager/Core/UpdateList.py b/UpdateManager/Core/UpdateList.py
index cc895d0..79c9bd8 100644
--- a/UpdateManager/Core/UpdateList.py
+++ b/UpdateManager/Core/UpdateList.py
@@ -218,6 +218,7 @@ class UpdateList():
         self.security_groups = []
         self.kernel_autoremove_groups = []
         self.ubuntu_pro_groups = []
+        self.ubuntu_pro_fake_groups = []
         self.num_updates = 0
         self.random = random.Random()
         self.ignored_phased_updates = []
@@ -483,6 +484,7 @@ class UpdateList():
         # do the upgrade
         self.distUpgradeWouldDelete = cache.saveDistUpgrade()
 
+        pro_pkgs = []
         security_pkgs = []
         upgrade_pkgs = []
         kernel_autoremove_pkgs = []
@@ -513,9 +515,13 @@ class UpdateList():
             def mark_delete(self):
                 pass
         fake_ua_packages = []
-        for (package_name, version, size) in ua_security_packages:
-            fake_ua_packages.append(FakeUbuntuProPackage(package_name,
-                                                         version, size))
+        ua_packages_names = []
+        for (package_name, version, size, downloadable) in ua_security_packages:
+            if downloadable:
+                ua_packages_names.append(package_name)
+            else:
+                fake_ua_packages.append(FakeUbuntuProPackage(package_name,
+                                                             version, size))
 
         # Find all upgradable packages
         for pkg in cache:
@@ -536,7 +542,10 @@ class UpdateList():
                         self.ignored_phased_updates.append(pkg)
                         continue
 
-                if is_security_update:
+                comes_from_pro = pkg.name in ua_packages_names
+                if comes_from_pro:
+                    pro_pkgs.append(pkg)
+                elif is_security_update:
                     security_pkgs.append(pkg)
                 else:
                     upgrade_pkgs.append(pkg)
@@ -559,10 +568,10 @@ class UpdateList():
         for pkg in self.ignored_phased_updates:
             pkg.mark_keep()
 
-        if security_pkgs or upgrade_pkgs:
+        if security_pkgs or upgrade_pkgs or pro_pkgs:
             # There's updates available. Initiate the desktop file cache.
             pkg_names = [p.name for p in
-                         security_pkgs + upgrade_pkgs + kernel_autoremove_pkgs]
+                         pro_pkgs + security_pkgs + upgrade_pkgs + kernel_autoremove_pkgs]
             self._populate_desktop_cache(pkg_names)
         self.update_groups = self._make_groups(cache, upgrade_pkgs,
                                                eventloop_callback)
@@ -570,5 +579,7 @@ class UpdateList():
                                                  eventloop_callback)
         self.kernel_autoremove_groups = self._make_groups(
             cache, kernel_autoremove_pkgs, eventloop_callback, True)
-        self.ubuntu_pro_groups = self._make_groups(
+        self.ubuntu_pro_fake_groups = self._make_groups(
             cache, fake_ua_packages, eventloop_callback, sensitive=False)
+        self.ubuntu_pro_groups = self._make_groups(
+            cache, pro_pkgs, eventloop_callback)
diff --git a/UpdateManager/Core/utils.py b/UpdateManager/Core/utils.py
index 48c513e..871fa6b 100644
--- a/UpdateManager/Core/utils.py
+++ b/UpdateManager/Core/utils.py
@@ -78,6 +78,16 @@ class ExecutionTime(object):
         print("%s: %s" % (self.info, time.time() - self.now))
 
 
+class SoftwarePropertiesPage():
+    ubuntu_software = 0
+    other_software = 1
+    updates = 2
+    authentication = 3
+    additional_drivers = 4
+    developer_options = 5
+    ubuntu_pro = 6
+
+
 def get_string_with_no_auth_from_source_entry(entry):
     tmp = copy(entry)
     url_parts = urlsplit(tmp.uri)
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 797407a..5c7acb1 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -65,7 +65,7 @@ from .Core.AlertWatcher import AlertWatcher
 from .Core.MyCache import MyCache
 from .Core.roam import NetworkManagerHelper
 from .Core.UpdateList import UpdateList
-from .Core.utils import get_arch, get_dist
+from .Core.utils import get_arch, get_dist, SoftwarePropertiesPage
 from .backend import (InstallBackend,
                       get_backend)
 
@@ -195,13 +195,13 @@ class UpdateManager(Gtk.Window):
         self._start_pane(None)
         sys.exit(0)
 
-    def show_settings(self):
+    def show_settings(self, page_number = SoftwarePropertiesPage.updates):
         try:
             apt_pkg.pkgsystem_unlock()
         except SystemError:
             pass
         cmd = ["/usr/bin/software-properties-gtk",
-               "--open-tab", "2"]
+               "--open-tab", str(page_number)]
 
         if "WAYLAND_DISPLAY" not in os.environ:
             cmd += ["--toplevel", "%s" % self.get_window().get_xid()]
@@ -263,30 +263,20 @@ class UpdateManager(Gtk.Window):
                 time.sleep(0.05)
             s = json.load(p.stdout)
             for package in s.get('packages', []):
+                if package.get('service_name', '') == 'standard-security':
+                    continue
                 status = package.get('status', '')
-                if status == 'pending_attach':
+                if status == 'pending_attach' or status == 'pending_enable' or status == 'upgrade_available':
                     name = package.get('package', '')
                     version = package.get('version', '')
                     size = package.get('download_size', 0)
-                    self.ua_security_packages.append((name, version, size))
+                    downloadable = status == 'upgrade_available'
+                    self.ua_security_packages.append((name, version, size, downloadable))
 
     def _make_available_pane(self, install_count, need_reboot=False,
                              cancelled_update=False, error_occurred=False):
         self._check_hwe_support_status()
-        if install_count == 0:
-            # Need Restart > New Release > No Updates
-            if need_reboot:
-                return NeedRestartDialog(self)
-            dist_upgrade = self._check_meta_release()
-            if dist_upgrade:
-                return dist_upgrade
-            elif cancelled_update:
-                return StoppedUpdatesDialog(self)
-            elif self.hwe_replacement_packages:
-                return HWEUpgradeDialog(self)
-            else:
-                return NoUpdatesDialog(self, error_occurred=error_occurred)
-        else:
+        if install_count != 0 or len(self.ua_security_packages) > 0:
             header = None
             desc = None
             if error_occurred:
@@ -299,6 +289,19 @@ class UpdateManager(Gtk.Window):
             elif self.hwe_replacement_packages:
                 return HWEUpgradeDialog(self)
             return UpdatesAvailable(self, header, desc, need_reboot)
+        else:
+            # Need Restart > New Release > No Updates
+            if need_reboot:
+                return NeedRestartDialog(self)
+            dist_upgrade = self._check_meta_release()
+            if dist_upgrade:
+                return dist_upgrade
+            elif cancelled_update:
+                return StoppedUpdatesDialog(self)
+            elif self.hwe_replacement_packages:
+                return HWEUpgradeDialog(self)
+            else:
+                return NoUpdatesDialog(self, error_occurred=error_occurred)
 
     def start_error(self, update_and_retry, header, desc):
         if update_and_retry:
diff --git a/UpdateManager/UpdatesAvailable.py b/UpdateManager/UpdatesAvailable.py
index 7c8cc79..b9a07d7 100644
--- a/UpdateManager/UpdatesAvailable.py
+++ b/UpdateManager/UpdatesAvailable.py
@@ -55,7 +55,7 @@ import threading
 from gettext import gettext as _
 from gettext import ngettext
 
-from .Core.utils import humanize_size
+from .Core.utils import humanize_size, SoftwarePropertiesPage
 from .Core.AlertWatcher import AlertWatcher
 from .Core.UpdateList import UpdateSystemGroup
 from .Dialogs import InternalDialog
@@ -250,16 +250,21 @@ class UpdatesAvailable(InternalDialog):
         self.add_settings_button()
         self.button_close = self.add_button(Gtk.STOCK_CANCEL,
                                             self.window_main.close)
+        self.button_pro = self.add_button(_("Enable Ubuntu Pro..."),
+                                    self.on_button_pro_clicked)
         self.button_install = self.add_button(_("Install Now"),
                                               self.on_button_install_clicked)
         self.focus_button = self.button_install
 
         # create text view
         self.textview_changes = ChangelogViewer()
+        self.textview_changes.set_wrap_mode(Gtk.WrapMode.WORD)
         self.textview_changes.show()
         self.scrolledwindow_changes.add(self.textview_changes)
         changes_buffer = self.textview_changes.get_buffer()
         changes_buffer.create_tag("versiontag", weight=Pango.Weight.BOLD)
+        changes_buffer.create_tag("changestag", weight=Pango.Weight.BOLD)
+        changes_buffer.create_tag("descriptiontag", weight=Pango.Weight.BOLD)
 
         # the treeview (move into it's own code!)
         self.store = Gtk.TreeStore(str, GObject.TYPE_PYOBJECT, str, bool, bool)
@@ -347,7 +352,6 @@ class UpdatesAvailable(InternalDialog):
         self.expander_details.connect("activate", self.pre_activate_details)
         self.expander_details.connect("notify::expanded",
                                       self.activate_details)
-        self.expander_desc.connect("notify::expanded", self.activate_desc)
 
         # If auto-updates are on, change cancel label
         self.notifier_settings = Gio.Settings.new("com.ubuntu.update-notifier")
@@ -363,6 +367,16 @@ class UpdatesAvailable(InternalDialog):
         self.alert_watcher.connect("network-3g-alert",
                                    self._on_network_3g_alert)
 
+        try:
+            from uaclient.api.u.apt_news.current_news.v1 import current_news
+            apt_news = current_news().current_news
+        except ImportError:
+            pro_client_apt_news_api_supported = False
+            apt_news = self._get_apt_news("/var/lib/ubuntu-advantage/messages/apt-news")
+        if apt_news:
+            self.news.get_buffer().set_text(apt_news)
+            self.expander_news.set_visible(True)
+
     def stop(self):
         InternalDialog.stop(self)
         self._save_state()
@@ -508,8 +522,16 @@ class UpdatesAvailable(InternalDialog):
 
         renderer.set_property("markup", markup)
 
-    def set_changes_buffer(self, changes_buffer, text, name, srcpkg):
-        changes_buffer.set_text("")
+    def set_changes_buffer(self, changes_buffer, long_desc, text, name, srcpkg):
+        changes_buffer.set_text("") # Clear "downloading list of changes..."
+
+        # Write the technical description section
+        changes_buffer.insert_with_tags_by_name(changes_buffer.get_end_iter(),
+                                                "Technical description\n",
+                                                "descriptiontag")
+        changes_buffer.insert(changes_buffer.get_end_iter(), long_desc + "\n\n")
+
+        # Write the changes section
         lines = text.split("\n")
         if len(lines) == 1:
             changes_buffer.set_text(text)
@@ -521,12 +543,16 @@ class UpdatesAvailable(InternalDialog):
                 r'^%s \((.*)\)(.*)\;.*$' % re.escape(srcpkg), line)
             #bullet_match = re.match("^.*[\*-]", line)
             author_match = re.match("^.*--.*<.*@.*>.*$", line)
+            changes_match = re.match(r'^Changes for [^ ]+ versions:$', line)
             if version_match:
                 version = version_match.group(1)
                 #upload_archive = version_match.group(2).strip()
                 version_text = _("Version %s: \n") % version
                 changes_buffer.insert_with_tags_by_name(end_iter, version_text,
                                                         "versiontag")
+            elif changes_match:
+                changes_buffer.insert_with_tags_by_name(end_iter, line + "\n",
+                                                        "changestag")
             elif (author_match):
                 pass
             else:
@@ -551,12 +577,8 @@ class UpdatesAvailable(InternalDialog):
                 item.pkg.candidate.description is None):
             changes_buffer = self.textview_changes.get_buffer()
             changes_buffer.set_text("")
-            desc_buffer = self.textview_descr.get_buffer()
-            desc_buffer.set_text("")
-            self.notebook_details.set_sensitive(False)
             return
         long_desc = item.pkg.candidate.description
-        self.notebook_details.set_sensitive(True)
         # do some regular expression magic on the description
         # Add a newline before each bullet
         p = re.compile(r'^(\s|\t)*(\*|0|-)', re.MULTILINE)
@@ -568,9 +590,6 @@ class UpdatesAvailable(InternalDialog):
         p = re.compile(r'\s\s+', re.MULTILINE)
         long_desc = p.sub("\n", long_desc)
 
-        desc_buffer = self.textview_descr.get_buffer()
-        desc_buffer.set_text(long_desc)
-
         # now do the changelog
         name = item.pkg.name
         if name is None:
@@ -583,7 +602,7 @@ class UpdatesAvailable(InternalDialog):
         if name in self.cache.all_changes:
             changes = self.cache.all_changes[name]
             srcpkg = self.cache[name].candidate.source_name
-            self.set_changes_buffer(changes_buffer, changes, name, srcpkg)
+            self.set_changes_buffer(changes_buffer, long_desc, changes, name, srcpkg)
         # if not connected, do not even attempt to get the changes
         elif not self.connected:
             changes_buffer.set_text(
@@ -628,8 +647,9 @@ class UpdatesAvailable(InternalDialog):
             changes += self.cache.all_news[name]
         if name in self.cache.all_changes:
             changes += self.cache.all_changes[name]
-        if changes:
-            self.set_changes_buffer(changes_buffer, changes, name, srcpkg)
+
+        if changes or long_desc:
+            self.set_changes_buffer(changes_buffer, long_desc, changes, name, srcpkg)
 
     def on_treeview_button_press(self, widget, event):
         """
@@ -656,6 +676,11 @@ class UpdatesAvailable(InternalDialog):
             menu.show()
             return True
 
+    def _get_apt_news(self, apt_news_file):
+        if os.access(apt_news_file, os.R_OK):
+            with open(apt_news_file) as f:
+                return f.read()
+
     # we need this for select all/unselect all
     def _toggle_group_headers(self, new_selection_value):
         """ small helper that will set/unset the group headers
@@ -753,6 +778,7 @@ class UpdatesAvailable(InternalDialog):
                 #    self.button_install.set_sensitive(True)
                 self.button_install.set_sensitive(True)
                 self.unity.set_install_menuitem_visible(True)
+                self.button_pro.destroy()
             else:
                 if inst_count > 0:
                     download_str = ngettext(
@@ -761,10 +787,15 @@ class UpdatesAvailable(InternalDialog):
                         inst_count)
                     self.button_install.set_sensitive(True)
                     self.unity.set_install_menuitem_visible(True)
+                    self.button_pro.destroy()
+                elif self.list.ubuntu_pro_fake_groups and not self.list.ubuntu_pro_groups:
+                    download_str = _("You need to enable Ubuntu Pro to install these updates.")
+                    self.button_install.destroy()
                 else:
                     download_str = _("There are no updates to install.")
                     self.button_install.set_sensitive(False)
                     self.unity.set_install_menuitem_visible(False)
+                    self.button_pro.destroy()
                 self.image_downsize.set_sensitive(False)
             self.label_downsize.set_text(download_str)
             self.hbox_downsize.show()
@@ -809,7 +840,6 @@ class UpdatesAvailable(InternalDialog):
                 text_desc = _("The computer also needs to restart "
                               "to finish installing previous updates.")
 
-        self.notebook_details.set_sensitive(True)
         self.treeview_update.set_sensitive(True)
         self.set_header(text_header)
         self.set_desc(text_desc)
@@ -830,8 +860,10 @@ class UpdatesAvailable(InternalDialog):
         self._restore_state()
 
     def activate_desc(self, expander, data):
-        expanded = self.expander_desc.get_expanded()
-        self.expander_desc.set_vexpand(expanded)
+        return
+
+    def on_button_pro_clicked(self):
+        self.window_main.show_settings(SoftwarePropertiesPage.ubuntu_pro)
 
     def on_button_install_clicked(self):
         self.unity.set_install_menuitem_visible(False)
@@ -1029,6 +1061,8 @@ class UpdatesAvailable(InternalDialog):
                     len(group.items) == 1:
                 group_is_item = group.items[0]
 
+            if group.name == "Ubuntu base":
+                group.name = "System components"
             group_row = [
                 group.name,
                 UpdateData(None, group, group_is_item),
@@ -1067,11 +1101,8 @@ class UpdatesAvailable(InternalDialog):
         if self.list.security_groups:
             self._add_header(_("Security updates"), self.list.security_groups)
             self._add_groups(self.list.security_groups)
-        if self.list.security_groups and self.list.update_groups:
-            self._add_header(_("Other updates"), self.list.update_groups)
-        elif self.list.update_groups and self.list.kernel_autoremove_groups:
-            self._add_header(_("Updates"), self.list.update_groups)
         if self.list.update_groups:
+            self._add_header(_("Other updates"), self.list.update_groups)
             self._add_groups(self.list.update_groups)
         if self.list.kernel_autoremove_groups:
             self._add_header(
@@ -1079,11 +1110,17 @@ class UpdatesAvailable(InternalDialog):
                 self.list.kernel_autoremove_groups)
             self._add_groups(self.list.kernel_autoremove_groups)
         if self.list.ubuntu_pro_groups:
-            self._add_header(_("Ubuntu Pro (enable in Settings…)"), self.list.ubuntu_pro_groups, sensitive=False)
+            self._add_header(_("Ubuntu Pro security updates"), self.list.ubuntu_pro_groups, sensitive=True)
             self._add_groups(self.list.ubuntu_pro_groups)
+        if self.list.ubuntu_pro_fake_groups:
+            self._add_header(_("Ubuntu Pro security updates (enable in Settings…)"), self.list.ubuntu_pro_fake_groups, sensitive=False)
+            self._add_groups(self.list.ubuntu_pro_fake_groups)
 
         self.treeview_update.set_model(self.store)
         self.pkg_cell_area.indent_toplevel = (
+            bool(self.list.ubuntu_pro_fake_groups) or
+            bool(self.list.ubuntu_pro_groups) or
+            bool(self.list.update_groups) or
             bool(self.list.security_groups) or
             bool(self.list.kernel_autoremove_groups))
         self.update_close_button()
diff --git a/data/gtkbuilder/UpdateManager.ui b/data/gtkbuilder/UpdateManager.ui
index a16ff47..d5321a2 100644
--- a/data/gtkbuilder/UpdateManager.ui
+++ b/data/gtkbuilder/UpdateManager.ui
@@ -6,17 +6,48 @@
     <property name="can_focus">False</property>
     <property name="spacing">12</property>
     <child>
+      <object class="GtkExpander" id="expander_news">
+        <property name="visible">False</property>
+        <property name="can_focus">True</property>
+        <property name="label">News</property>
+        <property name="spacing">6</property>
+        <property name="expanded">True</property>
+        <child>
+          <object class="GtkScrolledWindow">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="shadow_type">in</property>
+            <property name="min_content_height">80</property>
+            <child>
+              <object class="GtkTextView" id="news">
+                <property name="visible">True</property>
+                <property name="editable">False</property>
+                <property name="pixels_above_lines">6</property>
+                <property name="left_margin">6</property>
+                <property name="right_margin">6</property>
+                <property name="wrap_mode">word</property>
+                <property name="cursor_visible">False</property>
+                <property name="accepts_tab">False</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
       <object class="GtkExpander" id="expander_details">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="spacing">6</property>
         <property name="resize_toplevel">True</property>
         <child>
-          <object class="GtkVBox" id="vbox4">
+          <object class="GtkPaned" id="paned">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="vexpand">True</property>
-            <property name="spacing">6</property>
+            <property name="orientation">vertical</property>
             <child>
               <object class="GtkScrolledWindow" id="scrolledwindow_update">
                 <property name="visible">True</property>
@@ -44,113 +75,21 @@
                 </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="shrink">False</property>
+                <property name="resize">True</property>
               </packing>
             </child>
             <child>
-              <object class="GtkExpander" id="expander_desc">
+              <object class="GtkScrolledWindow" id="scrolledwindow_changes">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="shadow_type">in</property>
                 <child>
-                  <object class="GtkNotebook" id="notebook_details">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="show_border">False</property>
-                    <child>
-                      <object class="GtkVBox" id="vbox5">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="border_width">6</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkScrolledWindow" id="scrolledwindow_changes">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="shadow_type">in</property>
-                            <child>
-                              <placeholder/>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="expand">True</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                    <child type="tab">
-                      <object class="GtkLabel" id="label8">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Changes</property>
-                      </object>
-                      <packing>
-                        <property name="tab_fill">False</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkScrolledWindow" id="scrolledwindow3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="border_width">6</property>
-                        <property name="shadow_type">in</property>
-                        <property name="min_content_height">80</property>
-                        <child>
-                          <object class="GtkTextView" id="textview_descr">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="pixels_above_lines">6</property>
-                            <property name="editable">False</property>
-                            <property name="wrap_mode">word</property>
-                            <property name="left_margin">6</property>
-                            <property name="right_margin">6</property>
-                            <property name="cursor_visible">False</property>
-                            <property name="accepts_tab">False</property>
-                            <child internal-child="accessible">
-                              <object class="AtkObject" id="textview_descr-atkobject">
-                                <property name="AtkObject::accessible-name" translatable="yes">Description</property>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child type="tab">
-                      <object class="GtkLabel" id="label9">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="label" translatable="yes">Description</property>
-                        <child internal-child="accessible">
-                          <object class="AtkObject" id="label9-atkobject">
-                            <property name="AtkObject::accessible-name" translatable="yes">Description</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="position">1</property>
-                        <property name="tab_fill">False</property>
-                      </packing>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label13">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">Technical description</property>
-                  </object>
+                  <placeholder/>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="resize">True</property>
               </packing>
             </child>
           </object>
@@ -167,7 +106,7 @@
       <packing>
         <property name="expand">True</property>
         <property name="fill">True</property>
-        <property name="position">2</property>
+        <property name="position">1</property>
       </packing>
     </child>
     <child>
@@ -177,12 +116,13 @@
         <child>
           <object class="GtkHBox" id="hbox_downsize">
             <property name="can_focus">False</property>
-            <property name="spacing">12</property>
+            <property name="spacing">8</property>
             <child>
               <object class="GtkImage" id="image_downsize">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="icon_name">aptdaemon-download</property>
+                <property name="pixel_size">16</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -400,7 +340,7 @@
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="position">3</property>
+        <property name="position">2</property>
       </packing>
     </child>
   </object>
diff --git a/debian/changelog b/debian/changelog
index bc40574..4be724a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+update-manager (1:18.04.11.18) bionic; urgency=medium
+
+  * Ubuntu Pro (LP: #1990450):
+    - Show Ubuntu Pro packages, whether the system is attached to Ubuntu Pro
+      or not.
+    - Replace Install now button by Enable Ubuntu Pro button when only Ubuntu
+      Pro packages are available and the machine is not attached.
+    - Fix checkbox and expander widget from overlapping.
+    - Add News pane in a expander.
+    - Replace notebook with Description and Changes tabs by a pane.
+
+ -- Nathan Pratta Teodosio <[e-mail]>  Tue, 29 Aug 2023 07:47:20 +0200
+
 update-manager (1:18.04.11.17) bionic; urgency=medium
 
   * Fix Ubuntu Pro updates checkbox and expander widget from overlapping
diff --git a/debian/control b/debian/control
index 4d4cbd8..ad91c50 100644
--- a/debian/control
+++ b/debian/control
@@ -27,8 +27,10 @@ Depends: ${python3:Depends},
          ${misc:Depends}, 
          python3-update-manager (= ${source:Version}),
          python3-distro-info,
+         python3-yaml,
          distro-info-data,
          lsb-release,
+         ubuntu-advantage-tools,
          ubuntu-release-upgrader-core (>= 1:18.04.9)
 Recommends: libpam-modules (>= 1.0.1-9ubuntu3)
 Replaces: update-manager (<< 1:0.146.2)