Bug#1073832: firmware-{intel-graphics,intel-misc,marvell-prestera,mediatek,misc-nonfree,nvidia-graphics}: ineffective replaces due to /usr-move (DEP17)

[Helmut Grohne]

Package: 
firmware-intel-graphics,firmware-intel-misc,firmware-marvell-prestera,firmware-mediatek,firmware-misc-nonfree,firmware-nvidia-graphics
Version: 20230625-3~exp2
Severity: serious
Tags: patch
Control: affecs -1 + firmware-libertas,firmware-ti-connectivity
User: helm...@debian.org
Usertags: dep17p1

Hi,

thank you for uploading restructuring changes of firmware-nonfree to
experimental. dumat duly spot problems. Roughly speaking many of the
firmware files move from one package to another and at the same time all
of them move from /lib/firmware to /usr/lib/firmware causing the
earliest known /usr-merge problem that resulted in the file move
moratorium.

I don't think it helps to spell out lengthy details of what is broken
exactly and instead I'm attaching a patch. It may need some polishing to
your liking.

There are multiple mitigation strategies available. When it comes to
using apt-based resolvers, upgrading Replaces to Conflicts practically
solves the file loss problems. However, firmware tends to be relevant
for boot and the CTTE recommended doing more thorough mitigations when
booting may be impacted. Hence, my patch also adds protective
diversions. When you dpkg --unpack --auto-deconfigure the experimental
e.g. firmware-intel-graphics on a bookworm system with
firmware-misc-nonfree, dpkg will actually perform the unpack before the
removal despite declared Conflicts and hence loose files in an upgrade.
The protective diversions are installed in preinst and deleted in
postinst and thus the upgraded system no longer has them.

Note that even though the added usrmergemitigation list may look as
though it duplicates files, but that is not the case. For some packages,
it lists fewer files. If you later add more files to individual
packages, you should not add them to usrmergemitigation as that field
only carries those files that also are present in earlier releases. I
hope you won't forget when firmware-nonfree is in need of updating.

Please let me know what you think about the patch and whether you want
to turn it into a consumable shape or provide feedback as to how you
want it. I note that testing using piuparts does not work due to the
license stuff and a manual upgrade test looked good.

Helmut

diff --minimal -Nru firmware-nonfree-20230625/debian/README.source 
firmware-nonfree-20230625/debian/README.source
--- firmware-nonfree-20230625/debian/README.source      2024-06-02 
22:08:30.000000000 +0200
+++ firmware-nonfree-20230625/debian/README.source      2024-06-19 
12:45:44.000000000 +0200
@@ -79,6 +79,8 @@
 [base] replaces: Used as Replaces field
 [base] conflicts: Used as Conflicts field
 [base] provides: Used as Provides field
+[base] usrmergemitigation: List of firmware files that require protective
+                           diversions
 
 Optional per-file metadata:
 
diff --minimal -Nru firmware-nonfree-20230625/debian/bin/gencontrol.py 
firmware-nonfree-20230625/debian/bin/gencontrol.py
--- firmware-nonfree-20230625/debian/bin/gencontrol.py  2024-06-18 
02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/bin/gencontrol.py  2024-06-19 
13:11:28.000000000 +0200
@@ -256,15 +256,16 @@
 
         packages_binary[0]['Description'].append_pre(files_desc)
 
+        scripts = {}
+
         if 'initramfs-tools' in config_entry.get('support', []):
             postinst = self.templates.get('postinst.initramfs-tools')
-            open("debian/firmware-%s.postinst" % package, 
'w').write(self.substitute(postinst, vars))
+            scripts.setdefault("postinst", 
[]).append(self.substitute(postinst, vars))
 
         if 'license-accept' in config_entry:
             license = open("%s/LICENSE.install" % package_dir, 'r').read()
             preinst = self.templates.get('preinst.license')
-            preinst_filename = "debian/firmware-%s.preinst" % package
-            open(preinst_filename, 'w').write(self.substitute(preinst, vars))
+            scripts.setdefault("preinst", []).append(self.substitute(preinst, 
vars))
 
             templates = 
self.templates.get_templates_control('templates.license', vars)
             templates[0]['Description'].append(re.sub('\n\n', '\n.\n', 
license))
@@ -278,6 +279,17 @@
 % vars['license-title'])
             packages_binary[0]['Pre-Depends'] = PackageRelation('debconf | 
debconf-2.0')
 
+        if config_entry.get('usrmovemitigation', []):
+            for script in ("preinst", "postinst"):
+                script_template = self.templates.get(script + 
'.usrmovemitigation')
+                script_content = self.substitute(script_template, 
dict(files=config_entry["usrmovemitigation"]))
+                scripts.setdefault(script, []).append(script_content)
+
+        for script, script_contents in scripts.items():
+            script_contents.insert(0, "#!/bin/sh\n\nset -e\n")
+            script_contents.append("#DEBHELPER#\n\nexit 0\n")
+            open("debian/firmware-%s.%s" % (package, script), 
"w").write("\n".join(script_contents))
+
         packages.extend(packages_binary)
 
         makefile.add_cmds('binary-indep', ["$(MAKE) -f debian/rules.real 
binary-indep %s" % makeflags])
diff --minimal -Nru firmware-nonfree-20230625/debian/changelog 
firmware-nonfree-20230625/debian/changelog
--- firmware-nonfree-20230625/debian/changelog  2024-06-18 02:33:12.000000000 
+0200
+++ firmware-nonfree-20230625/debian/changelog  2024-06-19 13:11:28.000000000 
+0200
@@ -1,3 +1,11 @@
+firmware-nonfree (20230625-3~exp2.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Mitigate loss of files due to restructuring and /usr-move
+    (DEP17 P1, Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Wed, 19 Jun 2024 13:11:28 +0200
+
 firmware-nonfree (20230625-3~exp2) experimental; urgency=medium
 
   * qcom-soc: Re-fix lintian override for lib/firmware/qcom/apq8096/modem.mbn
diff --minimal -Nru 
firmware-nonfree-20230625/debian/config/intel-graphics/defines 
firmware-nonfree-20230625/debian/config/intel-graphics/defines
--- firmware-nonfree-20230625/debian/config/intel-graphics/defines      
2024-06-18 02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/config/intel-graphics/defines      
2024-06-19 11:29:05.000000000 +0200
@@ -4,8 +4,7 @@
  the Intel Graphics Media Driver aka i915 driver in the Linux kernel.
  This supports the iGPU found in f.e. Broadwell/Skylake/Broxton and
  Apollo/Gemini/Kaby/Coffee/Ice/Tiger/etc Lake CPUs.
-replaces: firmware-misc-nonfree (<< 20230625-3~)
-breaks: firmware-misc-nonfree (<< 20230625-3~)
+conflicts: firmware-misc-nonfree (<< 20230625-3~)
 files:
  i915/adlp_dmc.bin
  i915/adlp_dmc_ver2_09.bin
@@ -131,6 +130,127 @@
  i915/tgl_huc_7.5.0.bin
  i915/tgl_huc_7.9.3.bin
  intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin
+usrmovemitigation:
+ i915/adlp_dmc.bin
+ i915/adlp_dmc_ver2_09.bin
+ i915/adlp_dmc_ver2_10.bin
+ i915/adlp_dmc_ver2_12.bin
+ i915/adlp_dmc_ver2_14.bin
+ i915/adlp_dmc_ver2_16.bin
+ i915/adlp_guc_62.0.3.bin
+ i915/adlp_guc_69.0.3.bin
+ i915/adlp_guc_70.1.1.bin
+ i915/adlp_guc_70.bin
+ i915/adls_dmc_ver2_01.bin
+ i915/bxt_dmc_ver1.bin
+ i915/bxt_dmc_ver1_07.bin
+ i915/bxt_guc_32.0.3.bin
+ i915/bxt_guc_33.0.0.bin
+ i915/bxt_guc_49.0.1.bin
+ i915/bxt_guc_62.0.0.bin
+ i915/bxt_guc_69.0.3.bin
+ i915/bxt_guc_70.1.1.bin
+ i915/bxt_guc_ver8_7.bin
+ i915/bxt_guc_ver9_29.bin
+ i915/bxt_huc_2.0.0.bin
+ i915/bxt_huc_ver01_07_1398.bin
+ i915/bxt_huc_ver01_8_2893.bin
+ i915/cml_guc_33.0.0.bin
+ i915/cml_guc_49.0.1.bin
+ i915/cml_guc_62.0.0.bin
+ i915/cml_guc_69.0.3.bin
+ i915/cml_guc_70.1.1.bin
+ i915/cml_huc_4.0.0.bin
+ i915/cnl_dmc_ver1_07.bin
+ i915/dg1_dmc_ver2_02.bin
+ i915/dg1_guc_49.0.1.bin
+ i915/dg1_guc_62.0.0.bin
+ i915/dg1_guc_69.0.3.bin
+ i915/dg1_guc_70.1.1.bin
+ i915/dg1_guc_70.bin
+ i915/dg1_huc.bin
+ i915/dg1_huc_7.7.1.bin
+ i915/dg1_huc_7.9.3.bin
+ i915/dg2_dmc_ver2_06.bin
+ i915/dg2_dmc_ver2_07.bin
+ i915/dg2_dmc_ver2_08.bin
+ i915/dg2_guc_70.1.2.bin
+ i915/dg2_guc_70.4.1.bin
+ i915/dg2_guc_70.bin
+ i915/ehl_guc_33.0.4.bin
+ i915/ehl_guc_49.0.1.bin
+ i915/ehl_guc_62.0.0.bin
+ i915/ehl_guc_69.0.3.bin
+ i915/ehl_guc_70.1.1.bin
+ i915/ehl_huc_9.0.0.bin
+ i915/glk_dmc_ver1_04.bin
+ i915/glk_guc_32.0.3.bin
+ i915/glk_guc_33.0.0.bin
+ i915/glk_guc_49.0.1.bin
+ i915/glk_guc_62.0.0.bin
+ i915/glk_guc_69.0.3.bin
+ i915/glk_guc_70.1.1.bin
+ i915/glk_huc_4.0.0.bin
+ i915/glk_huc_ver03_01_2893.bin
+ i915/icl_dmc_ver1_07.bin
+ i915/icl_dmc_ver1_09.bin
+ i915/icl_guc_32.0.3.bin
+ i915/icl_guc_33.0.0.bin
+ i915/icl_guc_49.0.1.bin
+ i915/icl_guc_62.0.0.bin
+ i915/icl_guc_69.0.3.bin
+ i915/icl_guc_70.1.1.bin
+ i915/icl_huc_9.0.0.bin
+ i915/icl_huc_ver8_4_3238.bin
+ i915/kbl_dmc_ver1.bin
+ i915/kbl_dmc_ver1_01.bin
+ i915/kbl_dmc_ver1_04.bin
+ i915/kbl_guc_32.0.3.bin
+ i915/kbl_guc_33.0.0.bin
+ i915/kbl_guc_49.0.1.bin
+ i915/kbl_guc_62.0.0.bin
+ i915/kbl_guc_69.0.3.bin
+ i915/kbl_guc_70.1.1.bin
+ i915/kbl_guc_ver9_14.bin
+ i915/kbl_guc_ver9_39.bin
+ i915/kbl_huc_4.0.0.bin
+ i915/kbl_huc_ver02_00_1810.bin
+ i915/mtl_dmc.bin
+ i915/rkl_dmc_ver2_02.bin
+ i915/rkl_dmc_ver2_03.bin
+ i915/skl_dmc_ver1.bin
+ i915/skl_dmc_ver1_23.bin
+ i915/skl_dmc_ver1_26.bin
+ i915/skl_dmc_ver1_27.bin
+ i915/skl_guc_32.0.3.bin
+ i915/skl_guc_33.0.0.bin
+ i915/skl_guc_49.0.1.bin
+ i915/skl_guc_62.0.0.bin
+ i915/skl_guc_69.0.3.bin
+ i915/skl_guc_70.1.1.bin
+ i915/skl_guc_ver1.bin
+ i915/skl_guc_ver4.bin
+ i915/skl_guc_ver6.bin
+ i915/skl_guc_ver6_1.bin
+ i915/skl_guc_ver9_33.bin
+ i915/skl_huc_2.0.0.bin
+ i915/skl_huc_ver01_07_1398.bin
+ i915/tgl_dmc_ver2_04.bin
+ i915/tgl_dmc_ver2_06.bin
+ i915/tgl_dmc_ver2_08.bin
+ i915/tgl_dmc_ver2_12.bin
+ i915/tgl_guc_35.2.0.bin
+ i915/tgl_guc_49.0.1.bin
+ i915/tgl_guc_62.0.0.bin
+ i915/tgl_guc_69.0.3.bin
+ i915/tgl_guc_70.1.1.bin
+ i915/tgl_guc_70.bin
+ i915/tgl_huc.bin
+ i915/tgl_huc_7.0.12.bin
+ i915/tgl_huc_7.0.3.bin
+ i915/tgl_huc_7.5.0.bin
+ i915/tgl_huc_7.9.3.bin
+ intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin
 
 [i915/adlp_dmc.bin_base]
 desc: Intel ADL-P DMC firmware
diff --minimal -Nru firmware-nonfree-20230625/debian/config/intel-misc/defines 
firmware-nonfree-20230625/debian/config/intel-misc/defines
--- firmware-nonfree-20230625/debian/config/intel-misc/defines  2024-06-18 
02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/config/intel-misc/defines  2024-06-19 
11:29:56.000000000 +0200
@@ -5,8 +5,7 @@
  ipw2x00, intel-graphics or intel-sound packages.
  This includes for example Omni-Path, Ethernet/Network chips/devices,
  QuickAssist Technology crypto accelerators and Visual Sensing Controller.
-breaks: firmware-misc-nonfree (<< 20230625-3~)
-replaces: firmware-misc-nonfree (<< 20230625-3~)
+conflicts: firmware-misc-nonfree (<< 20230625-3~)
 files:
  hfi1_dc8051.fw
  hfi1_fabric.fw
@@ -26,6 +25,23 @@
  intel/ice/ddp/ice-1.3.30.0.pkg
  intel/ice/ddp-comms/ice_comms-1.3.40.0.pkg
  intel/ice/ddp-wireless_edge/ice_wireless_edge-1.3.10.0.pkg
+usrmovemitigation:
+ e100/d101m_ucode.bin
+ e100/d101s_ucode.bin
+ e100/d102e_ucode.bin
+ hfi1_dc8051.fw
+ hfi1_fabric.fw
+ hfi1_pcie.fw
+ hfi1_sbus.fw
+ intel/ice/ddp/ice-1.3.30.0.pkg
+ intel/ice/ddp/ice.pkg
+ qat_895xcc.bin
+ qat_895xcc_mmp.bin
+ qat_c3xxx.bin
+ qat_c3xxx_mmp.bin
+ qat_c62x.bin
+ qat_c62x_mmp.bin
+ qat_mmp.bin
 
 [hfi1_dc8051.fw_base]
 desc: Intel OPA Gen1 DC firmware
diff --minimal -Nru 
firmware-nonfree-20230625/debian/config/marvell-prestera/defines 
firmware-nonfree-20230625/debian/config/marvell-prestera/defines
--- firmware-nonfree-20230625/debian/config/marvell-prestera/defines    
2024-06-18 02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/config/marvell-prestera/defines    
2024-06-19 11:30:42.000000000 +0200
@@ -2,14 +2,16 @@
 desc: Marvell Prestera ASIC devices
 longdesc: 
  Marvell Switchdev solution Prestera Ethernet switches
-replaces: firmware-libertas (<< 20230625-3~)
-breaks: firmware-libertas (<< 20230625-3~)
+conflicts: firmware-libertas (<< 20230625-3~)
 files:
  mrvl/prestera/mvsw_prestera_fw-v2.0.img
  mrvl/prestera/mvsw_prestera_fw-v3.0.img
  mrvl/prestera/mvsw_prestera_fw-v4.0.img
  mrvl/prestera/mvsw_prestera_fw-v4.1.img
  mrvl/prestera/mvsw_prestera_fw_arm64-v4.1.img
+usrmovemitigation:
+ mrvl/prestera/mvsw_prestera_fw-v2.0.img
+ mrvl/prestera/mvsw_prestera_fw-v3.0.img
 
 [mrvl/prestera/mvsw_prestera_fw-v2.0.img_base]
 desc: Prestera ASIC firmware v2
diff --minimal -Nru firmware-nonfree-20230625/debian/config/mediatek/defines 
firmware-nonfree-20230625/debian/config/mediatek/defines
--- firmware-nonfree-20230625/debian/config/mediatek/defines    2024-06-18 
02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/config/mediatek/defines    2024-06-19 
11:31:23.000000000 +0200
@@ -4,8 +4,7 @@
  MediaTek devices such as ethernet/Wi-Fi/Bluetooth chips, SoCs
  and other chips and devices made by MediaTek and Ralink
 support: initramfs-tools
-breaks: firmware-misc-nonfree (<< 20230625-3~)
-replaces: firmware-misc-nonfree (<< 20230625-3~)
+conflicts: firmware-misc-nonfree (<< 20230625-3~)
 files:
  mt7601u.bin
  mt7650.bin
@@ -86,6 +85,51 @@
  mediatek/sof/sof-mt8186.ri
  mediatek/sof/sof-mt8195.ldc
  mediatek/sof/sof-mt8195.ri
+usrmovemitigation:
+ mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin
+ mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin
+ mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin
+ mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin
+ mediatek/WIFI_RAM_CODE_MT7922_1.bin
+ mediatek/WIFI_RAM_CODE_MT7961_1.bin
+ mediatek/mt7610e.bin
+ mediatek/mt7610u.bin
+ mediatek/mt7615_cr4.bin
+ mediatek/mt7615_n9.bin
+ mediatek/mt7615_rom_patch.bin
+ mediatek/mt7622_n9.bin
+ mediatek/mt7622_rom_patch.bin
+ mediatek/mt7622pr2h.bin
+ mediatek/mt7650e.bin
+ mediatek/mt7662u.bin
+ mediatek/mt7662u_rom_patch.bin
+ mediatek/mt7663_n9_rebb.bin
+ mediatek/mt7663_n9_v3.bin
+ mediatek/mt7663pr2h.bin
+ mediatek/mt7663pr2h_rebb.bin
+ mediatek/mt7668pr2h.bin
+ mediatek/mt7915_rom_patch.bin
+ mediatek/mt7915_wa.bin
+ mediatek/mt7915_wm.bin
+ mediatek/mt8173/vpu_d.bin
+ mediatek/mt8173/vpu_p.bin
+ mediatek/mt8183/scp.img
+ mediatek/mt8186/scp.img
+ mediatek/mt8195/scp.img
+ mt7601u.bin
+ mt7650.bin
+ mt7662.bin
+ mt7662_rom_patch.bin
+ rt2561.bin
+ rt2561s.bin
+ rt2661.bin
+ rt2860.bin
+ rt2870.bin
+ rt3070.bin
+ rt3071.bin
+ rt3090.bin
+ rt3290.bin
+ rt73.bin
 
 [rt73.bin_base]
 desc: Ralink RT2571W/RT2671 (RT2501USB/RT5201USB chipset) firmware
diff --minimal -Nru 
firmware-nonfree-20230625/debian/config/misc-nonfree/defines 
firmware-nonfree-20230625/debian/config/misc-nonfree/defines
--- firmware-nonfree-20230625/debian/config/misc-nonfree/defines        
2024-06-18 02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/config/misc-nonfree/defines        
2024-06-19 11:32:12.000000000 +0200
@@ -6,8 +6,7 @@
 recommends: firmware-nvidia-graphics, firmware-intel-graphics,
  firmware-intel-misc, firmware-mediatek
 support: initramfs-tools
-breaks: firmware-ti-connectivity (<< 20230625-3~)
-replaces: firmware-ti-connectivity (<< 20230625-3~)
+conflicts: firmware-ti-connectivity (<< 20230625-3~)
 provides: firmware-adi, firmware-ralink
 files:
  agere_ap_fw.bin
@@ -172,6 +171,8 @@
  ueagle-atm/DSP4p.bin
  ueagle-atm/eagleIV.fw
  wfx/wfm_wf200_C0.sec
+usrmovemitigation:
+ ti/vpdma-1b8.bin
 
 [agere_ap_fw.bin_base]
 desc: Agere/Prism/Symbol Orinoco firmware (AP mode)
diff --minimal -Nru 
firmware-nonfree-20230625/debian/config/nvidia-graphics/defines 
firmware-nonfree-20230625/debian/config/nvidia-graphics/defines
--- firmware-nonfree-20230625/debian/config/nvidia-graphics/defines     
2024-06-18 02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/config/nvidia-graphics/defines     
2024-06-19 11:34:14.000000000 +0200
@@ -2,8 +2,7 @@
 desc: Nvidia GPU chips
 longdesc:
  Nvidia graphics chips using the nouveau driver
-replaces: firmware-misc-nonfree (<< 20230625-3~)
-breaks: firmware-misc-nonfree (<< 20230625-3~)
+conflicts: firmware-misc-nonfree (<< 20230625-3~)
 files:
  nvidia/ga102/acr/ucode_ahesasc.bin
  nvidia/ga102/acr/ucode_asb.bin
@@ -248,6 +247,385 @@
  nvidia/gp108/acr/bl.bin
  nvidia/gp108/acr/ucode_load.bin
  nvidia/gp108/acr/ucode_unload.bin
+ nvidia/gp108/acr/unload_bl.bin
+ nvidia/gp108/gr/fecs_bl.bin
+ nvidia/gp108/gr/fecs_data.bin
+ nvidia/gp108/gr/fecs_inst.bin
+ nvidia/gp108/gr/fecs_sig.bin
+ nvidia/gp108/gr/gpccs_bl.bin
+ nvidia/gp108/gr/gpccs_data.bin
+ nvidia/gp108/gr/gpccs_inst.bin
+ nvidia/gp108/gr/gpccs_sig.bin
+ nvidia/gp108/gr/sw_bundle_init.bin
+ nvidia/gp108/gr/sw_ctx.bin
+ nvidia/gp108/gr/sw_method_init.bin
+ nvidia/gp108/gr/sw_nonctx.bin
+ nvidia/gp108/nvdec/scrubber.bin
+ nvidia/gp108/sec2/desc.bin
+ nvidia/gp108/sec2/image.bin
+ nvidia/gp108/sec2/sig.bin
+ nvidia/gp10b/acr/bl.bin
+ nvidia/gp10b/acr/ucode_load.bin
+ nvidia/gp10b/gr/fecs_bl.bin
+ nvidia/gp10b/gr/fecs_data.bin
+ nvidia/gp10b/gr/fecs_inst.bin
+ nvidia/gp10b/gr/fecs_sig.bin
+ nvidia/gp10b/gr/gpccs_bl.bin
+ nvidia/gp10b/gr/gpccs_data.bin
+ nvidia/gp10b/gr/gpccs_inst.bin
+ nvidia/gp10b/gr/gpccs_sig.bin
+ nvidia/gp10b/gr/sw_bundle_init.bin
+ nvidia/gp10b/gr/sw_ctx.bin
+ nvidia/gp10b/gr/sw_method_init.bin
+ nvidia/gp10b/gr/sw_nonctx.bin
+ nvidia/gp10b/pmu/desc.bin
+ nvidia/gp10b/pmu/image.bin
+ nvidia/gp10b/pmu/sig.bin
+ nvidia/gv100/acr/bl.bin
+ nvidia/gv100/acr/ucode_load.bin
+ nvidia/gv100/acr/ucode_unload.bin
+ nvidia/gv100/acr/unload_bl.bin
+ nvidia/gv100/gr/fecs_bl.bin
+ nvidia/gv100/gr/fecs_data.bin
+ nvidia/gv100/gr/fecs_inst.bin
+ nvidia/gv100/gr/fecs_sig.bin
+ nvidia/gv100/gr/gpccs_bl.bin
+ nvidia/gv100/gr/gpccs_data.bin
+ nvidia/gv100/gr/gpccs_inst.bin
+ nvidia/gv100/gr/gpccs_sig.bin
+ nvidia/gv100/gr/sw_bundle_init.bin
+ nvidia/gv100/gr/sw_ctx.bin
+ nvidia/gv100/gr/sw_method_init.bin
+ nvidia/gv100/gr/sw_nonctx.bin
+ nvidia/gv100/nvdec/scrubber.bin
+ nvidia/gv100/sec2/desc.bin
+ nvidia/gv100/sec2/image.bin
+ nvidia/gv100/sec2/sig.bin
+ nvidia/tu102/acr/bl.bin
+ nvidia/tu102/acr/ucode_ahesasc.bin
+ nvidia/tu102/acr/ucode_asb.bin
+ nvidia/tu102/acr/ucode_unload.bin
+ nvidia/tu102/acr/unload_bl.bin
+ nvidia/tu102/gr/fecs_bl.bin
+ nvidia/tu102/gr/fecs_data.bin
+ nvidia/tu102/gr/fecs_inst.bin
+ nvidia/tu102/gr/fecs_sig.bin
+ nvidia/tu102/gr/gpccs_bl.bin
+ nvidia/tu102/gr/gpccs_data.bin
+ nvidia/tu102/gr/gpccs_inst.bin
+ nvidia/tu102/gr/gpccs_sig.bin
+ nvidia/tu102/gr/sw_bundle_init.bin
+ nvidia/tu102/gr/sw_ctx.bin
+ nvidia/tu102/gr/sw_method_init.bin
+ nvidia/tu102/gr/sw_nonctx.bin
+ nvidia/tu102/gr/sw_veid_bundle_init.bin
+ nvidia/tu102/nvdec/scrubber.bin
+ nvidia/tu102/sec2/desc.bin
+ nvidia/tu102/sec2/image.bin
+ nvidia/tu102/sec2/sig.bin
+ nvidia/tu104/acr/bl.bin
+ nvidia/tu104/acr/ucode_ahesasc.bin
+ nvidia/tu104/acr/ucode_asb.bin
+ nvidia/tu104/acr/ucode_unload.bin
+ nvidia/tu104/acr/unload_bl.bin
+ nvidia/tu104/gr/fecs_bl.bin
+ nvidia/tu104/gr/fecs_data.bin
+ nvidia/tu104/gr/fecs_inst.bin
+ nvidia/tu104/gr/fecs_sig.bin
+ nvidia/tu104/gr/gpccs_bl.bin
+ nvidia/tu104/gr/gpccs_data.bin
+ nvidia/tu104/gr/gpccs_inst.bin
+ nvidia/tu104/gr/gpccs_sig.bin
+ nvidia/tu104/gr/sw_bundle_init.bin
+ nvidia/tu104/gr/sw_ctx.bin
+ nvidia/tu104/gr/sw_method_init.bin
+ nvidia/tu104/gr/sw_nonctx.bin
+ nvidia/tu104/gr/sw_veid_bundle_init.bin
+ nvidia/tu104/nvdec/scrubber.bin
+ nvidia/tu104/sec2/desc.bin
+ nvidia/tu104/sec2/image.bin
+ nvidia/tu104/sec2/sig.bin
+ nvidia/tu106/acr/bl.bin
+ nvidia/tu106/acr/ucode_ahesasc.bin
+ nvidia/tu106/acr/ucode_asb.bin
+ nvidia/tu106/acr/ucode_unload.bin
+ nvidia/tu106/acr/unload_bl.bin
+ nvidia/tu106/gr/fecs_bl.bin
+ nvidia/tu106/gr/fecs_data.bin
+ nvidia/tu106/gr/fecs_inst.bin
+ nvidia/tu106/gr/fecs_sig.bin
+ nvidia/tu106/gr/gpccs_bl.bin
+ nvidia/tu106/gr/gpccs_data.bin
+ nvidia/tu106/gr/gpccs_inst.bin
+ nvidia/tu106/gr/gpccs_sig.bin
+ nvidia/tu106/gr/sw_bundle_init.bin
+ nvidia/tu106/gr/sw_ctx.bin
+ nvidia/tu106/gr/sw_method_init.bin
+ nvidia/tu106/gr/sw_nonctx.bin
+ nvidia/tu106/gr/sw_veid_bundle_init.bin
+ nvidia/tu106/nvdec/scrubber.bin
+ nvidia/tu106/sec2/desc.bin
+ nvidia/tu106/sec2/image.bin
+ nvidia/tu106/sec2/sig.bin
+ nvidia/tu10x/typec/ccg_boot.cyacd
+ nvidia/tu10x/typec/ccg_primary.cyacd
+ nvidia/tu10x/typec/ccg_secondary.cyacd
+ nvidia/tu116/acr/bl.bin
+ nvidia/tu116/acr/ucode_ahesasc.bin
+ nvidia/tu116/acr/ucode_asb.bin
+ nvidia/tu116/acr/ucode_unload.bin
+ nvidia/tu116/acr/unload_bl.bin
+ nvidia/tu116/gr/fecs_bl.bin
+ nvidia/tu116/gr/fecs_data.bin
+ nvidia/tu116/gr/fecs_inst.bin
+ nvidia/tu116/gr/fecs_sig.bin
+ nvidia/tu116/gr/gpccs_bl.bin
+ nvidia/tu116/gr/gpccs_data.bin
+ nvidia/tu116/gr/gpccs_inst.bin
+ nvidia/tu116/gr/gpccs_sig.bin
+ nvidia/tu116/gr/sw_bundle_init.bin
+ nvidia/tu116/gr/sw_ctx.bin
+ nvidia/tu116/gr/sw_method_init.bin
+ nvidia/tu116/gr/sw_nonctx.bin
+ nvidia/tu116/gr/sw_veid_bundle_init.bin
+ nvidia/tu116/nvdec/scrubber.bin
+ nvidia/tu116/sec2/desc.bin
+ nvidia/tu116/sec2/image.bin
+ nvidia/tu116/sec2/sig.bin
+ nvidia/tu117/acr/bl.bin
+ nvidia/tu117/acr/ucode_ahesasc.bin
+ nvidia/tu117/acr/ucode_asb.bin
+ nvidia/tu117/acr/ucode_unload.bin
+ nvidia/tu117/acr/unload_bl.bin
+ nvidia/tu117/gr/fecs_bl.bin
+ nvidia/tu117/gr/fecs_data.bin
+ nvidia/tu117/gr/fecs_inst.bin
+ nvidia/tu117/gr/fecs_sig.bin
+ nvidia/tu117/gr/gpccs_bl.bin
+ nvidia/tu117/gr/gpccs_data.bin
+ nvidia/tu117/gr/gpccs_inst.bin
+ nvidia/tu117/gr/gpccs_sig.bin
+ nvidia/tu117/gr/sw_bundle_init.bin
+ nvidia/tu117/gr/sw_ctx.bin
+ nvidia/tu117/gr/sw_method_init.bin
+ nvidia/tu117/gr/sw_nonctx.bin
+ nvidia/tu117/gr/sw_veid_bundle_init.bin
+ nvidia/tu117/nvdec/scrubber.bin
+ nvidia/tu117/sec2/desc.bin
+ nvidia/tu117/sec2/image.bin
+ nvidia/tu117/sec2/sig.bin
+usrmovemitigation:
+ nvidia/ga102/acr/ucode_ahesasc.bin
+ nvidia/ga102/acr/ucode_asb.bin
+ nvidia/ga102/acr/ucode_unload.bin
+ nvidia/ga102/gr/NET_img.bin
+ nvidia/ga102/gr/fecs_bl.bin
+ nvidia/ga102/gr/fecs_sig.bin
+ nvidia/ga102/gr/gpccs_bl.bin
+ nvidia/ga102/gr/gpccs_sig.bin
+ nvidia/ga102/nvdec/scrubber.bin
+ nvidia/ga102/sec2/desc.bin
+ nvidia/ga102/sec2/hs_bl_sig.bin
+ nvidia/ga102/sec2/image.bin
+ nvidia/ga102/sec2/sig.bin
+ nvidia/ga103/gr/NET_img.bin
+ nvidia/ga103/gr/fecs_bl.bin
+ nvidia/ga103/gr/fecs_sig.bin
+ nvidia/ga103/gr/gpccs_bl.bin
+ nvidia/ga103/gr/gpccs_sig.bin
+ nvidia/ga104/gr/NET_img.bin
+ nvidia/ga104/gr/fecs_bl.bin
+ nvidia/ga104/gr/fecs_sig.bin
+ nvidia/ga104/gr/gpccs_bl.bin
+ nvidia/ga104/gr/gpccs_sig.bin
+ nvidia/ga106/gr/NET_img.bin
+ nvidia/ga106/gr/fecs_bl.bin
+ nvidia/ga106/gr/fecs_sig.bin
+ nvidia/ga106/gr/gpccs_bl.bin
+ nvidia/ga106/gr/gpccs_sig.bin
+ nvidia/ga107/gr/NET_img.bin
+ nvidia/ga107/gr/fecs_bl.bin
+ nvidia/ga107/gr/fecs_sig.bin
+ nvidia/ga107/gr/gpccs_bl.bin
+ nvidia/ga107/gr/gpccs_sig.bin
+ nvidia/gk20a/fecs_data.bin
+ nvidia/gk20a/fecs_inst.bin
+ nvidia/gk20a/gpccs_data.bin
+ nvidia/gk20a/gpccs_inst.bin
+ nvidia/gk20a/sw_bundle_init.bin
+ nvidia/gk20a/sw_ctx.bin
+ nvidia/gk20a/sw_method_init.bin
+ nvidia/gk20a/sw_nonctx.bin
+ nvidia/gm200/acr/bl.bin
+ nvidia/gm200/acr/ucode_load.bin
+ nvidia/gm200/acr/ucode_unload.bin
+ nvidia/gm200/gr/fecs_bl.bin
+ nvidia/gm200/gr/fecs_data.bin
+ nvidia/gm200/gr/fecs_inst.bin
+ nvidia/gm200/gr/fecs_sig.bin
+ nvidia/gm200/gr/gpccs_bl.bin
+ nvidia/gm200/gr/gpccs_data.bin
+ nvidia/gm200/gr/gpccs_inst.bin
+ nvidia/gm200/gr/gpccs_sig.bin
+ nvidia/gm200/gr/sw_bundle_init.bin
+ nvidia/gm200/gr/sw_ctx.bin
+ nvidia/gm200/gr/sw_method_init.bin
+ nvidia/gm200/gr/sw_nonctx.bin
+ nvidia/gm204/acr/bl.bin
+ nvidia/gm204/acr/ucode_load.bin
+ nvidia/gm204/acr/ucode_unload.bin
+ nvidia/gm204/gr/fecs_bl.bin
+ nvidia/gm204/gr/fecs_data.bin
+ nvidia/gm204/gr/fecs_inst.bin
+ nvidia/gm204/gr/fecs_sig.bin
+ nvidia/gm204/gr/gpccs_bl.bin
+ nvidia/gm204/gr/gpccs_data.bin
+ nvidia/gm204/gr/gpccs_inst.bin
+ nvidia/gm204/gr/gpccs_sig.bin
+ nvidia/gm204/gr/sw_bundle_init.bin
+ nvidia/gm204/gr/sw_ctx.bin
+ nvidia/gm204/gr/sw_method_init.bin
+ nvidia/gm204/gr/sw_nonctx.bin
+ nvidia/gm206/acr/bl.bin
+ nvidia/gm206/acr/ucode_load.bin
+ nvidia/gm206/acr/ucode_unload.bin
+ nvidia/gm206/gr/fecs_bl.bin
+ nvidia/gm206/gr/fecs_data.bin
+ nvidia/gm206/gr/fecs_inst.bin
+ nvidia/gm206/gr/fecs_sig.bin
+ nvidia/gm206/gr/gpccs_bl.bin
+ nvidia/gm206/gr/gpccs_data.bin
+ nvidia/gm206/gr/gpccs_inst.bin
+ nvidia/gm206/gr/gpccs_sig.bin
+ nvidia/gm206/gr/sw_bundle_init.bin
+ nvidia/gm206/gr/sw_ctx.bin
+ nvidia/gm206/gr/sw_method_init.bin
+ nvidia/gm206/gr/sw_nonctx.bin
+ nvidia/gm20b/acr/bl.bin
+ nvidia/gm20b/acr/ucode_load.bin
+ nvidia/gm20b/gr/fecs_bl.bin
+ nvidia/gm20b/gr/fecs_data.bin
+ nvidia/gm20b/gr/fecs_inst.bin
+ nvidia/gm20b/gr/fecs_sig.bin
+ nvidia/gm20b/gr/gpccs_data.bin
+ nvidia/gm20b/gr/gpccs_inst.bin
+ nvidia/gm20b/gr/sw_bundle_init.bin
+ nvidia/gm20b/gr/sw_ctx.bin
+ nvidia/gm20b/gr/sw_method_init.bin
+ nvidia/gm20b/gr/sw_nonctx.bin
+ nvidia/gm20b/pmu/desc.bin
+ nvidia/gm20b/pmu/image.bin
+ nvidia/gm20b/pmu/sig.bin
+ nvidia/gp100/acr/bl.bin
+ nvidia/gp100/acr/ucode_load.bin
+ nvidia/gp100/acr/ucode_unload.bin
+ nvidia/gp100/gr/fecs_bl.bin
+ nvidia/gp100/gr/fecs_data.bin
+ nvidia/gp100/gr/fecs_inst.bin
+ nvidia/gp100/gr/fecs_sig.bin
+ nvidia/gp100/gr/gpccs_bl.bin
+ nvidia/gp100/gr/gpccs_data.bin
+ nvidia/gp100/gr/gpccs_inst.bin
+ nvidia/gp100/gr/gpccs_sig.bin
+ nvidia/gp100/gr/sw_bundle_init.bin
+ nvidia/gp100/gr/sw_ctx.bin
+ nvidia/gp100/gr/sw_method_init.bin
+ nvidia/gp100/gr/sw_nonctx.bin
+ nvidia/gp102/acr/bl.bin
+ nvidia/gp102/acr/ucode_load.bin
+ nvidia/gp102/acr/ucode_unload.bin
+ nvidia/gp102/acr/unload_bl.bin
+ nvidia/gp102/gr/fecs_bl.bin
+ nvidia/gp102/gr/fecs_data.bin
+ nvidia/gp102/gr/fecs_inst.bin
+ nvidia/gp102/gr/fecs_sig.bin
+ nvidia/gp102/gr/gpccs_bl.bin
+ nvidia/gp102/gr/gpccs_data.bin
+ nvidia/gp102/gr/gpccs_inst.bin
+ nvidia/gp102/gr/gpccs_sig.bin
+ nvidia/gp102/gr/sw_bundle_init.bin
+ nvidia/gp102/gr/sw_ctx.bin
+ nvidia/gp102/gr/sw_method_init.bin
+ nvidia/gp102/gr/sw_nonctx.bin
+ nvidia/gp102/nvdec/scrubber.bin
+ nvidia/gp102/sec2/desc-1.bin
+ nvidia/gp102/sec2/desc.bin
+ nvidia/gp102/sec2/image-1.bin
+ nvidia/gp102/sec2/image.bin
+ nvidia/gp102/sec2/sig-1.bin
+ nvidia/gp102/sec2/sig.bin
+ nvidia/gp104/acr/bl.bin
+ nvidia/gp104/acr/ucode_load.bin
+ nvidia/gp104/acr/ucode_unload.bin
+ nvidia/gp104/acr/unload_bl.bin
+ nvidia/gp104/gr/fecs_bl.bin
+ nvidia/gp104/gr/fecs_data.bin
+ nvidia/gp104/gr/fecs_inst.bin
+ nvidia/gp104/gr/fecs_sig.bin
+ nvidia/gp104/gr/gpccs_bl.bin
+ nvidia/gp104/gr/gpccs_data.bin
+ nvidia/gp104/gr/gpccs_inst.bin
+ nvidia/gp104/gr/gpccs_sig.bin
+ nvidia/gp104/gr/sw_bundle_init.bin
+ nvidia/gp104/gr/sw_ctx.bin
+ nvidia/gp104/gr/sw_method_init.bin
+ nvidia/gp104/gr/sw_nonctx.bin
+ nvidia/gp104/nvdec/scrubber.bin
+ nvidia/gp104/sec2/desc-1.bin
+ nvidia/gp104/sec2/desc.bin
+ nvidia/gp104/sec2/image-1.bin
+ nvidia/gp104/sec2/image.bin
+ nvidia/gp104/sec2/sig-1.bin
+ nvidia/gp104/sec2/sig.bin
+ nvidia/gp106/acr/bl.bin
+ nvidia/gp106/acr/ucode_load.bin
+ nvidia/gp106/acr/ucode_unload.bin
+ nvidia/gp106/acr/unload_bl.bin
+ nvidia/gp106/gr/fecs_bl.bin
+ nvidia/gp106/gr/fecs_data.bin
+ nvidia/gp106/gr/fecs_inst.bin
+ nvidia/gp106/gr/fecs_sig.bin
+ nvidia/gp106/gr/gpccs_bl.bin
+ nvidia/gp106/gr/gpccs_data.bin
+ nvidia/gp106/gr/gpccs_inst.bin
+ nvidia/gp106/gr/gpccs_sig.bin
+ nvidia/gp106/gr/sw_bundle_init.bin
+ nvidia/gp106/gr/sw_ctx.bin
+ nvidia/gp106/gr/sw_method_init.bin
+ nvidia/gp106/gr/sw_nonctx.bin
+ nvidia/gp106/nvdec/scrubber.bin
+ nvidia/gp106/sec2/desc-1.bin
+ nvidia/gp106/sec2/desc.bin
+ nvidia/gp106/sec2/image-1.bin
+ nvidia/gp106/sec2/image.bin
+ nvidia/gp106/sec2/sig-1.bin
+ nvidia/gp106/sec2/sig.bin
+ nvidia/gp107/acr/bl.bin
+ nvidia/gp107/acr/ucode_load.bin
+ nvidia/gp107/acr/ucode_unload.bin
+ nvidia/gp107/acr/unload_bl.bin
+ nvidia/gp107/gr/fecs_bl.bin
+ nvidia/gp107/gr/fecs_data.bin
+ nvidia/gp107/gr/fecs_inst.bin
+ nvidia/gp107/gr/fecs_sig.bin
+ nvidia/gp107/gr/gpccs_bl.bin
+ nvidia/gp107/gr/gpccs_data.bin
+ nvidia/gp107/gr/gpccs_inst.bin
+ nvidia/gp107/gr/gpccs_sig.bin
+ nvidia/gp107/gr/sw_bundle_init.bin
+ nvidia/gp107/gr/sw_ctx.bin
+ nvidia/gp107/gr/sw_method_init.bin
+ nvidia/gp107/gr/sw_nonctx.bin
+ nvidia/gp107/nvdec/scrubber.bin
+ nvidia/gp107/sec2/desc-1.bin
+ nvidia/gp107/sec2/desc.bin
+ nvidia/gp107/sec2/image-1.bin
+ nvidia/gp107/sec2/image.bin
+ nvidia/gp107/sec2/sig-1.bin
+ nvidia/gp107/sec2/sig.bin
+ nvidia/gp108/acr/bl.bin
+ nvidia/gp108/acr/ucode_load.bin
+ nvidia/gp108/acr/ucode_unload.bin
  nvidia/gp108/acr/unload_bl.bin
  nvidia/gp108/gr/fecs_bl.bin
  nvidia/gp108/gr/fecs_data.bin
diff --minimal -Nru firmware-nonfree-20230625/debian/control 
firmware-nonfree-20230625/debian/control
--- firmware-nonfree-20230625/debian/control    2024-06-18 02:33:12.000000000 
+0200
+++ firmware-nonfree-20230625/debian/control    2024-06-19 13:11:28.000000000 
+0200
@@ -2155,9 +2155,9 @@
 Depends: ${misc:Depends}
 Recommends: 
 Suggests: initramfs-tools
-Replaces: firmware-misc-nonfree (<< 20230625-3~)
-Breaks: firmware-misc-nonfree (<< 20230625-3~)
-Conflicts: 
+Replaces: 
+Breaks: 
+Conflicts: firmware-misc-nonfree (<< 20230625-3~)
 Multi-Arch: foreign
 Description: Binary firmware for Intel Graphics Media Driver chips
  This package contains the binary firmware for  the Intel Graphics Media
@@ -2380,9 +2380,9 @@
 Depends: ${misc:Depends}
 Recommends: 
 Suggests: initramfs-tools
-Replaces: firmware-misc-nonfree (<< 20230625-3~)
-Breaks: firmware-misc-nonfree (<< 20230625-3~)
-Conflicts: 
+Replaces: 
+Breaks: 
+Conflicts: firmware-misc-nonfree (<< 20230625-3~)
 Multi-Arch: foreign
 Description: Binary firmware for miscellaneous Intel devices and chips
  This package contains the binary firmware for  miscellaneous Intel devices
@@ -2984,9 +2984,9 @@
 Depends: ${misc:Depends}
 Recommends: 
 Suggests: initramfs-tools
-Replaces: firmware-libertas (<< 20230625-3~)
-Breaks: firmware-libertas (<< 20230625-3~)
-Conflicts: 
+Replaces: 
+Breaks: 
+Conflicts: firmware-libertas (<< 20230625-3~)
 Multi-Arch: foreign
 Description: Binary firmware for Marvell Prestera ASIC devices
  This package contains the binary firmware for  Marvell Switchdev solution
@@ -3008,9 +3008,9 @@
 Depends: ${misc:Depends}
 Recommends: 
 Suggests: initramfs-tools
-Replaces: firmware-misc-nonfree (<< 20230625-3~)
-Breaks: firmware-misc-nonfree (<< 20230625-3~)
-Conflicts: 
+Replaces: 
+Breaks: 
+Conflicts: firmware-misc-nonfree (<< 20230625-3~)
 Multi-Arch: foreign
 Description: Binary firmware for MediaTek and Ralink chips for networking, 
SoCs and media
  This package contains the binary firmware for  MediaTek devices such as
@@ -3164,9 +3164,9 @@
 Depends: ${misc:Depends}
 Recommends: firmware-nvidia-graphics, firmware-intel-graphics, 
firmware-intel-misc, firmware-mediatek
 Suggests: initramfs-tools
-Replaces: firmware-ti-connectivity (<< 20230625-3~)
-Breaks: firmware-ti-connectivity (<< 20230625-3~)
-Conflicts: 
+Replaces: 
+Breaks: 
+Conflicts: firmware-ti-connectivity (<< 20230625-3~)
 Multi-Arch: foreign
 Description: Binary firmware for various drivers in the Linux kernel
  This package contains the binary firmware for  various drivers in the
@@ -3568,9 +3568,9 @@
 Depends: ${misc:Depends}
 Recommends: 
 Suggests: initramfs-tools
-Replaces: firmware-misc-nonfree (<< 20230625-3~)
-Breaks: firmware-misc-nonfree (<< 20230625-3~)
-Conflicts: 
+Replaces: 
+Breaks: 
+Conflicts: firmware-misc-nonfree (<< 20230625-3~)
 Multi-Arch: foreign
 Description: Binary firmware for Nvidia GPU chips
  This package contains the binary firmware for  Nvidia graphics chips using
diff --minimal -Nru firmware-nonfree-20230625/debian/control.md5sum 
firmware-nonfree-20230625/debian/control.md5sum
--- firmware-nonfree-20230625/debian/control.md5sum     2024-06-18 
02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/control.md5sum     2024-06-19 
13:11:28.000000000 +0200
@@ -1,13 +1,15 @@
-756f19279d2cfa999df58e6455f10465  debian/bin/gencontrol.py
-438cb8f049e1a7a422a9764a8d427bd0  debian/build/version-info
+ce4e0f21c9434741d5a6930e3ba64bd1  debian/bin/gencontrol.py
+cdc87ea3dd806fad1193952b46db048b  debian/build/version-info
 29c8d86cbba7d798701946b1d990539e  debian/templates/control.binary.in
 c03e4b00d7d344da35e815e921d78018  debian/templates/control.extra.in
 cf6b7f3cc41154a11d7cfbaa900f8c2a  debian/templates/control.source.in
 d8ec26344473f36fc003658b597cc8b2  debian/templates/metainfo.xml.firmware.in
 b5c757c4e1c22468195df48a5da46f6c  debian/templates/metainfo.xml.in
 f729dae60d5421700fd7cadc198d0e33  debian/templates/metainfo.xml.modalias.in
-1dc2bec8222eb519362c444a4afd1d69  debian/templates/postinst.initramfs-tools.in
-6263e4ff7146c93e389d80592d28d8d6  debian/templates/preinst.license.in
+5fac0478a58109fa5546fb2894550bdf  debian/templates/postinst.initramfs-tools.in
+f89cc1b2b8cd9259fff47eff09f132fb  
debian/templates/postinst.usrmovemitigation.in
+fee54397ba64c0c276c11be8571de497  debian/templates/preinst.license.in
+2bfbfdb060d258df84176535e7ced6fb  debian/templates/preinst.usrmovemitigation.in
 14a2c569f8c79cb237a31d63452ad7e9  debian/templates/templates.license.in
 09e1e0e439e4e8c93da0c4268ce9f4ef  debian/config/defines
 e72611bcd67a8608e3d42cd076a1ec8f  debian/config/amd-graphics/defines
@@ -17,20 +19,20 @@
 2cb8d4ae2b97d482dee5161fee7a0d21  debian/config/brcm80211/defines
 a3253743eca03c2a832cbd2ba3a5ef4d  debian/config/cavium/defines
 f58b34f6b80068a40abf57b5bac8f34c  debian/config/cirrus/defines
-18bd24806d48a17b1c1f154e0e0fd909  debian/config/intel-graphics/defines
-14d47905bae7882e02f98f73e47b7e32  debian/config/intel-misc/defines
+3a2119a18d9c49b6a0af9677fcb5a9c6  debian/config/intel-graphics/defines
+54ff7a9cac9d6c2782e06c97c4e1efb2  debian/config/intel-misc/defines
 6d76850b5e32bcecd208d50cca0ec613  debian/config/intel-sound/defines
 176556ab83c1d6ee90d45226fee22e24  debian/config/ipw2x00/defines
 0b2d53bd5b722322541692fae9ed27b1  debian/config/ivtv/defines
 8bb681eb587a244bd48bf7809b55fd93  debian/config/iwlwifi/defines
 da8b071dced65460cfd852bca4953381  debian/config/libertas/defines
-182843850e91b9cb2b87661a17d34164  debian/config/marvell-prestera/defines
-6ca83b2a58b383fefb53075ed29e6e59  debian/config/mediatek/defines
-d69d6c2acd54dc90a80fcd214335aff2  debian/config/misc-nonfree/defines
+9bbd78eb0700195e8d04fb70e4a04a51  debian/config/marvell-prestera/defines
+18956102a8ae5fc8f82ecaac5862cf8b  debian/config/mediatek/defines
+e11b23be97a5d0d72b5b9883b6e2679b  debian/config/misc-nonfree/defines
 c733dd7ca35876502288e6ae4953ca12  debian/config/myricom/defines
 8baabd5bf01af0adfcf399123fbb5e41  debian/config/netronome/defines
 159a8e4b32bafa9c76102883552ed061  debian/config/netxen/defines
-c9d3aa991e3bbf28e29910d778875718  debian/config/nvidia-graphics/defines
+e55c1b2104f0df5c284ac8d06483f19d  debian/config/nvidia-graphics/defines
 a811af39b139a707704b2e4967882159  debian/config/qcom-soc/defines
 aeea9a5bc9fc5475fcd4a5ac9b596d79  debian/config/qlogic/defines
 c1e2e52f2ce4d16ed09feaa9d59d084a  debian/config/realtek/defines
diff --minimal -Nru 
firmware-nonfree-20230625/debian/firmware-amd-graphics.postinst 
firmware-nonfree-20230625/debian/firmware-amd-graphics.postinst
--- firmware-nonfree-20230625/debian/firmware-amd-graphics.postinst     
2024-06-18 02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/firmware-amd-graphics.postinst     
2024-06-19 13:11:28.000000000 +0200
@@ -17,3 +17,5 @@
 esac
 
 #DEBHELPER#
+
+exit 0
diff --minimal -Nru firmware-nonfree-20230625/debian/firmware-bnx2.postinst 
firmware-nonfree-20230625/debian/firmware-bnx2.postinst
--- firmware-nonfree-20230625/debian/firmware-bnx2.postinst     2024-06-18 
02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/firmware-bnx2.postinst     2024-06-19 
13:11:28.000000000 +0200
@@ -17,3 +17,5 @@
 esac
 
 #DEBHELPER#
+
+exit 0
diff --minimal -Nru firmware-nonfree-20230625/debian/firmware-bnx2x.postinst 
firmware-nonfree-20230625/debian/firmware-bnx2x.postinst
--- firmware-nonfree-20230625/debian/firmware-bnx2x.postinst    2024-06-18 
02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/firmware-bnx2x.postinst    2024-06-19 
13:11:28.000000000 +0200
@@ -17,3 +17,5 @@
 esac
 
 #DEBHELPER#
+
+exit 0
diff --minimal -Nru firmware-nonfree-20230625/debian/firmware-cavium.postinst 
firmware-nonfree-20230625/debian/firmware-cavium.postinst
--- firmware-nonfree-20230625/debian/firmware-cavium.postinst   2024-06-18 
02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/firmware-cavium.postinst   2024-06-19 
13:11:28.000000000 +0200
@@ -17,3 +17,5 @@
 esac
 
 #DEBHELPER#
+
+exit 0
diff --minimal -Nru 
firmware-nonfree-20230625/debian/firmware-intel-graphics.postinst 
firmware-nonfree-20230625/debian/firmware-intel-graphics.postinst
--- firmware-nonfree-20230625/debian/firmware-intel-graphics.postinst   
1970-01-01 01:00:00.000000000 +0100
+++ firmware-nonfree-20230625/debian/firmware-intel-graphics.postinst   
2024-06-19 13:11:28.000000000 +0200
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
+       for f in  i915/adlp_dmc.bin i915/adlp_dmc_ver2_09.bin 
i915/adlp_dmc_ver2_10.bin i915/adlp_dmc_ver2_12.bin i915/adlp_dmc_ver2_14.bin 
i915/adlp_dmc_ver2_16.bin i915/adlp_guc_62.0.3.bin i915/adlp_guc_69.0.3.bin 
i915/adlp_guc_70.1.1.bin i915/adlp_guc_70.bin i915/adls_dmc_ver2_01.bin 
i915/bxt_dmc_ver1.bin i915/bxt_dmc_ver1_07.bin i915/bxt_guc_32.0.3.bin 
i915/bxt_guc_33.0.0.bin i915/bxt_guc_49.0.1.bin i915/bxt_guc_62.0.0.bin 
i915/bxt_guc_69.0.3.bin i915/bxt_guc_70.1.1.bin i915/bxt_guc_ver8_7.bin 
i915/bxt_guc_ver9_29.bin i915/bxt_huc_2.0.0.bin i915/bxt_huc_ver01_07_1398.bin 
i915/bxt_huc_ver01_8_2893.bin i915/cml_guc_33.0.0.bin i915/cml_guc_49.0.1.bin 
i915/cml_guc_62.0.0.bin i915/cml_guc_69.0.3.bin i915/cml_guc_70.1.1.bin 
i915/cml_huc_4.0.0.bin i915/cnl_dmc_ver1_07.bin i915/dg1_dmc_ver2_02.bin 
i915/dg1_guc_49.0.1.bin i915/dg1_guc_62.0.0.bin i915/dg1_guc_69.0.3.bin 
i915/dg1_guc_70.1.1.bin i915/dg1_guc_70.bin i915/dg1_huc.bin 
i915/dg1_huc_7.7.1.bin i915/dg1_huc_7.9.3.bin i915/dg2_dmc_ver2_06.bin 
i915/dg2_dmc_ver2_07.bin i915/dg2_dmc_ver2_08.bin i915/dg2_guc_70.1.2.bin 
i915/dg2_guc_70.4.1.bin i915/dg2_guc_70.bin i915/ehl_guc_33.0.4.bin 
i915/ehl_guc_49.0.1.bin i915/ehl_guc_62.0.0.bin i915/ehl_guc_69.0.3.bin 
i915/ehl_guc_70.1.1.bin i915/ehl_huc_9.0.0.bin i915/glk_dmc_ver1_04.bin 
i915/glk_guc_32.0.3.bin i915/glk_guc_33.0.0.bin i915/glk_guc_49.0.1.bin 
i915/glk_guc_62.0.0.bin i915/glk_guc_69.0.3.bin i915/glk_guc_70.1.1.bin 
i915/glk_huc_4.0.0.bin i915/glk_huc_ver03_01_2893.bin i915/icl_dmc_ver1_07.bin 
i915/icl_dmc_ver1_09.bin i915/icl_guc_32.0.3.bin i915/icl_guc_33.0.0.bin 
i915/icl_guc_49.0.1.bin i915/icl_guc_62.0.0.bin i915/icl_guc_69.0.3.bin 
i915/icl_guc_70.1.1.bin i915/icl_huc_9.0.0.bin i915/icl_huc_ver8_4_3238.bin 
i915/kbl_dmc_ver1.bin i915/kbl_dmc_ver1_01.bin i915/kbl_dmc_ver1_04.bin 
i915/kbl_guc_32.0.3.bin i915/kbl_guc_33.0.0.bin i915/kbl_guc_49.0.1.bin 
i915/kbl_guc_62.0.0.bin i915/kbl_guc_69.0.3.bin i915/kbl_guc_70.1.1.bin 
i915/kbl_guc_ver9_14.bin i915/kbl_guc_ver9_39.bin i915/kbl_huc_4.0.0.bin 
i915/kbl_huc_ver02_00_1810.bin i915/mtl_dmc.bin i915/rkl_dmc_ver2_02.bin 
i915/rkl_dmc_ver2_03.bin i915/skl_dmc_ver1.bin i915/skl_dmc_ver1_23.bin 
i915/skl_dmc_ver1_26.bin i915/skl_dmc_ver1_27.bin i915/skl_guc_32.0.3.bin 
i915/skl_guc_33.0.0.bin i915/skl_guc_49.0.1.bin i915/skl_guc_62.0.0.bin 
i915/skl_guc_69.0.3.bin i915/skl_guc_70.1.1.bin i915/skl_guc_ver1.bin 
i915/skl_guc_ver4.bin i915/skl_guc_ver6.bin i915/skl_guc_ver6_1.bin 
i915/skl_guc_ver9_33.bin i915/skl_huc_2.0.0.bin i915/skl_huc_ver01_07_1398.bin 
i915/tgl_dmc_ver2_04.bin i915/tgl_dmc_ver2_06.bin i915/tgl_dmc_ver2_08.bin 
i915/tgl_dmc_ver2_12.bin i915/tgl_guc_35.2.0.bin i915/tgl_guc_49.0.1.bin 
i915/tgl_guc_62.0.0.bin i915/tgl_guc_69.0.3.bin i915/tgl_guc_70.1.1.bin 
i915/tgl_guc_70.bin i915/tgl_huc.bin i915/tgl_huc_7.0.12.bin 
i915/tgl_huc_7.0.3.bin i915/tgl_huc_7.5.0.bin i915/tgl_huc_7.9.3.bin 
intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin; do
+               dpkg-divert --package #PACKAGE# --no-rename --quiet \
+                       --divert "/lib/firmware/$f.usr-is-merged" \
+                       --remove "/lib/firmware/$f"
+       done
+fi
+
+#DEBHELPER#
+
+exit 0
diff --minimal -Nru 
firmware-nonfree-20230625/debian/firmware-intel-graphics.preinst 
firmware-nonfree-20230625/debian/firmware-intel-graphics.preinst
--- firmware-nonfree-20230625/debian/firmware-intel-graphics.preinst    
1970-01-01 01:00:00.000000000 +0100
+++ firmware-nonfree-20230625/debian/firmware-intel-graphics.preinst    
2024-06-19 13:11:28.000000000 +0200
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] || [ "$1" = "install" ]; then
+       for f in  i915/adlp_dmc.bin i915/adlp_dmc_ver2_09.bin 
i915/adlp_dmc_ver2_10.bin i915/adlp_dmc_ver2_12.bin i915/adlp_dmc_ver2_14.bin 
i915/adlp_dmc_ver2_16.bin i915/adlp_guc_62.0.3.bin i915/adlp_guc_69.0.3.bin 
i915/adlp_guc_70.1.1.bin i915/adlp_guc_70.bin i915/adls_dmc_ver2_01.bin 
i915/bxt_dmc_ver1.bin i915/bxt_dmc_ver1_07.bin i915/bxt_guc_32.0.3.bin 
i915/bxt_guc_33.0.0.bin i915/bxt_guc_49.0.1.bin i915/bxt_guc_62.0.0.bin 
i915/bxt_guc_69.0.3.bin i915/bxt_guc_70.1.1.bin i915/bxt_guc_ver8_7.bin 
i915/bxt_guc_ver9_29.bin i915/bxt_huc_2.0.0.bin i915/bxt_huc_ver01_07_1398.bin 
i915/bxt_huc_ver01_8_2893.bin i915/cml_guc_33.0.0.bin i915/cml_guc_49.0.1.bin 
i915/cml_guc_62.0.0.bin i915/cml_guc_69.0.3.bin i915/cml_guc_70.1.1.bin 
i915/cml_huc_4.0.0.bin i915/cnl_dmc_ver1_07.bin i915/dg1_dmc_ver2_02.bin 
i915/dg1_guc_49.0.1.bin i915/dg1_guc_62.0.0.bin i915/dg1_guc_69.0.3.bin 
i915/dg1_guc_70.1.1.bin i915/dg1_guc_70.bin i915/dg1_huc.bin 
i915/dg1_huc_7.7.1.bin i915/dg1_huc_7.9.3.bin i915/dg2_dmc_ver2_06.bin 
i915/dg2_dmc_ver2_07.bin i915/dg2_dmc_ver2_08.bin i915/dg2_guc_70.1.2.bin 
i915/dg2_guc_70.4.1.bin i915/dg2_guc_70.bin i915/ehl_guc_33.0.4.bin 
i915/ehl_guc_49.0.1.bin i915/ehl_guc_62.0.0.bin i915/ehl_guc_69.0.3.bin 
i915/ehl_guc_70.1.1.bin i915/ehl_huc_9.0.0.bin i915/glk_dmc_ver1_04.bin 
i915/glk_guc_32.0.3.bin i915/glk_guc_33.0.0.bin i915/glk_guc_49.0.1.bin 
i915/glk_guc_62.0.0.bin i915/glk_guc_69.0.3.bin i915/glk_guc_70.1.1.bin 
i915/glk_huc_4.0.0.bin i915/glk_huc_ver03_01_2893.bin i915/icl_dmc_ver1_07.bin 
i915/icl_dmc_ver1_09.bin i915/icl_guc_32.0.3.bin i915/icl_guc_33.0.0.bin 
i915/icl_guc_49.0.1.bin i915/icl_guc_62.0.0.bin i915/icl_guc_69.0.3.bin 
i915/icl_guc_70.1.1.bin i915/icl_huc_9.0.0.bin i915/icl_huc_ver8_4_3238.bin 
i915/kbl_dmc_ver1.bin i915/kbl_dmc_ver1_01.bin i915/kbl_dmc_ver1_04.bin 
i915/kbl_guc_32.0.3.bin i915/kbl_guc_33.0.0.bin i915/kbl_guc_49.0.1.bin 
i915/kbl_guc_62.0.0.bin i915/kbl_guc_69.0.3.bin i915/kbl_guc_70.1.1.bin 
i915/kbl_guc_ver9_14.bin i915/kbl_guc_ver9_39.bin i915/kbl_huc_4.0.0.bin 
i915/kbl_huc_ver02_00_1810.bin i915/mtl_dmc.bin i915/rkl_dmc_ver2_02.bin 
i915/rkl_dmc_ver2_03.bin i915/skl_dmc_ver1.bin i915/skl_dmc_ver1_23.bin 
i915/skl_dmc_ver1_26.bin i915/skl_dmc_ver1_27.bin i915/skl_guc_32.0.3.bin 
i915/skl_guc_33.0.0.bin i915/skl_guc_49.0.1.bin i915/skl_guc_62.0.0.bin 
i915/skl_guc_69.0.3.bin i915/skl_guc_70.1.1.bin i915/skl_guc_ver1.bin 
i915/skl_guc_ver4.bin i915/skl_guc_ver6.bin i915/skl_guc_ver6_1.bin 
i915/skl_guc_ver9_33.bin i915/skl_huc_2.0.0.bin i915/skl_huc_ver01_07_1398.bin 
i915/tgl_dmc_ver2_04.bin i915/tgl_dmc_ver2_06.bin i915/tgl_dmc_ver2_08.bin 
i915/tgl_dmc_ver2_12.bin i915/tgl_guc_35.2.0.bin i915/tgl_guc_49.0.1.bin 
i915/tgl_guc_62.0.0.bin i915/tgl_guc_69.0.3.bin i915/tgl_guc_70.1.1.bin 
i915/tgl_guc_70.bin i915/tgl_huc.bin i915/tgl_huc_7.0.12.bin 
i915/tgl_huc_7.0.3.bin i915/tgl_huc_7.5.0.bin i915/tgl_huc_7.9.3.bin 
intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin; do
+               dpkg-divert --package #PACKAGE# --no-rename --quiet \
+                       --divert "/lib/firmware/$f.usr-is-merged" \
+                       --add "/lib/firmware/$f"
+       done
+fi
+
+#DEBHELPER#
+
+exit 0
diff --minimal -Nru 
firmware-nonfree-20230625/debian/firmware-intel-misc.postinst 
firmware-nonfree-20230625/debian/firmware-intel-misc.postinst
--- firmware-nonfree-20230625/debian/firmware-intel-misc.postinst       
1970-01-01 01:00:00.000000000 +0100
+++ firmware-nonfree-20230625/debian/firmware-intel-misc.postinst       
2024-06-19 13:11:28.000000000 +0200
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
+       for f in  e100/d101m_ucode.bin e100/d101s_ucode.bin 
e100/d102e_ucode.bin hfi1_dc8051.fw hfi1_fabric.fw hfi1_pcie.fw hfi1_sbus.fw 
intel/ice/ddp/ice-1.3.30.0.pkg intel/ice/ddp/ice.pkg qat_895xcc.bin 
qat_895xcc_mmp.bin qat_c3xxx.bin qat_c3xxx_mmp.bin qat_c62x.bin 
qat_c62x_mmp.bin qat_mmp.bin; do
+               dpkg-divert --package #PACKAGE# --no-rename --quiet \
+                       --divert "/lib/firmware/$f.usr-is-merged" \
+                       --remove "/lib/firmware/$f"
+       done
+fi
+
+#DEBHELPER#
+
+exit 0
diff --minimal -Nru 
firmware-nonfree-20230625/debian/firmware-intel-misc.preinst 
firmware-nonfree-20230625/debian/firmware-intel-misc.preinst
--- firmware-nonfree-20230625/debian/firmware-intel-misc.preinst        
1970-01-01 01:00:00.000000000 +0100
+++ firmware-nonfree-20230625/debian/firmware-intel-misc.preinst        
2024-06-19 13:11:28.000000000 +0200
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] || [ "$1" = "install" ]; then
+       for f in  e100/d101m_ucode.bin e100/d101s_ucode.bin 
e100/d102e_ucode.bin hfi1_dc8051.fw hfi1_fabric.fw hfi1_pcie.fw hfi1_sbus.fw 
intel/ice/ddp/ice-1.3.30.0.pkg intel/ice/ddp/ice.pkg qat_895xcc.bin 
qat_895xcc_mmp.bin qat_c3xxx.bin qat_c3xxx_mmp.bin qat_c62x.bin 
qat_c62x_mmp.bin qat_mmp.bin; do
+               dpkg-divert --package #PACKAGE# --no-rename --quiet \
+                       --divert "/lib/firmware/$f.usr-is-merged" \
+                       --add "/lib/firmware/$f"
+       done
+fi
+
+#DEBHELPER#
+
+exit 0
diff --minimal -Nru firmware-nonfree-20230625/debian/firmware-ipw2x00.preinst 
firmware-nonfree-20230625/debian/firmware-ipw2x00.preinst
--- firmware-nonfree-20230625/debian/firmware-ipw2x00.preinst   2024-06-18 
02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/firmware-ipw2x00.preinst   2024-06-19 
13:11:28.000000000 +0200
@@ -72,7 +72,7 @@
     RESULT=$?
     [ "$RESULT" = 0 ] || exit $RESULT
 fi
- 
+
 #DEBHELPER#
 
 exit 0
diff --minimal -Nru firmware-nonfree-20230625/debian/firmware-ivtv.preinst 
firmware-nonfree-20230625/debian/firmware-ivtv.preinst
--- firmware-nonfree-20230625/debian/firmware-ivtv.preinst      2024-06-18 
02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/firmware-ivtv.preinst      2024-06-19 
13:11:28.000000000 +0200
@@ -72,7 +72,7 @@
     RESULT=$?
     [ "$RESULT" = 0 ] || exit $RESULT
 fi
- 
+
 #DEBHELPER#
 
 exit 0
diff --minimal -Nru 
firmware-nonfree-20230625/debian/firmware-marvell-prestera.postinst 
firmware-nonfree-20230625/debian/firmware-marvell-prestera.postinst
--- firmware-nonfree-20230625/debian/firmware-marvell-prestera.postinst 
1970-01-01 01:00:00.000000000 +0100
+++ firmware-nonfree-20230625/debian/firmware-marvell-prestera.postinst 
2024-06-19 13:11:28.000000000 +0200
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
+       for f in  mrvl/prestera/mvsw_prestera_fw-v2.0.img 
mrvl/prestera/mvsw_prestera_fw-v3.0.img; do
+               dpkg-divert --package #PACKAGE# --no-rename --quiet \
+                       --divert "/lib/firmware/$f.usr-is-merged" \
+                       --remove "/lib/firmware/$f"
+       done
+fi
+
+#DEBHELPER#
+
+exit 0
diff --minimal -Nru 
firmware-nonfree-20230625/debian/firmware-marvell-prestera.preinst 
firmware-nonfree-20230625/debian/firmware-marvell-prestera.preinst
--- firmware-nonfree-20230625/debian/firmware-marvell-prestera.preinst  
1970-01-01 01:00:00.000000000 +0100
+++ firmware-nonfree-20230625/debian/firmware-marvell-prestera.preinst  
2024-06-19 13:11:28.000000000 +0200
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] || [ "$1" = "install" ]; then
+       for f in  mrvl/prestera/mvsw_prestera_fw-v2.0.img 
mrvl/prestera/mvsw_prestera_fw-v3.0.img; do
+               dpkg-divert --package #PACKAGE# --no-rename --quiet \
+                       --divert "/lib/firmware/$f.usr-is-merged" \
+                       --add "/lib/firmware/$f"
+       done
+fi
+
+#DEBHELPER#
+
+exit 0
diff --minimal -Nru firmware-nonfree-20230625/debian/firmware-mediatek.postinst 
firmware-nonfree-20230625/debian/firmware-mediatek.postinst
--- firmware-nonfree-20230625/debian/firmware-mediatek.postinst 2024-06-18 
02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/firmware-mediatek.postinst 2024-06-19 
13:11:28.000000000 +0200
@@ -16,4 +16,14 @@
        ;;
 esac
 
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
+       for f in  mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin 
mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin 
mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin 
mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin mediatek/WIFI_RAM_CODE_MT7922_1.bin 
mediatek/WIFI_RAM_CODE_MT7961_1.bin mediatek/mt7610e.bin mediatek/mt7610u.bin 
mediatek/mt7615_cr4.bin mediatek/mt7615_n9.bin mediatek/mt7615_rom_patch.bin 
mediatek/mt7622_n9.bin mediatek/mt7622_rom_patch.bin mediatek/mt7622pr2h.bin 
mediatek/mt7650e.bin mediatek/mt7662u.bin mediatek/mt7662u_rom_patch.bin 
mediatek/mt7663_n9_rebb.bin mediatek/mt7663_n9_v3.bin mediatek/mt7663pr2h.bin 
mediatek/mt7663pr2h_rebb.bin mediatek/mt7668pr2h.bin 
mediatek/mt7915_rom_patch.bin mediatek/mt7915_wa.bin mediatek/mt7915_wm.bin 
mediatek/mt8173/vpu_d.bin mediatek/mt8173/vpu_p.bin mediatek/mt8183/scp.img 
mediatek/mt8186/scp.img mediatek/mt8195/scp.img mt7601u.bin mt7650.bin 
mt7662.bin mt7662_rom_patch.bin rt2561.bin rt2561s.bin rt2661.bin rt2860.bin 
rt2870.bin rt3070.bin rt3071.bin rt3090.bin rt3290.bin rt73.bin; do
+               dpkg-divert --package #PACKAGE# --no-rename --quiet \
+                       --divert "/lib/firmware/$f.usr-is-merged" \
+                       --remove "/lib/firmware/$f"
+       done
+fi
+
 #DEBHELPER#
+
+exit 0
diff --minimal -Nru firmware-nonfree-20230625/debian/firmware-mediatek.preinst 
firmware-nonfree-20230625/debian/firmware-mediatek.preinst
--- firmware-nonfree-20230625/debian/firmware-mediatek.preinst  1970-01-01 
01:00:00.000000000 +0100
+++ firmware-nonfree-20230625/debian/firmware-mediatek.preinst  2024-06-19 
13:11:28.000000000 +0200
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] || [ "$1" = "install" ]; then
+       for f in  mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin 
mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin 
mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin 
mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin mediatek/WIFI_RAM_CODE_MT7922_1.bin 
mediatek/WIFI_RAM_CODE_MT7961_1.bin mediatek/mt7610e.bin mediatek/mt7610u.bin 
mediatek/mt7615_cr4.bin mediatek/mt7615_n9.bin mediatek/mt7615_rom_patch.bin 
mediatek/mt7622_n9.bin mediatek/mt7622_rom_patch.bin mediatek/mt7622pr2h.bin 
mediatek/mt7650e.bin mediatek/mt7662u.bin mediatek/mt7662u_rom_patch.bin 
mediatek/mt7663_n9_rebb.bin mediatek/mt7663_n9_v3.bin mediatek/mt7663pr2h.bin 
mediatek/mt7663pr2h_rebb.bin mediatek/mt7668pr2h.bin 
mediatek/mt7915_rom_patch.bin mediatek/mt7915_wa.bin mediatek/mt7915_wm.bin 
mediatek/mt8173/vpu_d.bin mediatek/mt8173/vpu_p.bin mediatek/mt8183/scp.img 
mediatek/mt8186/scp.img mediatek/mt8195/scp.img mt7601u.bin mt7650.bin 
mt7662.bin mt7662_rom_patch.bin rt2561.bin rt2561s.bin rt2661.bin rt2860.bin 
rt2870.bin rt3070.bin rt3071.bin rt3090.bin rt3290.bin rt73.bin; do
+               dpkg-divert --package #PACKAGE# --no-rename --quiet \
+                       --divert "/lib/firmware/$f.usr-is-merged" \
+                       --add "/lib/firmware/$f"
+       done
+fi
+
+#DEBHELPER#
+
+exit 0
diff --minimal -Nru 
firmware-nonfree-20230625/debian/firmware-misc-nonfree.postinst 
firmware-nonfree-20230625/debian/firmware-misc-nonfree.postinst
--- firmware-nonfree-20230625/debian/firmware-misc-nonfree.postinst     
2024-06-18 02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/firmware-misc-nonfree.postinst     
2024-06-19 13:11:28.000000000 +0200
@@ -16,4 +16,14 @@
        ;;
 esac
 
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
+       for f in  ti/vpdma-1b8.bin; do
+               dpkg-divert --package #PACKAGE# --no-rename --quiet \
+                       --divert "/lib/firmware/$f.usr-is-merged" \
+                       --remove "/lib/firmware/$f"
+       done
+fi
+
 #DEBHELPER#
+
+exit 0
diff --minimal -Nru 
firmware-nonfree-20230625/debian/firmware-misc-nonfree.preinst 
firmware-nonfree-20230625/debian/firmware-misc-nonfree.preinst
--- firmware-nonfree-20230625/debian/firmware-misc-nonfree.preinst      
1970-01-01 01:00:00.000000000 +0100
+++ firmware-nonfree-20230625/debian/firmware-misc-nonfree.preinst      
2024-06-19 13:11:28.000000000 +0200
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] || [ "$1" = "install" ]; then
+       for f in  ti/vpdma-1b8.bin; do
+               dpkg-divert --package #PACKAGE# --no-rename --quiet \
+                       --divert "/lib/firmware/$f.usr-is-merged" \
+                       --add "/lib/firmware/$f"
+       done
+fi
+
+#DEBHELPER#
+
+exit 0
diff --minimal -Nru firmware-nonfree-20230625/debian/firmware-myricom.postinst 
firmware-nonfree-20230625/debian/firmware-myricom.postinst
--- firmware-nonfree-20230625/debian/firmware-myricom.postinst  2024-06-18 
02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/firmware-myricom.postinst  2024-06-19 
13:11:28.000000000 +0200
@@ -17,3 +17,5 @@
 esac
 
 #DEBHELPER#
