diff -Nru gnome-software-3.36.0/debian/changelog gnome-software-3.36.0/debian/changelog --- gnome-software-3.36.0/debian/changelog 2020-04-05 21:24:13.000000000 +0000 +++ gnome-software-3.36.0/debian/changelog 2020-04-16 04:20:21.000000000 +0000 @@ -1,3 +1,18 @@ +gnome-software (3.36.0-0ubuntu2) focal; urgency=medium + + * debian/patches/0001-Mark-featured-AppStream-snippets-as-append-merge-com.patch: + - Fix invalid appstream data that causes APT to emit a warning + (LP: #1872258) + * debian/control: + * debian/ubuntu-software.install: + * debian/ubuntu-software.links: + * debian/icons/*: + * debian/patches/0014-build-Translate-Ubuntu-s-.desktop-file.patch: + - Remove ubuntu-software package - now provided by snap-store snap + (LP: #1872111) + + -- Robert Ancell Thu, 16 Apr 2020 16:20:21 +1200 + gnome-software (3.36.0-0ubuntu1) focal; urgency=medium * New upstream release (LP: #1870991) diff -Nru gnome-software-3.36.0/debian/control gnome-software-3.36.0/debian/control --- gnome-software-3.36.0/debian/control 2020-04-05 21:24:13.000000000 +0000 +++ gnome-software-3.36.0/debian/control 2020-04-16 04:20:21.000000000 +0000 @@ -154,11 +154,5 @@ Depends: gnome-software (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} -Description: Utility for browsing, installing, and removing software - Ubuntu Software lets you browse and install the applications available for - Ubuntu. You can view available software by category, or search by name - or description. You can also examine the software already installed, and - remove items you no longer need. - . - To install or remove software using Ubuntu Software, you need administrator - access on the computer. +Description: transitional dummy package + This is a transitional dummy package, it can be safely removed. diff -Nru gnome-software-3.36.0/debian/control.in gnome-software-3.36.0/debian/control.in --- gnome-software-3.36.0/debian/control.in 2020-04-05 21:24:13.000000000 +0000 +++ gnome-software-3.36.0/debian/control.in 2020-04-16 04:20:21.000000000 +0000 @@ -150,11 +150,5 @@ Depends: gnome-software (>= ${source:Version}), ${misc:Depends}, ${shlibs:Depends} -Description: Utility for browsing, installing, and removing software - Ubuntu Software lets you browse and install the applications available for - Ubuntu. You can view available software by category, or search by name - or description. You can also examine the software already installed, and - remove items you no longer need. - . - To install or remove software using Ubuntu Software, you need administrator - access on the computer. +Description: transitional dummy package + This is a transitional dummy package, it can be safely removed. diff -Nru gnome-software-3.36.0/debian/icons/hicolor/128x128/apps/ubuntusoftware.svg gnome-software-3.36.0/debian/icons/hicolor/128x128/apps/ubuntusoftware.svg --- gnome-software-3.36.0/debian/icons/hicolor/128x128/apps/ubuntusoftware.svg 2020-04-05 21:24:13.000000000 +0000 +++ gnome-software-3.36.0/debian/icons/hicolor/128x128/apps/ubuntusoftware.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,2293 +0,0 @@ - - - - diff -Nru gnome-software-3.36.0/debian/icons/hicolor/16x16/apps/ubuntusoftware.svg gnome-software-3.36.0/debian/icons/hicolor/16x16/apps/ubuntusoftware.svg --- gnome-software-3.36.0/debian/icons/hicolor/16x16/apps/ubuntusoftware.svg 2020-04-05 21:24:13.000000000 +0000 +++ gnome-software-3.36.0/debian/icons/hicolor/16x16/apps/ubuntusoftware.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,564 +0,0 @@ - - - - diff -Nru gnome-software-3.36.0/debian/icons/hicolor/24x24/apps/ubuntusoftware.svg gnome-software-3.36.0/debian/icons/hicolor/24x24/apps/ubuntusoftware.svg --- gnome-software-3.36.0/debian/icons/hicolor/24x24/apps/ubuntusoftware.svg 2020-04-05 21:24:13.000000000 +0000 +++ gnome-software-3.36.0/debian/icons/hicolor/24x24/apps/ubuntusoftware.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,678 +0,0 @@ - - - - diff -Nru gnome-software-3.36.0/debian/icons/hicolor/48x48/apps/ubuntusoftware.svg gnome-software-3.36.0/debian/icons/hicolor/48x48/apps/ubuntusoftware.svg --- gnome-software-3.36.0/debian/icons/hicolor/48x48/apps/ubuntusoftware.svg 2020-04-05 21:24:13.000000000 +0000 +++ gnome-software-3.36.0/debian/icons/hicolor/48x48/apps/ubuntusoftware.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,666 +0,0 @@ - - - - diff -Nru gnome-software-3.36.0/debian/icons/hicolor/scalable/apps/ubuntusoftware.svg gnome-software-3.36.0/debian/icons/hicolor/scalable/apps/ubuntusoftware.svg --- gnome-software-3.36.0/debian/icons/hicolor/scalable/apps/ubuntusoftware.svg 2020-04-05 21:24:13.000000000 +0000 +++ gnome-software-3.36.0/debian/icons/hicolor/scalable/apps/ubuntusoftware.svg 1970-01-01 00:00:00.000000000 +0000 @@ -1,2293 +0,0 @@ - - - - diff -Nru gnome-software-3.36.0/debian/patches/0001-Mark-featured-AppStream-snippets-as-append-merge-com.patch gnome-software-3.36.0/debian/patches/0001-Mark-featured-AppStream-snippets-as-append-merge-com.patch --- gnome-software-3.36.0/debian/patches/0001-Mark-featured-AppStream-snippets-as-append-merge-com.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-software-3.36.0/debian/patches/0001-Mark-featured-AppStream-snippets-as-append-merge-com.patch 2020-04-16 04:20:21.000000000 +0000 @@ -0,0 +1,281 @@ +From bb7f58f5f88381857cd9b5dbe608e75d459873f1 Mon Sep 17 00:00:00 2001 +From: Matthias Klumpp +Date: Tue, 24 Mar 2020 18:25:02 +0100 +Subject: [PATCH] Mark featured AppStream snippets as append-merge components - + again + +This once again fixes the issue that these components are otherwise +considered invalid new components, instead of modifications to existing +components (and this will produce an annoying warning message, asking +the distributor to fix their data). +--- + data/assets/org.gnome.Software.Featured.xml | 58 ++++++++++----------- + 1 file changed, 29 insertions(+), 29 deletions(-) + +diff --git a/data/assets/org.gnome.Software.Featured.xml b/data/assets/org.gnome.Software.Featured.xml +index 92576d2c..d1d920be 100644 +--- a/data/assets/org.gnome.Software.Featured.xml ++++ b/data/assets/org.gnome.Software.Featured.xml +@@ -1,6 +1,6 @@ + + +- ++ + inkscape.desktop + + border-color: #aaa; +@@ -13,7 +13,7 @@ background: + + + +- ++ + mypaint.desktop + + border-color: #888; +@@ -30,7 +30,7 @@ background: + + + +- ++ + org.gnome.Maps.desktop + + border-color: #deddda; +@@ -45,7 +45,7 @@ background: #f6f5f4, + + + +- ++ + org.gnome.Polari.desktop + + border-color: #4e9a06; +@@ -60,7 +60,7 @@ background: + + + +- ++ + transmission-gtk.desktop + + border-color: #d65100; +@@ -74,7 +74,7 @@ background: + + + +- ++ + org.gnome.Podcasts + + border: 1px solid #d7430a; +@@ -89,7 +89,7 @@ text-shadow: 0 1px 12px rgba(0,0,0,0.05), + -1px 0 rgba(0,0,0,0.1); + + +- ++ + org.gnome.Boxes.desktop + + Featured +@@ -106,7 +106,7 @@ text-shadow: 0 1px 12px rgba(0,0,0,0.05), + -1px 0 rgba(0,0,0,0.1); + + +- ++ + com.github.johnfactotum.Foliate + + Featured +@@ -123,7 +123,7 @@ text-shadow: none; + + + +- ++ + org.gnome.SoundRecorder.desktop + + border: 1px solid #bbb; +@@ -133,7 +133,7 @@ color: #fff; + text-shadow: none; + + +- ++ + org.kde.kdenlive + + border: 1px solid #df321e; +@@ -144,7 +144,7 @@ color: #df321e; + text-shadow: none; + + +- ++ + org.gimp.GIMP + + border-color: #4a8c30; +@@ -157,7 +157,7 @@ background: + + + +- ++ + org.videolan.VLC + + border: 1px solid #df321e; +@@ -168,7 +168,7 @@ color: #222; + text-shadow: 0 0 2px #fff; + + +- ++ + com.spotify.Client + + Featured +@@ -181,7 +181,7 @@ background: url('http://people.gnome.org/~jimmac/gnome-software/spotify-logo.svg + 10% / 200px auto no-repeat, -gtk-gradient (linear, left top, left bottom, from(#b47fba), to(#000)); + + +- ++ + com.slack.Slack + + border: 1px solid #eee; +@@ -194,7 +194,7 @@ color: #fff; + text-shadow: none; + + +- ++ + org.gnome.FeedReader + + border-color: #d65100; +@@ -206,7 +206,7 @@ background: #f5c211 + + + +- ++ + com.bitwarden.desktop + + border: 1px solid #1c6d8c; +@@ -217,7 +217,7 @@ color: #fff; + text-shadow: 0 0 2px #26a269; + + +- ++ + com.dropbox.Client + + border: 1px solid #a8c3d6; +@@ -227,7 +227,7 @@ background: #b8d3e6 url('file://@datadir@/gnome-software/featured-dropbox.png') + color: #47525d; + + +- ++ + com.github.calo001.fondo + + border: 1px solid transparent; +@@ -238,7 +238,7 @@ color: #fff; + text-shadow: 0 1px 2px #000; + + +- ++ + org.darktable.Darktable + + Featured +@@ -251,7 +251,7 @@ color: #fff; + text-shadow: 0 1px 2px #000; + + +- ++ + com.calibre_ebook.calibre + + Featured +@@ -264,7 +264,7 @@ color: #fff; + text-shadow: 0 1px 2px #000; + + +- ++ + fr.free.Homebank + + border: 1px solid transparent; +@@ -274,7 +274,7 @@ color: #fff; + text-shadow: 0 1px 2px #000; + + +- ++ + de.wolfvollprecht.UberWriter + + border: 1px solid #0554c4; +@@ -285,7 +285,7 @@ color: #fff; + text-shadow: 0 0 3px #3584e4; + + +- ++ + net.sourceforge.Klavaro + + border: 1px solid transparent; +@@ -295,7 +295,7 @@ color: #000; + text-shadow: 0 0 4px #fff; + + +- ++ + com.github.junrrein.PDFSlicer + + border: 1px solid #1c6d8c; +@@ -306,7 +306,7 @@ color: #fff; + text-shadow: none; + + +- ++ + org.gnome.Todo.desktop + + border: 1px solid transparent; +@@ -316,7 +316,7 @@ color: #fff; + text-shadow: 0 1px 2px #000; + + +- ++ + com.github.fabiocolacio.marker + + Featured +@@ -329,7 +329,7 @@ color: #fff; + text-shadow: 0 1px 2px #000; + + +- ++ + com.valvesoftware.Steam + + border-color: #1b2838; +@@ -339,7 +339,7 @@ background: #1b2838 url('http://people.gnome.org/~jimmac/gnome-software/steam-lo + 10% / 200px auto no-repeat; + + +- ++ + org.gnome.Tetravex + + border: 1px solid transparent; +@@ -349,7 +349,7 @@ color: #000; + text-shadow: 0 0 2px #fff; + + +- ++ + org.stellarium.Stellarium + + border: 1px solid transparent; +-- +2.25.1 + diff -Nru gnome-software-3.36.0/debian/patches/0014-build-Translate-Ubuntu-s-.desktop-file.patch gnome-software-3.36.0/debian/patches/0014-build-Translate-Ubuntu-s-.desktop-file.patch --- gnome-software-3.36.0/debian/patches/0014-build-Translate-Ubuntu-s-.desktop-file.patch 2020-04-05 21:24:13.000000000 +0000 +++ gnome-software-3.36.0/debian/patches/0014-build-Translate-Ubuntu-s-.desktop-file.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -From 259bece6da3c50bd1cb108a1ab60f28c1daf03b9 Mon Sep 17 00:00:00 2001 -From: Gunnar Hjalmarsson -Date: Thu, 22 Mar 2018 08:03:14 -0400 -Subject: [PATCH 14/29] build: Translate Ubuntu's .desktop file - ---- - data/meson.build | 3 +++ - data/org.gnome.Software.desktop | 19 +++++++++++++++++++ - po/POTFILES.in | 1 + - 3 files changed, 23 insertions(+) - create mode 100644 data/org.gnome.Software.desktop - -diff --git a/data/meson.build b/data/meson.build -index 06573881..42bfdeca 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -6,6 +6,9 @@ compiled_schemas = gnome.compile_schemas() - install_data('org.gnome.software.gschema.xml', - install_dir : 'share/glib-2.0/schemas') - -+install_data('org.gnome.Software.desktop', -+ install_dir : 'share/ubuntu/applications') -+ - if get_option('external_appstream') - # replace @libexecdir@ - conf_data = configuration_data() -diff --git a/data/org.gnome.Software.desktop b/data/org.gnome.Software.desktop -new file mode 100644 -index 00000000..663dc208 ---- /dev/null -+++ b/data/org.gnome.Software.desktop -@@ -0,0 +1,19 @@ -+[Desktop Entry] -+Name=Ubuntu Software -+Comment=Add, remove or update software on this computer -+# Translators: Do NOT translate or transliterate this text (this is an icon file name)! -+Icon=ubuntusoftware -+Exec=gnome-software %U -+Terminal=false -+Type=Application -+Categories=GNOME;GTK;System;PackageManager; -+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! -+Keywords=Updates;Upgrade;Sources;Repositories;Preferences;Install;Uninstall;Program;Software;App;Store; -+StartupNotify=true -+MimeType=x-scheme-handler/appstream;x-scheme-handler/apt;x-scheme-handler/snap; -+X-GNOME-Bugzilla-Bugzilla=GNOME -+X-GNOME-Bugzilla-Product=gnome-software -+X-GNOME-Bugzilla-Component=gnome-software -+X-GNOME-UsesNotifications=true -+DBusActivatable=true -+X-Ubuntu-Gettext-Domain=gnome-software -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 85fa3fff..728d829f 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -1,4 +1,5 @@ - data/appdata/org.gnome.Software.appdata.xml.in -+data/org.gnome.Software.desktop - data/org.gnome.software.external-appstream.policy.in.in - data/org.gnome.software.gschema.xml - src/gnome-software-local-file.desktop.in --- -2.25.1 - diff -Nru gnome-software-3.36.0/debian/patches/series gnome-software-3.36.0/debian/patches/series --- gnome-software-3.36.0/debian/patches/series 2020-04-05 21:24:13.000000000 +0000 +++ gnome-software-3.36.0/debian/patches/series 2020-04-16 04:20:21.000000000 +0000 @@ -1,4 +1,5 @@ # From upstream +0001-Mark-featured-AppStream-snippets-as-append-merge-com.patch # From ubuntu-master branch 0001-Construct-the-Software-Sources-menu-item-dynamically.patch @@ -14,7 +15,6 @@ 0011-Don-t-use-colour-to-differentiate-between-free-and-p.patch 0012-overview-page-Rotate-featured-apps.patch 0013-Add-a-basic-permissions-system.patch -0014-build-Translate-Ubuntu-s-.desktop-file.patch 0015-snap-Use-default-icon-if-none-provided.patch 0016-Delay-startup-of-GNOME-Software-to-allow-the-Shell-t.patch 0017-details-page-Don-t-show-missing-screenshot-placehold.patch diff -Nru gnome-software-3.36.0/debian/ubuntu-software.install gnome-software-3.36.0/debian/ubuntu-software.install --- gnome-software-3.36.0/debian/ubuntu-software.install 2020-04-05 21:24:13.000000000 +0000 +++ gnome-software-3.36.0/debian/ubuntu-software.install 2020-04-16 04:20:21.000000000 +0000 @@ -1,2 +0,0 @@ -usr/share/ubuntu/applications/ -debian/icons/hicolor usr/share/icons/ diff -Nru gnome-software-3.36.0/debian/ubuntu-software.links gnome-software-3.36.0/debian/ubuntu-software.links --- gnome-software-3.36.0/debian/ubuntu-software.links 2020-04-05 21:24:13.000000000 +0000 +++ gnome-software-3.36.0/debian/ubuntu-software.links 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -usr/bin/gnome-software usr/bin/ubuntu-software -usr/share/ubuntu/applications/org.gnome.Software.desktop usr/share/ubuntu-wayland/applications/org.gnome.Software.desktop