From 23e15cea65b2d9e6da8615f6fdad32a76a0ae5ed Mon Sep 17 00:00:00 2001
From: Dorian Stoll <dorian.stoll@tmsp.io>
Date: Sun, 29 Oct 2023 11:48:14 +0100
Subject: [PATCH] pkg: debian: Fix meta package dependencies after adjusting
 LOCALVERSION

---
 .github/scripts/package/debian.sh |  2 +-
 pkg/debian/meta/mkdebian.sh       | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/scripts/package/debian.sh b/.github/scripts/package/debian.sh
index dab8955c3..16964bd1e 100644
--- a/.github/scripts/package/debian.sh
+++ b/.github/scripts/package/debian.sh
@@ -117,7 +117,7 @@ build-packages)
 
     pushd pkg/debian/meta || exit 1
 
-    ./mkdebian.sh "$(make -C ../kernel/linux -s kernelrelease)" "${KERNEL_REVISION}"
+    ./mkdebian.sh "$(make -C ../kernel/linux -s kernelrelease)"
     dpkg-buildpackage -b -Zxz
 
     popd || exit 1
diff --git a/pkg/debian/meta/mkdebian.sh b/pkg/debian/meta/mkdebian.sh
index 92c69cacd..5b40c800d 100755
--- a/pkg/debian/meta/mkdebian.sh
+++ b/pkg/debian/meta/mkdebian.sh
@@ -1,15 +1,13 @@
 #!/usr/bin/bash
 
 kernelrelease="${1}"
-pkgrevision="${2}"
-suffix="${3:+-${3}}"
+suffix="${2:+-${2}}"
 
 distribution="unstable"
 debarch="amd64"
 debcompat="10"
 sourcename="linux-surface${suffix}"
 maintainer="surfacebot <surfacebot@users.noreply.github.com>"
-pkgversion="${kernelrelease}-${pkgrevision}"
 
 image_pkgname="linux-image-surface${suffix}"
 image_pkgname_actual="linux-image-${kernelrelease}"
@@ -28,7 +26,7 @@ echo "${debarch}" > "debian/arch"
 echo "${debcompat}" > "debian/compat"
 
 cat <<EOF > "debian/changelog"
-${sourcename} (${pkgversion}) ${distribution}; urgency=medium
+${sourcename} (${kernelrelease}) ${distribution}; urgency=medium
 
   * Linux kernel for Microsoft Surface devices.
 
@@ -44,14 +42,14 @@ Homepage: https://github.com/linux-surface/linux-surface
 
 Package: ${image_pkgname}
 Architecture: ${debarch}
-Depends: ${image_pkgname_actual} (= ${pkgversion})
+Depends: ${image_pkgname_actual} (= ${kernelrelease})
 Recommends: ${recommends}
 Description:
   Meta-package for linux-surface kernel images.
 
 Package: ${headers_pkgname}
 Architecture: ${debarch}
-Depends: ${headers_pkgname_actual} (= ${pkgversion})
+Depends: ${headers_pkgname_actual} (= ${kernelrelease})
 Description:
   Meta-package for linux-surface headers.
 EOF