More tweaks for signing template pieces

diff --git a/debian/gen_signing_changelog b/debian/gen_signing_changelog
index d6f132d692f2950453d9f5dfe1b9a56cb5524541..bb3aa2a94b2b8bc014069d7d444f75d0d89a9c5a 100755 (executable)
--- a/debian/gen_signing_changelog
+++ b/debian/gen_signing_changelog
@@ -21,7 +21,7 @@ DATE="$(dpkg-parsechangelog | sed -ne 's/^Date: \(.*\)/\1/p')"
 VERSION="$(dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)/\1/p')"
 MANGLED_VERSION="$(echo $VERSION | sed -r 's/-/\+/;s/\+(b[[:digit:]]+)$/.\1/')"
 
-printf "%s-%s-signed (%s) %s; urgency=%s\n" "${SOURCE}" "${ARCH}" "${MANGLED_VERSION}" "${DISTRIBUTION}" "${URGENCY}" > $OUT
+printf "%s-%s-signed (%s) %s; urgency=%s\n" "fwupd" "${ARCH}" "${MANGLED_VERSION}" "${DISTRIBUTION}" "${URGENCY}" > $OUT
 printf "\n" >> $OUT
 printf "  * Update to %s version %s\n" "${SOURCE}" "${VERSION}" >> $OUT
 printf "\n" >> $OUT

diff --git a/debian/gen_signing_json b/debian/gen_signing_json
index 6105e97223d0fc2464d75883404d585d9063ebef..dbaba1cec41ae52d19c053cc070477c2d38166d0 100755 (executable)
--- a/debian/gen_signing_json
+++ b/debian/gen_signing_json
@@ -4,15 +4,14 @@
 # package. Describes exactly what needs to be signed, and how.
 
 DIR=$1
-SOURCE=$2
-ARCH=$3
+ARCH=$2
 OUT="$DIR/files.json"
 
 # What file are we looking to sign?
 BINARY=$(find debian/tmp -name '*.efi' | xargs basename)
 
 # Actually needs full path within the binary deb
-BINARY="usr/libexec/${SOURCE}/efi/${BINARY}"
+BINARY="usr/libexec/fwupd/efi/${BINARY}"
 
 rm -f $OUT
 

diff --git a/debian/rules b/debian/rules
index 7592c5a27cffb218e714b8067fa0ca8a6d28fb1e..e74949104a032ff4eaf02f220a05bd8635f60fa3 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -57,8 +57,8 @@ ifeq (debian,$(SB_STYLE))
                file1=$$(echo $$file | sed "s,SIGNARCH,$(DEB_HOST_ARCH),"); \
                mv -v $$file $$file1; \
        done
-       debian/gen_signing_changelog $(TMPLDIR)/source-template/debian fwupd $(DEB_HOST_ARCH)
-       debian/gen_signing_json $(TMPLDIR) fwupd ${DEB_HOST_ARCH}
+       debian/gen_signing_changelog $(TMPLDIR)/source-template/debian fwupd-efi $(DEB_HOST_ARCH)
+       debian/gen_signing_json $(TMPLDIR) ${DEB_HOST_ARCH}
 endif
 
 override_dh_fixperms: