diff -pruN 43.3-1/debian/changelog 43.3-1ubuntu1/debian/changelog --- 43.3-1/debian/changelog 2023-01-10 19:14:13.000000000 +0000 +++ 43.3-1ubuntu1/debian/changelog 2023-01-10 19:15:50.000000000 +0000 @@ -1,27 +1,62 @@ +gnome-software (43.3-1ubuntu1) lunar; urgency=medium + + * Merge with Debian. Remaining changes: + - Add patch to disable apt updates (Closes: #787485) (LP: #1992498) + + -- Jeremy Bicha Tue, 10 Jan 2023 14:15:50 -0500 + gnome-software (43.3-1) unstable; urgency=medium * New upstream release -- Jeremy Bicha Tue, 10 Jan 2023 14:14:13 -0500 +gnome-software (43.2-3ubuntu1) lunar; urgency=medium + + * Merge with Debian. Remaining changes: + - Add patch to disable apt updates (Closes: #787485) (LP: #1992498) + + -- Jeremy Bicha Thu, 08 Dec 2022 19:03:22 -0500 + gnome-software (43.2-3) unstable; urgency=medium * Restore explicit Build-Depends on libsoup-3.0-dev -- Jeremy Bicha Thu, 08 Dec 2022 19:02:19 -0500 +gnome-software (43.2-2ubuntu1) lunar; urgency=medium + + * Merge with Debian. Remaining changes: + - Add patch to disable apt updates (Closes: #787485) (LP: #1992498) + + -- Jeremy Bicha Thu, 08 Dec 2022 18:12:55 -0500 + gnome-software (43.2-2) unstable; urgency=medium * Build against snapd-glib 1.63 using libsoup3 -- Jeremy Bicha Thu, 08 Dec 2022 18:11:05 -0500 +gnome-software (43.2-1ubuntu1) lunar; urgency=medium + + * Merge with Debian. Remaining changes: + - Add patch to disable apt updates (Closes: #787485) (LP: #1992498) + + -- Jeremy Bicha Tue, 06 Dec 2022 08:50:41 -0500 + gnome-software (43.2-1) unstable; urgency=medium * New upstream release -- Jeremy Bicha Tue, 06 Dec 2022 08:48:10 -0500 +gnome-software (43.1-2ubuntu1) lunar; urgency=medium + + * Merge with Debian. Remaining changes: + - Add patch to disable apt updates (Closes: #787485) (LP: #1992498) + + -- Jeremy Bicha Wed, 23 Nov 2022 10:51:36 -0500 + gnome-software (43.1-2) unstable; urgency=medium * Restore accidentally dropped 43.0-2 changes @@ -45,6 +80,13 @@ gnome-software (43.0-2) unstable; urgenc -- Simon McVittie Fri, 14 Oct 2022 10:27:33 +0100 +gnome-software (43.0-1ubuntu1) kinetic; urgency=medium + + [ Nathan Pratta Teodosio ] + * Add patch to disable apt updates (Closes: #787485) (LP: #1992498) + + -- Jeremy Bicha Tue, 11 Oct 2022 14:44:58 -0400 + gnome-software (43.0-1) unstable; urgency=medium * New upstream release diff -pruN 43.3-1/debian/control 43.3-1ubuntu1/debian/control --- 43.3-1/debian/control 2023-01-10 19:14:13.000000000 +0000 +++ 43.3-1ubuntu1/debian/control 2023-01-10 19:15:50.000000000 +0000 @@ -5,7 +5,8 @@ Source: gnome-software Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Jeremy Bicha Build-Depends: debhelper-compat (= 13), appstream , diff -pruN 43.3-1/debian/control.in 43.3-1ubuntu1/debian/control.in --- 43.3-1/debian/control.in 2023-01-10 19:14:13.000000000 +0000 +++ 43.3-1ubuntu1/debian/control.in 2023-01-10 19:15:50.000000000 +0000 @@ -1,7 +1,8 @@ Source: gnome-software Section: gnome Priority: optional -Maintainer: Debian GNOME Maintainers +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Build-Depends: debhelper-compat (= 13), appstream , diff -pruN 43.3-1/debian/gbp.conf 43.3-1ubuntu1/debian/gbp.conf --- 43.3-1/debian/gbp.conf 2023-01-10 19:14:13.000000000 +0000 +++ 43.3-1ubuntu1/debian/gbp.conf 2023-01-10 19:15:50.000000000 +0000 @@ -1,6 +1,7 @@ [DEFAULT] pristine-tar = True -debian-branch = debian/master +debian-branch = ubuntu/master +debian-tag = ubuntu/%(version)s upstream-branch = upstream/latest [buildpackage] diff -pruN 43.3-1/debian/patches/no-offline-update-prompt.patch 43.3-1ubuntu1/debian/patches/no-offline-update-prompt.patch --- 43.3-1/debian/patches/no-offline-update-prompt.patch 1970-01-01 00:00:00.000000000 +0000 +++ 43.3-1ubuntu1/debian/patches/no-offline-update-prompt.patch 2023-01-10 19:15:50.000000000 +0000 @@ -0,0 +1,39 @@ +From: Nathan Pratta Teodosio +Date: Tue, 27 Sep 2022 09:42:31 -0300 +Subject: [PATCH] Disable offline updates + +--- + plugins/packagekit/gs-plugin-packagekit.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/plugins/packagekit/gs-plugin-packagekit.c b/plugins/packagekit/gs-plugin-packagekit.c +index 35cc786e8..b83040431 100644 +--- a/plugins/packagekit/gs-plugin-packagekit.c ++++ b/plugins/packagekit/gs-plugin-packagekit.c +@@ -755,6 +755,8 @@ gs_plugin_packagekit_add_updates (GsPlugin *plugin, + GCancellable *cancellable, + GError **error) + { ++ return TRUE; //using unattended-upgrades in Debian and Ubuntu ++ + g_autoptr(GsPackagekitHelper) helper = gs_packagekit_helper_new (plugin); + g_autoptr(PkTask) task_updates = NULL; + g_autoptr(PkResults) results = NULL; +@@ -3683,6 +3685,8 @@ gs_plugin_packagekit_download (GsPlugin *plugin, + GCancellable *cancellable, + GError **error) + { ++ return TRUE; //using unattended-upgrades in Debian and Ubuntu ++ + GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (plugin); + g_autoptr(GsAppList) list_tmp = gs_app_list_new (); + g_autoptr(GError) error_local = NULL; +@@ -3977,6 +3981,8 @@ gs_plugin_update (GsPlugin *plugin, + GCancellable *cancellable, + GError **error) + { ++ return TRUE; //using unattended-upgrades in Debian and Ubuntu ++ + GsPluginPackagekit *self = GS_PLUGIN_PACKAGEKIT (plugin); + + /* any are us? */ diff -pruN 43.3-1/debian/patches/series 43.3-1ubuntu1/debian/patches/series --- 43.3-1/debian/patches/series 2023-01-10 19:14:13.000000000 +0000 +++ 43.3-1ubuntu1/debian/patches/series 2023-01-10 19:15:50.000000000 +0000 @@ -1 +1,2 @@ 01_details-Use-custom-icon-for-verified-developers.patch +no-offline-update-prompt.patch