From ff56a598f60df8c42807fffc856086144dd94d69 Mon Sep 17 00:00:00 2001
From: Jeremy Bicha <jbicha@ubuntu.com>
Date: Sat, 22 Oct 2016 13:02:45 -0400
Subject: [PATCH] Use software-properties-gtk instead of gpk-prefs to configure
 Sources

Closes: #698336
---
 debian/control                                   |  1 +
 debian/gnome-packagekit.install                  |  3 ---
 debian/patches/series                            |  1 +
 debian/patches/use-software-properties-gtk.patch | 15 +++++++++++++++
 4 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 debian/patches/series
 create mode 100644 debian/patches/use-software-properties-gtk.patch

diff --git a/debian/control b/debian/control
index 5828940..e023843 100644
--- a/debian/control
+++ b/debian/control
@@ -27,6 +27,7 @@ Package: gnome-packagekit
 Architecture: any
 Depends: gnome-packagekit-data (>= ${source:Version}),
          packagekit (>= 1.0.4),
+         software-properties-gtk,
          ${misc:Depends},
          ${shlibs:Depends}
 Replaces: gnome-packagekit-session (<< 3.16.0),
diff --git a/debian/gnome-packagekit.install b/debian/gnome-packagekit.install
index edd4142..96e4dd8 100644
--- a/debian/gnome-packagekit.install
+++ b/debian/gnome-packagekit.install
@@ -1,15 +1,12 @@
 usr/bin/gpk-application
 usr/bin/gpk-log
-usr/bin/gpk-prefs
 usr/bin/gpk-update-viewer
 usr/share/GConf/gsettings/org.gnome.packagekit.gschema.migrate
 usr/share/appdata/*
 usr/share/applications/org.gnome.Packages.desktop
 usr/share/applications/gpk-log.desktop
-usr/share/applications/gpk-prefs.desktop
 usr/share/applications/org.gnome.PackageUpdater.desktop
 usr/share/glib-2.0/schemas/org.gnome.packagekit.gschema.xml
 usr/share/man/man1/gpk-application.1
 usr/share/man/man1/gpk-log.1
-usr/share/man/man1/gpk-prefs.1
 usr/share/man/man1/gpk-update-viewer.1
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8ef6502
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-software-properties-gtk.patch
diff --git a/debian/patches/use-software-properties-gtk.patch b/debian/patches/use-software-properties-gtk.patch
new file mode 100644
index 0000000..f64ffb6
--- /dev/null
+++ b/debian/patches/use-software-properties-gtk.patch
@@ -0,0 +1,15 @@
+Description: Use software-properties-gtk to configure package sources
+Author: Jeremy Bicha <jbicha@ubuntu.com>
+Index: gnome-packagekit-3.21.91/src/gpk-application.c
+===================================================================
+--- gnome-packagekit-3.21.91.orig/src/gpk-application.c
++++ gnome-packagekit-3.21.91/src/gpk-application.c
+@@ -2207,7 +2207,7 @@ gpk_application_activate_sources_cb (GSi
+ 	window = GTK_WIDGET (gtk_builder_get_object (priv->builder, "window_manager"));
+ 	xid = gdk_x11_window_get_xid (gtk_widget_get_window (window));
+ 
+-	command = g_strdup_printf ("%s/gpk-prefs --parent-window %u", BINDIR, xid);
++	command = g_strdup_printf ("%s/software-properties-gtk", BINDIR, xid);
+ 	g_debug ("running: %s", command);
+ 	ret = g_spawn_command_line_async (command, NULL);
+ 	if (!ret)
-- 
2.9.3

