diff -Nru gpgme1.0-1.16.0/debian/changelog gpgme1.0-1.16.0/debian/changelog
--- gpgme1.0-1.16.0/debian/changelog	2022-03-31 13:59:19.000000000 +0200
+++ gpgme1.0-1.16.0/debian/changelog	2023-06-29 18:37:08.000000000 +0200
@@ -1,3 +1,9 @@
+gpgme1.0 (1.16.0-1.2ubuntu4.1) jammy; urgency=medium
+
+  * avoid -unknown suffix (Closes: #1004742, LP: #1991606)
+
+ -- Benjamin Drung <bdrung@ubuntu.com>  Thu, 29 Jun 2023 18:37:08 +0200
+
 gpgme1.0 (1.16.0-1.2ubuntu4) jammy; urgency=medium
 
   * d/patches:
diff -Nru gpgme1.0-1.16.0/debian/patches/0001-avoid-identifying-as-beta.patch gpgme1.0-1.16.0/debian/patches/0001-avoid-identifying-as-beta.patch
--- gpgme1.0-1.16.0/debian/patches/0001-avoid-identifying-as-beta.patch	2021-11-24 03:23:52.000000000 +0100
+++ gpgme1.0-1.16.0/debian/patches/0001-avoid-identifying-as-beta.patch	1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Date: Thu, 11 Jun 2015 18:26:16 -0400
-Subject: avoid identifying as beta
-
-If we build from git-buildpackage using autoreconf, it comes out
-looking like a beta because we're not on a git tag.
-
-This patch avoids that situation.
----
- autogen.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/autogen.sh b/autogen.sh
-index 9b36158..5cfc244 100755
---- a/autogen.sh
-+++ b/autogen.sh
-@@ -249,7 +249,7 @@ if [ "$myhost" = "find-version" ]; then
-     fi
- 
-     beta=no
--    if [ -e .git ]; then
-+    if false; then
-       ingit=yes
-       tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
-       tmp=$(echo "$tmp" | sed s/^"$package"//)
diff -Nru gpgme1.0-1.16.0/debian/patches/0001-Remove-upstream-git-fanciness.patch gpgme1.0-1.16.0/debian/patches/0001-Remove-upstream-git-fanciness.patch
--- gpgme1.0-1.16.0/debian/patches/0001-Remove-upstream-git-fanciness.patch	1970-01-01 01:00:00.000000000 +0100
+++ gpgme1.0-1.16.0/debian/patches/0001-Remove-upstream-git-fanciness.patch	2023-06-29 18:34:28.000000000 +0200
@@ -0,0 +1,105 @@
+From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Date: Thu, 11 Jun 2015 18:26:16 -0400
+Subject: Remove upstream git fanciness
+
+Debian needs to be able to build libgpg-error while using git for
+tracking the debian packaging itself.  Debian also wants to autoreconf
+this stuff.  However, Debian does *not* need to conform exactly to
+upstream's git configurations.
+
+This avoids mistakes like accidentally identifying running code as a
+beta.
+
+This is the same approach taken in debian's libgpg-error packaging
+since 2017.
+
+Forwarded: not-needed
+---
+ autogen.sh | 67 ++++----------------------------------------------------------
+ 1 file changed, 4 insertions(+), 63 deletions(-)
+
+diff --git a/autogen.sh b/autogen.sh
+index 9b36158..5dfca0e 100755
+--- a/autogen.sh
++++ b/autogen.sh
+@@ -249,27 +249,10 @@ if [ "$myhost" = "find-version" ]; then
+     fi
+ 
+     beta=no
+-    if [ -e .git ]; then
+-      ingit=yes
+-      tmp=$(git describe --match "${matchstr1}" --long 2>/dev/null)
+-      tmp=$(echo "$tmp" | sed s/^"$package"//)
+-      if [ -n "$tmp" ]; then
+-          tmp=$(echo "$tmp" | sed s/^"$package"//  \
+-                | awk -F- '$3!=0 && $3 !~ /^beta/ {print"-beta"$3}')
+-      else
+-          tmp=$(git describe --match "${matchstr2}" --long 2>/dev/null \
+-                | awk -F- '$4!=0{print"-beta"$4}')
+-      fi
+-      [ -n "$tmp" ] && beta=yes
+-      rev=$(git rev-parse --short HEAD | tr -d '\n\r')
+-      rvd=$((0x$(echo ${rev} | dd bs=1 count=4 2>/dev/null)))
+-    else
+-      ingit=no
+-      beta=yes
+-      tmp="-unknown"
+-      rev="0000000"
+-      rvd="0"
+-    fi
++    ingit=no
++    tmp=""
++    rvd="$(wc -l < debian/changelog)"
++    rev="$(printf %07x $rvd)"
+ 
+     echo "$package-$vers$tmp:$beta:$ingit:$vers$tmp:$vers:$tmp:$rev:$rvd:"
+     exit 0
+@@ -452,48 +435,6 @@ EOF
+     die_p
+ fi
+ 
+-# Check the git setup.
+-if [ -d .git ]; then
+-  CP="cp -p"
+-  # If we have a GNU cp we can add -v
+-  if cp --version >/dev/null 2>/dev/null; then
+-    [ -z "${SILENT}" ] && CP="$CP -v"
+-  fi
+-  if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then
+-    [ -z "${SILENT}" ] && cat <<EOF
+-*** Activating trailing whitespace git pre-commit hook. ***
+-    For more information see this thread:
+-      https://mail.gnome.org/archives/desktop-devel-list/2009-May/msg00084.html
+-    To deactivate this pre-commit hook again move .git/hooks/pre-commit
+-    and .git/hooks/pre-commit.sample out of the way.
+-EOF
+-      $CP .git/hooks/pre-commit.sample .git/hooks/pre-commit
+-      chmod +x  .git/hooks/pre-commit
+-  fi
+-
+-  if [ "$gettext_vers" != "n/a" ]; then
+-    tmp=$(git config --get filter.cleanpo.clean)
+-    if [ "$tmp" != \
+-          "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'" ]
+-    then
+-      info "*** Adding GIT filter.cleanpo.clean configuration."
+-      git config --add filter.cleanpo.clean \
+-        "awk '/^\"POT-Creation-Date:/&&!s{s=1;next};!/^#: /{print}'"
+-    fi
+-  fi
+-  if [ -f build-aux/git-hooks/commit-msg -a ! -f .git/hooks/commit-msg ] ; then
+-      [ -z "${SILENT}" ] && cat <<EOF
+-*** Activating commit log message check hook. ***
+-EOF
+-      $CP build-aux/git-hooks/commit-msg .git/hooks/commit-msg
+-      chmod +x  .git/hooks/commit-msg
+-      if [ x"${display_name}" != x ]; then
+-         git config format.subjectPrefix "PATCH ${display_name}"
+-         git config sendemail.to "${patches_to}"
+-      fi
+-  fi
+-fi
+-
+ aclocal_flags="-I m4"
+ if [ -n "${extra_aclocal_flags}" ]; then
+   aclocal_flags="${aclocal_flags} ${extra_aclocal_flags}"
diff -Nru gpgme1.0-1.16.0/debian/patches/series gpgme1.0-1.16.0/debian/patches/series
--- gpgme1.0-1.16.0/debian/patches/series	2022-03-31 13:59:19.000000000 +0200
+++ gpgme1.0-1.16.0/debian/patches/series	2023-06-29 18:36:08.000000000 +0200
@@ -1,4 +1,4 @@
-0001-avoid-identifying-as-beta.patch
+0001-Remove-upstream-git-fanciness.patch
 0004-drop-python2-support.patch
 0006-Ship-python-examples-with-python3-in-shebang-line.patch
 0004-core-Fix-use-after-free-issue-in-test.patch