Don't override the upstream EPLA packaging key anymore

Emacs 26.3 has the correct version.

This reverts commit d1de1246503b55518a912694704fd5e509e01d3a.

diff --git a/debian/etc-package-keyring-new.gpg b/debian/etc-package-keyring-new.gpg
deleted file mode 100644 (file)
index 490dee4..0000000
Binary files a/debian/etc-package-keyring-new.gpg and /dev/null differ

diff --git a/debian/etc-package-keyring-old.gpg b/debian/etc-package-keyring-old.gpg
deleted file mode 100644 (file)
index e76e685..0000000
Binary files a/debian/etc-package-keyring-old.gpg and /dev/null differ

diff --git a/debian/rules b/debian/rules
index 5e5433beae68b2a5d392d8c19f7d002e1c66bd04..b50b1615ac707013cb88f13b83bfdfd45ba2bf3a 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -314,15 +314,7 @@ override_dh_autoreconf:
 override_dh_auto_configure:
 
 debian/stamp-configured: $(autogen_build_files)
-        # If the deps for this target change, start over.
-        # When the "new" keyring is obsolete, update
-        # debian/source/include-binaries.
-       if test "$$(sha1sum etc/package-keyring.gpg | cut -f 1 -d ' ')" \
-         != 5eda21f010a2d246359efc6450830ac3d500760e; then \
-         echo 'Unexpected keyring hash - is it obsolete?'; \
-         false; \
-       fi
-       cp -a debian/etc-package-keyring-new.gpg etc/package-keyring.gpg
+        # If the deps for this target change, start over
        rm -rf debian/build-src debian/build-gtk debian/build-lucid debian/build-nox
        mkdir debian/build-src
        cp -a $$(ls -A | egrep -v '^(\.git|\.pc|debian)$$') debian/build-src
@@ -567,8 +559,6 @@ override_dh_auto_clean: $(persistent_autogen_files)
 
 override_dh_clean: $(persistent_autogen_files)
        dh_clean
-       cp -a debian/etc-package-keyring-old.gpg \
-         etc/package-keyring.gpg
        rm -rf \
          debian/stamp-* \
          debian/build-lucid \

diff --git a/debian/source/include-binaries b/debian/source/include-binaries
deleted file mode 100644 (file)
index 3549d04..0000000
--- a/debian/source/include-binaries
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/etc-package-keyring-new.gpg
-debian/etc-package-keyring-old.gpg