Merge ~nteodosio/software-properties:xenial-ua into software-properties:ubuntu/master

[Nathan Teodosio]

0.96.20.11[1] was blocked in proposed because of syntax error[2] in a exception with Xenial's old Python.

We committed the fix already but need to release it yet, for we should coordinate LP:1990450 (update-manager) with LP:2029473 (software-properties) on Xenial.

[1] https://git.launchpad.net/software-properties/commit/?id=f2e294b194184fef230a4012e057955f2b097a6c
[2] https://autopkgtest.ubuntu.com/results/autopkgtest-xenial/xenial/amd64/s/software-properties/20231026_095741_b43a1@/log.gz

Unmerged commits

7d9f5be... by Nathan Teodosio on 2023-11-15

Release software-properties 0.96.20.12.

4cbf8e7... by Nathan Teodosio on 2023-10-26

Fix invalid syntax and unused import.

f2e294b... by Sebastien Bacher on 2023-08-30

releasing package software-properties version 0.96.20.11

09a94a9... by Sebastien Bacher on 2023-08-30

Update translatable sources

a57fef4... by Nathan Teodosio on 2023-08-30

Add comment explaining why we need to decode to UTF8.

d9c3635... by Nathan Teodosio on 2023-08-30

Do not block on daemon thread.

Would happen upon exiting after launching Enable Ubuntu Pro.

bdd470d... by Nathan Teodosio on 2023-08-30

Only decode to UTF8 if coming from ua call.

b3b28a9... by Nathan Teodosio on 2023-08-29

Add SVG to .install

b4c2e04... by Nathan Teodosio on 2023-08-29

status_json.decode("utf-8")

To avoid JSON object must be str, not bytes

71b072d... by Nathan Teodosio on 2023-08-29

Depend on python3-distro-info and ubuntu-advantage-{tools,desktop-daemon}.

diff --git a/add-apt-repository b/add-apt-repository
index 985cae9..bf6dc41 100755
--- a/add-apt-repository
+++ b/add-apt-repository
@@ -203,6 +203,7 @@ class AddAptRepository(object):
             if (s.uri, suite) in binary_entries:
                 binary_entries[(s.uri, suite)].append(s)
             else:
+<<<<<<< add-apt-repository
                 binary_entries[(s.uri, suite)] = [s]
 
         for (uri, suite), entries in binary_entries.items():
@@ -228,6 +229,39 @@ class AddAptRepository(object):
                     if get_source_entry_pocket(e) == 'release':
                         comps += e.comps
                 comps = list(set(comps))
+=======
+                print(_("'%s' distribution component is already enabled for all sources.") % line)
+                sys.exit(0)
+        sp.sourceslist.save()
+        sys.exit(0)
+
+    # this wasn't a component name ('multiverse', 'backports'), so its either
+    # a actual line to be added or a shortcut.
+    try:
+        shortcut = shortcut_handler(line)
+    except ShortcutException as e:
+        print(e)
+        sys.exit(1)
+
+    # display more information about the shortcut / ppa info
+    if not options.assume_yes and shortcut.should_confirm():
+        try:
+            info = shortcut.info()
+        except ShortcutException as e:
+            print(e)
+            sys.exit(1)
+
+        # strip ANSI escape sequences
+        description = re.sub(r"(\x9B|\x1B\[)[0-?]*[ -/]*[@-~]",
+                             "", info["description"] or "")
+
+        print(" %s" % description)
+        print(_(" More info: %s") % str(info["web_link"]))
+        if (sys.stdin.isatty() and
+            not "FORCE_ADD_APT_REPOSITORY" in os.environ):
+            if options.remove:
+                print(_("Press [ENTER] to continue or ctrl-c to cancel removing it"))
+>>>>>>> add-apt-repository
             else:
                 comps = ['main', 'restricted']
 
diff --git a/data/gtkbuilder/dialog-ua-attach.ui b/data/gtkbuilder/dialog-ua-attach.ui
index 1445b82..0f0f195 100644
--- a/data/gtkbuilder/dialog-ua-attach.ui
+++ b/data/gtkbuilder/dialog-ua-attach.ui
@@ -39,6 +39,10 @@
             <property name="margin-top">30</property>
             <property name="xalign">0</property>
             <property name="group">magic_radio</property>
+<<<<<<< data/gtkbuilder/dialog-ua-attach.ui
+=======
+            <signal name="toggled" handler="on_radio_toggled" swapped="no"/>
+>>>>>>> data/gtkbuilder/dialog-ua-attach.ui
             <signal name="clicked" handler="on_magic_radio_clicked" swapped="no"/>
           </object>
         </child>
@@ -48,6 +52,7 @@
             <property name="can-focus">False</property>
             <property name="orientation">horizontal</property>
             <child>
+<<<<<<< data/gtkbuilder/dialog-ua-attach.ui
               <object class="GtkLabel" id="pin_label">
                 <property name="label">      </property>
                 <property name="visible">True</property>
@@ -61,6 +66,30 @@
                 <attributes>
                   <attribute name="scale" value="2"/>
                 </attributes>
+=======
+              <object class="GtkBox" id="pin_label_box">
+                <property name="visible">True</property>
+                <property name="margin-left">20</property>
+                <property name="margin-top">12</property>
+                <property name="margin-bottom">8</property>
+                <property name="can-focus">False</property>
+                <child>
+                  <object class="GtkLabel" id="pin_label">
+                    <property name="label">      </property>
+                    <property name="visible">True</property>
+                    <property name="selectable">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="halign">start</property>
+                    <property name="margin-left">6</property>
+                    <property name="margin-right">6</property>
+                    <property name="margin-top">4</property>
+                    <property name="margin-bottom">4</property>
+                    <attributes>
+                      <attribute name="scale" value="2"/>
+                    </attributes>
+                  </object>
+                </child>
+>>>>>>> data/gtkbuilder/dialog-ua-attach.ui
               </object>
             </child>
             <child>
@@ -68,6 +97,10 @@
                 <property name="visible">True</property>
                 <property name="valign">center</property>
                 <property name="margin">3</property>
+<<<<<<< data/gtkbuilder/dialog-ua-attach.ui
+=======
+                <property name="margin-left">9</property>
+>>>>>>> data/gtkbuilder/dialog-ua-attach.ui
                 <child>
                   <object class="GtkSpinner" id="pin_spinner">
                     <property name="visible">True</property>
diff --git a/data/gtkbuilder/main.ui b/data/gtkbuilder/main.ui
index 9c3551b..ac6b91c 100644
--- a/data/gtkbuilder/main.ui
+++ b/data/gtkbuilder/main.ui
@@ -539,6 +539,33 @@
                         <property name="position">0</property>
                       </packing>
                     </child>
+<<<<<<< data/gtkbuilder/main.ui
+=======
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="label" translatable="yes">Snap package updates are checked routinely and installed automatically.</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkAlignment" id="alignment2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="top_padding">6</property>
+                    <property name="left_padding">12</property>
+>>>>>>> data/gtkbuilder/main.ui
                     <child>
                       <object class="GtkAlignment">
                         <property name="visible">True</property>
@@ -546,7 +573,103 @@
                         <property name="top_padding">6</property>
                         <property name="left_padding">12</property>
                         <child>
+<<<<<<< data/gtkbuilder/main.ui
                           <object class="GtkVBox">
+=======
+                          <object class="GtkHBox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkLabel" id="label_esm_heading">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">For other packages, this system has:</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkHBox">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkLabel" id="label_esm_status">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">0</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label_esm_subscribe">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="xalign">1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkLabel" id="label_eol_heading">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">False</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkLabel" id="label_eol">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="xalign">0</property>
+                              </object>
+                              <packing>
+                                <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkHBox" id="hbox_check_for_updates">
+>>>>>>> data/gtkbuilder/main.ui
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="spacing">6</property>
@@ -1236,7 +1359,11 @@
             </child>
             <child>
               <object class="GtkStack" id="stack_ua_main">
+<<<<<<< data/gtkbuilder/main.ui
                 <property name="visible">False</property>
+=======
+                <property name="visible">True</property>
+>>>>>>> data/gtkbuilder/main.ui
                 <child>
                   <object class="GtkBox" id="box_ua_options">
                     <property name="visible">True</property>
@@ -1376,6 +1503,10 @@ Receive security updates for over 25,000 Ubuntu packages, free for up to 5 machi
                         <child>
                           <object class="GtkLabel" id="label_ua_esm_infra_error">
                             <property name="visible">False</property>
+<<<<<<< data/gtkbuilder/main.ui
+=======
+                            <property name="label" translatable="yes">Could not enable ESM Infra. Please try again.</property>
+>>>>>>> data/gtkbuilder/main.ui
                             <property name="valign">center</property>
                             <property name="xalign">0</property>
                             <attributes>
@@ -1413,6 +1544,10 @@ Receive security updates for over 25,000 Ubuntu packages, free for up to 5 machi
                         <child>
                           <object class="GtkLabel" id="label_ua_esm_apps_error">
                             <property name="visible">False</property>
+<<<<<<< data/gtkbuilder/main.ui
+=======
+                            <property name="label" translatable="yes">Could not enable ESM Apps. Please try again.</property>
+>>>>>>> data/gtkbuilder/main.ui
                             <property name="xalign">0</property>
                             <attributes>
                               <attribute name="foreground" value="red"/>
@@ -1450,6 +1585,10 @@ Receive security updates for over 25,000 Ubuntu packages, free for up to 5 machi
                         <child>
                           <object class="GtkLabel" id="label_ua_livepatch_error">
                             <property name="visible">False</property>
+<<<<<<< data/gtkbuilder/main.ui
+=======
+                            <property name="label" translatable="yes">Could not enable Livepatch. Please try again.</property>
+>>>>>>> data/gtkbuilder/main.ui
                             <property name="xalign">0</property>
                             <attributes>
                               <attribute name="foreground" value="red"/>
@@ -1534,7 +1673,11 @@ Receive security updates for over 25,000 Ubuntu packages, free for up to 5 machi
                                 <child>
                                   <object class="GtkLabel" id="label_ua_fips_status">
                                     <property name="visible">True</property>
+<<<<<<< data/gtkbuilder/main.ui
                                     <property name="label">&lt;b&gt;FIPS 140-2&lt;/b&gt;</property>
+=======
+                                    <property name="label" translatable="yes">&lt;b&gt;FIPS 140-2&lt;/b&gt;</property>
+>>>>>>> data/gtkbuilder/main.ui
                                     <property name="use_markup">True</property>
                                     <property name="xalign">0</property>
                                   </object>
@@ -1713,6 +1856,7 @@ Receive security updates for over 25,000 Ubuntu packages, free for up to 5 machi
     <child type="titlebar">
       <placeholder/>
     </child>
+<<<<<<< data/gtkbuilder/main.ui
   </object>
   <object class="GtkSizeGroup">
     <widgets>
@@ -1724,14 +1868,25 @@ Receive security updates for over 25,000 Ubuntu packages, free for up to 5 machi
       <widget name="label_updates_6"/>
       <widget name="label_updates_7"/>
     </widgets>
+=======
+>>>>>>> data/gtkbuilder/main.ui
   </object>
   <object class="GtkSizeGroup">
     <widgets>
+<<<<<<< data/gtkbuilder/main.ui
       <widget name="combobox_updates_subscription"/>
       <widget name="combobox_update_interval"/>
       <widget name="combobox_security_updates"/>
       <widget name="combobox_other_updates"/>
       <widget name="combobox_release_upgrades"/>
