summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2021-04-01 04:48:03 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2021-04-01 04:48:03 +0000
commitf9fca4f65e52c42f24f4d92293a9bfbe4db3c2c7 (patch)
treee6dae1ff7f050c3fe2b3750d3f5a7c59bd959b9c
parentMerging upstream version 3.38.1. (diff)
downloadgnome-software-f9fca4f65e52c42f24f4d92293a9bfbe4db3c2c7.tar.xz
gnome-software-f9fca4f65e52c42f24f4d92293a9bfbe4db3c2c7.zip
Merging debian version 3.38.1-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog11
-rw-r--r--debian/patches/01_details-Use-custom-icon-for-verified-developers.patch10
-rw-r--r--debian/patches/packagekit-Package-details-not-found-when-not-having-4-se.patch39
-rw-r--r--debian/patches/series1
4 files changed, 19 insertions, 42 deletions
diff --git a/debian/changelog b/debian/changelog
index 9043665..f68c6eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gnome-software (3.38.1-1) unstable; urgency=medium
+
+ * Team upload
+ * New upstream release
+ - Fix package details not found for some packages
+ - Ignore harmless warnings when using unusual fwupd versions
+ - Translation updates
+ * Drop patch that was applied upstream
+
+ -- Simon McVittie <smcv@debian.org> Thu, 18 Feb 2021 15:08:20 +0000
+
gnome-software (3.38.0-3progress6u1) fuchur; urgency=medium
* Initial upload to fuchur.
diff --git a/debian/patches/01_details-Use-custom-icon-for-verified-developers.patch b/debian/patches/01_details-Use-custom-icon-for-verified-developers.patch
index ab0ae29..09ca548 100644
--- a/debian/patches/01_details-Use-custom-icon-for-verified-developers.patch
+++ b/debian/patches/01_details-Use-custom-icon-for-verified-developers.patch
@@ -1,4 +1,3 @@
-From 36d4b7f4f8779febd2408d590b85be5bb5c1519e Mon Sep 17 00:00:00 2001
From: Robert Ancell <robert.ancell@canonical.com>
Date: Tue, 28 Aug 2018 12:43:15 +1200
Subject: [PATCH 21/24] details: Use custom icon for verified developers
@@ -10,6 +9,9 @@ Subject: [PATCH 21/24] details: Use custom icon for verified developers
3 files changed, 14 insertions(+), 1 deletion(-)
create mode 100644 src/developer-verified.svg
+diff --git a/src/developer-verified.svg b/src/developer-verified.svg
+new file mode 100644
+index 0000000..57c0f11
--- /dev/null
+++ b/src/developer-verified.svg
@@ -0,0 +1,12 @@
@@ -26,15 +28,19 @@ Subject: [PATCH 21/24] details: Use custom icon for verified developers
+ </g>
+</svg>
\ No newline at end of file
+diff --git a/src/gnome-software.gresource.xml b/src/gnome-software.gresource.xml
+index 459ecf8..283cf35 100644
--- a/src/gnome-software.gresource.xml
+++ b/src/gnome-software.gresource.xml
-@@ -37,5 +37,6 @@
+@@ -38,5 +38,6 @@
<file preprocess="xml-stripblanks">org.freedesktop.PackageKit.xml</file>
<file>gtk-style.css</file>
<file>gtk-style-hc.css</file>
+ <file>developer-verified.svg</file>
</gresource>
</gresources>
+diff --git a/src/gs-details-page.ui b/src/gs-details-page.ui
+index f86674f..b6cba9e 100644
--- a/src/gs-details-page.ui
+++ b/src/gs-details-page.ui
@@ -948,7 +948,7 @@
diff --git a/debian/patches/packagekit-Package-details-not-found-when-not-having-4-se.patch b/debian/patches/packagekit-Package-details-not-found-when-not-having-4-se.patch
deleted file mode 100644
index 4eab8fa..0000000
--- a/debian/patches/packagekit-Package-details-not-found-when-not-having-4-se.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Milan Crha <mcrha@redhat.com>
-Date: Wed, 23 Sep 2020 08:14:06 +0200
-Subject: packagekit: Package details not found when not having 4 semicolons
-
-Correct package_id_equal() to count also with packages, which do not have
-4 semicolons in the ID (like `hedgewars;1.0.0-9.fc32;x86_64;updates`).
-
-Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1069
-Closes https://gitlab.gnome.org/GNOME/gnome-software/-/merge_requests/517
----
- plugins/packagekit/packagekit-common.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/packagekit/packagekit-common.c b/plugins/packagekit/packagekit-common.c
-index 495960d..ed77b34 100644
---- a/plugins/packagekit/packagekit-common.c
-+++ b/plugins/packagekit/packagekit-common.c
-@@ -433,10 +433,10 @@ package_id_equal (gconstpointer a,
- {
- const gchar *package_id_a = a;
- const gchar *package_id_b = b;
-- gsize n_semicolons = 0;
-+ gsize i, n_semicolons = 0;
-
- /* compare up to and including the last semicolon */
-- for (gsize i = 0; package_id_a[i] != '\0' && package_id_b[i] != '\0'; i++) {
-+ for (i = 0; package_id_a[i] != '\0' && package_id_b[i] != '\0'; i++) {
- if (package_id_a[i] != package_id_b[i])
- return FALSE;
- if (package_id_a[i] == ';')
-@@ -445,7 +445,7 @@ package_id_equal (gconstpointer a,
- return TRUE;
- }
-
-- return FALSE;
-+ return package_id_a[i] == package_id_b[i];
- }
-
- GHashTable *
diff --git a/debian/patches/series b/debian/patches/series
index e3cb9c0..1621570 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
01_details-Use-custom-icon-for-verified-developers.patch
-packagekit-Package-details-not-found-when-not-having-4-se.patch