+
+exit 0
diff --minimal -Nru 
firmware-nonfree-20230625/debian/firmware-netronome.postinst 
firmware-nonfree-20230625/debian/firmware-netronome.postinst
--- firmware-nonfree-20230625/debian/firmware-netronome.postinst        
2024-06-18 02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/firmware-netronome.postinst        
2024-06-19 13:11:28.000000000 +0200
@@ -17,3 +17,5 @@
 esac
 
 #DEBHELPER#
+
+exit 0
diff --minimal -Nru firmware-nonfree-20230625/debian/firmware-netxen.postinst 
firmware-nonfree-20230625/debian/firmware-netxen.postinst
--- firmware-nonfree-20230625/debian/firmware-netxen.postinst   2024-06-18 
02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/firmware-netxen.postinst   2024-06-19 
13:11:28.000000000 +0200
@@ -17,3 +17,5 @@
 esac
 
 #DEBHELPER#
+
+exit 0
diff --minimal -Nru 
firmware-nonfree-20230625/debian/firmware-nvidia-graphics.postinst 
firmware-nonfree-20230625/debian/firmware-nvidia-graphics.postinst
--- firmware-nonfree-20230625/debian/firmware-nvidia-graphics.postinst  
1970-01-01 01:00:00.000000000 +0100
+++ firmware-nonfree-20230625/debian/firmware-nvidia-graphics.postinst  
2024-06-19 13:11:28.000000000 +0200
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
+       for f in  nvidia/ga102/acr/ucode_ahesasc.bin 
nvidia/ga102/acr/ucode_asb.bin nvidia/ga102/acr/ucode_unload.bin 
nvidia/ga102/gr/NET_img.bin nvidia/ga102/gr/fecs_bl.bin 
nvidia/ga102/gr/fecs_sig.bin nvidia/ga102/gr/gpccs_bl.bin 
nvidia/ga102/gr/gpccs_sig.bin nvidia/ga102/nvdec/scrubber.bin 
nvidia/ga102/sec2/desc.bin nvidia/ga102/sec2/hs_bl_sig.bin 
nvidia/ga102/sec2/image.bin nvidia/ga102/sec2/sig.bin 
nvidia/ga103/gr/NET_img.bin nvidia/ga103/gr/fecs_bl.bin 
nvidia/ga103/gr/fecs_sig.bin nvidia/ga103/gr/gpccs_bl.bin 
nvidia/ga103/gr/gpccs_sig.bin nvidia/ga104/gr/NET_img.bin 
nvidia/ga104/gr/fecs_bl.bin nvidia/ga104/gr/fecs_sig.bin 
nvidia/ga104/gr/gpccs_bl.bin nvidia/ga104/gr/gpccs_sig.bin 
nvidia/ga106/gr/NET_img.bin nvidia/ga106/gr/fecs_bl.bin 
nvidia/ga106/gr/fecs_sig.bin nvidia/ga106/gr/gpccs_bl.bin 
nvidia/ga106/gr/gpccs_sig.bin nvidia/ga107/gr/NET_img.bin 
nvidia/ga107/gr/fecs_bl.bin nvidia/ga107/gr/fecs_sig.bin 
nvidia/ga107/gr/gpccs_bl.bin nvidia/ga107/gr/gpccs_sig.bin 
nvidia/gk20a/fecs_data.bin nvidia/gk20a/fecs_inst.bin 
nvidia/gk20a/gpccs_data.bin nvidia/gk20a/gpccs_inst.bin 
nvidia/gk20a/sw_bundle_init.bin nvidia/gk20a/sw_ctx.bin 
nvidia/gk20a/sw_method_init.bin nvidia/gk20a/sw_nonctx.bin 
nvidia/gm200/acr/bl.bin nvidia/gm200/acr/ucode_load.bin 
nvidia/gm200/acr/ucode_unload.bin nvidia/gm200/gr/fecs_bl.bin 
nvidia/gm200/gr/fecs_data.bin nvidia/gm200/gr/fecs_inst.bin 
nvidia/gm200/gr/fecs_sig.bin nvidia/gm200/gr/gpccs_bl.bin 
nvidia/gm200/gr/gpccs_data.bin nvidia/gm200/gr/gpccs_inst.bin 
nvidia/gm200/gr/gpccs_sig.bin nvidia/gm200/gr/sw_bundle_init.bin 
nvidia/gm200/gr/sw_ctx.bin nvidia/gm200/gr/sw_method_init.bin 
nvidia/gm200/gr/sw_nonctx.bin nvidia/gm204/acr/bl.bin 
nvidia/gm204/acr/ucode_load.bin nvidia/gm204/acr/ucode_unload.bin 
nvidia/gm204/gr/fecs_bl.bin nvidia/gm204/gr/fecs_data.bin 
nvidia/gm204/gr/fecs_inst.bin nvidia/gm204/gr/fecs_sig.bin 
nvidia/gm204/gr/gpccs_bl.bin nvidia/gm204/gr/gpccs_data.bin 
nvidia/gm204/gr/gpccs_inst.bin nvidia/gm204/gr/gpccs_sig.bin 
nvidia/gm204/gr/sw_bundle_init.bin nvidia/gm204/gr/sw_ctx.bin 
nvidia/gm204/gr/sw_method_init.bin nvidia/gm204/gr/sw_nonctx.bin 
nvidia/gm206/acr/bl.bin nvidia/gm206/acr/ucode_load.bin 
nvidia/gm206/acr/ucode_unload.bin nvidia/gm206/gr/fecs_bl.bin 
nvidia/gm206/gr/fecs_data.bin nvidia/gm206/gr/fecs_inst.bin 
nvidia/gm206/gr/fecs_sig.bin nvidia/gm206/gr/gpccs_bl.bin 
nvidia/gm206/gr/gpccs_data.bin nvidia/gm206/gr/gpccs_inst.bin 
nvidia/gm206/gr/gpccs_sig.bin nvidia/gm206/gr/sw_bundle_init.bin 
nvidia/gm206/gr/sw_ctx.bin nvidia/gm206/gr/sw_method_init.bin 
nvidia/gm206/gr/sw_nonctx.bin nvidia/gm20b/acr/bl.bin 
nvidia/gm20b/acr/ucode_load.bin nvidia/gm20b/gr/fecs_bl.bin 
nvidia/gm20b/gr/fecs_data.bin nvidia/gm20b/gr/fecs_inst.bin 
nvidia/gm20b/gr/fecs_sig.bin nvidia/gm20b/gr/gpccs_data.bin 
nvidia/gm20b/gr/gpccs_inst.bin nvidia/gm20b/gr/sw_bundle_init.bin 
nvidia/gm20b/gr/sw_ctx.bin nvidia/gm20b/gr/sw_method_init.bin 
nvidia/gm20b/gr/sw_nonctx.bin nvidia/gm20b/pmu/desc.bin 
nvidia/gm20b/pmu/image.bin nvidia/gm20b/pmu/sig.bin nvidia/gp100/acr/bl.bin 
nvidia/gp100/acr/ucode_load.bin nvidia/gp100/acr/ucode_unload.bin 
nvidia/gp100/gr/fecs_bl.bin nvidia/gp100/gr/fecs_data.bin 
nvidia/gp100/gr/fecs_inst.bin nvidia/gp100/gr/fecs_sig.bin 
nvidia/gp100/gr/gpccs_bl.bin nvidia/gp100/gr/gpccs_data.bin 
nvidia/gp100/gr/gpccs_inst.bin nvidia/gp100/gr/gpccs_sig.bin 
nvidia/gp100/gr/sw_bundle_init.bin nvidia/gp100/gr/sw_ctx.bin 
nvidia/gp100/gr/sw_method_init.bin nvidia/gp100/gr/sw_nonctx.bin 
nvidia/gp102/acr/bl.bin nvidia/gp102/acr/ucode_load.bin 
nvidia/gp102/acr/ucode_unload.bin nvidia/gp102/acr/unload_bl.bin 
nvidia/gp102/gr/fecs_bl.bin nvidia/gp102/gr/fecs_data.bin 
nvidia/gp102/gr/fecs_inst.bin nvidia/gp102/gr/fecs_sig.bin 
nvidia/gp102/gr/gpccs_bl.bin nvidia/gp102/gr/gpccs_data.bin 
nvidia/gp102/gr/gpccs_inst.bin nvidia/gp102/gr/gpccs_sig.bin 
nvidia/gp102/gr/sw_bundle_init.bin nvidia/gp102/gr/sw_ctx.bin 
nvidia/gp102/gr/sw_method_init.bin nvidia/gp102/gr/sw_nonctx.bin 
nvidia/gp102/nvdec/scrubber.bin nvidia/gp102/sec2/desc-1.bin 
nvidia/gp102/sec2/desc.bin nvidia/gp102/sec2/image-1.bin 
nvidia/gp102/sec2/image.bin nvidia/gp102/sec2/sig-1.bin 
nvidia/gp102/sec2/sig.bin nvidia/gp104/acr/bl.bin 
nvidia/gp104/acr/ucode_load.bin nvidia/gp104/acr/ucode_unload.bin 
nvidia/gp104/acr/unload_bl.bin nvidia/gp104/gr/fecs_bl.bin 
nvidia/gp104/gr/fecs_data.bin nvidia/gp104/gr/fecs_inst.bin 
nvidia/gp104/gr/fecs_sig.bin nvidia/gp104/gr/gpccs_bl.bin 
nvidia/gp104/gr/gpccs_data.bin nvidia/gp104/gr/gpccs_inst.bin 
nvidia/gp104/gr/gpccs_sig.bin nvidia/gp104/gr/sw_bundle_init.bin 
nvidia/gp104/gr/sw_ctx.bin nvidia/gp104/gr/sw_method_init.bin 
nvidia/gp104/gr/sw_nonctx.bin nvidia/gp104/nvdec/scrubber.bin 
nvidia/gp104/sec2/desc-1.bin nvidia/gp104/sec2/desc.bin 
nvidia/gp104/sec2/image-1.bin nvidia/gp104/sec2/image.bin 
nvidia/gp104/sec2/sig-1.bin nvidia/gp104/sec2/sig.bin nvidia/gp106/acr/bl.bin 
nvidia/gp106/acr/ucode_load.bin nvidia/gp106/acr/ucode_unload.bin 
nvidia/gp106/acr/unload_bl.bin nvidia/gp106/gr/fecs_bl.bin 
nvidia/gp106/gr/fecs_data.bin nvidia/gp106/gr/fecs_inst.bin 
nvidia/gp106/gr/fecs_sig.bin nvidia/gp106/gr/gpccs_bl.bin 
nvidia/gp106/gr/gpccs_data.bin nvidia/gp106/gr/gpccs_inst.bin 
nvidia/gp106/gr/gpccs_sig.bin nvidia/gp106/gr/sw_bundle_init.bin 
nvidia/gp106/gr/sw_ctx.bin nvidia/gp106/gr/sw_method_init.bin 
nvidia/gp106/gr/sw_nonctx.bin nvidia/gp106/nvdec/scrubber.bin 
nvidia/gp106/sec2/desc-1.bin nvidia/gp106/sec2/desc.bin 
nvidia/gp106/sec2/image-1.bin nvidia/gp106/sec2/image.bin 
nvidia/gp106/sec2/sig-1.bin nvidia/gp106/sec2/sig.bin nvidia/gp107/acr/bl.bin 
nvidia/gp107/acr/ucode_load.bin nvidia/gp107/acr/ucode_unload.bin 
nvidia/gp107/acr/unload_bl.bin nvidia/gp107/gr/fecs_bl.bin 
nvidia/gp107/gr/fecs_data.bin nvidia/gp107/gr/fecs_inst.bin 
nvidia/gp107/gr/fecs_sig.bin nvidia/gp107/gr/gpccs_bl.bin 
nvidia/gp107/gr/gpccs_data.bin nvidia/gp107/gr/gpccs_inst.bin 
nvidia/gp107/gr/gpccs_sig.bin nvidia/gp107/gr/sw_bundle_init.bin 
nvidia/gp107/gr/sw_ctx.bin nvidia/gp107/gr/sw_method_init.bin 
nvidia/gp107/gr/sw_nonctx.bin nvidia/gp107/nvdec/scrubber.bin 
nvidia/gp107/sec2/desc-1.bin nvidia/gp107/sec2/desc.bin 
nvidia/gp107/sec2/image-1.bin nvidia/gp107/sec2/image.bin 
nvidia/gp107/sec2/sig-1.bin nvidia/gp107/sec2/sig.bin nvidia/gp108/acr/bl.bin 
nvidia/gp108/acr/ucode_load.bin nvidia/gp108/acr/ucode_unload.bin 
nvidia/gp108/acr/unload_bl.bin nvidia/gp108/gr/fecs_bl.bin 
nvidia/gp108/gr/fecs_data.bin nvidia/gp108/gr/fecs_inst.bin 
nvidia/gp108/gr/fecs_sig.bin nvidia/gp108/gr/gpccs_bl.bin 
nvidia/gp108/gr/gpccs_data.bin nvidia/gp108/gr/gpccs_inst.bin 
nvidia/gp108/gr/gpccs_sig.bin nvidia/gp108/gr/sw_bundle_init.bin 
nvidia/gp108/gr/sw_ctx.bin nvidia/gp108/gr/sw_method_init.bin 
nvidia/gp108/gr/sw_nonctx.bin nvidia/gp108/nvdec/scrubber.bin 
nvidia/gp108/sec2/desc.bin nvidia/gp108/sec2/image.bin 
nvidia/gp108/sec2/sig.bin nvidia/gp10b/acr/bl.bin 
nvidia/gp10b/acr/ucode_load.bin nvidia/gp10b/gr/fecs_bl.bin 
nvidia/gp10b/gr/fecs_data.bin nvidia/gp10b/gr/fecs_inst.bin 
nvidia/gp10b/gr/fecs_sig.bin nvidia/gp10b/gr/gpccs_bl.bin 
nvidia/gp10b/gr/gpccs_data.bin nvidia/gp10b/gr/gpccs_inst.bin 
nvidia/gp10b/gr/gpccs_sig.bin nvidia/gp10b/gr/sw_bundle_init.bin 
nvidia/gp10b/gr/sw_ctx.bin nvidia/gp10b/gr/sw_method_init.bin 
nvidia/gp10b/gr/sw_nonctx.bin nvidia/gp10b/pmu/desc.bin 
nvidia/gp10b/pmu/image.bin nvidia/gp10b/pmu/sig.bin nvidia/gv100/acr/bl.bin 
nvidia/gv100/acr/ucode_load.bin nvidia/gv100/acr/ucode_unload.bin 
nvidia/gv100/acr/unload_bl.bin nvidia/gv100/gr/fecs_bl.bin 
nvidia/gv100/gr/fecs_data.bin nvidia/gv100/gr/fecs_inst.bin 
nvidia/gv100/gr/fecs_sig.bin nvidia/gv100/gr/gpccs_bl.bin 
nvidia/gv100/gr/gpccs_data.bin nvidia/gv100/gr/gpccs_inst.bin 
nvidia/gv100/gr/gpccs_sig.bin nvidia/gv100/gr/sw_bundle_init.bin 
nvidia/gv100/gr/sw_ctx.bin nvidia/gv100/gr/sw_method_init.bin 
nvidia/gv100/gr/sw_nonctx.bin nvidia/gv100/nvdec/scrubber.bin 
nvidia/gv100/sec2/desc.bin nvidia/gv100/sec2/image.bin 
nvidia/gv100/sec2/sig.bin nvidia/tu102/acr/bl.bin 
nvidia/tu102/acr/ucode_ahesasc.bin nvidia/tu102/acr/ucode_asb.bin 
nvidia/tu102/acr/ucode_unload.bin nvidia/tu102/acr/unload_bl.bin 
nvidia/tu102/gr/fecs_bl.bin nvidia/tu102/gr/fecs_data.bin 
nvidia/tu102/gr/fecs_inst.bin nvidia/tu102/gr/fecs_sig.bin 
nvidia/tu102/gr/gpccs_bl.bin nvidia/tu102/gr/gpccs_data.bin 
nvidia/tu102/gr/gpccs_inst.bin nvidia/tu102/gr/gpccs_sig.bin 
nvidia/tu102/gr/sw_bundle_init.bin nvidia/tu102/gr/sw_ctx.bin 
nvidia/tu102/gr/sw_method_init.bin nvidia/tu102/gr/sw_nonctx.bin 
nvidia/tu102/gr/sw_veid_bundle_init.bin nvidia/tu102/nvdec/scrubber.bin 
nvidia/tu102/sec2/desc.bin nvidia/tu102/sec2/image.bin 
nvidia/tu102/sec2/sig.bin nvidia/tu104/acr/bl.bin 
nvidia/tu104/acr/ucode_ahesasc.bin nvidia/tu104/acr/ucode_asb.bin 
nvidia/tu104/acr/ucode_unload.bin nvidia/tu104/acr/unload_bl.bin 
nvidia/tu104/gr/fecs_bl.bin nvidia/tu104/gr/fecs_data.bin 
nvidia/tu104/gr/fecs_inst.bin nvidia/tu104/gr/fecs_sig.bin 
nvidia/tu104/gr/gpccs_bl.bin nvidia/tu104/gr/gpccs_data.bin 
nvidia/tu104/gr/gpccs_inst.bin nvidia/tu104/gr/gpccs_sig.bin 
nvidia/tu104/gr/sw_bundle_init.bin nvidia/tu104/gr/sw_ctx.bin 
nvidia/tu104/gr/sw_method_init.bin nvidia/tu104/gr/sw_nonctx.bin 
nvidia/tu104/gr/sw_veid_bundle_init.bin nvidia/tu104/nvdec/scrubber.bin 
nvidia/tu104/sec2/desc.bin nvidia/tu104/sec2/image.bin 
nvidia/tu104/sec2/sig.bin nvidia/tu106/acr/bl.bin 
nvidia/tu106/acr/ucode_ahesasc.bin nvidia/tu106/acr/ucode_asb.bin 
nvidia/tu106/acr/ucode_unload.bin nvidia/tu106/acr/unload_bl.bin 
nvidia/tu106/gr/fecs_bl.bin nvidia/tu106/gr/fecs_data.bin 
nvidia/tu106/gr/fecs_inst.bin nvidia/tu106/gr/fecs_sig.bin 
nvidia/tu106/gr/gpccs_bl.bin nvidia/tu106/gr/gpccs_data.bin 
nvidia/tu106/gr/gpccs_inst.bin nvidia/tu106/gr/gpccs_sig.bin 
nvidia/tu106/gr/sw_bundle_init.bin nvidia/tu106/gr/sw_ctx.bin 
nvidia/tu106/gr/sw_method_init.bin nvidia/tu106/gr/sw_nonctx.bin 
nvidia/tu106/gr/sw_veid_bundle_init.bin nvidia/tu106/nvdec/scrubber.bin 
nvidia/tu106/sec2/desc.bin nvidia/tu106/sec2/image.bin 
nvidia/tu106/sec2/sig.bin nvidia/tu10x/typec/ccg_boot.cyacd 
nvidia/tu10x/typec/ccg_primary.cyacd nvidia/tu10x/typec/ccg_secondary.cyacd 
nvidia/tu116/acr/bl.bin nvidia/tu116/acr/ucode_ahesasc.bin 
nvidia/tu116/acr/ucode_asb.bin nvidia/tu116/acr/ucode_unload.bin 
nvidia/tu116/acr/unload_bl.bin nvidia/tu116/gr/fecs_bl.bin 
nvidia/tu116/gr/fecs_data.bin nvidia/tu116/gr/fecs_inst.bin 
nvidia/tu116/gr/fecs_sig.bin nvidia/tu116/gr/gpccs_bl.bin 
nvidia/tu116/gr/gpccs_data.bin nvidia/tu116/gr/gpccs_inst.bin 
nvidia/tu116/gr/gpccs_sig.bin nvidia/tu116/gr/sw_bundle_init.bin 
nvidia/tu116/gr/sw_ctx.bin nvidia/tu116/gr/sw_method_init.bin 
nvidia/tu116/gr/sw_nonctx.bin nvidia/tu116/gr/sw_veid_bundle_init.bin 
nvidia/tu116/nvdec/scrubber.bin nvidia/tu116/sec2/desc.bin 
nvidia/tu116/sec2/image.bin nvidia/tu116/sec2/sig.bin nvidia/tu117/acr/bl.bin 
nvidia/tu117/acr/ucode_ahesasc.bin nvidia/tu117/acr/ucode_asb.bin 
nvidia/tu117/acr/ucode_unload.bin nvidia/tu117/acr/unload_bl.bin 
nvidia/tu117/gr/fecs_bl.bin nvidia/tu117/gr/fecs_data.bin 
nvidia/tu117/gr/fecs_inst.bin nvidia/tu117/gr/fecs_sig.bin 
nvidia/tu117/gr/gpccs_bl.bin nvidia/tu117/gr/gpccs_data.bin 
nvidia/tu117/gr/gpccs_inst.bin nvidia/tu117/gr/gpccs_sig.bin 
nvidia/tu117/gr/sw_bundle_init.bin nvidia/tu117/gr/sw_ctx.bin 
nvidia/tu117/gr/sw_method_init.bin nvidia/tu117/gr/sw_nonctx.bin 
nvidia/tu117/gr/sw_veid_bundle_init.bin nvidia/tu117/nvdec/scrubber.bin 
nvidia/tu117/sec2/desc.bin nvidia/tu117/sec2/image.bin 
nvidia/tu117/sec2/sig.bin; do
+               dpkg-divert --package #PACKAGE# --no-rename --quiet \
+                       --divert "/lib/firmware/$f.usr-is-merged" \
+                       --remove "/lib/firmware/$f"
+       done
+fi
+
+#DEBHELPER#
+
+exit 0
diff --minimal -Nru 
firmware-nonfree-20230625/debian/firmware-nvidia-graphics.preinst 
firmware-nonfree-20230625/debian/firmware-nvidia-graphics.preinst
--- firmware-nonfree-20230625/debian/firmware-nvidia-graphics.preinst   
1970-01-01 01:00:00.000000000 +0100
+++ firmware-nonfree-20230625/debian/firmware-nvidia-graphics.preinst   
2024-06-19 13:11:28.000000000 +0200
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+set -e
+
+if [ "$1" = "upgrade" ] || [ "$1" = "install" ]; then
+       for f in  nvidia/ga102/acr/ucode_ahesasc.bin 
nvidia/ga102/acr/ucode_asb.bin nvidia/ga102/acr/ucode_unload.bin 
nvidia/ga102/gr/NET_img.bin nvidia/ga102/gr/fecs_bl.bin 
nvidia/ga102/gr/fecs_sig.bin nvidia/ga102/gr/gpccs_bl.bin 
nvidia/ga102/gr/gpccs_sig.bin nvidia/ga102/nvdec/scrubber.bin 
nvidia/ga102/sec2/desc.bin nvidia/ga102/sec2/hs_bl_sig.bin 
nvidia/ga102/sec2/image.bin nvidia/ga102/sec2/sig.bin 
nvidia/ga103/gr/NET_img.bin nvidia/ga103/gr/fecs_bl.bin 
nvidia/ga103/gr/fecs_sig.bin nvidia/ga103/gr/gpccs_bl.bin 
nvidia/ga103/gr/gpccs_sig.bin nvidia/ga104/gr/NET_img.bin 
nvidia/ga104/gr/fecs_bl.bin nvidia/ga104/gr/fecs_sig.bin 
nvidia/ga104/gr/gpccs_bl.bin nvidia/ga104/gr/gpccs_sig.bin 
nvidia/ga106/gr/NET_img.bin nvidia/ga106/gr/fecs_bl.bin 
nvidia/ga106/gr/fecs_sig.bin nvidia/ga106/gr/gpccs_bl.bin 
nvidia/ga106/gr/gpccs_sig.bin nvidia/ga107/gr/NET_img.bin 
nvidia/ga107/gr/fecs_bl.bin nvidia/ga107/gr/fecs_sig.bin 
nvidia/ga107/gr/gpccs_bl.bin nvidia/ga107/gr/gpccs_sig.bin 
nvidia/gk20a/fecs_data.bin nvidia/gk20a/fecs_inst.bin 
nvidia/gk20a/gpccs_data.bin nvidia/gk20a/gpccs_inst.bin 
nvidia/gk20a/sw_bundle_init.bin nvidia/gk20a/sw_ctx.bin 
nvidia/gk20a/sw_method_init.bin nvidia/gk20a/sw_nonctx.bin 
nvidia/gm200/acr/bl.bin nvidia/gm200/acr/ucode_load.bin 
nvidia/gm200/acr/ucode_unload.bin nvidia/gm200/gr/fecs_bl.bin 
nvidia/gm200/gr/fecs_data.bin nvidia/gm200/gr/fecs_inst.bin 
nvidia/gm200/gr/fecs_sig.bin nvidia/gm200/gr/gpccs_bl.bin 
nvidia/gm200/gr/gpccs_data.bin nvidia/gm200/gr/gpccs_inst.bin 
nvidia/gm200/gr/gpccs_sig.bin nvidia/gm200/gr/sw_bundle_init.bin 
nvidia/gm200/gr/sw_ctx.bin nvidia/gm200/gr/sw_method_init.bin 
nvidia/gm200/gr/sw_nonctx.bin nvidia/gm204/acr/bl.bin 
nvidia/gm204/acr/ucode_load.bin nvidia/gm204/acr/ucode_unload.bin 
nvidia/gm204/gr/fecs_bl.bin nvidia/gm204/gr/fecs_data.bin 
nvidia/gm204/gr/fecs_inst.bin nvidia/gm204/gr/fecs_sig.bin 
nvidia/gm204/gr/gpccs_bl.bin nvidia/gm204/gr/gpccs_data.bin 
nvidia/gm204/gr/gpccs_inst.bin nvidia/gm204/gr/gpccs_sig.bin 
nvidia/gm204/gr/sw_bundle_init.bin nvidia/gm204/gr/sw_ctx.bin 
nvidia/gm204/gr/sw_method_init.bin nvidia/gm204/gr/sw_nonctx.bin 
nvidia/gm206/acr/bl.bin nvidia/gm206/acr/ucode_load.bin 
nvidia/gm206/acr/ucode_unload.bin nvidia/gm206/gr/fecs_bl.bin 
nvidia/gm206/gr/fecs_data.bin nvidia/gm206/gr/fecs_inst.bin 
nvidia/gm206/gr/fecs_sig.bin nvidia/gm206/gr/gpccs_bl.bin 
nvidia/gm206/gr/gpccs_data.bin nvidia/gm206/gr/gpccs_inst.bin 
nvidia/gm206/gr/gpccs_sig.bin nvidia/gm206/gr/sw_bundle_init.bin 
nvidia/gm206/gr/sw_ctx.bin nvidia/gm206/gr/sw_method_init.bin 
nvidia/gm206/gr/sw_nonctx.bin nvidia/gm20b/acr/bl.bin 
nvidia/gm20b/acr/ucode_load.bin nvidia/gm20b/gr/fecs_bl.bin 
nvidia/gm20b/gr/fecs_data.bin nvidia/gm20b/gr/fecs_inst.bin 
nvidia/gm20b/gr/fecs_sig.bin nvidia/gm20b/gr/gpccs_data.bin 
nvidia/gm20b/gr/gpccs_inst.bin nvidia/gm20b/gr/sw_bundle_init.bin 
nvidia/gm20b/gr/sw_ctx.bin nvidia/gm20b/gr/sw_method_init.bin 
nvidia/gm20b/gr/sw_nonctx.bin nvidia/gm20b/pmu/desc.bin 
nvidia/gm20b/pmu/image.bin nvidia/gm20b/pmu/sig.bin nvidia/gp100/acr/bl.bin 
nvidia/gp100/acr/ucode_load.bin nvidia/gp100/acr/ucode_unload.bin 
nvidia/gp100/gr/fecs_bl.bin nvidia/gp100/gr/fecs_data.bin 
nvidia/gp100/gr/fecs_inst.bin nvidia/gp100/gr/fecs_sig.bin 
nvidia/gp100/gr/gpccs_bl.bin nvidia/gp100/gr/gpccs_data.bin 
nvidia/gp100/gr/gpccs_inst.bin nvidia/gp100/gr/gpccs_sig.bin 
nvidia/gp100/gr/sw_bundle_init.bin nvidia/gp100/gr/sw_ctx.bin 
nvidia/gp100/gr/sw_method_init.bin nvidia/gp100/gr/sw_nonctx.bin 
nvidia/gp102/acr/bl.bin nvidia/gp102/acr/ucode_load.bin 
nvidia/gp102/acr/ucode_unload.bin nvidia/gp102/acr/unload_bl.bin 
nvidia/gp102/gr/fecs_bl.bin nvidia/gp102/gr/fecs_data.bin 
nvidia/gp102/gr/fecs_inst.bin nvidia/gp102/gr/fecs_sig.bin 
nvidia/gp102/gr/gpccs_bl.bin nvidia/gp102/gr/gpccs_data.bin 
nvidia/gp102/gr/gpccs_inst.bin nvidia/gp102/gr/gpccs_sig.bin 
nvidia/gp102/gr/sw_bundle_init.bin nvidia/gp102/gr/sw_ctx.bin 
nvidia/gp102/gr/sw_method_init.bin nvidia/gp102/gr/sw_nonctx.bin 
nvidia/gp102/nvdec/scrubber.bin nvidia/gp102/sec2/desc-1.bin 
nvidia/gp102/sec2/desc.bin nvidia/gp102/sec2/image-1.bin 
nvidia/gp102/sec2/image.bin nvidia/gp102/sec2/sig-1.bin 
nvidia/gp102/sec2/sig.bin nvidia/gp104/acr/bl.bin 
nvidia/gp104/acr/ucode_load.bin nvidia/gp104/acr/ucode_unload.bin 
nvidia/gp104/acr/unload_bl.bin nvidia/gp104/gr/fecs_bl.bin 
nvidia/gp104/gr/fecs_data.bin nvidia/gp104/gr/fecs_inst.bin 
nvidia/gp104/gr/fecs_sig.bin nvidia/gp104/gr/gpccs_bl.bin 
nvidia/gp104/gr/gpccs_data.bin nvidia/gp104/gr/gpccs_inst.bin 
nvidia/gp104/gr/gpccs_sig.bin nvidia/gp104/gr/sw_bundle_init.bin 
nvidia/gp104/gr/sw_ctx.bin nvidia/gp104/gr/sw_method_init.bin 
nvidia/gp104/gr/sw_nonctx.bin nvidia/gp104/nvdec/scrubber.bin 
nvidia/gp104/sec2/desc-1.bin nvidia/gp104/sec2/desc.bin 
nvidia/gp104/sec2/image-1.bin nvidia/gp104/sec2/image.bin 
nvidia/gp104/sec2/sig-1.bin nvidia/gp104/sec2/sig.bin nvidia/gp106/acr/bl.bin 
nvidia/gp106/acr/ucode_load.bin nvidia/gp106/acr/ucode_unload.bin 
nvidia/gp106/acr/unload_bl.bin nvidia/gp106/gr/fecs_bl.bin 
nvidia/gp106/gr/fecs_data.bin nvidia/gp106/gr/fecs_inst.bin 
nvidia/gp106/gr/fecs_sig.bin nvidia/gp106/gr/gpccs_bl.bin 
nvidia/gp106/gr/gpccs_data.bin nvidia/gp106/gr/gpccs_inst.bin 
nvidia/gp106/gr/gpccs_sig.bin nvidia/gp106/gr/sw_bundle_init.bin 
nvidia/gp106/gr/sw_ctx.bin nvidia/gp106/gr/sw_method_init.bin 
nvidia/gp106/gr/sw_nonctx.bin nvidia/gp106/nvdec/scrubber.bin 
nvidia/gp106/sec2/desc-1.bin nvidia/gp106/sec2/desc.bin 
nvidia/gp106/sec2/image-1.bin nvidia/gp106/sec2/image.bin 
nvidia/gp106/sec2/sig-1.bin nvidia/gp106/sec2/sig.bin nvidia/gp107/acr/bl.bin 
nvidia/gp107/acr/ucode_load.bin nvidia/gp107/acr/ucode_unload.bin 
nvidia/gp107/acr/unload_bl.bin nvidia/gp107/gr/fecs_bl.bin 
nvidia/gp107/gr/fecs_data.bin nvidia/gp107/gr/fecs_inst.bin 
nvidia/gp107/gr/fecs_sig.bin nvidia/gp107/gr/gpccs_bl.bin 
nvidia/gp107/gr/gpccs_data.bin nvidia/gp107/gr/gpccs_inst.bin 
nvidia/gp107/gr/gpccs_sig.bin nvidia/gp107/gr/sw_bundle_init.bin 
nvidia/gp107/gr/sw_ctx.bin nvidia/gp107/gr/sw_method_init.bin 
nvidia/gp107/gr/sw_nonctx.bin nvidia/gp107/nvdec/scrubber.bin 
nvidia/gp107/sec2/desc-1.bin nvidia/gp107/sec2/desc.bin 
nvidia/gp107/sec2/image-1.bin nvidia/gp107/sec2/image.bin 
nvidia/gp107/sec2/sig-1.bin nvidia/gp107/sec2/sig.bin nvidia/gp108/acr/bl.bin 
nvidia/gp108/acr/ucode_load.bin nvidia/gp108/acr/ucode_unload.bin 
nvidia/gp108/acr/unload_bl.bin nvidia/gp108/gr/fecs_bl.bin 
nvidia/gp108/gr/fecs_data.bin nvidia/gp108/gr/fecs_inst.bin 
nvidia/gp108/gr/fecs_sig.bin nvidia/gp108/gr/gpccs_bl.bin 
nvidia/gp108/gr/gpccs_data.bin nvidia/gp108/gr/gpccs_inst.bin 
nvidia/gp108/gr/gpccs_sig.bin nvidia/gp108/gr/sw_bundle_init.bin 
nvidia/gp108/gr/sw_ctx.bin nvidia/gp108/gr/sw_method_init.bin 
nvidia/gp108/gr/sw_nonctx.bin nvidia/gp108/nvdec/scrubber.bin 
nvidia/gp108/sec2/desc.bin nvidia/gp108/sec2/image.bin 
nvidia/gp108/sec2/sig.bin nvidia/gp10b/acr/bl.bin 
nvidia/gp10b/acr/ucode_load.bin nvidia/gp10b/gr/fecs_bl.bin 
nvidia/gp10b/gr/fecs_data.bin nvidia/gp10b/gr/fecs_inst.bin 
nvidia/gp10b/gr/fecs_sig.bin nvidia/gp10b/gr/gpccs_bl.bin 
nvidia/gp10b/gr/gpccs_data.bin nvidia/gp10b/gr/gpccs_inst.bin 
nvidia/gp10b/gr/gpccs_sig.bin nvidia/gp10b/gr/sw_bundle_init.bin 
nvidia/gp10b/gr/sw_ctx.bin nvidia/gp10b/gr/sw_method_init.bin 
nvidia/gp10b/gr/sw_nonctx.bin nvidia/gp10b/pmu/desc.bin 
nvidia/gp10b/pmu/image.bin nvidia/gp10b/pmu/sig.bin nvidia/gv100/acr/bl.bin 
nvidia/gv100/acr/ucode_load.bin nvidia/gv100/acr/ucode_unload.bin 
nvidia/gv100/acr/unload_bl.bin nvidia/gv100/gr/fecs_bl.bin 
nvidia/gv100/gr/fecs_data.bin nvidia/gv100/gr/fecs_inst.bin 
nvidia/gv100/gr/fecs_sig.bin nvidia/gv100/gr/gpccs_bl.bin 
nvidia/gv100/gr/gpccs_data.bin nvidia/gv100/gr/gpccs_inst.bin 
nvidia/gv100/gr/gpccs_sig.bin nvidia/gv100/gr/sw_bundle_init.bin 
nvidia/gv100/gr/sw_ctx.bin nvidia/gv100/gr/sw_method_init.bin 
nvidia/gv100/gr/sw_nonctx.bin nvidia/gv100/nvdec/scrubber.bin 
nvidia/gv100/sec2/desc.bin nvidia/gv100/sec2/image.bin 
nvidia/gv100/sec2/sig.bin nvidia/tu102/acr/bl.bin 
nvidia/tu102/acr/ucode_ahesasc.bin nvidia/tu102/acr/ucode_asb.bin 
nvidia/tu102/acr/ucode_unload.bin nvidia/tu102/acr/unload_bl.bin 
nvidia/tu102/gr/fecs_bl.bin nvidia/tu102/gr/fecs_data.bin 
nvidia/tu102/gr/fecs_inst.bin nvidia/tu102/gr/fecs_sig.bin 
nvidia/tu102/gr/gpccs_bl.bin nvidia/tu102/gr/gpccs_data.bin 
nvidia/tu102/gr/gpccs_inst.bin nvidia/tu102/gr/gpccs_sig.bin 
nvidia/tu102/gr/sw_bundle_init.bin nvidia/tu102/gr/sw_ctx.bin 
nvidia/tu102/gr/sw_method_init.bin nvidia/tu102/gr/sw_nonctx.bin 
nvidia/tu102/gr/sw_veid_bundle_init.bin nvidia/tu102/nvdec/scrubber.bin 
nvidia/tu102/sec2/desc.bin nvidia/tu102/sec2/image.bin 
nvidia/tu102/sec2/sig.bin nvidia/tu104/acr/bl.bin 
nvidia/tu104/acr/ucode_ahesasc.bin nvidia/tu104/acr/ucode_asb.bin 
nvidia/tu104/acr/ucode_unload.bin nvidia/tu104/acr/unload_bl.bin 
nvidia/tu104/gr/fecs_bl.bin nvidia/tu104/gr/fecs_data.bin 
nvidia/tu104/gr/fecs_inst.bin nvidia/tu104/gr/fecs_sig.bin 
nvidia/tu104/gr/gpccs_bl.bin nvidia/tu104/gr/gpccs_data.bin 
nvidia/tu104/gr/gpccs_inst.bin nvidia/tu104/gr/gpccs_sig.bin 
nvidia/tu104/gr/sw_bundle_init.bin nvidia/tu104/gr/sw_ctx.bin 
nvidia/tu104/gr/sw_method_init.bin nvidia/tu104/gr/sw_nonctx.bin 
nvidia/tu104/gr/sw_veid_bundle_init.bin nvidia/tu104/nvdec/scrubber.bin 
nvidia/tu104/sec2/desc.bin nvidia/tu104/sec2/image.bin 
nvidia/tu104/sec2/sig.bin nvidia/tu106/acr/bl.bin 
nvidia/tu106/acr/ucode_ahesasc.bin nvidia/tu106/acr/ucode_asb.bin 
nvidia/tu106/acr/ucode_unload.bin nvidia/tu106/acr/unload_bl.bin 
nvidia/tu106/gr/fecs_bl.bin nvidia/tu106/gr/fecs_data.bin 
nvidia/tu106/gr/fecs_inst.bin nvidia/tu106/gr/fecs_sig.bin 
nvidia/tu106/gr/gpccs_bl.bin nvidia/tu106/gr/gpccs_data.bin 
nvidia/tu106/gr/gpccs_inst.bin nvidia/tu106/gr/gpccs_sig.bin 
nvidia/tu106/gr/sw_bundle_init.bin nvidia/tu106/gr/sw_ctx.bin 
nvidia/tu106/gr/sw_method_init.bin nvidia/tu106/gr/sw_nonctx.bin 
nvidia/tu106/gr/sw_veid_bundle_init.bin nvidia/tu106/nvdec/scrubber.bin 
nvidia/tu106/sec2/desc.bin nvidia/tu106/sec2/image.bin 
nvidia/tu106/sec2/sig.bin nvidia/tu10x/typec/ccg_boot.cyacd 
nvidia/tu10x/typec/ccg_primary.cyacd nvidia/tu10x/typec/ccg_secondary.cyacd 
nvidia/tu116/acr/bl.bin nvidia/tu116/acr/ucode_ahesasc.bin 
nvidia/tu116/acr/ucode_asb.bin nvidia/tu116/acr/ucode_unload.bin 
nvidia/tu116/acr/unload_bl.bin nvidia/tu116/gr/fecs_bl.bin 
nvidia/tu116/gr/fecs_data.bin nvidia/tu116/gr/fecs_inst.bin 
nvidia/tu116/gr/fecs_sig.bin nvidia/tu116/gr/gpccs_bl.bin 
nvidia/tu116/gr/gpccs_data.bin nvidia/tu116/gr/gpccs_inst.bin 
nvidia/tu116/gr/gpccs_sig.bin nvidia/tu116/gr/sw_bundle_init.bin 
nvidia/tu116/gr/sw_ctx.bin nvidia/tu116/gr/sw_method_init.bin 
nvidia/tu116/gr/sw_nonctx.bin nvidia/tu116/gr/sw_veid_bundle_init.bin 
nvidia/tu116/nvdec/scrubber.bin nvidia/tu116/sec2/desc.bin 
nvidia/tu116/sec2/image.bin nvidia/tu116/sec2/sig.bin nvidia/tu117/acr/bl.bin 
nvidia/tu117/acr/ucode_ahesasc.bin nvidia/tu117/acr/ucode_asb.bin 
nvidia/tu117/acr/ucode_unload.bin nvidia/tu117/acr/unload_bl.bin 
nvidia/tu117/gr/fecs_bl.bin nvidia/tu117/gr/fecs_data.bin 
nvidia/tu117/gr/fecs_inst.bin nvidia/tu117/gr/fecs_sig.bin 
nvidia/tu117/gr/gpccs_bl.bin nvidia/tu117/gr/gpccs_data.bin 
nvidia/tu117/gr/gpccs_inst.bin nvidia/tu117/gr/gpccs_sig.bin 
nvidia/tu117/gr/sw_bundle_init.bin nvidia/tu117/gr/sw_ctx.bin 
nvidia/tu117/gr/sw_method_init.bin nvidia/tu117/gr/sw_nonctx.bin 
nvidia/tu117/gr/sw_veid_bundle_init.bin nvidia/tu117/nvdec/scrubber.bin 
nvidia/tu117/sec2/desc.bin nvidia/tu117/sec2/image.bin 
nvidia/tu117/sec2/sig.bin; do
+               dpkg-divert --package #PACKAGE# --no-rename --quiet \
+                       --divert "/lib/firmware/$f.usr-is-merged" \
+                       --add "/lib/firmware/$f"
+       done
+fi
+
+#DEBHELPER#
+
+exit 0
diff --minimal -Nru firmware-nonfree-20230625/debian/firmware-qlogic.postinst 
firmware-nonfree-20230625/debian/firmware-qlogic.postinst
--- firmware-nonfree-20230625/debian/firmware-qlogic.postinst   2024-06-18 
02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/firmware-qlogic.postinst   2024-06-19 
13:11:28.000000000 +0200
@@ -17,3 +17,5 @@
 esac
 
 #DEBHELPER#
