Update the EPLA packaging key (previous key expires 2019-09-23)

Add the new upstream key from this upstream commit:

  commit f16785d361097df9fddfcc0b60ae6f0d92e7e911
  Author: Stefan Monnier <monnier@iro.umontreal.ca>
  Date:   Wed May 8 13:19:36 2019 -0400

    * etc/package-keyring.gpg: Add the 2019 key (backport)

    Origin: backport, commit: 916510b6d919a333d1dac528a9d051aa6d857ccc
    Forwarded: not-needed

Add the old and new keyrings to debian/ and
debian/source/include-binaries since debian/patches/ can't handle git
binary diffs.

Thanks to Stefan Monnier for reporting the problem and providing the
patch.

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

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

diff --git a/debian/rules b/debian/rules
index b50b1615ac707013cb88f13b83bfdfd45ba2bf3a..5e5433beae68b2a5d392d8c19f7d002e1c66bd04 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -314,7 +314,15 @@ override_dh_autoreconf:
 override_dh_auto_configure:
 
 debian/stamp-configured: $(autogen_build_files)
-        # If the deps for this target change, start over
+        # 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
        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
@@ -559,6 +567,8 @@ 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
new file mode 100644 (file)
index 0000000..3549d04
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1,2 @@
+debian/etc-package-keyring-new.gpg
+debian/etc-package-keyring-old.gpg