+=======
+      <widget name="label_esm_heading"/>
+      <widget name="label_eol_heading"/>
+      <widget name="label3"/>
+      <widget name="label4"/>
+      <widget name="label5"/>
+      <widget name="label29"/>
+>>>>>>> data/gtkbuilder/main.ui
     </widgets>
   </object>
 </interface>
diff --git a/data/ubuntu-pro-logo.svg b/data/ubuntu-pro-logo.svg
index b94971a..2ad3260 100644
--- a/data/ubuntu-pro-logo.svg
+++ b/data/ubuntu-pro-logo.svg
@@ -1 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 130.71 34"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#e95420;}.cls-3{fill:none;}</style></defs><g><path d="M31.74,29.47c-1.3,0-2.33-.25-3.1-.76-.77-.51-1.33-1.19-1.67-2.05-.34-.86-.51-1.81-.51-2.87V14.68h1.42v8.92c0,1.59,.36,2.75,1.07,3.49,.71,.74,1.64,1.11,2.8,1.11s2.09-.37,2.8-1.11c.71-.74,1.07-1.9,1.07-3.49V14.68h1.42v9.11c0,1.06-.17,2.02-.51,2.87s-.9,1.54-1.67,2.05-1.81,.76-3.1,.76Z"/><path d="M44.46,29.41c-.63,0-1.19-.03-1.68-.09-.49-.06-.93-.14-1.29-.23-.37-.09-.69-.18-.95-.26V13.2l1.36-.25v6.06c.24-.18,.62-.37,1.15-.57,.53-.2,1.14-.3,1.84-.3,1.04,0,1.93,.24,2.65,.72,.72,.48,1.28,1.15,1.66,2,.38,.85,.57,1.82,.57,2.92,0,1.17-.22,2.18-.67,3.02-.45,.84-1.06,1.49-1.86,1.94-.79,.45-1.72,.68-2.78,.68Zm-.02-1.23c.78,0,1.46-.17,2.04-.51,.58-.34,1.03-.84,1.36-1.5,.33-.66,.49-1.46,.49-2.39,0-.6-.06-1.16-.19-1.69-.13-.53-.33-1-.61-1.41-.28-.41-.64-.73-1.1-.96s-1.01-.34-1.68-.34-1.22,.11-1.73,.33c-.52,.22-.89,.43-1.13,.63v7.56c.21,.06,.52,.12,.94,.19,.42,.07,.95,.1,1.61,.1Z"/><path d="M56.74,29.37c-1.07,0-1.92-.21-2.55-.62-.63-.41-1.07-.99-1.34-1.73-.26-.75-.4-1.61-.4-2.6v-6.06h1.36v5.62c0,1.02,.1,1.83,.3,2.43,.2,.61,.53,1.04,.99,1.32,.46,.27,1.07,.41,1.84,.41,.64,0,1.2-.04,1.67-.1s.77-.13,.9-.19v-9.48h1.36v10.42c-.4,.11-.95,.24-1.63,.38-.68,.14-1.52,.21-2.51,.21Z"/><path d="M64.26,29.16v-10.42c.4-.11,.95-.24,1.64-.38,.69-.14,1.52-.21,2.5-.21,1.1,0,1.96,.21,2.58,.63,.62,.42,1.06,1,1.32,1.74,.26,.75,.39,1.61,.39,2.6v6.04h-1.36v-5.6c0-1.02-.09-1.83-.28-2.44-.19-.61-.51-1.05-.97-1.33-.46-.27-1.09-.41-1.88-.41-.64,0-1.19,.04-1.66,.1-.47,.07-.77,.13-.91,.19v9.48h-1.36Z"/><path d="M79.39,29.39c-.89,0-1.59-.16-2.11-.47s-.88-.78-1.09-1.41-.31-1.42-.31-2.38V15.19l1.36-.25v3.43h4.3v1.15h-4.3v5.74c0,.82,.09,1.44,.27,1.86,.18,.42,.44,.7,.78,.83,.34,.14,.73,.21,1.18,.21,.57,0,1.03-.07,1.38-.21,.35-.14,.62-.26,.81-.35l.33,1.13c-.2,.12-.54,.27-1.02,.43-.49,.16-1.02,.24-1.59,.24Z"/><path d="M88.09,29.37c-1.07,0-1.92-.21-2.55-.62-.63-.41-1.07-.99-1.34-1.73-.26-.75-.4-1.61-.4-2.6v-6.06h1.36v5.62c0,1.02,.1,1.83,.3,2.43,.2,.61,.53,1.04,.99,1.32,.46,.27,1.07,.41,1.84,.41,.64,0,1.2-.04,1.67-.1s.77-.13,.9-.19v-9.48h1.36v10.42c-.4,.11-.95,.24-1.63,.38-.68,.14-1.52,.21-2.51,.21Z"/><path d="M100.67,29.16V14.96c.5-.14,1.09-.24,1.77-.3,.67-.06,1.3-.09,1.89-.09,2.03,0,3.55,.39,4.56,1.18s1.51,1.89,1.51,3.31c0,1.1-.25,1.98-.76,2.64-.51,.66-1.24,1.14-2.18,1.43-.95,.29-2.08,.44-3.41,.44h-1.96v5.6h-1.42Zm1.42-6.83h1.8c1.02,0,1.9-.09,2.65-.26,.75-.17,1.34-.5,1.75-.98,.42-.48,.63-1.17,.63-2.06s-.22-1.51-.66-1.97c-.44-.47-1-.79-1.69-.98-.69-.19-1.42-.28-2.18-.28-.52,0-.96,.02-1.34,.05s-.7,.07-.96,.09v6.39Z"/><path d="M112.84,29.16v-10.3c.35-.15,.83-.31,1.44-.47,.61-.16,1.36-.24,2.24-.24,.29,0,.58,.02,.87,.05,.29,.04,.54,.08,.75,.12s.37,.09,.47,.14l-.27,1.17c-.1-.06-.32-.12-.67-.18-.35-.06-.8-.09-1.36-.09-.58,0-1.05,.04-1.41,.12-.35,.08-.59,.15-.7,.21v9.46h-1.36Z"/><path d="M124.62,29.41c-.96,0-1.81-.23-2.55-.7-.74-.47-1.32-1.12-1.74-1.97s-.64-1.84-.64-2.97,.21-2.13,.64-2.98c.42-.84,1.01-1.5,1.74-1.97s1.59-.71,2.55-.71,1.81,.24,2.56,.71c.74,.47,1.33,1.13,1.74,1.97,.42,.84,.63,1.83,.63,2.98s-.21,2.12-.63,2.97-1,1.51-1.74,1.97c-.75,.47-1.6,.7-2.56,.7Zm0-1.23c.71,0,1.33-.18,1.85-.54,.52-.36,.93-.87,1.21-1.54,.29-.66,.43-1.44,.43-2.33s-.14-1.69-.43-2.35-.69-1.17-1.21-1.54c-.52-.36-1.14-.54-1.85-.54s-1.33,.18-1.85,.54c-.52,.36-.93,.87-1.21,1.54-.29,.66-.43,1.45-.43,2.35s.14,1.67,.43,2.33c.29,.66,.69,1.17,1.21,1.54,.52,.36,1.14,.54,1.85,.54Z"/></g><g><rect class="cls-2" x="0" width="21" height="32"/><rect class="cls-3" x="2.5" y="14" width="16" height="16"/><circle class="cls-1" cx="4.8" cy="21.15" r="2.17"/><circle class="cls-1" cx="13.86" cy="16.39" r="2.17"/><path class="cls-1" d="M9.7,26.75c-1.57-.34-2.87-1.34-3.61-2.75-.58,.26-1.23,.34-1.86,.23,.89,2.19,2.78,3.77,5.1,4.27,.51,.11,1.03,.16,1.54,.16-.4-.52-.62-1.16-.64-1.82-.18-.02-.36-.05-.53-.09Z"/><circle class="cls-1" cx="13.37" cy="26.76" r="2.17"/><path class="cls-1" d="M16.39,25.96c.68-.85,1.15-1.86,1.38-2.93,.4-1.87,.03-3.83-1.03-5.42-.25,.59-.68,1.09-1.22,1.43,.59,1.11,.77,2.38,.5,3.61-.13,.6-.36,1.17-.68,1.68,.51,.42,.87,.98,1.04,1.62Z"/><path class="cls-1" d="M4.63,18.04c.06,0,.11,0,.17,0,.22,0,.44,.02,.66,.07,.35,.08,.69,.21,.99,.4,.98-1.41,2.56-2.25,4.27-2.28,0-.16,.03-.33,.07-.49,.1-.47,.3-.9,.59-1.27-2.73-.22-5.39,1.19-6.74,3.58Z"/></g></svg>
\ No newline at end of file
+<<<<<<< data/ubuntu-pro-logo.svg
+<?xml version="1.0" encoding="UTF-8"?><svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 130.71 34"><defs><style>.cls-1{fill:#fff;}.cls-2{fill:#e95420;}.cls-3{fill:none;}</style></defs><g><path d="M31.74,29.47c-1.3,0-2.33-.25-3.1-.76-.77-.51-1.33-1.19-1.67-2.05-.34-.86-.51-1.81-.51-2.87V14.68h1.42v8.92c0,1.59,.36,2.75,1.07,3.49,.71,.74,1.64,1.11,2.8,1.11s2.09-.37,2.8-1.11c.71-.74,1.07-1.9,1.07-3.49V14.68h1.42v9.11c0,1.06-.17,2.02-.51,2.87s-.9,1.54-1.67,2.05-1.81,.76-3.1,.76Z"/><path d="M44.46,29.41c-.63,0-1.19-.03-1.68-.09-.49-.06-.93-.14-1.29-.23-.37-.09-.69-.18-.95-.26V13.2l1.36-.25v6.06c.24-.18,.62-.37,1.15-.57,.53-.2,1.14-.3,1.84-.3,1.04,0,1.93,.24,2.65,.72,.72,.48,1.28,1.15,1.66,2,.38,.85,.57,1.82,.57,2.92,0,1.17-.22,2.18-.67,3.02-.45,.84-1.06,1.49-1.86,1.94-.79,.45-1.72,.68-2.78,.68Zm-.02-1.23c.78,0,1.46-.17,2.04-.51,.58-.34,1.03-.84,1.36-1.5,.33-.66,.49-1.46,.49-2.39,0-.6-.06-1.16-.19-1.69-.13-.53-.33-1-.61-1.41-.28-.41-.64-.73-1.1-.96s-1.01-.34-1.68-.34-1.22,.11-1.73,.33c-.52,.22-.89,.43-1.13,.63v7.56c.21,.06,.52,.12,.94,.19,.42,.07,.95,.1,1.61,.1Z"/><path d="M56.74,29.37c-1.07,0-1.92-.21-2.55-.62-.63-.41-1.07-.99-1.34-1.73-.26-.75-.4-1.61-.4-2.6v-6.06h1.36v5.62c0,1.02,.1,1.83,.3,2.43,.2,.61,.53,1.04,.99,1.32,.46,.27,1.07,.41,1.84,.41,.64,0,1.2-.04,1.67-.1s.77-.13,.9-.19v-9.48h1.36v10.42c-.4,.11-.95,.24-1.63,.38-.68,.14-1.52,.21-2.51,.21Z"/><path d="M64.26,29.16v-10.42c.4-.11,.95-.24,1.64-.38,.69-.14,1.52-.21,2.5-.21,1.1,0,1.96,.21,2.58,.63,.62,.42,1.06,1,1.32,1.74,.26,.75,.39,1.61,.39,2.6v6.04h-1.36v-5.6c0-1.02-.09-1.83-.28-2.44-.19-.61-.51-1.05-.97-1.33-.46-.27-1.09-.41-1.88-.41-.64,0-1.19,.04-1.66,.1-.47,.07-.77,.13-.91,.19v9.48h-1.36Z"/><path d="M79.39,29.39c-.89,0-1.59-.16-2.11-.47s-.88-.78-1.09-1.41-.31-1.42-.31-2.38V15.19l1.36-.25v3.43h4.3v1.15h-4.3v5.74c0,.82,.09,1.44,.27,1.86,.18,.42,.44,.7,.78,.83,.34,.14,.73,.21,1.18,.21,.57,0,1.03-.07,1.38-.21,.35-.14,.62-.26,.81-.35l.33,1.13c-.2,.12-.54,.27-1.02,.43-.49,.16-1.02,.24-1.59,.24Z"/><path d="M88.09,29.37c-1.07,0-1.92-.21-2.55-.62-.63-.41-1.07-.99-1.34-1.73-.26-.75-.4-1.61-.4-2.6v-6.06h1.36v5.62c0,1.02,.1,1.83,.3,2.43,.2,.61,.53,1.04,.99,1.32,.46,.27,1.07,.41,1.84,.41,.64,0,1.2-.04,1.67-.1s.77-.13,.9-.19v-9.48h1.36v10.42c-.4,.11-.95,.24-1.63,.38-.68,.14-1.52,.21-2.51,.21Z"/><path d="M100.67,29.16V14.96c.5-.14,1.09-.24,1.77-.3,.67-.06,1.3-.09,1.89-.09,2.03,0,3.55,.39,4.56,1.18s1.51,1.89,1.51,3.31c0,1.1-.25,1.98-.76,2.64-.51,.66-1.24,1.14-2.18,1.43-.95,.29-2.08,.44-3.41,.44h-1.96v5.6h-1.42Zm1.42-6.83h1.8c1.02,0,1.9-.09,2.65-.26,.75-.17,1.34-.5,1.75-.98,.42-.48,.63-1.17,.63-2.06s-.22-1.51-.66-1.97c-.44-.47-1-.79-1.69-.98-.69-.19-1.42-.28-2.18-.28-.52,0-.96,.02-1.34,.05s-.7,.07-.96,.09v6.39Z"/><path d="M112.84,29.16v-10.3c.35-.15,.83-.31,1.44-.47,.61-.16,1.36-.24,2.24-.24,.29,0,.58,.02,.87,.05,.29,.04,.54,.08,.75,.12s.37,.09,.47,.14l-.27,1.17c-.1-.06-.32-.12-.67-.18-.35-.06-.8-.09-1.36-.09-.58,0-1.05,.04-1.41,.12-.35,.08-.59,.15-.7,.21v9.46h-1.36Z"/><path d="M124.62,29.41c-.96,0-1.81-.23-2.55-.7-.74-.47-1.32-1.12-1.74-1.97s-.64-1.84-.64-2.97,.21-2.13,.64-2.98c.42-.84,1.01-1.5,1.74-1.97s1.59-.71,2.55-.71,1.81,.24,2.56,.71c.74,.47,1.33,1.13,1.74,1.97,.42,.84,.63,1.83,.63,2.98s-.21,2.12-.63,2.97-1,1.51-1.74,1.97c-.75,.47-1.6,.7-2.56,.7Zm0-1.23c.71,0,1.33-.18,1.85-.54,.52-.36,.93-.87,1.21-1.54,.29-.66,.43-1.44,.43-2.33s-.14-1.69-.43-2.35-.69-1.17-1.21-1.54c-.52-.36-1.14-.54-1.85-.54s-1.33,.18-1.85,.54c-.52,.36-.93,.87-1.21,1.54-.29,.66-.43,1.45-.43,2.35s.14,1.67,.43,2.33c.29,.66,.69,1.17,1.21,1.54,.52,.36,1.14,.54,1.85,.54Z"/></g><g><rect class="cls-2" x="0" width="21" height="32"/><rect class="cls-3" x="2.5" y="14" width="16" height="16"/><circle class="cls-1" cx="4.8" cy="21.15" r="2.17"/><circle class="cls-1" cx="13.86" cy="16.39" r="2.17"/><path class="cls-1" d="M9.7,26.75c-1.57-.34-2.87-1.34-3.61-2.75-.58,.26-1.23,.34-1.86,.23,.89,2.19,2.78,3.77,5.1,4.27,.51,.11,1.03,.16,1.54,.16-.4-.52-.62-1.16-.64-1.82-.18-.02-.36-.05-.53-.09Z"/><circle class="cls-1" cx="13.37" cy="26.76" r="2.17"/><path class="cls-1" d="M16.39,25.96c.68-.85,1.15-1.86,1.38-2.93,.4-1.87,.03-3.83-1.03-5.42-.25,.59-.68,1.09-1.22,1.43,.59,1.11,.77,2.38,.5,3.61-.13,.6-.36,1.17-.68,1.68,.51,.42,.87,.98,1.04,1.62Z"/><path class="cls-1" d="M4.63,18.04c.06,0,.11,0,.17,0,.22,0,.44,.02,.66,.07,.35,.08,.69,.21,.99,.4,.98-1.41,2.56-2.25,4.27-2.28,0-.16,.03-.33,.07-.49,.1-.47,.3-.9,.59-1.27-2.73-.22-5.39,1.19-6.74,3.58Z"/></g></svg>
+=======
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1579.82 400">
+  <g>
+    <path d="m381.87,354.01c-11.69,0-21.64-1.78-29.85-5.33-8.22-3.56-14.86-8.47-19.94-14.74-5.08-6.26-8.77-13.59-11.05-21.98-2.29-8.38-3.43-17.4-3.43-27.06v-110.77h17.28v108.49c0,9.65,1.14,18,3.43,25.03,2.29,7.03,5.46,12.83,9.53,17.4,4.06,4.57,8.97,7.96,14.74,10.16,5.76,2.2,12.2,3.3,19.31,3.3s13.55-1.1,19.31-3.3c5.76-2.2,10.67-5.59,14.74-10.16s7.24-10.37,9.53-17.4c2.29-7.03,3.43-15.37,3.43-25.03v-108.49h17.28v110.77c0,9.65-1.14,18.67-3.43,27.06-2.29,8.38-5.97,15.71-11.05,21.98-5.08,6.27-11.73,11.18-19.94,14.74-8.22,3.56-18.17,5.33-29.85,5.33Z"/>
+    <path d="m500.62,226.73c2.88-2.2,7.5-4.53,13.85-6.99,6.35-2.45,13.85-3.68,22.48-3.68,9.48,0,17.91,1.7,25.28,5.08,7.37,3.39,13.59,8.13,18.67,14.23,5.08,6.1,8.93,13.34,11.56,21.72,2.62,8.38,3.94,17.57,3.94,27.57,0,10.67-1.57,20.24-4.7,28.71-3.13,8.47-7.54,15.67-13.21,21.59-5.68,5.93-12.45,10.46-20.32,13.59-7.88,3.13-16.64,4.7-26.3,4.7-11.69,0-21.34-.76-28.96-2.29-7.62-1.52-13.89-3.13-18.8-4.83v-190.04l16.51-3.05v73.68Zm0,107.98c2.54.85,6.31,1.65,11.31,2.41,4.99.76,11.56,1.14,19.69,1.14,14.23,0,25.66-4.61,34.3-13.85,8.64-9.23,12.96-22.49,12.96-39.76,0-7.28-.76-14.18-2.29-20.71-1.52-6.52-3.98-12.19-7.37-17.02-3.39-4.83-7.84-8.68-13.34-11.56-5.51-2.88-12.32-4.32-20.45-4.32-3.9,0-7.62.38-11.18,1.14-3.56.76-6.86,1.74-9.91,2.92-3.05,1.19-5.72,2.46-8,3.81-2.29,1.36-4.19,2.63-5.72,3.81v91.97Z"/>
+    <path d="m726.96,345.63c-4.91,1.36-11.52,2.88-19.82,4.57-8.3,1.69-18.46,2.54-30.49,2.54-9.82,0-18.04-1.44-24.64-4.32-6.61-2.88-11.94-6.94-16.01-12.2-4.06-5.25-6.99-11.6-8.76-19.05-1.78-7.45-2.67-15.67-2.67-24.64v-73.68h16.51v68.34c0,9.32.67,17.19,2.03,23.63,1.35,6.44,3.56,11.65,6.61,15.62,3.05,3.98,6.99,6.86,11.81,8.64,4.83,1.78,10.71,2.67,17.66,2.67,7.79,0,14.56-.42,20.33-1.27,5.76-.85,9.4-1.61,10.92-2.29v-115.34h16.51v126.78Z"/>
+    <path d="m763.39,223.43c4.91-1.35,11.52-2.88,19.82-4.57,8.3-1.69,18.46-2.54,30.49-2.54,9.99,0,18.33,1.44,25.03,4.32,6.69,2.88,12.02,6.99,16.01,12.32,3.98,5.33,6.81,11.73,8.51,19.18,1.69,7.46,2.54,15.67,2.54,24.64v73.42h-16.51v-68.09c0-9.31-.63-17.19-1.91-23.63-1.27-6.44-3.39-11.69-6.35-15.75-2.96-4.07-6.86-6.99-11.69-8.77-4.83-1.78-10.88-2.67-18.17-2.67-7.79,0-14.53.42-20.2,1.27-5.68.85-9.36,1.61-11.05,2.29v115.34h-16.51v-126.78Z"/>
+    <path d="m916.61,218.85h52.34v13.97h-52.34v69.87c0,7.46.63,13.51,1.9,18.17,1.27,4.66,3.09,8.26,5.46,10.8,2.37,2.54,5.25,4.24,8.64,5.08,3.38.85,7.11,1.27,11.18,1.27,6.94,0,12.53-.8,16.77-2.41,4.23-1.61,7.53-3.09,9.91-4.45l4.06,13.72c-2.37,1.52-6.52,3.26-12.45,5.21-5.93,1.95-12.37,2.92-19.31,2.92-8.13,0-14.95-1.06-20.45-3.18-5.51-2.12-9.91-5.34-13.21-9.65-3.3-4.32-5.63-9.69-6.99-16.13-1.36-6.43-2.03-14.06-2.03-22.87v-120.93l16.52-3.05v41.67Z"/>
+    <path d="m1094.4,345.63c-4.91,1.36-11.52,2.88-19.82,4.57-8.3,1.69-18.46,2.54-30.49,2.54-9.82,0-18.04-1.44-24.64-4.32-6.61-2.88-11.94-6.94-16.01-12.2-4.06-5.25-6.99-11.6-8.76-19.05-1.78-7.45-2.67-15.67-2.67-24.64v-73.68h16.51v68.34c0,9.32.67,17.19,2.03,23.63,1.35,6.44,3.56,11.65,6.61,15.62,3.05,3.98,6.99,6.86,11.81,8.64,4.83,1.78,10.71,2.67,17.66,2.67,7.79,0,14.56-.42,20.32-1.27,5.76-.85,9.4-1.61,10.93-2.29v-115.34h16.51v126.78Z"/>
+    <path d="m1241.5,172.61c24.9,0,43.44,4.74,55.64,14.23,12.2,9.49,18.29,22.95,18.29,40.4,0,10-1.78,18.51-5.34,25.53-3.56,7.03-8.64,12.7-15.24,17.02-6.61,4.32-14.7,7.46-24.26,9.4-9.57,1.95-20.37,2.92-32.39,2.92h-23.88v68.09h-17.28v-172.76c6.1-1.69,13.25-2.92,21.47-3.68,8.21-.76,15.88-1.14,22.99-1.14Zm.76,14.99c-6.44,0-11.9.21-16.39.63-4.49.42-8.35.81-11.56,1.14v77.74h21.85c9.31,0,17.74-.55,25.28-1.65,7.54-1.1,13.97-3.13,19.31-6.1,5.34-2.96,9.44-7.07,12.32-12.32,2.88-5.25,4.32-11.94,4.32-20.07s-1.57-14.23-4.7-19.31c-3.14-5.08-7.29-9.1-12.45-12.07-5.17-2.96-11.05-5.04-17.66-6.22-6.61-1.18-13.38-1.78-20.32-1.78Z"/>
+    <path d="m1385.07,216.31c5.42,0,10.54.42,15.37,1.27,4.83.85,8.17,1.7,10.04,2.54l-3.3,14.23c-1.36-.67-4.11-1.4-8.26-2.16-4.15-.76-9.62-1.14-16.39-1.14-7.12,0-12.83.51-17.15,1.52-4.32,1.02-7.16,1.87-8.51,2.54v115.09h-16.51v-125.25c4.23-1.86,10.08-3.77,17.53-5.72,7.45-1.95,16.51-2.92,27.18-2.92Z"/>
+    <path d="m1538.85,284.65c0,10.33-1.48,19.73-4.45,28.2-2.96,8.47-7.11,15.67-12.45,21.6-5.34,5.93-11.65,10.54-18.93,13.85-7.29,3.3-15.33,4.95-24.14,4.95s-16.86-1.65-24.13-4.95c-7.29-3.3-13.59-7.92-18.93-13.85-5.34-5.93-9.49-13.12-12.45-21.6-2.97-8.47-4.45-17.87-4.45-28.2s1.48-19.73,4.45-28.2c2.96-8.47,7.11-15.71,12.45-21.72,5.33-6.01,11.64-10.67,18.93-13.97,7.28-3.3,15.33-4.95,24.13-4.95s16.85,1.65,24.14,4.95c7.28,3.3,13.59,7.96,18.93,13.97,5.34,6.01,9.48,13.25,12.45,21.72,2.96,8.47,4.45,17.87,4.45,28.2Zm-17.53,0c0-16.43-3.81-29.51-11.43-39.25-7.62-9.74-17.96-14.61-31-14.61s-23.37,4.87-31,14.61c-7.62,9.74-11.43,22.83-11.43,39.25s3.81,29.47,11.43,39.13c7.62,9.65,17.95,14.48,31,14.48s23.38-4.83,31-14.48,11.43-22.69,11.43-39.13Z"/>
+  </g>
+  <g>
+    <rect fill="#e95420" x="0" y="0" width="254.06" height="400"/>
+    <rect fill="#e95420" x="30.25" y="169.38" width="193.57" height="193.57"/>
+    <circle fill="white" cx="58.09" cy="255.92" r="26.3"/>
+    <circle fill="white" cx="167.63" cy="198.25" r="26.3"/>
+    <path fill="white" d="m117.41,323.61c-18.95-4.06-34.78-16.16-43.68-33.32-7.01,3.19-14.9,4.16-22.49,2.76,10.77,26.45,33.61,45.66,61.65,51.67,6.15,1.32,12.42,1.96,18.68,1.92-4.83-6.35-7.52-14.01-7.7-21.99-2.17-.24-4.33-.59-6.45-1.05Z"/>
+    <circle fill="white" cx="161.71" cy="323.76" r="26.3"/>
+    <path fill="white" d="m198.31,314.1c8.18-10.31,13.94-22.5,16.71-35.45,4.84-22.59.32-46.29-12.4-65.51-3.03,7.14-8.17,13.17-14.79,17.32,7.1,13.38,9.26,28.82,6.08,43.67-1.56,7.27-4.31,14.12-8.18,20.38,6.19,5.08,10.56,11.91,12.59,19.6Z"/>
+    <path fill="white" d="m56.06,218.2c.67-.04,1.34-.05,2-.05,2.66,0,5.31.28,7.94.85,4.29.92,8.32,2.54,12.01,4.84,11.84-17.03,30.95-27.25,51.65-27.63.11-1.99.38-3.97.79-5.92,1.21-5.63,3.67-10.9,7.19-15.41-33.08-2.62-65.22,14.45-81.59,43.33Z"/>
+  </g>
+</svg>
+>>>>>>> data/ubuntu-pro-logo.svg
diff --git a/debian/changelog b/debian/changelog
index af14a7c..e284ee7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 software-properties (0.99.40) noble; urgency=medium
 
   * cloudarchive: Enable support for the Caracal Ubuntu Cloud Archive on
