Merging debian version 3.20240116.2+nmu1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 14 insertions, 7 deletions

diff --git a/debian/amd64-microcode.dirs b/debian/amd64-microcode.dirs
index 60f0777..06abd4d 100644
--- a/debian/amd64-microcode.dirs
+++ b/debian/amd64-microcode.dirs
@@ -1,5 +1,5 @@
 etc/default
 etc/modprobe.d
-lib/firmware/amd-ucode
-lib/firmware/amd
-lib/firmware/amdtee
+usr/lib/firmware/amd-ucode
+usr/lib/firmware/amd
+usr/lib/firmware/amdtee
diff --git a/debian/amd64-microcode.install b/debian/amd64-microcode.install
index 07af704..2ee8df0 100644
--- a/debian/amd64-microcode.install
+++ b/debian/amd64-microcode.install
@@ -1,3 +1,3 @@
-amd-ucode/*bin	lib/firmware/amd-ucode
-amdtee/*        lib/firmware/amdtee
-amd/*sev*bin	lib/firmware/amd
+amd-ucode/*bin	usr/lib/firmware/amd-ucode
+amdtee/*        usr/lib/firmware/amdtee
+amd/*sev*bin	usr/lib/firmware/amd
diff --git a/debian/changelog b/debian/changelog
index da34616..47037dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+amd64-microcode (3.20240116.2+nmu1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Install files into /usr instead of /. (Closes: 1059372)
+
+ -- Chris Hofstaedtler <zeha@debian.org>  Mon, 03 Jun 2024 22:41:28 +0200
+
 amd64-microcode (3.20240116.2-0.0~progress7.99u1) graograman-backports; urgency=medium
 
   * Initial reupload to graograman-backports.
diff --git a/debian/initramfs.hook b/debian/initramfs.hook
index c65d7d4..1f6b696 100755
--- a/debian/initramfs.hook
+++ b/debian/initramfs.hook
@@ -31,7 +31,7 @@ verbose()
     :
 }
 
-AUCODE_FW_DIR=/lib/firmware/amd-ucode
+AUCODE_FW_DIR=/usr/lib/firmware/amd-ucode
 AMD64UCODE_INITRAMFS=auto
 [ -r ${AMD64UCODE_CONFIG} ] && . ${AMD64UCODE_CONFIG}