+
+exit 0
diff --minimal -Nru firmware-nonfree-20230625/debian/firmware-realtek.postinst 
firmware-nonfree-20230625/debian/firmware-realtek.postinst
--- firmware-nonfree-20230625/debian/firmware-realtek.postinst  2024-06-18 
02:33:12.000000000 +0200
+++ firmware-nonfree-20230625/debian/firmware-realtek.postinst  2024-06-19 
13:11:28.000000000 +0200
@@ -17,3 +17,5 @@
 esac
 
 #DEBHELPER#
+
+exit 0
diff --minimal -Nru 
firmware-nonfree-20230625/debian/templates/postinst.initramfs-tools.in 
firmware-nonfree-20230625/debian/templates/postinst.initramfs-tools.in
--- firmware-nonfree-20230625/debian/templates/postinst.initramfs-tools.in      
2023-06-21 00:33:42.000000000 +0200
+++ firmware-nonfree-20230625/debian/templates/postinst.initramfs-tools.in      
2024-06-19 11:39:41.000000000 +0200
@@ -1,7 +1,3 @@
-#!/bin/sh
-
-set -e
-
 case "$1" in
        configure)
                dpkg-trigger --no-await update-initramfs
@@ -15,5 +11,3 @@
                exit 1
        ;;
 esac
