diff -Nru gnome-software-3.22.2+git20161108.0.a58dfc7/debian/changelog gnome-software-3.22.2+git20161108.0.a58dfc7/debian/changelog --- gnome-software-3.22.2+git20161108.0.a58dfc7/debian/changelog 2016-11-18 22:33:55.000000000 +0000 +++ gnome-software-3.22.2+git20161108.0.a58dfc7/debian/changelog 2016-11-23 21:30:45.000000000 +0000 @@ -1,3 +1,10 @@ +gnome-software (3.22.2+git20161108.0.a58dfc7-0ubuntu4) zesty; urgency=medium + + * Fix dh_install-indep rule to actually apply so that the Ubuntu Software + package works correctly + + -- Jeremy Bicha Wed, 23 Nov 2016 16:30:45 -0500 + gnome-software (3.22.2+git20161108.0.a58dfc7-0ubuntu3) zesty; urgency=medium * Fix non-amd64 build diff -Nru gnome-software-3.22.2+git20161108.0.a58dfc7/debian/control gnome-software-3.22.2+git20161108.0.a58dfc7/debian/control --- gnome-software-3.22.2+git20161108.0.a58dfc7/debian/control 2016-11-18 22:33:55.000000000 +0000 +++ gnome-software-3.22.2+git20161108.0.a58dfc7/debian/control 2016-11-23 21:30:45.000000000 +0000 @@ -30,7 +30,7 @@ libjson-glib-dev, liblimba-dev (>= 0.5.6) [linux-any], liboauth-dev, -# libpackagekit-glib2-dev (>= 1.1.4), + libpackagekit-glib2-dev (>= 1.1.4), libpolkit-gobject-1-dev, libsecret-1-dev, libsoup2.4-dev (>= 2.52), @@ -51,7 +51,7 @@ gnome-software-common (= ${source:Version}), gnome-software-plugin-snap [linux-any], gsettings-desktop-schemas (>= 3.18), -# packagekit (>= 1.1.4), + packagekit (>= 1.1.4), software-properties-gtk, ${misc:Depends}, ${shlibs:Depends} diff -Nru gnome-software-3.22.2+git20161108.0.a58dfc7/debian/control.in gnome-software-3.22.2+git20161108.0.a58dfc7/debian/control.in --- gnome-software-3.22.2+git20161108.0.a58dfc7/debian/control.in 2016-11-18 22:33:55.000000000 +0000 +++ gnome-software-3.22.2+git20161108.0.a58dfc7/debian/control.in 2016-11-23 21:30:45.000000000 +0000 @@ -26,7 +26,7 @@ libjson-glib-dev, liblimba-dev (>= 0.5.6) [linux-any], liboauth-dev, -# libpackagekit-glib2-dev (>= 1.1.4), + libpackagekit-glib2-dev (>= 1.1.4), libpolkit-gobject-1-dev, libsecret-1-dev, libsoup2.4-dev (>= 2.52), @@ -47,7 +47,7 @@ gnome-software-common (= ${source:Version}), gnome-software-plugin-snap [linux-any], gsettings-desktop-schemas (>= 3.18), -# packagekit (>= 1.1.4), + packagekit (>= 1.1.4), software-properties-gtk, ${misc:Depends}, ${shlibs:Depends} diff -Nru gnome-software-3.22.2+git20161108.0.a58dfc7/debian/patches/flatpak.patch gnome-software-3.22.2+git20161108.0.a58dfc7/debian/patches/flatpak.patch --- gnome-software-3.22.2+git20161108.0.a58dfc7/debian/patches/flatpak.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.22.2+git20161108.0.a58dfc7/debian/patches/flatpak.patch 2016-11-23 21:30:45.000000000 +0000 @@ -0,0 +1,80 @@ +From 4a79c4ed1afd6e1a433973c72f152f85374e7415 Mon Sep 17 00:00:00 2001 +From: Richard Hughes +Date: Tue, 15 Nov 2016 12:52:26 +0000 +Subject: Never crash when the flatpak origin is NULL + +I'm not completely sure how this can happen, but it's something to do with a +failed flatpak install happening before the refine operation. + +Either way, checking the value before we pass it to libflatpak is probably a +good idea. +--- + src/plugins/gs-flatpak.c | 33 +++++++++++++++++++++++++++++++++ + 1 file changed, 33 insertions(+) + +diff --git a/src/plugins/gs-flatpak.c b/src/plugins/gs-flatpak.c +index 7e97625..616e1ee 100644 +--- a/src/plugins/gs-flatpak.c ++++ b/src/plugins/gs-flatpak.c +@@ -1025,6 +1025,10 @@ gs_plugin_refine_item_origin_hostname (GsFlatpak *self, GsApp *app, + if (gs_app_get_origin_hostname (app) != NULL) + return TRUE; + ++ /* no origin */ ++ if (gs_app_get_origin (app) == NULL) ++ return TRUE; ++ + /* get the remote */ + xremote = flatpak_installation_get_remote_by_name (self->installation, + gs_app_get_origin (app), +@@ -1470,6 +1474,16 @@ gs_plugin_refine_item_metadata (GsFlatpak *self, + } else { + g_autoptr(FlatpakRef) xref = NULL; + ++ /* no origin */ ++ if (gs_app_get_origin (app) == NULL) { ++ g_set_error (error, ++ GS_PLUGIN_ERROR, ++ GS_PLUGIN_ERROR_NOT_SUPPORTED, ++ "no origin set for %s", ++ gs_app_get_unique_id (app)); ++ return FALSE; ++ } ++ + /* fetch from the server */ + xref = gs_flatpak_create_fake_ref (app, error); + if (xref == NULL) +@@ -1584,6 +1598,16 @@ gs_plugin_refine_item_size (GsFlatpak *self, + } else { + g_autoptr(FlatpakRef) xref = NULL; + g_autoptr(GError) error_local = NULL; ++ ++ /* no origin */ ++ if (gs_app_get_origin (app) == NULL) { ++ g_set_error (error, ++ GS_PLUGIN_ERROR, ++ GS_PLUGIN_ERROR_NOT_SUPPORTED, ++ "no origin set for %s", ++ gs_app_get_unique_id (app)); ++ return FALSE; ++ } + xref = gs_flatpak_create_fake_ref (app, error); + if (xref == NULL) + return FALSE; +@@ -1952,6 +1976,15 @@ gs_flatpak_app_install (GsFlatpak *self, + app, + cancellable, error); + } else { ++ /* no origin */ ++ if (gs_app_get_origin (app) == NULL) { ++ g_set_error (error, ++ GS_PLUGIN_ERROR, ++ GS_PLUGIN_ERROR_NOT_SUPPORTED, ++ "no origin set for %s", ++ gs_app_get_unique_id (app)); ++ return FALSE; ++ } + g_debug ("installing %s", gs_app_get_id (app)); + xref = flatpak_installation_install (self->installation, + gs_app_get_origin (app), + diff -Nru gnome-software-3.22.2+git20161108.0.a58dfc7/debian/patches/series gnome-software-3.22.2+git20161108.0.a58dfc7/debian/patches/series --- gnome-software-3.22.2+git20161108.0.a58dfc7/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.22.2+git20161108.0.a58dfc7/debian/patches/series 2016-11-23 21:30:45.000000000 +0000 @@ -0,0 +1 @@ +flatpak.patch diff -Nru gnome-software-3.22.2+git20161108.0.a58dfc7/debian/rules gnome-software-3.22.2+git20161108.0.a58dfc7/debian/rules --- gnome-software-3.22.2+git20161108.0.a58dfc7/debian/rules 2016-11-18 22:33:55.000000000 +0000 +++ gnome-software-3.22.2+git20161108.0.a58dfc7/debian/rules 2016-11-23 21:30:45.000000000 +0000 @@ -52,7 +52,7 @@ sed -i 's/@URL@/$(FREE_URL)/g' debian/gnome-software.gsettings-override dh_installgsettings -override_dh_install: +override_dh_install-arch: # Remove unused files rm -f debian/tmp/usr/lib/gs-plugins-*/*.a rm -f debian/tmp/usr/lib/gs-plugins-*/*.la @@ -67,6 +67,8 @@ override_dh_install-indep: # Change the name and icon for Unity sessions + # Also needs override_dh_install renamed to override_dh_install-arch + dh_install sed -i 's/Name=Software/Name=Ubuntu Software/' debian/ubuntu-software/usr/share/ubuntu/applications/org.gnome.Software.desktop sed -i 's/Icon=org.gnome.Software/Icon=ubuntusoftware/' debian/ubuntu-software/usr/share/ubuntu/applications/org.gnome.Software.desktop