diff --git a/helpers/DATA/software-properties/remove_livepatch_from_gtk_ui.patch b/helpers/DATA/software-properties/remove_livepatch_from_gtk_ui.patch new file mode 100644 index 0000000000000000000000000000000000000000..23200e0592f27ad68e260795ce7e439d6b6d34cc --- /dev/null +++ b/helpers/DATA/software-properties/remove_livepatch_from_gtk_ui.patch @@ -0,0 +1,234 @@ +--- data/gtkbuilder/main.ui 2019-09-08 00:59:05.221188984 -0700 ++++ data/gtkbuilder/main.ui 2019-09-08 00:56:52.294542817 -0700 +@@ -1116,231 +1116,6 @@ + <property name="tab_fill">False</property> + </packing> + </child> +- <child> +- <object class="GtkBox" id="vbox_livepatch"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="border_width">12</property> +- <property name="orientation">vertical</property> +- <property name="spacing">12</property> +- <child> +- <object class="GtkLabel" id="label_livepatch_description"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="label" translatable="yes">Canonical Livepatch helps keep your system secure by applying security updates that don't require a restart. <a href="https://www.ubuntu.com/livepatch">Learn More</a></property> +- <property name="use_markup">True</property> +- <property name="wrap">True</property> +- <property name="max_width_chars">1</property> +- <property name="xalign">0</property> +- </object> +- <packing> +- <property name="expand">False</property> +- <property name="fill">True</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <object class="GtkBox" id="hbox_switch"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="spacing">6</property> +- <child> +- <object class="GtkSwitch" id="switch_livepatch"> +- <property name="visible">True</property> +- <property name="sensitive">False</property> +- <property name="can_focus">True</property> +- </object> +- <packing> +- <property name="expand">False</property> +- <property name="fill">True</property> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <object class="GtkSpinner" id="spinner_livepatch"> +- <property name="can_focus">False</property> +- </object> +- <packing> +- <property name="expand">False</property> +- <property name="fill">True</property> +- <property name="position">1</property> +- </packing> +- </child> +- <child> +- <object class="GtkLabel" id="label_livepatch_switch"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- </object> +- <packing> +- <property name="expand">False</property> +- <property name="fill">True</property> +- <property name="position">2</property> +- </packing> +- </child> +- <child> +- <object class="GtkButton" id="button_livepatch_login"> +- <property name="can_focus">True</property> +- <property name="receives_default">True</property> +- </object> +- <packing> +- <property name="expand">False</property> +- <property name="fill">True</property> +- <property name="pack_type">end</property> +- <property name="position">3</property> +- </packing> +- </child> +- </object> +- <packing> +- <property name="expand">False</property> +- <property name="fill">True</property> +- <property name="position">1</property> +- </packing> +- </child> +- <child> +- <object class="GtkStack" id="stack_livepatch"> +- <property name="can_focus">False</property> +- <property name="transition_type">crossfade</property> +- <property name="interpolate_size">True</property> +- <child> +- <object class="GtkScrolledWindow"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="shadow_type">in</property> +- <child> +- <object class="GtkTextView" id="textview_livepatch"> +- <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="buffer">textbuffer_livepatch</property> +- <property name="accepts_tab">False</property> +- </object> +- </child> +- </object> +- <packing> +- <property name="name">page_livepatch_message</property> +- </packing> +- </child> +- <child> +- <object class="GtkBox"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="orientation">vertical</property> +- <property name="spacing">12</property> +- <child> +- <object class="GtkLabel" id="label_livepatch_last_update"> +- <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> +- <property name="position">0</property> +- </packing> +- </child> +- <child> +- <object class="GtkLabel" id="label_livepatch_header"> +- <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> +- <property name="position">1</property> +- </packing> +- </child> +- <child> +- <object class="GtkScrolledWindow" id="scrolledwindow_livepatch_fixes"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="shadow_type">in</property> +- <child> +- <object class="GtkTreeView" id="treeview_livepatch"> +- <property name="visible">True</property> +- <property name="can_focus">True</property> +- <property name="model">model_livepatch_fixes</property> +- <property name="headers_visible">False</property> +- <property name="enable_search">False</property> +- <property name="show_expanders">False</property> +- <child internal-child="selection"> +- <object class="GtkTreeSelection"/> +- </child> +- <child> +- <object class="GtkTreeViewColumn"> +- <property name="title" translatable="yes">column</property> +- <child> +- <object class="GtkCellRendererText"> +- <property name="width_chars">100</property> +- <property name="wrap_mode">word</property> +- <property name="wrap_width">100</property> +- </object> +- <attributes> +- <attribute name="markup">0</attribute> +- </attributes> +- </child> +- </object> +- </child> +- </object> +- </child> +- </object> +- <packing> +- <property name="expand">True</property> +- <property name="fill">True</property> +- <property name="position">2</property> +- </packing> +- </child> +- </object> +- <packing> +- <property name="name">page_livepatch_status</property> +- <property name="position">1</property> +- </packing> +- </child> +- </object> +- <packing> +- <property name="expand">True</property> +- <property name="fill">True</property> +- <property name="position">2</property> +- </packing> +- </child> +- <child> +- <object class="GtkCheckButton" id="checkbutton_livepatch_topbar"> +- <property name="label" translatable="yes">Show Livepatch status in the top bar</property> +- <property name="visible">True</property> +- <property name="sensitive">False</property> +- <property name="can_focus">True</property> +- <property name="receives_default">False</property> +- <property name="halign">start</property> +- <property name="draw_indicator">True</property> +- </object> +- <packing> +- <property name="expand">False</property> +- <property name="fill">True</property> +- <property name="pack_type">end</property> +- <property name="position">3</property> +- </packing> +- </child> +- </object> +- <packing> +- <property name="position">6</property> +- </packing> +- </child> +- <child type="tab"> +- <object class="GtkLabel" id="label_livepatch"> +- <property name="visible">True</property> +- <property name="can_focus">False</property> +- <property name="label">Livepatch</property> +- </object> +- <packing> +- <property name="position">6</property> +- <property name="tab_fill">False</property> +- </packing> +- </child> + </object> + <packing> + <property name="expand">True</property> diff --git a/helpers/make-software-properties b/helpers/make-software-properties index a2c69930029906621be6b71420a90a00bb16d14c..2b0e654f7b530f2ced6a3f675703f0c5f88aac3c 100644 --- a/helpers/make-software-properties +++ b/helpers/make-software-properties @@ -2,6 +2,7 @@ # # Copyright (C) 2011-2016 Rubén RodrÃguez <ruben@trisquel.info> # Copyright (C) 2011 Carlos Pais <freemind@lavabit.com> +# Copyright (C) 2019 Mason Hock <mason@masonhock.com> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,7 +19,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=1 +VERSION=2 . ./config @@ -62,7 +63,18 @@ sed '/software-properties-drivers/d' -i debian/software-properties-gtk.install s replace "Trisquel-Gettext" "Ubuntu-Gettext" . -changelog "Adapted for Trisquel codenames" +sed '/test_suite/d' -i setup.py +rm -rf tests + +sed '/gir1.2-snapd-1/d' -i debian/control +sed '/self.init_livepatch/d' -i softwareproperties/gtk/SoftwarePropertiesGtk.py +patch -p0 < $DATA/remove_livepatch_from_gtk_ui.patch +sed 's/status = self.get_status()/status = Snapd.SnapStatus.UNKNOWN/' -i softwareproperties/LivepatchSnap.py + +rm data/software-properties-drivers.desktop.in +sed -i '/software-properties-drivers/d' po/POTFILES.in + +changelog "Removed Ubuntu-specifc tests, Livepatch, Snap" compile