-
-#DEBHELPER#
diff --minimal -Nru 
firmware-nonfree-20230625/debian/templates/postinst.usrmovemitigation.in 
firmware-nonfree-20230625/debian/templates/postinst.usrmovemitigation.in
--- firmware-nonfree-20230625/debian/templates/postinst.usrmovemitigation.in    
1970-01-01 01:00:00.000000000 +0100
+++ firmware-nonfree-20230625/debian/templates/postinst.usrmovemitigation.in    
2024-06-19 13:11:15.000000000 +0200
@@ -0,0 +1,7 @@
+if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ]; then
+       for f in @files@; do
+               dpkg-divert --package #PACKAGE# --no-rename --quiet \
+                       --divert "/lib/firmware/$f.usr-is-merged" \
+                       --remove "/lib/firmware/$f"
+       done
+fi
diff --minimal -Nru 
firmware-nonfree-20230625/debian/templates/preinst.license.in 
firmware-nonfree-20230625/debian/templates/preinst.license.in
--- firmware-nonfree-20230625/debian/templates/preinst.license.in       
2024-06-02 22:08:30.000000000 +0200
+++ firmware-nonfree-20230625/debian/templates/preinst.license.in       
2024-06-19 11:39:51.000000000 +0200
@@ -1,7 +1,3 @@
-#!/bin/sh
-
-set -e
-
 . /usr/share/debconf/confmodule
 db_version 2.0
 db_capb backup
@@ -72,7 +68,3 @@
     RESULT=$?
     [ "$RESULT" = 0 ] || exit $RESULT
 fi
- 
-#DEBHELPER#
-
-exit 0
diff --minimal -Nru 
firmware-nonfree-20230625/debian/templates/preinst.usrmovemitigation.in 
firmware-nonfree-20230625/debian/templates/preinst.usrmovemitigation.in
--- firmware-nonfree-20230625/debian/templates/preinst.usrmovemitigation.in     
1970-01-01 01:00:00.000000000 +0100
+++ firmware-nonfree-20230625/debian/templates/preinst.usrmovemitigation.in     
2024-06-19 13:11:07.000000000 +0200
@@ -0,0 +1,7 @@
+if [ "$1" = "upgrade" ] || [ "$1" = "install" ]; then
+       for f in @files@; do
+               dpkg-divert --package #PACKAGE# --no-rename --quiet \
+                       --divert "/lib/firmware/$f.usr-is-merged" \
+                       --add "/lib/firmware/$f"
+       done
+fi