Package: dfu-util
Version: 0.11-1
Severity: wishlist
Tags: patch

I have just now wrapped up the current changes in the salsa git
repository and uploaded it to the delayed queue with a 10 day delay, ref
my intention expressed in <URL: https://bugs.debian.org/843214 >.

The change relative to the current debian/unstable branch  is also made
available in the debian/unstable-nmu-0.11-1.1 of the git repository.

This is the complete patch relative to release 0.11-1:

diff --git a/debian/changelog b/debian/changelog
index dc31c2b..3b30ce8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+dfu-util (0.11-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+
+  [ Tormod Volden ]
+  * Add VCS links to debian/control
+  * Set Rules-Requires-Root to No in debian/control
+  * Add simple autopkgtest
+  * Build-depend on pkgconf instead of pkg-config
+  * Bump Standards-Version to 4.7.0
+  * Clean up patch header
+  * Add Appstream metainfo with hardware modaliases
+
+  [ Petter Reinholdtsen ]
+  * Converted Appstream metadata XML to upstreamable patch.
+
+ -- Petter Reinholdtsen <[email protected]>  Thu, 27 Feb 2025 19:36:15 +0100
+
 dfu-util (0.11-1) unstable; urgency=medium
 
   [ Tormod Volden ]
diff --git a/debian/control b/debian/control
index 5a93571..5261531 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,12 @@ Source: dfu-util
 Section: electronics
 Priority: optional
 Maintainer: Tormod Volden <[email protected]>
-Build-Depends: debhelper (>= 10), libusb-1.0-0-dev, pkg-config, dh-exec
-Standards-Version: 4.5.0
+Build-Depends: debhelper (>= 10), libusb-1.0-0-dev, pkgconf, dh-exec
+Standards-Version: 4.7.0
 Homepage: http://dfu-util.sourceforge.net
+Vcs-Browser: https://salsa.debian.org/debian/dfu-util
+Vcs-Git: https://salsa.debian.org/debian/dfu-util.git
+Rules-Requires-Root: no
 
 Package: dfu-util
 Architecture: any
diff --git a/debian/patches/10-dfuse-pack-use-python3.patch 
b/debian/patches/10-dfuse-pack-use-python3.patch
index 8aa6e5f..10ed588 100644
--- a/debian/patches/10-dfuse-pack-use-python3.patch
+++ b/debian/patches/10-dfuse-pack-use-python3.patch
@@ -4,8 +4,6 @@ Description: Use python3 for dfuse-pack.py
  with either Python 2 or 3, the shebang must match our dependency
  in debian/control.
 Author: Tormod Volden <[email protected]>
-
----
 Forwarded: not-needed
 Last-Update: 2022-01-21
 
diff --git a/debian/patches/1010-appstream-metainfo.patch 
b/debian/patches/1010-appstream-metainfo.patch
new file mode 100644
index 0000000..177cb5e
--- /dev/null
+++ b/debian/patches/1010-appstream-metainfo.patch
@@ -0,0 +1,47 @@
+Description: Added Appstream metadata XML with hardware mapping.
+Author: Tormod Volden <[email protected]>
+Bug-Debian: https://bugs.debian.org/843214
+Forwarded: no
+Last-Update: 2024-12-29
+---
+Index: dfu-util-salsa/Makefile.am
+===================================================================
+--- dfu-util-salsa.orig/Makefile.am    2024-12-29 06:58:52.046148614 +0100
++++ dfu-util-salsa/Makefile.am 2024-12-29 06:58:52.042148573 +0100
+@@ -1,6 +1,10 @@
+ SUBDIRS = src doc
+ 
+-EXTRA_DIST = autogen.sh TODO DEVICES.txt dfuse-pack.py
++EXTRA_DIST = autogen.sh TODO DEVICES.txt dfuse-pack.py \
++             net.sourceforge.dfu_util.metainfo.xml
++
++dist_metainfo_DATA = net.sourceforge.dfu_util.metainfo.xml
++metainfodir = $(datarootdir)/metainfo
+ 
+ wwwman: www/dfu-util.1.html www/dfu-suffix.1.html www/dfu-prefix.1.html
+ 
+Index: dfu-util-salsa/net.sourceforge.dfu_util.metainfo.xml
+===================================================================
+--- /dev/null  1970-01-01 00:00:00.000000000 +0000
++++ dfu-util-salsa/net.sourceforge.dfu_util.metainfo.xml       2024-12-29 
06:59:55.786813054 +0100
+@@ -0,0 +1,20 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<component>
++  <id>net.sourceforge.dfu_util</id>
++  <metadata_license>FSFAP</metadata_license>
++  <name>dfu-util</name>
++  <summary>Device firmware update (DFU) USB programmer</summary>
++  <description>
++    <p>
++      dfu-util is a program that implements the host (PC) side of the
++      USB DFU 1.0 and 1.1 (Universal Serial Bus Device Firmware Upgrade)
++      protocol. Also the DfuSe protocol 1.1a from ST is supported.
++    </p>
++  </description>
++  <url type="homepage">https://dfu-util.sourceforge.net</url>
++  <provides>
++    <modalias>usb:v0483pDF11d*</modalias>
++    <modalias>usb:v28E9p0189d*</modalias>
++    <modalias>usb:v1D50p607Fd*</modalias>
++  </provides>
++</component>
diff --git a/debian/patches/series b/debian/patches/series
index cc5da2e..f5b7628 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 10-dfuse-pack-use-python3.patch
+1010-appstream-metainfo.patch
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..83e5cec
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,2 @@
+Test-Command: dfu-util --list --verbose
+Restrictions: superficial

-- 
Happy hacking
Petter Reinholdtsen

Reply via email to