[Pkg-gtkpod-devel] Bug#1077480: usbmuxd: Correct appstream metainfo license and prepare for upstreaming

[Petter Reinholdtsen]

Package: usbmuxd
Version: 1.1.1-2
Tags: patch
User: pere at hungry.com
Usertags: appstream-modalias

The current appstream information is ignored because its license is not
compatible with the rest of the appstrean catalog (GPL-3+).  This patch
change it to MIT used by most of the other appstream metainfo entries.

It also convert the appstream metainfo to a upstreamable patch, add
homepage URL to the XML, switch to debhelper compat level 13 to make
sure autoreconf is used for the Makefile.am change to take effect and
correct a hexadecimla value in the provides to a capital letter.

diff --git a/debian/control b/debian/control
index 5d8952e..f664983 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: gtkpod Maintainers <pkg-gtkpod-devel at alioth-lists.debian.net>
 Uploaders: Yves-Alexis Perez <corsac at debian.org>
 Standards-Version: 4.5.0
-Build-Depends: debhelper-compat (= 12),
+Build-Depends: debhelper-compat (= 13),
                pkgconf,
                libusb-1.0-0-dev [linux-any],
                udev [linux-any],
diff --git a/debian/org.libimobiledevice.usbmuxd.metainfo.xml b/debian/org.libimobiledevice.usbmuxd.metainfo.xml
deleted file mode 100644
index 822a400..0000000
--- a/debian/org.libimobiledevice.usbmuxd.metainfo.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<component>
-  <id>org.libimobiledevice.usbmuxd</id>
-  <metadata_license>GPL-3+</metadata_license>
-  <name>usbmuxd</name>
-  <summary>Socket daemon to multiplex connections from and to iOS devices</summary>
-  <description>
-    <p>
-      usbmuxd stands for "USB multiplexing daemon". This daemon is in charge of
-      multiplexing connections over USB to an iOS device.
-    </p>
-  </description>
-  <provides>
-    <modalias>usb:v05ACp129*d*</modalias>
-    <modalias>usb:v05ACp12a*d*</modalias>
-    <modalias>usb:v05ACp8600d*</modalias>
-  </provides>
-</component>
diff --git a/debian/patches/1000-appstream-metainfo.patch b/debian/patches/1000-appstream-metainfo.patch
new file mode 100644
index 0000000..be0d88e
--- /dev/null
+++ b/debian/patches/1000-appstream-metainfo.patch
@@ -0,0 +1,56 @@
+Description: Added AppStream metainfo XML with hardware provide info.
+ This allow isenkram to propose this package when the hardware is
+ present.
+Author: Petter Reinholdtsen
+Forwarded: no
+Last-Update: 2024-07-29
+---
+Index: usbmuxd-salsa/Makefile.am
+===================================================================
+--- usbmuxd-salsa.orig/Makefile.am     2024-07-29 09:18:09.685778596 +0000
++++ usbmuxd-salsa/Makefile.am  2024-07-29 09:18:57.090115575 +0000
+@@ -1,4 +1,5 @@
+ AUTOMAKE_OPTIONS = foreign
++
+ ACLOCAL_AMFLAGS = -I m4
+ SUBDIRS = src $(UDEV_SUB) $(SYSTEMD_SUB) docs
+ 
+@@ -6,8 +7,12 @@
+       docs \
+       COPYING.GPLv2 \
+       COPYING.GPLv3 \
++      org.libimobiledevice.usbmuxd.metainfo.xml \
+       README.md
+ 
+ DISTCHECK_CONFIGURE_FLAGS = \
+       --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
+-      --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+\ No newline at end of file
++      --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
++
++dist_metainfo_DATA = org.libimobiledevice.usbmuxd.metainfo.xml
++metainfodir = $(datarootdir)/metainfo
+Index: usbmuxd-salsa/org.libimobiledevice.usbmuxd.metainfo.xml
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ usbmuxd-salsa/org.libimobiledevice.usbmuxd.metainfo.xml    2024-07-29 09:26:33.205523883 +0000
+@@ -0,0 +1,19 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<component>
++  <id>org.libimobiledevice.usbmuxd</id>
++  <metadata_license>MIT</metadata_license>
++  <name>usbmuxd</name>
++  <summary>Socket daemon to multiplex connections from and to iOS devices</summary>
++  <description>
++    <p>
++      usbmuxd stands for "USB multiplexing daemon". This daemon is in charge of
++      multiplexing connections over USB to an iOS device.
++    </p>
++  </description>
++  <url type="homepage">https://github.com/libimobiledevice/usbmuxd</url>
++  <provides>
++    <modalias>usb:v05ACp129*d*</modalias>
++    <modalias>usb:v05ACp12A*d*</modalias>
++    <modalias>usb:v05ACp8600d*</modalias>
++  </provides>
++</component>
diff --git a/debian/patches/series b/debian/patches/series
index ce4edfe..1914710 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ Fix-FTBFS-in-kfreebsd.patch
 0002-drop-PIDFile-directive-use-default-one-in-run.patch
 0003-Port-to-libplist-2.3.0.patch
 0004-conf-Fix-false-plist-read-write-errors-caused-by-usi.patch
+1000-appstream-metainfo.patch
diff --git a/debian/rules b/debian/rules
index c28662d..dfa388a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,5 +12,4 @@ override_dh_install:
 ifneq ($(DEB_HOST_ARCH_OS),linux)
        rm -f debian/usbmuxd/lib/udev/rules.d/* debian/tmp/lib/systemd/system/*
 endif
-       dh_install debian/org.libimobiledevice.usbmuxd.metainfo.xml usr/share/metainfo/
        dh_install

-- 
Happy hacking
Petter Reinholdtsen