This is an autogenerated patch header for a single-debian-patch file. The
delta against upstream is either kept as a single patch, or maintained
in some VCS, and exported as a single patch instead of more manageable
atomic patches.

--- usbview-3.0.orig/ChangeLog
+++ usbview-3.0/ChangeLog
@@ -3,6 +3,9 @@
 # Copyright (c) 2022 Greg Kroah-Hartman <greg@kroah.com>
 #
 
+version 3.0.x
+	- remove now-unnecessary policykit/pkexec support
+
 version 3.0
 	- remove need for debugfs/usbdevfs/usbfs file entirely, rely only on
 	  sysfs now.  This removes the need to run the program as root, which
--- usbview-3.0.orig/Makefile.am
+++ usbview-3.0/Makefile.am
@@ -28,17 +28,13 @@ interface.o: $(icon_bitmaps_xpm)
 
 EXTRA_DIST = $(man_MANS) usbview_icon.svg usbview.desktop	\
 	usbview_logo.xcf				\
-	org.freedesktop.pkexec.usbview.policy		\
 	LICENSES/GPL-2.0-only.txt
 
 desktopdir = $(datadir)/applications
+metainfodir = $(datadir)/metainfo
 if DESKTOP
 desktop_DATA = usbview.desktop
-endif
-
-polkitactiondir = $(datadir)/polkit-1/actions
-if POLKIT
-polkitaction_DATA = org.freedesktop.pkexec.usbview.policy
+metainfo_DATA = com.kroah.usbview.metainfo.xml
 endif
 
 icondir = $(datadir)/icons
--- /dev/null
+++ usbview-3.0/com.kroah.usbview.metainfo.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>com.kroah.usbview</id>
+
+  <name>USBView</name>
+  <summary>A USB device tree viewer</summary>
+
+  <metadata_license>FSFAP</metadata_license>
+  <project_license>GPL-2.0-only</project_license>
+
+  <description>
+    <p>
+      USBView is a small application to show what the device tree of the USB bus looks like.
+      It shows a graphical representation of the devices that are currently plugged in,
+      showing the topology of the USB bus.
+      It also displays information on each individual device on the bus.
+    </p>
+  </description>
+
+  <launchable type="desktop-id">usbview.desktop</launchable>
+
+  <content_rating/>
+</component>
--- usbview-3.0.orig/configure.ac
+++ usbview-3.0/configure.ac
@@ -27,13 +27,6 @@ AC_ARG_ENABLE(desktop,
 	[desktop=yes])
 AC_MSG_RESULT([$desktop])
 
-AC_MSG_CHECKING([whether to try to install policykit file])
-AC_ARG_ENABLE(polkit,
-	[AS_HELP_STRING([--enable-policykit],[try to install policykit file (default=yes)])],
-	[polkit=$enableval],
-	[polkit=yes])
-AC_MSG_RESULT([$polkit])
-
 # Checks for programs.
 
 AC_PROG_CC
@@ -49,7 +42,6 @@ AS_IF([test "$have_convert" = "no"],
        icons=no])
 
 AM_CONDITIONAL(DESKTOP,[test x${desktop} = xyes])
-AM_CONDITIONAL(POLKIT,[test x${polkit} = xyes])
 AM_CONDITIONAL(ICONS,[test x${icons} = xyes])
 
 # Checks for libraries.
--- usbview-3.0.orig/interface.c
+++ usbview-3.0/interface.c
@@ -52,7 +52,7 @@ query_tooltip_cb(GtkWidget *widget, gint
 	/* Get the color, if it's red, set tooltip to indicate device has no driver. */
 	gtk_tree_model_get_iter(model, &iter, path);
 	gtk_tree_model_get(model, &iter, COLOR_COLUMN, &color, -1);
-	if (strncmp(color, "red", 4) == 0) {
+	if (color != NULL && strncmp(color, "red", 4) == 0) {
 		gtk_tooltip_set_text(tooltip, "This device has no attached driver");
 		return_val = TRUE;
 	}
--- usbview-3.0.orig/main.c
+++ usbview-3.0/main.c
@@ -16,11 +16,8 @@
 int main (int argc, char *argv[])
 {
 	GtkWidget *window1;
-	gboolean is_pkexec = getenv("PKEXEC_UID") != NULL;
 
-	// only evalute command line parameters if not running in pkexec
-	// privilege escalation context to avoid potential attack vectors
-	gtk_init (is_pkexec ? NULL : &argc, is_pkexec ? NULL : &argv);
+	gtk_init (&argc, &argv);
 
 	initialize_stuff();
 
--- usbview-3.0.orig/usbtree.c
+++ usbview-3.0/usbtree.c
@@ -224,7 +224,7 @@ static void DisplayDevice (struct Device
 	int		interfaceNum;
 	gboolean	driverAttached = TRUE;
 	gint		deviceAddr;
-	const gchar	*color = "black";
+	const gchar	*color = NULL;
 
 	if (device == NULL)
 		return;
--- usbview-3.0.orig/usbview.desktop
+++ usbview-3.0/usbview.desktop
@@ -2,7 +2,7 @@
 Name=USBView
 GenericName=USB Device Viewer
 Comment=View USB devices attached to system
-Exec=pkexec /usr/bin/usbview
+Exec=usbview
 Icon=usbview
 Terminal=false
 Type=Application
--- usbview-3.0.orig/usbview.spdx
+++ usbview-3.0/usbview.spdx
@@ -147,12 +147,6 @@ LicenseConcluded: NOASSERTION
 LicenseInfoInFile: GPL-2.0-only
 FileCopyrightText: <text>Copyright (c) 1999, 2000 by Greg Kroah-Hartman, <greg@kroah.com></text>
 
-FileName: ./org.freedesktop.pkexec.usbview.policy
-SPDXID: SPDXRef-e1edd9361c0b2f7f3a558b68a2678aa1
-FileChecksum: SHA1: 0b4c127e5936771ffe64804894c307167d2cd258
-LicenseConcluded: NOASSERTION
-FileCopyrightText: NONE
-
 FileName: ./sysfs.c
 SPDXID: SPDXRef-63056d996de2c47eaf5023eb00f93cce
 FileChecksum: SHA1: a2233ef39597b84d31656e763859e31eb2f11a0b