@@ -283,12 +284,28 @@ software-properties (0.99.4) hirsute; urgency=medium
  -- Corey Bryant <[e-mail]>  Tue, 03 Nov 2020 08:58:47 -0500
 
 software-properties (0.99.3) groovy; urgency=medium
+=======
+software-properties (0.96.20.12) xenial; urgency=medium
+
+  * Fix invalid syntax for old Python and unused import.
+
+ -- Nathan Pratta Teodosio <[e-mail]>  Wed, 15 Nov 2023 15:24:09 +0100
+
+software-properties (0.96.20.11) xenial; urgency=medium
+
+  * Backport of the Ubuntu Pro tab (lp: #2029473)
+
+ -- Nathan Pratta Teodosio <[e-mail]>  Wed, 30 Aug 2023 11:29:36 +0200
+
+software-properties (0.96.20.10) xenial-security; urgency=medium
+>>>>>>> debian/changelog
 
   * SECURITY UPDATE: malicious repo could send ANSI sequences to terminal
     (LP: #1890286)
     - add-apt-repository: strip ANSI sequences from the description.
     - CVE-2020-15709
 
+<<<<<<< debian/changelog
  -- Marc Deslauriers <[e-mail]>  Mon, 17 Aug 2020 10:19:34 -0400
 
 software-properties (0.99.2) groovy; urgency=medium
@@ -374,10 +391,16 @@ software-properties (0.98.6) focal; urgency=medium
  -- Corey Bryant <[e-mail]>  Wed, 13 Nov 2019 16:00:59 -0500
 
 software-properties (0.98.5) eoan; urgency=medium
+=======
+ -- Marc Deslauriers <[e-mail]>  Fri, 07 Aug 2020 10:08:35 -0400
+
+software-properties (0.96.20.9) xenial; urgency=medium
+>>>>>>> debian/changelog
 
   * cloudarchive: Update outdated WEB_LINK that is presented when
     cloud archive is enabled (LP: #1836258).
 
+<<<<<<< debian/changelog
  -- Corey Bryant <[e-mail]>  Fri, 12 Jul 2019 10:02:43 -0400
 
 software-properties (0.98.4) eoan; urgency=medium
@@ -546,10 +569,16 @@ software-properties (0.96.30) disco; urgency=medium
  -- Sebastien Bacher <[e-mail]>  Tue, 15 Jan 2019 10:48:27 +0100
 
 software-properties (0.96.29) disco; urgency=medium
+=======
+ -- Corey Bryant <[e-mail]>  Fri, 12 Jul 2019 10:15:23 -0400
+
+software-properties (0.96.20.8) xenial; urgency=medium
+>>>>>>> debian/changelog
 
   * SoftwarePropertiesGtk.py: when checking a package's depends for DKMS also
     pass on an AttributeError (LP: #1807373)
 
+<<<<<<< debian/changelog
  -- Brian Murray <[e-mail]>  Tue, 11 Dec 2018 14:35:40 -0800
 
 software-properties (0.96.28) disco; urgency=medium
@@ -863,18 +892,45 @@ software-properties (0.96.24.10) zesty; urgency=medium
 
 software-properties (0.96.24.9) zesty; urgency=medium
 
+=======
+ -- Brian Murray <[e-mail]>  Mon, 17 Dec 2018 11:21:26 -0800
+
+software-properties (0.96.20.7) xenial; urgency=medium
+
+  * software-properties-gtk:
+    - fix the backend code to set the gnome debconf frontend, without which
+      libgtk2-perl goes unused.
+    - depend on libgtk2-perl to ensure it's available, since it was not seeded
+      on the desktop at release time.  This is only a Recommends: in zesty,
+      but we need to ensure this isn't ignored on upgrade.
+    LP: #1679784.
+
+ -- Steve Langasek <[e-mail]>  Thu, 27 Apr 2017 16:21:42 -0700
+
+software-properties (0.96.20.6) xenial; urgency=medium
+
+  * Add knowledge of OpenStack releases Pike and Queens. (LP: #1670385)
+
+>>>>>>> debian/changelog
   [ Scott Moser & Dimitri John Ledkov ]
   * When failing to retrieve a GPG key, raise an exception such that
     e.g. add-apt-repository can fail when it did not manage to retrieve a
     GPG key for the shortcut repository. LP: #1532855
 
+<<<<<<< debian/changelog
  -- Dimitri John Ledkov <[e-mail]>  Wed, 01 Mar 2017 17:38:45 +0000
 
 software-properties (0.96.24.8) zesty; urgency=medium
+=======
+ -- Scott Moser <[e-mail]>  Mon, 06 Mar 2017 16:56:40 -0500
+
+software-properties (0.96.20.5) xenial; urgency=medium
+>>>>>>> debian/changelog
 
   * cloudarchive: Enable support for the Ocata Ubuntu Cloud Archive on
     16.04 (LP: #1645827).
 
+<<<<<<< debian/changelog
  -- Corey Bryant <[e-mail]>  Tue, 29 Nov 2016 13:29:35 -0500
 
 software-properties (0.96.24.7) yakkety; urgency=medium
@@ -935,6 +991,11 @@ software-properties (0.96.24.3) yakkety; urgency=medium
  -- Sebastien Bacher <[e-mail]>  Wed, 17 Aug 2016 11:34:26 +0200
 
 software-properties (0.96.24.2) yakkety; urgency=medium
+=======
+ -- Corey Bryant <[e-mail]>  Tue, 29 Nov 2016 13:49:16 -0500
+
+software-properties (0.96.20.4) xenial; urgency=medium
+>>>>>>> debian/changelog
 
   * Do not assume that a distribution adding the PPA of another distribution
     will want the latest series all the time. Instead check if the requested
@@ -944,6 +1005,7 @@ software-properties (0.96.24.2) yakkety; urgency=medium
     use the same series name. As long as launchpad knows about the series we
     should be fine even if the constraints are a bit lax.
 
+<<<<<<< debian/changelog
  -- Harald Sitter <[e-mail]>  Fri, 12 Aug 2016 13:52:41 +0200
 
 software-properties (0.96.24.1) yakkety; urgency=medium
@@ -959,6 +1021,11 @@ software-properties (0.96.24) yakkety; urgency=medium
  -- Brian Murray <[e-mail]>  Thu, 23 Jun 2016 10:33:47 -0700
 
 software-properties (0.96.23) yakkety; urgency=medium
+=======
+ -- Harald Sitter <[e-mail]>  Fri, 12 Aug 2016 16:12:07 +0200
+
+software-properties (0.96.20.3) xenial; urgency=medium
+>>>>>>> debian/changelog
 
   * softwareproperties/ppa.py:
     - fix exception output when `add-apt-repository` is called with
@@ -967,23 +1034,39 @@ software-properties (0.96.23) yakkety; urgency=medium
     - add network check for tests that require talking to launchpad
       or the cloud archives
 
+<<<<<<< debian/changelog
  -- Michael Vogt <[e-mail]>  Wed, 22 Jun 2016 15:42:14 +0200
 
 software-properties (0.96.22) yakkety; urgency=medium
+=======
+ -- Brian Murray <[e-mail]>  Fri, 22 Jul 2016 15:27:26 -0700
+
+software-properties (0.96.20.2) xenial; urgency=medium
+>>>>>>> debian/changelog
 
   * SoftwarePropertiesGtk.py: only add mirror choices if there are mirrors
     available from which to choose. (LP: #1101881)
   * DialogMirror.py: guard against a traceback when get cursor returns None.
     (LP: #1101881)
 
+<<<<<<< debian/changelog
  -- Brian Murray <[e-mail]>  Mon, 20 Jun 2016 11:08:28 -0700
 
 software-properties (0.96.21) yakkety; urgency=medium
+=======
+ -- Brian Murray <[e-mail]>  Tue, 21 Jun 2016 12:22:08 -0700
+
+software-properties (0.96.20.1) xenial; urgency=medium
+>>>>>>> debian/changelog
 
   * cloudarchive: Enable support for the Newton Ubuntu Cloud Archive on
     16.04 (LP: #1591382).
 
+<<<<<<< debian/changelog
  -- Corey Bryant <[e-mail]>  Fri, 10 Jun 2016 17:22:43 -0400
+=======
+ -- Corey Bryant <[e-mail]>  Fri, 10 Jun 2016 17:32:35 -0400
+>>>>>>> debian/changelog
 
 software-properties (0.96.20) xenial; urgency=medium
 
diff --git a/debian/control b/debian/control
index fcb6123..4690b5b 100644
--- a/debian/control
+++ b/debian/control
@@ -33,6 +33,7 @@ XS-Testsuite: autopkgtest
 Package: python3-software-properties
 Section: python
 Architecture: all
+<<<<<<< debian/control
 Depends: gpg,
          iso-codes,
          lsb-release,
@@ -42,6 +43,12 @@ Depends: gpg,
          python3-launchpadlib,
          ${misc:Depends},
          ${python3:Depends}
+=======
+Depends: ${python3:Depends}, ${misc:Depends}, python3, python3-apt (>=
+ 0.6.20ubuntu16), python3-pycurl, lsb-release, iso-codes, python3-distro-info
+ (>= 0.14ubuntu0.3), ubuntu-advantage-tools (>=27.11~),
+ ubuntu-advantage-desktop-daemon
+>>>>>>> debian/control
 Recommends: unattended-upgrades
 Description: manage the repositories that you install software from
  This software provides an abstraction of the used apt repositories.
@@ -75,6 +82,7 @@ Description: manage the repositories that you install software from (common)
 
 Package: software-properties-gtk
 Architecture: all
+<<<<<<< debian/control
 Depends: gir1.2-goa-1.0 (>= 3.27.92-1ubuntu1),
          gir1.2-gtk-3.0,
          gir1.2-handy-1,
@@ -92,6 +100,17 @@ Depends: gir1.2-goa-1.0 (>= 3.27.92-1ubuntu1),
          ${python3:Depends}
 Recommends: gnome-keyring,
             gnome-session-bin | xfce4-session | mate-session-manager
+=======
+Depends: ${python3:Depends}, ${misc:Depends}, python3,
+ python3-software-properties (= ${binary:Version}),
+ python3-gi,
+ gir1.2-gtk-3.0,
+ python3-aptdaemon.gtk3widgets,
+ software-properties-common,
+ ubuntu-drivers-common (>= 1:0.2.75),
+ python3-gi,
+ libgtk2-perl,
+>>>>>>> debian/control
 Description: manage the repositories that you install software from (gtk)
  This software provides an abstraction of the used apt repositories.
  It allows you to easily manage your distribution and independent software
diff --git a/debian/software-properties-gtk.install b/debian/software-properties-gtk.install
index be53144..fbaac36 100644
--- a/debian/software-properties-gtk.install
+++ b/debian/software-properties-gtk.install
@@ -2,6 +2,7 @@
 debian/tmp/usr/bin/software-properties-gtk
 debian/tmp/usr/lib/python3*/*-packages/softwareproperties/gtk/*.py
 debian/tmp/usr/share/applications/software-properties-drivers.desktop
+<<<<<<< debian/software-properties-gtk.install
 debian/tmp/usr/share/applications/software-properties-gtk.desktop
 debian/tmp/usr/share/applications/software-properties-livepatch.desktop
 debian/tmp/usr/share/glib-2.0/schemas
@@ -11,3 +12,7 @@ debian/tmp/usr/share/mime/packages
 debian/tmp/usr/share/software-properties/gtkbuilder
 debian/tmp/usr/share/software-properties/ubuntu-pro-logo.svg
 debian/tmp/usr/share/software-properties/ubuntu-pro-logo-dark.svg
+=======
+debian/tmp/usr/share/software-properties/ubuntu-pro-logo.svg
+#debian/tmp/usr/share/gnome/help/software-properties
+>>>>>>> debian/software-properties-gtk.install
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 97ce1bf..ff745a1 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -54,3 +54,7 @@ softwareproperties/sourceslist.py
 [type: gettext/glade]data/gtkbuilder/dialog-ua-attach.ui
 [type: gettext/glade]data/gtkbuilder/dialog-ua-detach.ui
 [type: gettext/glade]data/gtkbuilder/dialog-ua-fips-enable.ui
+<<<<<<< po/POTFILES.in
+=======
+
+>>>>>>> po/POTFILES.in
diff --git a/softwareproperties/SoftwareProperties.py b/softwareproperties/SoftwareProperties.py
index d8f7435..d901f54 100644
--- a/softwareproperties/SoftwareProperties.py
+++ b/softwareproperties/SoftwareProperties.py
@@ -128,7 +128,8 @@ class SoftwareProperties(object):
     " wait for all running threads (PPA key fetchers) to exit "
     for t in threading.enumerate():
       if t.ident != threading.current_thread().ident:
-        t.join()
+        if not t.daemon:
+          t.join()
 
   def backup_apt_conf(self):
     """Backup all apt configuration options"""
@@ -682,8 +683,29 @@ class SoftwareProperties(object):
     if channel:
       keyp = "%s/%s.key" % (self.CHANNEL_PATH, channel)
       self.add_key(keyp)
+<<<<<<< softwareproperties/SoftwareProperties.py
       return True
     return False
+=======
+
+    cdata = (shortcut.add_key, {'keyserver': (self.options and
+                                              self.options.keyserver)})
+    def addkey_func():
+        func, kwargs = cdata
+        msg = "Added key."
+        try:
+            ret = func(**kwargs)
+            if not ret:
+                msg = "Failed to add key."
+        except Exception as e:
+            ret = False
+            msg = str(e)
+        self.myqueue.put([ret, msg])
+
+    worker = threading.Thread(target=addkey_func)
+    worker.start()
+    return worker
+>>>>>>> softwareproperties/SoftwareProperties.py
 
   def update_interface(self):
     " abstract interface to keep the UI alive "
@@ -748,6 +770,19 @@ class SoftwareProperties(object):
                          file=new_debsrc_entry.file,
                          architectures=new_debsrc_entry.architectures)
     self.set_modified_sourceslist()
+<<<<<<< softwareproperties/SoftwareProperties.py
+=======
+    if worker:
+        # wait for GPG key to be downloaded
+        worker.join(30)
+        if worker.isAlive():
+            # thread timed out.
+            raise shortcuts.ShortcutException("Error: retrieving gpg key timed out.")
+        result, msg = self.myqueue.get()
+        if not result:
+            raise shortcuts.ShortcutException(msg)
+
+>>>>>>> softwareproperties/SoftwareProperties.py
     if self.options and self.options.update:
         import apt
         cache = apt.Cache()
diff --git a/softwareproperties/cloudarchive.py b/softwareproperties/cloudarchive.py
index 3cbc5f3..ebeabdf 100644
--- a/softwareproperties/cloudarchive.py
+++ b/softwareproperties/cloudarchive.py
@@ -45,6 +45,7 @@ RELEASE_MAP = {
     'ocata': 'xenial',
     'pike': 'xenial',
     'queens': 'xenial',
+<<<<<<< softwareproperties/cloudarchive.py
     'rocky': 'bionic',
     'stein': 'bionic',
     'train': 'bionic',
@@ -57,9 +58,12 @@ RELEASE_MAP = {
     'antelope': 'jammy',
     'bobcat': 'jammy',
     'caracal': 'jammy',
+=======
+>>>>>>> softwareproperties/cloudarchive.py
 }
 UCA = "Ubuntu Cloud Archive"
 WEB_LINK = 'https://wiki.ubuntu.com/OpenStack/CloudArchive'
+<<<<<<< softwareproperties/cloudarchive.py
 
 UCA_ARCHIVE = "http://ubuntu-cloud.archive.canonical.com/ubuntu"
 UCA_PREFIXES = ['cloud-archive', 'uca']
@@ -93,6 +97,23 @@ class CloudArchiveShortcutHandler(ShortcutHandler):
         if not self.caname in RELEASE_MAP:
             msg = (_("not a valid cloud-archive: '%s'") % self.caname)
             raise ShortcutException(msg)
+=======
+APT_INSTALL_KEY = ['apt-get', '--quiet', '--assume-yes', 'install',
+                   'ubuntu-cloud-keyring']
+
+ALIASES = {'tools-updates': 'tools'}
+for _r in RELEASE_MAP:
+    ALIASES["%s-updates" % _r] = _r
+
+MAP = {
+    'tools': {
+        'sldfmt': '%(codename)s-updates/cloud-tools',
+        'description': UCA + " for cloud-tools (JuJu and MAAS)"},
+    'tools-proposed': {
+        'sldfmt': '%(codename)s-proposed/cloud-tools',
+        'description': UCA + " for cloud-tools (JuJu and MAAS) [proposed]"}
+}
+>>>>>>> softwareproperties/cloudarchive.py
 
         codename = RELEASE_MAP[self.caname]
         validnames = set((codename, os.getenv("CA_ALLOW_CODENAME") or codename))
diff --git a/softwareproperties/gtk/DialogUaAttach.py b/softwareproperties/gtk/DialogUaAttach.py
index d029e64..84d93dc 100644
--- a/softwareproperties/gtk/DialogUaAttach.py
+++ b/softwareproperties/gtk/DialogUaAttach.py
@@ -25,6 +25,10 @@ from softwareproperties.gtk.utils import setup_ui
 from uaclient.api.u.pro.attach.magic.initiate.v1 import initiate
 from uaclient.api.u.pro.attach.magic.wait.v1 import MagicAttachWaitOptions, wait
 from uaclient.exceptions import MagicAttachTokenError
+<<<<<<< softwareproperties/gtk/DialogUaAttach.py
+=======
+import threading
+>>>>>>> softwareproperties/gtk/DialogUaAttach.py
 
 class DialogUaAttach:
     def __init__(self, parent, datadir, ua_object):
@@ -139,8 +143,11 @@ class DialogUaAttach:
         self.attach()
 
     def on_cancel_clicked(self, button):
+<<<<<<< softwareproperties/gtk/DialogUaAttach.py
         if self.poll:
             GLib.Thread.unref(self.poll)
+=======
+>>>>>>> softwareproperties/gtk/DialogUaAttach.py
         self.dialog.response(Gtk.ResponseType.CANCEL)
 
     def poll_for_magic_token(self):
@@ -148,6 +155,7 @@ class DialogUaAttach:
         try:
             response = wait(options)
             self.contract_token = response.contract_token
+<<<<<<< softwareproperties/gtk/DialogUaAttach.py
             if self.magic_radio.get_active():
                 GLib.idle_add(self.update_state, "pin_validated")
         except MagicAttachTokenError:
@@ -155,6 +163,13 @@ class DialogUaAttach:
                 GLib.idle_add(self.update_state, "expired")
         except Exception as e:
             print("Error getting the Ubuntu Pro token: ", e, flush = True)
+=======
+            GLib.idle_add(self.update_state, 'pin_validated')
+        except MagicAttachTokenError:
+            GLib.idle_add(self.update_state, 'expired')
+        except Exception as e:
+            print("Error getting the Ubuntu Pro token: ", e)
+>>>>>>> softwareproperties/gtk/DialogUaAttach.py
         finally:
             self.poll = None
 
@@ -163,6 +178,11 @@ class DialogUaAttach:
         if self.poll != None or self.contract_token != None:
             return
 
+<<<<<<< softwareproperties/gtk/DialogUaAttach.py
+=======
+        self.contract_token = None
+
+>>>>>>> softwareproperties/gtk/DialogUaAttach.py
         # Request a magic attachment and parse relevants fields from response.
         #  userCode:  The pin the user has to type in <ubuntu.com/pro/attach>;
         #  token:     Identifies the request (used for polling for it).
@@ -174,6 +194,7 @@ class DialogUaAttach:
             print("Error retrieving magic token: ", e)
             return
         self.update_state()
+<<<<<<< softwareproperties/gtk/DialogUaAttach.py
         self.poll = GLib.Thread.new("poll", self.poll_for_magic_token)
 
     def on_radio_toggled(self, button):
@@ -181,6 +202,13 @@ class DialogUaAttach:
             self.update_state("pin_validated")
         else:
             self.update_state()
+=======
+        self.poll = threading.Thread(target=self.poll_for_magic_token, daemon=True)
+        self.poll.start()
+
+    def on_radio_toggled(self, button):
+        self.update_state()
+>>>>>>> softwareproperties/gtk/DialogUaAttach.py
 
     def on_magic_radio_clicked(self, button):
         self.start_magic_attach()
@@ -197,7 +225,12 @@ class DialogUaAttach:
                 self.start_magic_attach()
             elif self.poll == None:
                 # wait() timed out without internet; Restart polling.
+<<<<<<< softwareproperties/gtk/DialogUaAttach.py
                 self.poll = GLib.Thread.new("poll", self.poll_for_magic_token)
+=======
+                self.poll = threading.Thread(target=self.poll_for_magic_token, daemon=True)
+                self.poll.start()
+>>>>>>> softwareproperties/gtk/DialogUaAttach.py
 
     def finish(self):
         self.dialog.response(Gtk.ResponseType.OK)
diff --git a/softwareproperties/gtk/SoftwarePropertiesGtk.py b/softwareproperties/gtk/SoftwarePropertiesGtk.py
index 0cced00..847f3dc 100644
--- a/softwareproperties/gtk/SoftwarePropertiesGtk.py
+++ b/softwareproperties/gtk/SoftwarePropertiesGtk.py
@@ -46,7 +46,13 @@ gi.require_version("PackageKitGlib", "1.0")
 from gi.repository import PackageKitGlib as packagekit
 from gi.repository import GObject, Gdk, Gtk, Gio, GLib, Handy
 
+<<<<<<< softwareproperties/gtk/SoftwarePropertiesGtk.py
 from aptsources.sourceslist import Deb822SourceEntry
+=======
+import gi
+gi.require_version("Gdk", "3.0")
+from gi.repository import GObject, Gdk, Gtk, Gio, GLib
+>>>>>>> softwareproperties/gtk/SoftwarePropertiesGtk.py
 
 from .SimpleGtkbuilderApp import SimpleGtkbuilderApp
 from .DialogAdd import DialogAdd
@@ -252,9 +258,14 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
         self.show_distro()
         # Setup and show the Additonal Drivers tab
         self.init_drivers()
+<<<<<<< softwareproperties/gtk/SoftwarePropertiesGtk.py
         # Setup and show the Ubuntu Pro tab if the serie is a LTS
         if is_current_distro_lts():
             self.init_ubuntu_pro()
+=======
+        # Setup and show the Ubuntu Pro tab
+        self.init_ubuntu_pro()
+>>>>>>> softwareproperties/gtk/SoftwarePropertiesGtk.py
 
         # Connect to switch-page before setting initial tab. Otherwise the
         # first switch goes unnoticed.
@@ -489,6 +500,57 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
         self.handlers[combobox] = combobox.connect(
             "changed", self.on_combobox_updates_subscription_changed)
 
+        status = get_ua_status()
+        if not is_current_distro_lts():
+                esm_available = False
+                esm_enabled = False
+        else:
+                (infra_available, infra_status) = get_ua_service_status("esm-infra", status=status)
+                (apps_available, apps_status) = get_ua_service_status("esm-apps", status=status)
+                esm_available = bool(infra_available or apps_available)
+                esm_enabled = "enabled" in (infra_status, apps_status)
+        distro = current_distro()
+        if esm_enabled:
+                eol_text = _("Extended Security Maintenance")
+                # EOL date should probably be UA contract expiry.
+                # This is probably sooner than ESM EOL for the distro and
+                # gives software properties dialogs a chance to interact about
+                # renewals if needed.
+                try:
+                        # Ignore timezone to simplify formatting python < 3.7
+                        # 3.7 has datetime.fromisoformat()
+                        dt, _sep, _tz = status.get("expires", "").partition("+")
+                        eol_date = datetime.datetime.strptime(
+                            dt, "%Y-%m-%dT%H:%M:%S"
+                        ).date()
+                except ValueError:
+                        print("Unable to determine UA contract expiry")
+                        eol_date = distro.eol
+        else:
+                eol_text = _("Basic Security Maintenance")
+                eol_date = distro.eol
+        self.label_esm_status.set_markup(eol_text)
+        esm_url = "https://ubuntu.com/esm"  # Non-EOL LTS generic ESM
+        today = datetime.datetime.now().date()
+        if today >= eol_date:
+                if esm_available:
+                        # EOL LTS uses release-specific ESM ubuntu.com/XX-YY
+                        distro_ver = distro.version.replace(' LTS', '')
+                        esm_url = "https://ubuntu.com/%s" % distro_ver.replace(".", "-")
+                eol_expiry_text = _("Ended %s - extend or upgrade now") % eol_date.strftime("%x")
+        elif today >= eol_date - datetime.timedelta(days=60):
+                eol_expiry_text = _("Ends %s - extend or upgrade soon") % eol_date.strftime("%x")
+        else:
+                eol_expiry_text = _("Active until %s") % eol_date.strftime("%x")
+        self.label_eol.set_label(eol_expiry_text)
+        self.label_esm_subscribe.set_markup(
+                "<a href=\"%s\">%s</a>" % (esm_url, _("Extend…"))
+        )
+        self.label_esm_subscribe.set_visible(
+                esm_available and not esm_enabled
+        )
+        eol_expiry_text = _("Ended %s") % eol_date.strftime("%x")
+
         # setup the server chooser
         cell = Gtk.CellRendererText()
         self.combobox_server.pack_start(cell, True)
@@ -1281,6 +1343,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
 
         self.cancellable = Gio.Cancellable()
         try:
+<<<<<<< softwareproperties/gtk/SoftwarePropertiesGtk.py
             if removals:
                 installs_pending = False
                 if installs:
@@ -1308,6 +1371,16 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
                         False  # ready data
                  )
 
+=======
+            self.transaction = self.apt_client.commit_packages(install=installs, remove=removals,
+                                                               reinstall=[], purge=[], upgrade=[], downgrade=[])
+            self.transaction.connect("progress-changed", self.on_driver_changes_progress)
+            self.transaction.connect("cancellable-changed", self.on_driver_changes_cancellable_changed)
+            self.transaction.connect("finished", self.on_driver_changes_finish)
+            self.transaction.connect("error", self.on_driver_changes_error)
+            self.transaction.set_debconf_frontend("gnome")
+            self.transaction.run()
+>>>>>>> softwareproperties/gtk/SoftwarePropertiesGtk.py
             self.button_driver_revert.set_sensitive(False)
             self.button_driver_apply.set_sensitive(False)
             self.scrolled_window_drivers.set_sensitive(False)
@@ -1425,6 +1498,7 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
             return
 
         pkg = None
+<<<<<<< softwareproperties/gtk/SoftwarePropertiesGtk.py
         if pkg_name:
             pkg = self.apt_cache[pkg_name]
             # Add the matching linux modules package when available
@@ -1435,6 +1509,24 @@ class SoftwarePropertiesGtk(SoftwareProperties, SimpleGtkbuilderApp):
                     self.driver_changes.append(modules_package_obj)
             except (KeyError, TypeError):
                 pass
+=======
+        try:
+            if pkg_name:
+                pkg = self.apt_cache[pkg_name]
+                # If the package depends on dkms
+                # we need to install the correct linux metapackage
+                # so that users get the latest headers
+                if 'dkms' in pkg.candidate.record['Depends']:
+                    linux_meta = detect.get_linux(self.apt_cache)
+                    if (linux_meta and
+                        linux_meta not in self.driver_changes):
+                        # Install the linux metapackage
+                        lmp = self.apt_cache[linux_meta]
+                        if not lmp.is_installed:
+                            self.driver_changes.append(lmp)
+        except (AttributeError, KeyError):
+            pass
+>>>>>>> softwareproperties/gtk/SoftwarePropertiesGtk.py
 
         if button.get_active():
             if pkg in self.driver_changes:
diff --git a/softwareproperties/gtk/UbuntuProPage.py b/softwareproperties/gtk/UbuntuProPage.py
index 113fed0..4cf4cf4 100644
--- a/softwareproperties/gtk/UbuntuProPage.py
+++ b/softwareproperties/gtk/UbuntuProPage.py
@@ -22,7 +22,11 @@ from gettext import gettext as _
 import gi
 gi.require_version("Gtk", "3.0")
 from gi.repository import GdkPixbuf, Gio, Gtk
+<<<<<<< softwareproperties/gtk/UbuntuProPage.py
 from softwareproperties.gtk.utils import current_distro, is_dark_theme
+=======
+from softwareproperties.gtk.utils import current_distro
+>>>>>>> softwareproperties/gtk/UbuntuProPage.py
 
 from .DialogUaAttach import DialogUaAttach
 from .DialogUaDetach import DialogUaDetach
@@ -77,6 +81,7 @@ class UbuntuProPage(object):
         self.label_ua_usg_status = parent.label_ua_usg_status
         self.label_ua_usg_description = parent.label_ua_usg_description
 
+<<<<<<< softwareproperties/gtk/UbuntuProPage.py
         if is_dark_theme(self.stack_ua_attach):
             ubuntu_pro_logo = GdkPixbuf.Pixbuf.new_from_file_at_scale(os.path.join(parent.datadir, 'ubuntu-pro-logo-dark.svg'), -1, 50, True)
         else:
@@ -86,6 +91,11 @@ class UbuntuProPage(object):
         # Display the tab on init which is only on LTS series
         self.stack_ua_main.set_visible(True)
 
+=======
+        ubuntu_pro_logo = GdkPixbuf.Pixbuf.new_from_file_at_scale(os.path.join(parent.datadir, 'ubuntu-pro-logo.svg'), -1, 50, True)
+        parent.image_ubuntu_pro_logo.set_from_pixbuf(ubuntu_pro_logo)
+
+>>>>>>> softwareproperties/gtk/UbuntuProPage.py
         parent.button_ua_attach.connect('clicked', self.on_button_ua_attach_clicked)
         parent.button_ua_detach.connect('clicked', self.on_button_ua_detach_clicked)
         self.on_ua_esm_infra_changed_handler = self.switch_ua_esm_infra.connect('notify::active', self.on_ua_esm_infra_changed)
diff --git a/softwareproperties/gtk/utils.py b/softwareproperties/gtk/utils.py
index 6f67f33..d7c7995 100644
--- a/softwareproperties/gtk/utils.py
+++ b/softwareproperties/gtk/utils.py
@@ -28,11 +28,24 @@ import json
 import os
 import subprocess
 
+<<<<<<< softwareproperties/gtk/utils.py
 import logging
 LOG=logging.getLogger(__name__)
 
 import time
 
+=======
+from gi.repository import Gtk
+import aptsources.distro
+import distro_info
+import json
+import os
+import subprocess
+
+import logging
+LOG=logging.getLogger(__name__)
+
+>>>>>>> softwareproperties/gtk/utils.py
 UA_STATUS_JSON = "/var/lib/ubuntu-advantage/status.json"
 
 def setup_ui(self, path, domain):
@@ -47,6 +60,7 @@ def setup_ui(self, path, domain):
             setattr(self, name, o)
         else:
             logging.debug("can not get name for object '%s'" % o)
+<<<<<<< softwareproperties/gtk/utils.py
 
 def has_gnome_online_accounts():
     try:
@@ -55,16 +69,21 @@ def has_gnome_online_accounts():
     except Exception:
         return False
 
+=======
+>>>>>>> softwareproperties/gtk/utils.py
 def is_current_distro_lts():
     distro = aptsources.distro.get_distro()
     di = distro_info.UbuntuDistroInfo()
     return di.is_lts(distro.codename)
 
+<<<<<<< softwareproperties/gtk/utils.py
 def is_current_distro_supported():
     distro = aptsources.distro.get_distro()
     di = distro_info.UbuntuDistroInfo()
     return distro.codename in di.supported(datetime.now().date())
 
+=======
+>>>>>>> softwareproperties/gtk/utils.py
 def current_distro():
     distro = aptsources.distro.get_distro()
     di = distro_info.UbuntuDistroInfo()
@@ -100,7 +119,12 @@ def get_ua_status():
                 "Ubuntu Advantage client returned code %d" % result.returncode
             )
             return {}
+<<<<<<< softwareproperties/gtk/utils.py
         status_json = result.stdout
+=======
+        # result.stdout is type bytes, but json.loads only accepts str in <3.6.
+        status_json = result.stdout.decode('utf-8')
+>>>>>>> softwareproperties/gtk/utils.py
     if not status_json:
         print(
             "Warning: no Ubuntu Advantage status found."
@@ -146,6 +170,7 @@ def get_ua_service_status(service_name='esm-infra', status=None):
         if "status" in service:
             service_status = service["status"]  # enabled, disabled or n/a
     return (available, service_status)
+<<<<<<< softwareproperties/gtk/utils.py
 
 
 def retry(exceptions, tries=10, delay=0.1, backoff=2):
@@ -185,3 +210,5 @@ def is_dark_theme(widget):
     if env_gtk_theme != None:
         return GLib.str_has_suffix(env_gtk_theme, "dark")
     return Handy.StyleManager.get_default().get_dark()
+=======
+>>>>>>> softwareproperties/gtk/utils.py
diff --git a/softwareproperties/ppa.py b/softwareproperties/ppa.py
index 4ec6cb2..8b4cfff 100644
--- a/softwareproperties/ppa.py
+++ b/softwareproperties/ppa.py
@@ -25,6 +25,7 @@ from gettext import gettext as _
 from launchpadlib.launchpad import Launchpad
 from lazr.restfulclient.errors import (NotFound, BadRequest, Unauthorized)
 
+<<<<<<< softwareproperties/ppa.py
 from softwareproperties.shortcuthandler import (ShortcutHandler, ShortcutException,
                                                 InvalidShortcutException)
 from softwareproperties.sourceslist import SourcesListShortcutHandler
@@ -182,8 +183,208 @@ class PPAShortcutHandler(ShortcutHandler):
     def _match_ppa(self, shortcut):
         (prefix, _, ppa) = shortcut.rpartition(':')
         if not prefix.lower() == 'ppa':
+=======
+from gettext import gettext as _
+from threading import Thread
+
+from softwareproperties.shortcuts import ShortcutException
+
+try:
+    import urllib.request
+    from urllib.error import HTTPError, URLError
+    import urllib.parse
+    from http.client import HTTPException
+    NEED_PYCURL = False
+except ImportError:
+    NEED_PYCURL = True
+    import pycurl
+    HTTPError = pycurl.error
+
+
+DEFAULT_KEYSERVER = "hkp://keyserver.ubuntu.com:80/"
+# maintained until 2015
+LAUNCHPAD_PPA_API = 'https://launchpad.net/api/1.0/%s/+archive/%s'
+LAUNCHPAD_USER_API = 'https://launchpad.net/api/1.0/%s'
+LAUNCHPAD_USER_PPAS_API = 'https://launchpad.net/api/1.0/%s/ppas'
+LAUNCHPAD_DISTRIBUTION_API = 'https://launchpad.net/api/1.0/%s'
+LAUNCHPAD_DISTRIBUTION_SERIES_API = 'https://launchpad.net/api/1.0/%s/%s'
+# Specify to use the system default SSL store; change to a different path
+# to test with custom certificates.
+LAUNCHPAD_PPA_CERT = "/etc/ssl/certs/ca-certificates.crt"
+
+
+class CurlCallback:
+    def __init__(self):
+        self.contents = ''
+
+    def body_callback(self, buf):
+        self.contents = self.contents + buf
+
+
+class PPAException(Exception):
+
+    def __init__(self, value, original_error=None):
+        self.value = value
+        self.original_error = original_error
+
+    def __str__(self):
+        return repr(self.value)
+
+
+def encode(s):
+    return re.sub("[^a-zA-Z0-9_-]", "_", s)
+
+def get_info_from_lp(lp_url):
+    if NEED_PYCURL:
+        # python2 has no cert verification so we need pycurl
+        return _get_https_content_pycurl(lp_url)
+    else:
+        # python3 has cert verification so we can use the buildin urllib
+        return _get_https_content_py3(lp_url)
+
+def get_ppa_info_from_lp(owner_name, ppa):
+    lp_url = LAUNCHPAD_PPA_API % (owner_name, ppa)
+    return get_info_from_lp(lp_url)
+
+def series_valid_for_distro(distribution, series):
+    lp_url = LAUNCHPAD_DISTRIBUTION_SERIES_API % (distribution, series)
+    try:
+        get_info_from_lp(lp_url)
+        return True
+    except PPAException:
+        return False
+
+def get_current_series_from_lp(distribution):
+    lp_url = LAUNCHPAD_DISTRIBUTION_API % distribution
+    return os.path.basename(get_info_from_lp(lp_url)["current_series_link"])
+
+
+def _get_https_content_py3(lp_url):
+    try:
+        request = urllib.request.Request(str(lp_url), headers={"Accept":" application/json"})
+        lp_page = urllib.request.urlopen(request, cafile=LAUNCHPAD_PPA_CERT)
+        json_data = lp_page.read().decode("utf-8", "strict")
+    except (URLError, HTTPException) as e:
+        # HTTPException doesn't have a reason but might have a string
+        # representation
+        reason = hasattr(e, "reason") and e.reason or e
+        raise PPAException("Error reading %s: %s" % (lp_url, reason), e)
+    return json.loads(json_data)
+
+def _get_https_content_pycurl(lp_url):
+    # this is the fallback code for python2
+    try:
+        callback = CurlCallback()
+        curl = pycurl.Curl()
+        curl.setopt(pycurl.SSL_VERIFYPEER, 1)
+        curl.setopt(pycurl.SSL_VERIFYHOST, 2)
+        curl.setopt(pycurl.WRITEFUNCTION, callback.body_callback)
+        if LAUNCHPAD_PPA_CERT:
+            curl.setopt(pycurl.CAINFO, LAUNCHPAD_PPA_CERT)
+        curl.setopt(pycurl.URL, str(lp_url))
+        curl.setopt(pycurl.HTTPHEADER, ["Accept: application/json"])
+        curl.perform()
+        curl.close()
+        json_data = callback.contents
+    except pycurl.error as e:
+        raise PPAException("Error reading %s: %s" % (lp_url, e), e)
+    return json.loads(json_data)
+
+
+def mangle_ppa_shortcut(shortcut):
+    ppa_shortcut = shortcut.split(":")[1]
+    if ppa_shortcut.startswith("/"):
+        ppa_shortcut = ppa_shortcut.lstrip("/")
+    user = ppa_shortcut.split("/")[0]
+    if (user[0] == "~"):
+        user = user[1:]
+    ppa_path_objs = ppa_shortcut.split("/")[1:]
+    ppa_path = []
+    if (len(ppa_path_objs) < 1):
+        ppa_path = ['ubuntu', 'ppa']
+    elif (len(ppa_path_objs) == 1):
+        ppa_path.insert(0, "ubuntu")
+        ppa_path.extend(ppa_path_objs)
+    else:
+        ppa_path = ppa_path_objs
+    ppa = "~%s/%s" % (user, "/".join(ppa_path))
+    return ppa
+
+def verify_keyid_is_v4(signing_key_fingerprint):
+    """Verify that the keyid is a v4 fingerprint with at least 160bit"""
+    return len(signing_key_fingerprint) >= 160/8
+
+
+class AddPPASigningKey(object):
+    " thread class for adding the signing key in the background "
+
+    GPG_DEFAULT_OPTIONS = ["gpg", "--no-default-keyring", "--no-options"]
+
+    def __init__(self, ppa_path, keyserver=None):
+        self.ppa_path = ppa_path
+        self.keyserver = (keyserver if keyserver is not None
+                          else DEFAULT_KEYSERVER)
+
+    def _recv_key(self, keyring, secret_keyring, signing_key_fingerprint, keyring_dir):
+        try:
+            # double check that the signing key is a v4 fingerprint (160bit)
+            if not verify_keyid_is_v4(signing_key_fingerprint):
+                print("Error: signing key fingerprint '%s' too short" %
+                    signing_key_fingerprint)
+                return False
+        except TypeError:
+            print("Error: signing key fingerprint does not exist")
             return False
+        # then get it
+        res = subprocess.call(self.GPG_DEFAULT_OPTIONS + [
+            "--homedir", keyring_dir,
+            "--secret-keyring", secret_keyring,
+            "--keyring", keyring,
+            "--keyserver", self.keyserver,
+            "--recv", signing_key_fingerprint,
+            ])
+        return (res == 0)
+
+    def _export_key(self, keyring, export_keyring, signing_key_fingerprint, keyring_dir):
+        res = subprocess.call(self.GPG_DEFAULT_OPTIONS + [
+          "--homedir", keyring_dir,
+          "--keyring", keyring,
+          "--output", export_keyring,
+          "--export", signing_key_fingerprint,
+          ])
+        if res != 0:
+            return False
+        return True
 
+    def _get_fingerprints(self, keyring, keyring_dir):
+        cmd = self.GPG_DEFAULT_OPTIONS + [
+          "--homedir", keyring_dir,
+          "--keyring", keyring,
+          "--fingerprint",
+          "--batch",
+          "--with-colons",
+          ]
+        output = subprocess.check_output(cmd, universal_newlines=True)
+        fingerprints = []
+        for line in output.splitlines():
+            if line.startswith("fpr:"):
+                fingerprints.append(line.split(":")[9])
+        return fingerprints
+
+    def _verify_fingerprint(self, keyring, expected_fingerprint, keyring_dir):
+        got_fingerprints = self._get_fingerprints(keyring, keyring_dir)
+        if len(got_fingerprints) > 1:
+            print("Got '%s' fingerprints, expected only one" %
+                  len(got_fingerprints))
+            return False
+        got_fingerprint = got_fingerprints[0]
+        if got_fingerprint != expected_fingerprint:
+            print("Fingerprints do not match, not importing: '%s' != '%s'" % (
+                    expected_fingerprint, got_fingerprint))
+>>>>>>> softwareproperties/ppa.py
+            return False
+
+<<<<<<< softwareproperties/ppa.py
         (teamname, _, ppaname) = ppa.partition('/')
         teamname = teamname.lstrip('~')
         if '/' in ppaname:
@@ -194,6 +395,16 @@ class PPAShortcutHandler(ShortcutHandler):
             if '/' in ppaname:
                 # Path is too long for valid ppa
                 return False
+=======
+    def add_ppa_signing_key(self, ppa_path=None):
+        """Query and add the corresponding PPA signing key.
+
+        The signing key fingerprint is obtained from the Launchpad PPA page,
+        via a secure channel, so it can be trusted.
+        """
+        if ppa_path is None:
+            ppa_path = self.ppa_path
+>>>>>>> softwareproperties/ppa.py
 
         self.teamname = teamname
         self.ppaname = ppaname or 'ppa'
@@ -221,8 +432,135 @@ class PPAShortcutHandler(ShortcutHandler):
         path = parsed.path.strip().strip('/').split('/')
         if len(path) < 2:
             return False
+<<<<<<< softwareproperties/ppa.py
         self.teamname = path[0]
         self.ppaname = path[1]
+=======
+        # and add it
+        trustedgpgd = apt_pkg.config.find_dir("Dir::Etc::trustedparts")
+        apt_keyring = os.path.join(trustedgpgd, "%s.gpg" % (
+            encode(ppa_info["reference"][1:])))
+        res = subprocess.call(["apt-key", "--keyring", apt_keyring, "add",
+            tmp_keyring])
+        # cleanup
+        cleanup(tmp_keyring_dir)
+        return (res == 0)
+
+
+class AddPPASigningKeyThread(Thread, AddPPASigningKey):
+    # This class is legacy.  There are no users inside the software-properties
+    # codebase other than a test case.  It was left in case there were outside
+    # users.  Internally, we've changed from having a class implement the
+    # tread to explicitly launching a thread and invoking a method in it
+    # see check_and_add_key_for_whitelisted_shortcut for how.
+    def __init__(self, ppa_path, keyserver=None):
+        Thread.__init__(self)
+        AddPPASigningKey.__init__(self, ppa_path=ppa_path, keyserver=keyserver)
+
+    def run(self):
+        self.add_ppa_signing_key(self.ppa_path)
+
+
+def _get_suggested_ppa_message(user, ppa_name):
+    try:
+        msg = []
+        try:
+            try:
+                lp_user = get_info_from_lp(LAUNCHPAD_USER_API % user)
+            except PPAException:
+                return _("ERROR: '{user}' user or team does not exist.").format(user=user)
+            lp_ppas = get_info_from_lp(LAUNCHPAD_USER_PPAS_API % user)
+            entity_name = _("team") if lp_user["is_team"] else _("user")
+            if lp_ppas["total_size"] > 0:
+                # Translators: %(entity)s is either "team" or "user"
+                msg.append(_("The %(entity)s named '%(user)s' has no PPA named '%(ppa)s'") % {
+                        'entity' : entity_name,
+                         'user' : user,
+                         'ppa' : ppa_name})
+                msg.append(_("Please choose from the following available PPAs:"))
+                for ppa in lp_ppas["entries"]:
+                    msg.append(_(" * '%(name)s':  %(displayname)s") % {
+                                 'name' : ppa["name"],
+                                 'displayname' : ppa["displayname"]})
+            else:
+                # Translators: %(entity)s is either "team" or "user"
+                msg.append(_("The %(entity)s named '%(user)s' does not have any PPA") % {
+                             'entity' : entity_name, 'user' : user})
+            return '\n'.join(msg)
+        except KeyError:
+            return ''
+    except ImportError:
+        return _("Please check that the PPA name or format is correct.")
+
+
+def get_ppa_info(shortcut):
+    user = shortcut.split("/")[0]
+    ppa = "/".join(shortcut.split("/")[1:])
+    try:
+        ret = get_ppa_info_from_lp(user, ppa)
+        ret["distribution"] = ret["distribution_link"].split('/')[-1]
+        ret["owner"] = ret["owner_link"].split('/')[-1]
+        return ret
+    except (HTTPError, Exception):
+        msg = []
+        msg.append(_("Cannot add PPA: 'ppa:%s/%s'.") % (
+            user, ppa))
+
+        # If the PPA does not exist, then try to find if the user/team
+        # exists. If it exists, list down the PPAs
+        raise ShortcutException('\n'.join(msg) + "\n" +
+                                _get_suggested_ppa_message(user, ppa))
+
+    except (ValueError, PPAException):
+        raise ShortcutException(
+            _("Cannot access PPA (%s) to get PPA information, "
+              "please check your internet connection.") % \
+              (LAUNCHPAD_PPA_API % (user, ppa)))
+
+
+class PPAShortcutHandler(object):
+    def __init__(self, shortcut):
+        super(PPAShortcutHandler, self).__init__()
+        try:
+            self.shortcut = mangle_ppa_shortcut(shortcut)
+        except:
+            raise ShortcutException(_("ERROR: '{shortcut}' is not a valid ppa format")
+                                      .format(shortcut=shortcut))
+        info = get_ppa_info(self.shortcut)
+
+        if "private" in info and info["private"]:
+            raise ShortcutException(
+                _("Adding private PPAs is not supported currently"))
+
+        self._info = info
+
+    def info(self):
+        return self._info
+
+    def expand(self, codename, distro=None):
+        if (distro is not None
+                and distro != self._info["distribution"]
+                and not series_valid_for_distro(self._info["distribution"], codename)):
+            # The requested PPA is for a foreign distribution.  Guess that
+            # the user wants that distribution's current series.
+            # This only applies if the local distribution is not the same
+            # distribution the remote PPA is associated with AND the local
+            # codename is not equal to the PPA's series.
+            # e.g. local:Foobar/xenial and ppa:Ubuntu/xenial will use 'xenial'
+            #      local:Foobar/fluffy and ppa:Ubuntu/xenial will use '$latest'
+            codename = get_current_series_from_lp(self._info["distribution"])
+        debline = "deb http://ppa.launchpad.net/%s/%s/%s %s main" % (
+            self._info["owner"][1:], self._info["name"],
+            self._info["distribution"], codename)
+        sourceslistd = apt_pkg.config.find_dir("Dir::Etc::sourceparts")
+        filename = os.path.join(sourceslistd, "%s-%s-%s-%s.list" % (
+            encode(self._info["owner"][1:]), encode(self._info["distribution"]),
+            encode(self._info["name"]), codename))
+        return (debline, filename)
+
+    def should_confirm(self):
+        return True
+>>>>>>> softwareproperties/ppa.py
 
         self._username = handler.username
         self._password = handler.password
@@ -230,9 +568,16 @@ class PPAShortcutHandler(ShortcutHandler):
         self._set_source_entry(handler.SourceEntry().line)
         return True
 
+<<<<<<< softwareproperties/ppa.py
     def _set_auth(self):
         if self._lp_anon or not self.lpppa.private:
             return
+=======
+def shortcut_handler(shortcut):
+    if not shortcut.startswith("ppa:"):
+        return None
+    return PPAShortcutHandler(shortcut)
+>>>>>>> softwareproperties/ppa.py
 
         if self._username and self._password:
             return
diff --git a/softwareproperties/shortcuts.py b/softwareproperties/shortcuts.py
index a6bc034..f0f81cc 100644
--- a/softwareproperties/shortcuts.py
+++ b/softwareproperties/shortcuts.py
@@ -33,6 +33,11 @@ SHORTCUT_HANDLERS = [
     URIShortcutHandler,
 ]
 
+<<<<<<< softwareproperties/shortcuts.py
+=======
+    def add_key(self, keyserver=None):
+        return True
+>>>>>>> softwareproperties/shortcuts.py
 
 def shortcut_handler(shortcut, **kwargs):
     for handler in SHORTCUT_HANDLERS:
diff --git a/tests/test_shortcuts.py b/tests/test_shortcuts.py
index f518d69..80f81bb 100644
--- a/tests/test_shortcuts.py
+++ b/tests/test_shortcuts.py
@@ -5,6 +5,7 @@ import apt
 from functools import partial
 import unittest
 import sys
+<<<<<<< tests/test_shortcuts.py
 import os
 
 from aptsources.distro import get_distro
@@ -115,7 +116,31 @@ def mock_login_with(*args, **kwargs):
 
     lp.people = mock_people
     return lp
+=======
+try:
+    from urllib.request import urlopen
+    from urllib.error import HTTPError, URLError
+except ImportError:
+    from urllib2 import HTTPError, URLError, urlopen
+try:
+    from http.client import HTTPException
+except ImportError:
+    from httplib import HTTPException
 
+sys.path.insert(0, "..")
+
+from softwareproperties.SoftwareProperties import shortcut_handler
+from softwareproperties.shortcuts import ShortcutException
+from mock import patch
+>>>>>>> tests/test_shortcuts.py
+
+def has_network():
+    try:
+        network = urlopen("https://launchpad.net/")
+        network
+    except (URLError, HTTPException):
+        return False
+    return True
 
 class ShortcutsTestcase(unittest.TestCase):
     enable_source = False
@@ -138,6 +163,7 @@ class ShortcutsTestcase(unittest.TestCase):
     def create_handler(self, line, handler, *args, **kwargs):
         return handler(line, *args, enable_source=self.enable_source, **kwargs)
 
+<<<<<<< tests/test_shortcuts.py
     def create_handlers(self, line, handler, *args, **kwargs):
         handlers = handler if isinstance(handler, list) else [handler]
         # note, always appends shortcut_handler
@@ -205,6 +231,8 @@ class ShortcutsTestcase(unittest.TestCase):
             for shortcut in self.create_handlers(uri, URIShortcutHandler):
                 self.check_shortcut(shortcut, line, sourcefile=URI_SOURCEFILE)
 
+=======
+>>>>>>> tests/test_shortcuts.py
     @unittest.skipUnless(has_network(), "requires network")
     def test_shortcut_ppa(self):
         for ppa in VALID_PPAS:
@@ -249,7 +277,9 @@ class ShortcutsTestcase(unittest.TestCase):
             else:
                 os.environ.pop(key, None)
 
+    @unittest.skipUnless(has_network(), "requires network")
     def test_shortcut_cloudarchive(self):
+<<<<<<< tests/test_shortcuts.py
         for uca in VALID_UCAS:
             line = UCA_LINE_PROPOSED if 'proposed' in uca else UCA_LINE
             with self.ca_allow_codename(CODENAME):
@@ -276,6 +306,22 @@ class ShortcutsTestcase(unittest.TestCase):
 
 class EnableSourceShortcutsTestcase(ShortcutsTestcase):
     enable_source = True
+=======
+        line = "cloud-archive:folsom"
+        handler = shortcut_handler(line)
+        self.assertEqual(
+            ('deb http://ubuntu-cloud.archive.canonical.com/ubuntu '\
+             'precise-updates/folsom main',
+             '/etc/apt/sources.list.d/cloudarchive-folsom.list'),
+            handler.expand("precise", distro="ubuntu"))
+
+    def test_shortcut_exception(self):
+        with self.assertRaises(ShortcutException):
+            with patch('softwareproperties.ppa.get_ppa_info_from_lp',
+                       side_effect=lambda *args: HTTPError("url", 404, "not found", [], None)):
+                shortcut_handler("ppa:mvo")
+
+>>>>>>> tests/test_shortcuts.py
 
 
 if __name__ == "__main__":